From abcb5c63f4ac1d9ff4294a6462889b623bc783ac Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sat, 17 Jun 2023 12:41:52 -0500 Subject: [PATCH] Update: Remove f_array_length_t and related, replacing with f_number_unsigned_t and appropriate. This simplifies the design. Doing this comes at a cost of some flexibility and hackability. After some consideration, I have decided that it can introduce more complicated handling when needing to process both f_array_length_t and f_number_unsigned_t during I/O. This should keep things simple. I decided to maintain the custom functions for managing this. I could use an ifdef wrapper and call the appropriate calls within, but I can do that for another time if I decide to (and remember to). --- build/disable/level_0/f_type.h | 3 - build/disable/level_0/f_type_array.h | 36 +-- build/level_0/settings | 6 +- build/monolithic/settings | 6 +- build/stand_alone/byte_dump.config.h | 39 +-- build/stand_alone/byte_dump.settings | 4 +- build/stand_alone/fake.config.h | 40 +-- build/stand_alone/fake.settings | 4 +- build/stand_alone/firewall.config.h | 38 +-- build/stand_alone/firewall.settings | 4 +- build/stand_alone/utf8.config.h | 38 +-- build/stand_alone/utf8.settings | 4 +- level_0/f_account/c/account.c | 8 +- level_0/f_account/c/account/accounts.c | 46 ++-- level_0/f_account/c/account/accounts.h | 32 +-- level_0/f_account/c/account/common.h | 8 +- level_0/f_account/c/account/private-accounts.c | 18 +- level_0/f_account/c/account/private-accounts.h | 8 +- level_0/f_account/c/private-account.c | 4 +- level_0/f_account/c/private-account.h | 2 +- level_0/f_account/data/build/structures | 4 +- .../tests/unit/c/test-account-ss_append.c | 4 +- .../tests/unit/c/test-account-ss_append_all.c | 6 +- level_0/f_capability/c/capability.c | 2 +- .../tests/unit/c/test-color-context_delete.c | 2 +- .../tests/unit/c/test-color-context_destroy.c | 2 +- level_0/f_compare/c/compare.c | 36 +-- level_0/f_compare/c/compare.h | 36 +-- level_0/f_compare/c/compare/private-utf.c | 60 ++--- level_0/f_compare/c/compare/private-utf.h | 8 +- level_0/f_compare/c/compare/utf.c | 36 +-- level_0/f_compare/c/compare/utf.h | 36 +-- level_0/f_compare/c/private-compare.c | 62 ++--- level_0/f_compare/c/private-compare.h | 8 +- .../tests/unit/c/test-compare-dynamic_except.c | 6 +- .../unit/c/test-compare-dynamic_except_string.c | 6 +- .../unit/c/test-compare-dynamic_except_trim.c | 6 +- .../c/test-compare-dynamic_except_trim_string.c | 6 +- .../unit/c/test-compare-dynamic_partial_except.c | 6 +- .../test-compare-dynamic_partial_except_dynamic.c | 6 +- .../c/test-compare-dynamic_partial_except_string.c | 6 +- .../c/test-compare-dynamic_partial_except_trim.c | 6 +- ...t-compare-dynamic_partial_except_trim_dynamic.c | 6 +- ...st-compare-dynamic_partial_except_trim_string.c | 6 +- .../f_compare/tests/unit/c/test-compare-except.c | 6 +- .../tests/unit/c/test-compare-except_trim.c | 6 +- .../tests/unit/c/test-compare-utf_dynamic_except.c | 6 +- .../c/test-compare-utf_dynamic_except_string.c | 6 +- .../unit/c/test-compare-utf_dynamic_except_trim.c | 6 +- .../test-compare-utf_dynamic_except_trim_string.c | 6 +- .../c/test-compare-utf_dynamic_partial_except.c | 6 +- ...st-compare-utf_dynamic_partial_except_dynamic.c | 6 +- ...est-compare-utf_dynamic_partial_except_string.c | 6 +- .../test-compare-utf_dynamic_partial_except_trim.c | 6 +- ...mpare-utf_dynamic_partial_except_trim_dynamic.c | 6 +- ...ompare-utf_dynamic_partial_except_trim_string.c | 6 +- .../tests/unit/c/test-compare-utf_except.c | 6 +- .../tests/unit/c/test-compare-utf_except_trim.c | 6 +- level_0/f_compare/tests/unit/c/test-compare.c | 2 +- level_0/f_console/c/console.c | 48 ++-- level_0/f_console/c/console.h | 12 +- level_0/f_console/c/console/common.c | 24 +- level_0/f_console/c/console/common.h | 96 +++---- level_0/f_console/c/private-console.c | 2 +- .../c/test-console-parameter_prioritize_left.c | 6 +- .../c/test-console-parameter_prioritize_right.c | 6 +- .../tests/unit/c/test-console-parameters_delete.c | 6 +- .../tests/unit/c/test-console-parameters_destroy.c | 6 +- level_0/f_conversion/c/private-conversion.c | 2 +- level_0/f_directory/c/directory.c | 2 +- level_0/f_directory/c/directory/private-type.c | 8 +- level_0/f_directory/c/directory/private-type.h | 4 +- level_0/f_directory/c/directory/type.c | 22 +- level_0/f_directory/c/directory/type.h | 22 +- level_0/f_environment/c/environment.c | 2 +- level_0/f_file/c/file.c | 38 +-- level_0/f_file/c/file.h | 10 +- level_0/f_file/c/file/stream.c | 28 +- level_0/f_file/c/file/stream.h | 10 +- level_0/f_file/c/private-file.c | 14 +- level_0/f_file/c/private-file.h | 4 +- .../f_file/tests/unit/c/test-file-mode_to_mode.c | 2 +- .../f_file/tests/unit/c/test-file-stream_write.c | 2 +- .../tests/unit/c/test-file-stream_write_block.c | 4 +- .../tests/unit/c/test-file-stream_write_range.c | 6 +- .../tests/unit/c/test-file-stream_write_until.c | 6 +- level_0/f_file/tests/unit/c/test-file-write.c | 2 +- .../f_file/tests/unit/c/test-file-write_block.c | 2 +- .../f_file/tests/unit/c/test-file-write_range.c | 6 +- .../f_file/tests/unit/c/test-file-write_until.c | 6 +- level_0/f_fss/c/fss.c | 22 +- level_0/f_fss/c/fss.h | 4 +- level_0/f_fss/c/fss/delimit.h | 58 ++--- level_0/f_fss/c/fss/named.c | 44 ++-- level_0/f_fss/c/fss/named.h | 38 +-- level_0/f_fss/c/fss/nest.c | 66 ++--- level_0/f_fss/c/fss/nest.h | 64 ++--- level_0/f_fss/c/fss/set.c | 88 +++---- level_0/f_fss/c/fss/set.h | 72 +++--- level_0/f_fss/c/private-fss.c | 60 ++--- level_0/f_fss/c/private-fss.h | 36 +-- level_0/f_fss/tests/unit/c/test-fss-count_lines.c | 6 +- .../tests/unit/c/test-fss-count_lines_range.c | 10 +- level_0/f_fss/tests/unit/c/test-fss-is_combining.c | 4 +- level_0/f_fss/tests/unit/c/test-fss-is_graph.c | 2 +- level_0/f_fss/tests/unit/c/test-fss-is_space.c | 2 +- .../f_fss/tests/unit/c/test-fss-is_zero_width.c | 2 +- level_0/f_fss/tests/unit/c/test-fss-seek_to_eol.c | 2 +- .../tests/unit/c/test-fss-skip_past_delimit.c | 2 +- .../f_fss/tests/unit/c/test-fss-skip_past_space.c | 2 +- level_0/f_iki/c/iki.c | 20 +- level_0/f_iki/c/iki/common.h | 14 +- level_0/f_iki/c/iki/data.c | 50 ++-- level_0/f_iki/c/iki/data.h | 40 +-- level_0/f_iki/c/iki/private-data.c | 30 +-- level_0/f_iki/c/iki/private-data.h | 8 +- level_0/f_iki/c/private-iki.c | 10 +- level_0/f_iki/c/private-iki.h | 20 +- level_0/f_iki/tests/unit/c/test-iki-datas_append.c | 8 +- .../f_iki/tests/unit/c/test-iki-datas_append_all.c | 14 +- .../f_iki/tests/unit/c/test-iki-datass_append.c | 16 +- .../tests/unit/c/test-iki-datass_append_all.c | 20 +- level_0/f_iki/tests/unit/c/test-iki-read.c | 2 +- level_0/f_limit/c/limit/private-set.c | 14 +- level_0/f_limit/c/limit/private-set.h | 8 +- level_0/f_limit/c/limit/private-value.c | 14 +- level_0/f_limit/c/limit/private-value.h | 8 +- level_0/f_limit/c/limit/set.c | 46 ++-- level_0/f_limit/c/limit/set.h | 40 +-- level_0/f_limit/c/limit/value.c | 46 ++-- level_0/f_limit/c/limit/value.h | 40 +-- .../tests/unit/c/test-limit-sets_append_all.c | 2 +- .../f_limit/tests/unit/c/test-limit-setss_append.c | 4 +- .../tests/unit/c/test-limit-setss_append_all.c | 10 +- .../tests/unit/c/test-limit-values_append_all.c | 2 +- .../tests/unit/c/test-limit-valuess_append.c | 4 +- .../tests/unit/c/test-limit-valuess_append_all.c | 10 +- level_0/f_memory/c/memory/common.h | 10 +- level_0/f_memory/c/memory/structure.c | 22 +- level_0/f_memory/c/memory/structure.h | 16 +- level_0/f_memory/c/private-memory.c | 4 +- level_0/f_memory/c/private-memory.h | 4 +- level_0/f_parse/c/parse.c | 22 +- level_0/f_path/c/path.c | 14 +- level_0/f_path/c/private-path.c | 2 +- .../tests/unit/c/test-path-directory_cleanup.c | 2 +- level_0/f_print/c/print.c | 94 +++---- level_0/f_print/c/print.h | 58 ++--- level_0/f_print/c/print/common.h | 4 +- level_0/f_print/c/print/private-to.c | 118 ++++----- level_0/f_print/c/print/private-to.h | 24 +- level_0/f_print/c/print/to.c | 86 +++---- level_0/f_print/c/print/to.h | 56 ++-- level_0/f_print/c/private-print.c | 144 +++++------ level_0/f_print/c/private-print.h | 28 +- level_0/f_print/tests/unit/c/test-print-except.c | 14 +- .../tests/unit/c/test-print-except_dynamic.c | 12 +- .../unit/c/test-print-except_dynamic_partial.c | 12 +- .../unit/c/test-print-except_dynamic_partial_raw.c | 12 +- .../test-print-except_dynamic_partial_raw_safely.c | 12 +- .../c/test-print-except_dynamic_partial_safely.c | 12 +- .../tests/unit/c/test-print-except_dynamic_raw.c | 12 +- .../unit/c/test-print-except_dynamic_raw_safely.c | 12 +- .../unit/c/test-print-except_dynamic_safely.c | 12 +- .../f_print/tests/unit/c/test-print-except_in.c | 14 +- .../tests/unit/c/test-print-except_in_dynamic.c | 12 +- .../unit/c/test-print-except_in_dynamic_partial.c | 12 +- .../c/test-print-except_in_dynamic_partial_raw.c | 12 +- ...st-print-except_in_dynamic_partial_raw_safely.c | 12 +- .../test-print-except_in_dynamic_partial_safely.c | 12 +- .../unit/c/test-print-except_in_dynamic_raw.c | 12 +- .../c/test-print-except_in_dynamic_raw_safely.c | 12 +- .../unit/c/test-print-except_in_dynamic_safely.c | 12 +- .../tests/unit/c/test-print-except_in_raw.c | 14 +- .../tests/unit/c/test-print-except_in_raw_safely.c | 14 +- .../tests/unit/c/test-print-except_in_safely.c | 14 +- .../f_print/tests/unit/c/test-print-except_raw.c | 14 +- .../tests/unit/c/test-print-except_raw_safely.c | 14 +- .../tests/unit/c/test-print-except_safely.c | 14 +- .../f_print/tests/unit/c/test-print-to_except.c | 14 +- .../tests/unit/c/test-print-to_except_dynamic.c | 12 +- .../unit/c/test-print-to_except_dynamic_partial.c | 12 +- .../c/test-print-to_except_dynamic_partial_raw.c | 12 +- ...st-print-to_except_dynamic_partial_raw_safely.c | 12 +- .../test-print-to_except_dynamic_partial_safely.c | 12 +- .../unit/c/test-print-to_except_dynamic_raw.c | 12 +- .../c/test-print-to_except_dynamic_raw_safely.c | 12 +- .../unit/c/test-print-to_except_dynamic_safely.c | 12 +- .../f_print/tests/unit/c/test-print-to_except_in.c | 14 +- .../tests/unit/c/test-print-to_except_in_dynamic.c | 12 +- .../c/test-print-to_except_in_dynamic_partial.c | 12 +- .../test-print-to_except_in_dynamic_partial_raw.c | 12 +- ...print-to_except_in_dynamic_partial_raw_safely.c | 12 +- ...est-print-to_except_in_dynamic_partial_safely.c | 12 +- .../unit/c/test-print-to_except_in_dynamic_raw.c | 12 +- .../c/test-print-to_except_in_dynamic_raw_safely.c | 12 +- .../c/test-print-to_except_in_dynamic_safely.c | 12 +- .../tests/unit/c/test-print-to_except_in_raw.c | 14 +- .../unit/c/test-print-to_except_in_raw_safely.c | 14 +- .../tests/unit/c/test-print-to_except_in_safely.c | 14 +- .../tests/unit/c/test-print-to_except_raw.c | 14 +- .../tests/unit/c/test-print-to_except_raw_safely.c | 14 +- .../tests/unit/c/test-print-to_except_safely.c | 14 +- level_0/f_rip/c/private-rip.c | 6 +- level_0/f_rip/c/private-rip.h | 2 +- level_0/f_rip/c/rip.c | 28 +- level_0/f_rip/c/rip.h | 4 +- level_0/f_rip/c/rip/private-utf.c | 2 +- level_0/f_rip/c/rip/private-utf.h | 2 +- level_0/f_rip/c/rip/utf.c | 12 +- level_0/f_rip/c/rip/utf.h | 4 +- level_0/f_serialize/c/private-serialize.c | 8 +- level_0/f_serialize/c/private-serialize.h | 2 +- level_0/f_serialize/c/serialize.c | 18 +- level_0/f_serialize/c/serialize.h | 4 +- level_0/f_string/c/private-string.c | 22 +- level_0/f_string/c/private-string.h | 8 +- level_0/f_string/c/string.c | 40 +-- level_0/f_string/c/string.h | 28 +- level_0/f_string/c/string/common.h | 4 +- level_0/f_string/c/string/dynamic.c | 58 ++--- level_0/f_string/c/string/dynamic.h | 16 +- level_0/f_string/c/string/dynamics.c | 22 +- level_0/f_string/c/string/dynamics.h | 16 +- level_0/f_string/c/string/dynamicss.c | 24 +- level_0/f_string/c/string/dynamicss.h | 16 +- level_0/f_string/c/string/map_multis.c | 22 +- level_0/f_string/c/string/map_multis.h | 20 +- level_0/f_string/c/string/map_multiss.c | 24 +- level_0/f_string/c/string/map_multiss.h | 20 +- level_0/f_string/c/string/maps.c | 22 +- level_0/f_string/c/string/maps.h | 20 +- level_0/f_string/c/string/mapss.c | 24 +- level_0/f_string/c/string/mapss.h | 20 +- level_0/f_string/c/string/private-dynamic.c | 6 +- level_0/f_string/c/string/private-dynamic.h | 6 +- level_0/f_string/c/string/private-dynamics.c | 14 +- level_0/f_string/c/string/private-dynamics.h | 4 +- level_0/f_string/c/string/private-dynamicss.c | 12 +- level_0/f_string/c/string/private-dynamicss.h | 4 +- level_0/f_string/c/string/private-map_multis.c | 14 +- level_0/f_string/c/string/private-map_multis.h | 4 +- level_0/f_string/c/string/private-map_multiss.c | 12 +- level_0/f_string/c/string/private-map_multiss.h | 4 +- level_0/f_string/c/string/private-maps.c | 14 +- level_0/f_string/c/string/private-maps.h | 4 +- level_0/f_string/c/string/private-mapss.c | 12 +- level_0/f_string/c/string/private-mapss.h | 4 +- level_0/f_string/c/string/private-quantitys.c | 10 +- level_0/f_string/c/string/private-quantitys.h | 4 +- level_0/f_string/c/string/private-quantityss.c | 12 +- level_0/f_string/c/string/private-quantityss.h | 4 +- level_0/f_string/c/string/private-ranges.c | 10 +- level_0/f_string/c/string/private-ranges.h | 4 +- level_0/f_string/c/string/private-rangess.c | 12 +- level_0/f_string/c/string/private-rangess.h | 4 +- level_0/f_string/c/string/private-triples.c | 14 +- level_0/f_string/c/string/private-triples.h | 8 +- level_0/f_string/c/string/private-tripless.c | 12 +- level_0/f_string/c/string/private-tripless.h | 4 +- level_0/f_string/c/string/quantity.h | 4 +- level_0/f_string/c/string/quantitys.c | 22 +- level_0/f_string/c/string/quantitys.h | 20 +- level_0/f_string/c/string/quantityss.c | 24 +- level_0/f_string/c/string/quantityss.h | 20 +- level_0/f_string/c/string/range.h | 4 +- level_0/f_string/c/string/ranges.c | 24 +- level_0/f_string/c/string/ranges.h | 20 +- level_0/f_string/c/string/rangess.c | 24 +- level_0/f_string/c/string/rangess.h | 20 +- level_0/f_string/c/string/static.h | 4 +- level_0/f_string/c/string/statics.h | 4 +- level_0/f_string/c/string/staticss.h | 4 +- level_0/f_string/c/string/triples.c | 24 +- level_0/f_string/c/string/triples.h | 20 +- level_0/f_string/c/string/tripless.c | 24 +- level_0/f_string/c/string/tripless.h | 20 +- .../tests/unit/c/test-string-dynamic_terminate.c | 4 +- .../unit/c/test-string-dynamic_terminate_after.c | 4 +- .../tests/unit/c/test-string-dynamics_append_all.c | 6 +- .../tests/unit/c/test-string-dynamicss_append.c | 6 +- .../unit/c/test-string-dynamicss_append_all.c | 14 +- .../unit/c/test-string-map_multis_append_all.c | 6 +- .../tests/unit/c/test-string-map_multiss_append.c | 6 +- .../unit/c/test-string-map_multiss_append_all.c | 14 +- .../tests/unit/c/test-string-maps_append_all.c | 6 +- .../tests/unit/c/test-string-mapss_append.c | 6 +- .../tests/unit/c/test-string-mapss_append_all.c | 14 +- .../unit/c/test-string-quantitys_append_all.c | 2 +- .../tests/unit/c/test-string-quantityss_append.c | 2 +- .../unit/c/test-string-quantityss_append_all.c | 6 +- .../tests/unit/c/test-string-ranges_append_all.c | 2 +- .../tests/unit/c/test-string-rangess_append.c | 2 +- .../tests/unit/c/test-string-rangess_append_all.c | 6 +- .../tests/unit/c/test-string-triples_append_all.c | 4 +- .../tests/unit/c/test-string-tripless_append.c | 4 +- .../tests/unit/c/test-string-tripless_append_all.c | 8 +- level_0/f_thread/c/private-thread.c | 116 ++++----- level_0/f_thread/c/private-thread.h | 60 ++--- level_0/f_thread/c/thread/attribute.c | 22 +- level_0/f_thread/c/thread/attribute.h | 20 +- level_0/f_thread/c/thread/barrier.c | 22 +- level_0/f_thread/c/thread/barrier.h | 20 +- level_0/f_thread/c/thread/barrier_attribute.c | 22 +- level_0/f_thread/c/thread/barrier_attribute.h | 20 +- level_0/f_thread/c/thread/condition.c | 22 +- level_0/f_thread/c/thread/condition.h | 20 +- level_0/f_thread/c/thread/condition_attribute.c | 22 +- level_0/f_thread/c/thread/condition_attribute.h | 20 +- level_0/f_thread/c/thread/id.c | 22 +- level_0/f_thread/c/thread/id.h | 20 +- level_0/f_thread/c/thread/key.c | 22 +- level_0/f_thread/c/thread/key.h | 20 +- level_0/f_thread/c/thread/lock.c | 22 +- level_0/f_thread/c/thread/lock.h | 20 +- level_0/f_thread/c/thread/lock_attribute.c | 22 +- level_0/f_thread/c/thread/lock_attribute.h | 20 +- level_0/f_thread/c/thread/mutex.c | 22 +- level_0/f_thread/c/thread/mutex.h | 20 +- level_0/f_thread/c/thread/mutex_attribute.c | 22 +- level_0/f_thread/c/thread/mutex_attribute.h | 20 +- level_0/f_thread/c/thread/once.c | 22 +- level_0/f_thread/c/thread/once.h | 20 +- level_0/f_thread/c/thread/semaphore.c | 22 +- level_0/f_thread/c/thread/semaphore.h | 20 +- level_0/f_thread/c/thread/set.c | 22 +- level_0/f_thread/c/thread/set.h | 20 +- level_0/f_thread/c/thread/spin.c | 22 +- level_0/f_thread/c/thread/spin.h | 20 +- level_0/f_type/c/type.h | 171 ++++++------- level_0/f_type_array/c/type_array.h | 2 +- level_0/f_type_array/c/type_array/array_length.c | 285 --------------------- level_0/f_type_array/c/type_array/cell.c | 46 ++-- level_0/f_type_array/c/type_array/cell.h | 32 +-- level_0/f_type_array/c/type_array/common.h | 50 ++-- level_0/f_type_array/c/type_array/fll_id.c | 46 ++-- level_0/f_type_array/c/type_array/fll_id.h | 32 +-- level_0/f_type_array/c/type_array/int128.c | 46 ++-- level_0/f_type_array/c/type_array/int128.h | 32 +-- level_0/f_type_array/c/type_array/int16.c | 46 ++-- level_0/f_type_array/c/type_array/int16.h | 32 +-- level_0/f_type_array/c/type_array/int32.c | 46 ++-- level_0/f_type_array/c/type_array/int32.h | 32 +-- level_0/f_type_array/c/type_array/int64.c | 46 ++-- level_0/f_type_array/c/type_array/int64.h | 32 +-- level_0/f_type_array/c/type_array/int8.c | 46 ++-- level_0/f_type_array/c/type_array/int8.h | 32 +-- .../f_type_array/c/type_array/number_unsigned.c | 285 +++++++++++++++++++++ .../{array_length.h => number_unsigned.h} | 110 ++++---- .../c/type_array/private-array_length.c | 126 --------- .../c/type_array/private-array_length.h | 175 ------------- level_0/f_type_array/c/type_array/private-cell.c | 14 +- level_0/f_type_array/c/type_array/private-cell.h | 8 +- level_0/f_type_array/c/type_array/private-fll_id.c | 14 +- level_0/f_type_array/c/type_array/private-fll_id.h | 8 +- level_0/f_type_array/c/type_array/private-int128.c | 14 +- level_0/f_type_array/c/type_array/private-int128.h | 8 +- level_0/f_type_array/c/type_array/private-int16.c | 14 +- level_0/f_type_array/c/type_array/private-int16.h | 8 +- level_0/f_type_array/c/type_array/private-int32.c | 14 +- level_0/f_type_array/c/type_array/private-int32.h | 8 +- level_0/f_type_array/c/type_array/private-int64.c | 14 +- level_0/f_type_array/c/type_array/private-int64.h | 8 +- level_0/f_type_array/c/type_array/private-int8.c | 14 +- level_0/f_type_array/c/type_array/private-int8.h | 8 +- .../c/type_array/private-number_unsigned.c | 126 +++++++++ .../c/type_array/private-number_unsigned.h | 175 +++++++++++++ level_0/f_type_array/c/type_array/private-state.c | 14 +- level_0/f_type_array/c/type_array/private-state.h | 8 +- level_0/f_type_array/c/type_array/private-status.c | 14 +- level_0/f_type_array/c/type_array/private-status.h | 8 +- .../f_type_array/c/type_array/private-uint128.c | 14 +- .../f_type_array/c/type_array/private-uint128.h | 8 +- level_0/f_type_array/c/type_array/private-uint16.c | 14 +- level_0/f_type_array/c/type_array/private-uint16.h | 8 +- level_0/f_type_array/c/type_array/private-uint32.c | 14 +- level_0/f_type_array/c/type_array/private-uint32.h | 8 +- level_0/f_type_array/c/type_array/private-uint64.c | 14 +- level_0/f_type_array/c/type_array/private-uint64.h | 8 +- level_0/f_type_array/c/type_array/private-uint8.c | 14 +- level_0/f_type_array/c/type_array/private-uint8.h | 8 +- level_0/f_type_array/c/type_array/state.c | 46 ++-- level_0/f_type_array/c/type_array/state.h | 32 +-- level_0/f_type_array/c/type_array/status.c | 46 ++-- level_0/f_type_array/c/type_array/status.h | 32 +-- level_0/f_type_array/c/type_array/uint128.c | 46 ++-- level_0/f_type_array/c/type_array/uint128.h | 32 +-- level_0/f_type_array/c/type_array/uint16.c | 46 ++-- level_0/f_type_array/c/type_array/uint16.h | 32 +-- level_0/f_type_array/c/type_array/uint32.c | 46 ++-- level_0/f_type_array/c/type_array/uint32.h | 32 +-- level_0/f_type_array/c/type_array/uint64.c | 46 ++-- level_0/f_type_array/c/type_array/uint64.h | 32 +-- level_0/f_type_array/c/type_array/uint8.c | 46 ++-- level_0/f_type_array/c/type_array/uint8.h | 32 +-- level_0/f_type_array/data/build/settings | 6 +- level_0/f_type_array/data/build/settings-tests | 4 +- .../unit/c/test-type_array-array_lengths_adjust.h | 27 -- .../unit/c/test-type_array-array_lengths_append.c | 37 --- .../unit/c/test-type_array-array_lengths_append.h | 27 -- .../c/test-type_array-array_lengths_append_all.h | 34 --- .../c/test-type_array-array_lengths_decimate_by.h | 34 --- .../c/test-type_array-array_lengths_decrease_by.h | 34 --- .../c/test-type_array-array_lengths_increase.h | 34 --- .../c/test-type_array-array_lengths_increase_by.h | 34 --- .../unit/c/test-type_array-array_lengths_resize.h | 27 -- .../unit/c/test-type_array-array_lengthss_adjust.h | 27 -- .../unit/c/test-type_array-array_lengthss_append.h | 34 --- .../c/test-type_array-array_lengthss_append_all.h | 34 --- .../c/test-type_array-array_lengthss_decimate_by.h | 34 --- .../c/test-type_array-array_lengthss_decrease_by.h | 34 --- .../c/test-type_array-array_lengthss_increase.h | 34 --- .../c/test-type_array-array_lengthss_increase_by.h | 34 --- .../unit/c/test-type_array-array_lengthss_resize.h | 27 -- .../tests/unit/c/test-type_array-cellss_append.c | 4 +- .../unit/c/test-type_array-cellss_append_all.c | 6 +- .../tests/unit/c/test-type_array-fll_idss_append.c | 4 +- .../unit/c/test-type_array-fll_idss_append_all.c | 6 +- .../unit/c/test-type_array-int128s_append_all.c | 2 +- .../tests/unit/c/test-type_array-int128ss_append.c | 4 +- .../unit/c/test-type_array-int128ss_append_all.c | 10 +- .../unit/c/test-type_array-int16s_append_all.c | 2 +- .../tests/unit/c/test-type_array-int16ss_append.c | 4 +- .../unit/c/test-type_array-int16ss_append_all.c | 10 +- .../unit/c/test-type_array-int16ss_increase_by.c | 24 -- .../unit/c/test-type_array-int32s_append_all.c | 2 +- .../tests/unit/c/test-type_array-int32ss_append.c | 4 +- .../unit/c/test-type_array-int32ss_append_all.c | 10 +- .../unit/c/test-type_array-int64s_append_all.c | 2 +- .../tests/unit/c/test-type_array-int64ss_append.c | 4 +- .../unit/c/test-type_array-int64ss_append_all.c | 10 +- .../unit/c/test-type_array-int8s_append_all.c | 2 +- .../tests/unit/c/test-type_array-int8ss_append.c | 4 +- .../unit/c/test-type_array-int8ss_append_all.c | 10 +- ...c => test-type_array-number_unsigneds_adjust.c} | 14 +- .../c/test-type_array-number_unsigneds_adjust.h | 27 ++ .../c/test-type_array-number_unsigneds_append.c | 37 +++ .../c/test-type_array-number_unsigneds_append.h | 27 ++ ... test-type_array-number_unsigneds_append_all.c} | 30 +-- .../test-type_array-number_unsigneds_append_all.h | 34 +++ ...test-type_array-number_unsigneds_decimate_by.c} | 24 +- .../test-type_array-number_unsigneds_decimate_by.h | 34 +++ ...test-type_array-number_unsigneds_decrease_by.c} | 24 +- .../test-type_array-number_unsigneds_decrease_by.h | 34 +++ ...=> test-type_array-number_unsigneds_increase.c} | 24 +- .../c/test-type_array-number_unsigneds_increase.h | 34 +++ ...test-type_array-number_unsigneds_increase_by.c} | 24 +- .../test-type_array-number_unsigneds_increase_by.h | 34 +++ ...c => test-type_array-number_unsigneds_resize.c} | 14 +- .../c/test-type_array-number_unsigneds_resize.h | 27 ++ ... => test-type_array-number_unsignedss_adjust.c} | 14 +- .../c/test-type_array-number_unsignedss_adjust.h | 27 ++ ... => test-type_array-number_unsignedss_append.c} | 32 +-- .../c/test-type_array-number_unsignedss_append.h | 34 +++ ...test-type_array-number_unsignedss_append_all.c} | 40 +-- .../test-type_array-number_unsignedss_append_all.h | 34 +++ ...est-type_array-number_unsignedss_decimate_by.c} | 24 +- ...test-type_array-number_unsignedss_decimate_by.h | 34 +++ ...est-type_array-number_unsignedss_decrease_by.c} | 24 +- ...test-type_array-number_unsignedss_decrease_by.h | 34 +++ ...> test-type_array-number_unsignedss_increase.c} | 24 +- .../c/test-type_array-number_unsignedss_increase.h | 34 +++ ...est-type_array-number_unsignedss_increase_by.c} | 26 +- ...test-type_array-number_unsignedss_increase_by.h | 34 +++ ... => test-type_array-number_unsignedss_resize.c} | 14 +- .../c/test-type_array-number_unsignedss_resize.h | 27 ++ .../c/test-type_array-number_unsingedss_adjust.c | 42 +++ .../c/test-type_array-number_unsingedss_adjust.h | 27 ++ .../c/test-type_array-number_unsingedss_append.c | 86 +++++++ .../c/test-type_array-number_unsingedss_append.h | 34 +++ .../test-type_array-number_unsingedss_append_all.c | 105 ++++++++ .../test-type_array-number_unsingedss_append_all.h | 34 +++ ...test-type_array-number_unsingedss_decimate_by.c | 74 ++++++ ...test-type_array-number_unsingedss_decimate_by.h | 34 +++ ...test-type_array-number_unsingedss_decrease_by.c | 74 ++++++ ...test-type_array-number_unsingedss_decrease_by.h | 34 +++ .../c/test-type_array-number_unsingedss_increase.c | 76 ++++++ .../c/test-type_array-number_unsingedss_increase.h | 34 +++ ...test-type_array-number_unsingedss_increase_by.c | 84 ++++++ ...test-type_array-number_unsingedss_increase_by.h | 34 +++ .../c/test-type_array-number_unsingedss_resize.c | 42 +++ .../c/test-type_array-number_unsingedss_resize.h | 27 ++ .../tests/unit/c/test-type_array-statess_append.c | 4 +- .../unit/c/test-type_array-statess_append_all.c | 6 +- .../unit/c/test-type_array-statuss_append_all.c | 2 +- .../tests/unit/c/test-type_array-statusss_append.c | 4 +- .../unit/c/test-type_array-statusss_append_all.c | 10 +- .../unit/c/test-type_array-uint128s_append_all.c | 2 +- .../unit/c/test-type_array-uint128ss_append.c | 4 +- .../unit/c/test-type_array-uint128ss_append_all.c | 10 +- .../unit/c/test-type_array-uint16s_append_all.c | 2 +- .../tests/unit/c/test-type_array-uint16ss_append.c | 4 +- .../unit/c/test-type_array-uint16ss_append_all.c | 10 +- .../unit/c/test-type_array-uint32s_append_all.c | 2 +- .../tests/unit/c/test-type_array-uint32ss_append.c | 4 +- .../unit/c/test-type_array-uint32ss_append_all.c | 10 +- .../unit/c/test-type_array-uint64s_append_all.c | 2 +- .../tests/unit/c/test-type_array-uint64ss_append.c | 4 +- .../unit/c/test-type_array-uint64ss_append_all.c | 10 +- .../unit/c/test-type_array-uint8s_append_all.c | 2 +- .../tests/unit/c/test-type_array-uint8ss_append.c | 4 +- .../unit/c/test-type_array-uint8ss_append_all.c | 10 +- .../f_type_array/tests/unit/c/test-type_array.c | 96 +++---- .../f_type_array/tests/unit/c/test-type_array.h | 32 +-- level_0/f_utf/c/private-utf.c | 2 +- level_0/f_utf/c/private-utf.h | 2 +- level_0/f_utf/c/utf.c | 8 +- level_0/f_utf/c/utf.h | 4 +- level_0/f_utf/c/utf/convert.c | 16 +- level_0/f_utf/c/utf/convert.h | 12 +- level_0/f_utf/c/utf/dynamic.c | 58 ++--- level_0/f_utf/c/utf/dynamic.h | 16 +- level_0/f_utf/c/utf/dynamics.c | 22 +- level_0/f_utf/c/utf/dynamics.h | 16 +- level_0/f_utf/c/utf/dynamicss.c | 24 +- level_0/f_utf/c/utf/dynamicss.h | 16 +- level_0/f_utf/c/utf/is.c | 60 ++--- level_0/f_utf/c/utf/is.h | 60 ++--- level_0/f_utf/c/utf/map_multis.c | 22 +- level_0/f_utf/c/utf/map_multis.h | 20 +- level_0/f_utf/c/utf/map_multiss.c | 24 +- level_0/f_utf/c/utf/map_multiss.h | 20 +- level_0/f_utf/c/utf/maps.c | 22 +- level_0/f_utf/c/utf/maps.h | 20 +- level_0/f_utf/c/utf/mapss.c | 24 +- level_0/f_utf/c/utf/mapss.h | 20 +- level_0/f_utf/c/utf/private-dynamic.c | 6 +- level_0/f_utf/c/utf/private-dynamic.h | 6 +- level_0/f_utf/c/utf/private-dynamics.c | 14 +- level_0/f_utf/c/utf/private-dynamics.h | 4 +- level_0/f_utf/c/utf/private-dynamicss.c | 12 +- level_0/f_utf/c/utf/private-dynamicss.h | 4 +- level_0/f_utf/c/utf/private-map_multis.c | 14 +- level_0/f_utf/c/utf/private-map_multis.h | 4 +- level_0/f_utf/c/utf/private-map_multiss.c | 12 +- level_0/f_utf/c/utf/private-map_multiss.h | 4 +- level_0/f_utf/c/utf/private-maps.c | 14 +- level_0/f_utf/c/utf/private-maps.h | 4 +- level_0/f_utf/c/utf/private-mapss.c | 12 +- level_0/f_utf/c/utf/private-mapss.h | 4 +- level_0/f_utf/c/utf/private-string.c | 22 +- level_0/f_utf/c/utf/private-string.h | 8 +- level_0/f_utf/c/utf/private-triples.c | 14 +- level_0/f_utf/c/utf/private-triples.h | 4 +- level_0/f_utf/c/utf/private-tripless.c | 12 +- level_0/f_utf/c/utf/private-tripless.h | 4 +- level_0/f_utf/c/utf/static.h | 4 +- level_0/f_utf/c/utf/statics.h | 4 +- level_0/f_utf/c/utf/staticss.h | 4 +- level_0/f_utf/c/utf/string.c | 40 +-- level_0/f_utf/c/utf/string.h | 24 +- level_0/f_utf/c/utf/strings.c | 40 +-- level_0/f_utf/c/utf/strings.h | 24 +- level_0/f_utf/c/utf/stringss.c | 40 +-- level_0/f_utf/c/utf/stringss.h | 24 +- level_0/f_utf/c/utf/triples.c | 24 +- level_0/f_utf/c/utf/triples.h | 20 +- level_0/f_utf/c/utf/tripless.c | 24 +- level_0/f_utf/c/utf/tripless.h | 20 +- level_0/f_utf/tests/unit/c/test-utf-append.c | 2 +- .../f_utf/tests/unit/c/test-utf-append_assure.c | 4 +- .../tests/unit/c/test-utf-append_assure_nulless.c | 4 +- .../f_utf/tests/unit/c/test-utf-append_nulless.c | 2 +- .../tests/unit/c/test-utf-character_is_combining.c | 2 +- .../tests/unit/c/test-utf-character_is_control.c | 2 +- .../tests/unit/c/test-utf-character_is_digit.c | 2 +- .../tests/unit/c/test-utf-character_is_emoji.c | 2 +- .../tests/unit/c/test-utf-character_is_numeric.c | 2 +- .../tests/unit/c/test-utf-character_is_phonetic.c | 2 +- .../tests/unit/c/test-utf-character_is_private.c | 2 +- .../unit/c/test-utf-character_is_punctuation.c | 2 +- .../tests/unit/c/test-utf-character_is_subscript.c | 2 +- .../unit/c/test-utf-character_is_superscript.c | 2 +- .../tests/unit/c/test-utf-character_is_symbol.c | 2 +- .../unit/c/test-utf-character_is_whitespace.c | 2 +- .../c/test-utf-character_is_whitespace_modifier.c | 2 +- .../c/test-utf-character_is_whitespace_other.c | 2 +- .../test-utf-character_is_whitespace_zero_width.c | 2 +- .../tests/unit/c/test-utf-character_is_wide.c | 2 +- .../tests/unit/c/test-utf-character_is_word.c | 4 +- .../tests/unit/c/test-utf-character_is_word_dash.c | 4 +- .../unit/c/test-utf-character_is_word_dash_plus.c | 4 +- .../unit/c/test-utf-character_is_zero_width.c | 2 +- .../f_utf/tests/unit/c/test-utf-dynamic_append.c | 2 +- .../tests/unit/c/test-utf-dynamic_append_assure.c | 4 +- .../c/test-utf-dynamic_append_assure_nulless.c | 4 +- .../tests/unit/c/test-utf-dynamic_append_nulless.c | 2 +- level_0/f_utf/tests/unit/c/test-utf-dynamic_mash.c | 4 +- .../tests/unit/c/test-utf-dynamic_mash_nulless.c | 4 +- level_0/f_utf/tests/unit/c/test-utf-dynamic_mish.c | 4 +- .../tests/unit/c/test-utf-dynamic_mish_nulless.c | 4 +- .../tests/unit/c/test-utf-dynamic_partial_append.c | 2 +- .../c/test-utf-dynamic_partial_append_assure.c | 4 +- ...est-utf-dynamic_partial_append_assure_nulless.c | 4 +- .../c/test-utf-dynamic_partial_append_nulless.c | 2 +- .../tests/unit/c/test-utf-dynamic_partial_mash.c | 4 +- .../unit/c/test-utf-dynamic_partial_mash_nulless.c | 4 +- .../tests/unit/c/test-utf-dynamic_partial_mish.c | 4 +- .../unit/c/test-utf-dynamic_partial_mish_nulless.c | 4 +- .../unit/c/test-utf-dynamic_partial_prepend.c | 2 +- .../c/test-utf-dynamic_partial_prepend_assure.c | 4 +- ...st-utf-dynamic_partial_prepend_assure_nulless.c | 4 +- .../c/test-utf-dynamic_partial_prepend_nulless.c | 2 +- .../f_utf/tests/unit/c/test-utf-dynamic_prepend.c | 2 +- .../tests/unit/c/test-utf-dynamic_prepend_assure.c | 4 +- .../c/test-utf-dynamic_prepend_assure_nulless.c | 4 +- .../unit/c/test-utf-dynamic_prepend_nulless.c | 2 +- .../tests/unit/c/test-utf-dynamic_terminate.c | 4 +- .../unit/c/test-utf-dynamic_terminate_after.c | 4 +- .../f_utf/tests/unit/c/test-utf-dynamics_append.c | 2 +- .../tests/unit/c/test-utf-dynamics_append_all.c | 10 +- .../f_utf/tests/unit/c/test-utf-dynamicss_append.c | 10 +- .../tests/unit/c/test-utf-dynamicss_append_all.c | 18 +- level_0/f_utf/tests/unit/c/test-utf-is_combining.c | 2 +- level_0/f_utf/tests/unit/c/test-utf-is_control.c | 2 +- level_0/f_utf/tests/unit/c/test-utf-is_digit.c | 2 +- level_0/f_utf/tests/unit/c/test-utf-is_emoji.c | 2 +- level_0/f_utf/tests/unit/c/test-utf-is_numeric.c | 2 +- level_0/f_utf/tests/unit/c/test-utf-is_phonetic.c | 2 +- level_0/f_utf/tests/unit/c/test-utf-is_private.c | 2 +- .../f_utf/tests/unit/c/test-utf-is_punctuation.c | 2 +- level_0/f_utf/tests/unit/c/test-utf-is_subscript.c | 2 +- .../f_utf/tests/unit/c/test-utf-is_superscript.c | 2 +- level_0/f_utf/tests/unit/c/test-utf-is_symbol.c | 2 +- .../f_utf/tests/unit/c/test-utf-is_whitespace.c | 2 +- .../tests/unit/c/test-utf-is_whitespace_modifier.c | 2 +- .../tests/unit/c/test-utf-is_whitespace_other.c | 2 +- .../unit/c/test-utf-is_whitespace_zero_width.c | 2 +- level_0/f_utf/tests/unit/c/test-utf-is_wide.c | 2 +- level_0/f_utf/tests/unit/c/test-utf-is_word.c | 4 +- level_0/f_utf/tests/unit/c/test-utf-is_word_dash.c | 4 +- .../tests/unit/c/test-utf-is_word_dash_plus.c | 4 +- .../f_utf/tests/unit/c/test-utf-is_zero_width.c | 2 +- .../tests/unit/c/test-utf-map_multis_append.c | 12 +- .../tests/unit/c/test-utf-map_multis_append_all.c | 6 +- .../tests/unit/c/test-utf-map_multiss_append.c | 6 +- .../tests/unit/c/test-utf-map_multiss_append_all.c | 14 +- .../f_utf/tests/unit/c/test-utf-maps_append_all.c | 6 +- level_0/f_utf/tests/unit/c/test-utf-mapss_append.c | 6 +- .../f_utf/tests/unit/c/test-utf-mapss_append_all.c | 14 +- level_0/f_utf/tests/unit/c/test-utf-mash.c | 4 +- level_0/f_utf/tests/unit/c/test-utf-mash_nulless.c | 4 +- level_0/f_utf/tests/unit/c/test-utf-mish.c | 4 +- level_0/f_utf/tests/unit/c/test-utf-mish_nulless.c | 4 +- level_0/f_utf/tests/unit/c/test-utf-prepend.c | 2 +- .../f_utf/tests/unit/c/test-utf-prepend_assure.c | 4 +- .../tests/unit/c/test-utf-prepend_assure_nulless.c | 4 +- .../f_utf/tests/unit/c/test-utf-prepend_nulless.c | 2 +- .../tests/unit/c/test-utf-triples_append_all.c | 4 +- .../f_utf/tests/unit/c/test-utf-tripless_append.c | 4 +- .../tests/unit/c/test-utf-tripless_append_all.c | 8 +- level_1/fl_control_group/c/control_group.c | 2 +- level_1/fl_conversion/c/private-conversion.c | 36 +-- level_1/fl_conversion/c/private-conversion.h | 12 +- level_1/fl_directory/c/directory.c | 8 +- level_1/fl_directory/c/private-directory.c | 14 +- level_1/fl_environment/c/environment.c | 24 +- level_1/fl_fss/c/fss/basic.c | 6 +- level_1/fl_fss/c/fss/basic.h | 8 +- level_1/fl_fss/c/fss/basic_list.c | 50 ++-- level_1/fl_fss/c/fss/basic_list.h | 12 +- level_1/fl_fss/c/fss/embedded_list.c | 156 +++++------ level_1/fl_fss/c/fss/embedded_list.h | 12 +- level_1/fl_fss/c/fss/extended.c | 10 +- level_1/fl_fss/c/fss/extended.h | 16 +- level_1/fl_fss/c/fss/extended_list.c | 46 ++-- level_1/fl_fss/c/fss/extended_list.h | 12 +- level_1/fl_fss/c/private-fss.c | 38 +-- level_1/fl_fss/c/private-fss.h | 12 +- level_1/fl_path/c/path.c | 6 +- level_1/fl_print/c/print.c | 80 +++--- level_1/fl_print/c/print.h | 60 ++--- level_1/fl_print/c/private-print.c | 168 ++++++------ level_1/fl_print/c/private-print.h | 16 +- level_1/fl_signal/c/signal.c | 2 +- level_1/fl_utf_file/c/private-utf_file.c | 14 +- level_1/fl_utf_file/c/private-utf_file.h | 2 +- level_1/fl_utf_file/c/utf_file.c | 22 +- level_1/fl_utf_file/c/utf_file.h | 10 +- level_2/fll_control_group/c/control_group.c | 2 +- level_2/fll_execute/c/execute.c | 16 +- level_2/fll_execute/c/execute.h | 4 +- level_2/fll_execute/c/private-execute.c | 12 +- level_2/fll_file/c/private-file.c | 8 +- level_2/fll_fss/c/fss.c | 100 ++++---- level_2/fll_fss/c/fss.h | 20 +- level_2/fll_fss/c/fss/basic.c | 2 +- level_2/fll_fss/c/fss/basic_list.c | 2 +- level_2/fll_fss/c/fss/embedded_list.c | 2 +- level_2/fll_fss/c/fss/extended.c | 4 +- level_2/fll_fss/c/fss/extended_list.c | 2 +- level_2/fll_fss/c/fss/payload.c | 4 +- level_2/fll_iki/c/private-iki.c | 14 +- level_2/fll_print/c/print.c | 110 ++++---- level_2/fll_print/c/print.h | 112 ++++---- level_2/fll_program/c/private-program.c | 2 +- level_2/fll_program/c/program.c | 28 +- level_2/fll_program/c/program.h | 8 +- level_3/byte_dump/c/byte_dump.c | 18 +- level_3/byte_dump/c/common.c | 2 +- level_3/byte_dump/c/private-byte_dump.c | 4 +- level_3/control/c/common.c | 2 +- level_3/control/c/control.c | 4 +- level_3/control/c/private-common.c | 2 +- level_3/control/c/private-common.h | 2 +- level_3/control/c/private-control.c | 24 +- level_3/controller/c/common.c | 2 +- level_3/controller/c/common/private-cache.c | 6 +- level_3/controller/c/common/private-cache.h | 14 +- level_3/controller/c/common/private-entry.c | 8 +- level_3/controller/c/common/private-entry.h | 16 +- level_3/controller/c/common/private-process.c | 28 +- level_3/controller/c/common/private-process.h | 22 +- level_3/controller/c/common/private-rule.c | 28 +- level_3/controller/c/common/private-rule.h | 30 +-- level_3/controller/c/common/private-setting.h | 2 +- level_3/controller/c/controller.c | 8 +- .../controller/c/controller/private-controller.c | 6 +- level_3/controller/c/entry/private-entry.c | 72 +++--- level_3/controller/c/entry/private-entry.h | 8 +- level_3/controller/c/entry/private-entry_print.c | 6 +- level_3/controller/c/entry/private-entry_print.h | 4 +- level_3/controller/c/process/private-process.c | 8 +- level_3/controller/c/process/private-process.h | 6 +- level_3/controller/c/rule/private-rule.c | 120 ++++----- level_3/controller/c/rule/private-rule.h | 10 +- level_3/controller/c/rule/private-rule_print.c | 8 +- level_3/controller/c/rule/private-rule_print.h | 6 +- level_3/controller/c/thread/private-thread.c | 6 +- .../controller/c/thread/private-thread_process.c | 4 +- level_3/fake/c/main/build.c | 18 +- level_3/fake/c/main/build.h | 2 +- level_3/fake/c/main/build/library.c | 6 +- level_3/fake/c/main/build/load.c | 10 +- level_3/fake/c/main/build/objects.c | 4 +- level_3/fake/c/main/build/skeleton.c | 2 +- level_3/fake/c/main/common.c | 12 +- level_3/fake/c/main/common.h | 2 +- level_3/fake/c/main/common/print.c | 2 +- level_3/fake/c/main/common/print.h | 2 +- level_3/fake/c/main/common/type.h | 2 +- level_3/fake/c/main/fake.c | 6 +- level_3/fake/c/main/make/load_fakefile.c | 20 +- level_3/fake/c/main/make/load_parameters.c | 2 +- level_3/fake/c/main/make/operate.c | 36 +-- level_3/fake/c/main/make/operate.h | 6 +- level_3/fake/c/main/make/operate_process.c | 6 +- level_3/fake/c/main/make/operate_process.h | 2 +- level_3/fake/c/main/make/operate_process_type.c | 62 ++--- level_3/fake/c/main/make/operate_process_type.h | 2 +- level_3/fake/c/main/make/operate_validate.c | 4 +- level_3/fake/c/main/make/operate_validate.h | 2 +- level_3/fake/c/main/make/operate_validate_type.c | 30 +-- level_3/fake/c/main/make/operate_validate_type.h | 2 +- level_3/fake/c/main/make/print/message.c | 2 +- level_3/fake/c/main/make/print/verbose.c | 2 +- level_3/fake/c/main/print/error.c | 10 +- level_3/fake/c/main/print/error.h | 4 +- level_3/fake/c/main/print/message.c | 2 +- level_3/fake/c/main/signal.c | 2 +- level_3/firewall/c/common.c | 2 +- level_3/firewall/c/firewall.c | 14 +- level_3/firewall/c/private-common.c | 4 +- level_3/firewall/c/private-common.h | 14 +- level_3/firewall/c/private-firewall.c | 38 +-- level_3/fss_embedded_list_read/c/common.c | 2 +- .../c/fss_embedded_list_read.c | 12 +- level_3/fss_embedded_list_read/c/private-common.c | 4 +- level_3/fss_embedded_list_read/c/private-common.h | 16 +- level_3/fss_embedded_list_read/c/private-read.c | 100 ++++---- level_3/fss_embedded_list_read/c/private-read.h | 8 +- level_3/fss_identify/c/common.c | 2 +- level_3/fss_identify/c/fss_identify.c | 12 +- level_3/fss_identify/c/private-common.h | 6 +- level_3/fss_identify/c/private-identify.c | 6 +- level_3/fss_read/c/main/common.c | 24 +- level_3/fss_read/c/main/common/static.c | 2 +- level_3/fss_read/c/main/common/static.h | 2 +- level_3/fss_read/c/main/common/type.c | 14 +- level_3/fss_read/c/main/common/type.h | 26 +- level_3/fss_read/c/main/fss_read.c | 8 +- level_3/fss_read/c/main/fss_read.h | 6 +- level_3/fss_read/c/main/main.c | 4 +- level_3/fss_read/c/main/print/data.c | 6 +- level_3/fss_read/c/main/print/data.h | 4 +- level_3/fss_read/c/main/print/error.c | 4 +- level_3/fss_read/c/main/print/error.h | 4 +- level_3/fss_read/c/main/process_normal.c | 46 ++-- level_3/fss_read/c/main/process_normal.h | 2 +- level_3/fss_read/c/main/signal.c | 2 +- level_3/fss_read/c/payload/fss_read.c | 4 +- level_3/fss_write/c/main/common.c | 48 ++-- level_3/fss_write/c/main/fss_write.c | 16 +- level_3/fss_write/c/main/fss_write.h | 2 +- level_3/fss_write/c/main/main.c | 4 +- level_3/fss_write/c/main/signal.c | 2 +- level_3/fss_write/c/payload/fss_write.c | 16 +- level_3/iki_read/c/main/common.c | 38 +-- level_3/iki_read/c/main/common/type.h | 8 +- level_3/iki_read/c/main/identify.c | 8 +- level_3/iki_read/c/main/identify.h | 2 +- level_3/iki_read/c/main/iki_read.c | 2 +- level_3/iki_read/c/main/print/data.c | 8 +- level_3/iki_read/c/main/print/data.h | 6 +- level_3/iki_read/c/main/process.c | 40 +-- level_3/iki_read/c/main/signal.c | 2 +- level_3/iki_write/c/main/common.c | 10 +- level_3/iki_write/c/main/iki_write.c | 4 +- level_3/iki_write/c/main/signal.c | 2 +- level_3/status_code/c/main/signal.c | 2 +- level_3/status_code/c/main/status_code.c | 6 +- level_3/utf8/c/main/bytesequence.c | 4 +- level_3/utf8/c/main/codepoint.c | 8 +- level_3/utf8/c/main/common.c | 8 +- level_3/utf8/c/main/print/data.c | 4 +- level_3/utf8/c/main/print/data.h | 4 +- level_3/utf8/c/main/print/error.c | 2 +- level_3/utf8/c/main/print/error.h | 2 +- level_3/utf8/c/main/signal.c | 2 +- level_3/utf8/c/main/utf8.c | 4 +- 820 files changed, 7959 insertions(+), 7159 deletions(-) delete mode 100644 level_0/f_type_array/c/type_array/array_length.c create mode 100644 level_0/f_type_array/c/type_array/number_unsigned.c rename level_0/f_type_array/c/type_array/{array_length.h => number_unsigned.h} (70%) delete mode 100644 level_0/f_type_array/c/type_array/private-array_length.c delete mode 100644 level_0/f_type_array/c/type_array/private-array_length.h create mode 100644 level_0/f_type_array/c/type_array/private-number_unsigned.c create mode 100644 level_0/f_type_array/c/type_array/private-number_unsigned.h delete mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_adjust.h delete mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_append.c delete mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_append.h delete mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_append_all.h delete mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_decimate_by.h delete mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_decrease_by.h delete mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_increase.h delete mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_increase_by.h delete mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_resize.h delete mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_adjust.h delete mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_append.h delete mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_append_all.h delete mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_decimate_by.h delete mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_decrease_by.h delete mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_increase.h delete mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_increase_by.h delete mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_resize.h rename level_0/f_type_array/tests/unit/c/{test-type_array-array_lengths_adjust.c => test-type_array-number_unsigneds_adjust.c} (51%) create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_adjust.h create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_append.c create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_append.h rename level_0/f_type_array/tests/unit/c/{test-type_array-array_lengths_append_all.c => test-type_array-number_unsigneds_append_all.c} (51%) create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_append_all.h rename level_0/f_type_array/tests/unit/c/{test-type_array-array_lengthss_decrease_by.c => test-type_array-number_unsigneds_decimate_by.c} (51%) create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_decimate_by.h rename level_0/f_type_array/tests/unit/c/{test-type_array-array_lengthss_decimate_by.c => test-type_array-number_unsigneds_decrease_by.c} (51%) create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_decrease_by.h rename level_0/f_type_array/tests/unit/c/{test-type_array-array_lengthss_increase.c => test-type_array-number_unsigneds_increase.c} (55%) create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_increase.h rename level_0/f_type_array/tests/unit/c/{test-type_array-array_lengths_increase_by.c => test-type_array-number_unsigneds_increase_by.c} (52%) create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_increase_by.h rename level_0/f_type_array/tests/unit/c/{test-type_array-array_lengthss_adjust.c => test-type_array-number_unsigneds_resize.c} (51%) create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_resize.h rename level_0/f_type_array/tests/unit/c/{test-type_array-array_lengths_resize.c => test-type_array-number_unsignedss_adjust.c} (50%) create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_adjust.h rename level_0/f_type_array/tests/unit/c/{test-type_array-array_lengthss_append.c => test-type_array-number_unsignedss_append.c} (51%) create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_append.h rename level_0/f_type_array/tests/unit/c/{test-type_array-array_lengthss_append_all.c => test-type_array-number_unsignedss_append_all.c} (50%) create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_append_all.h rename level_0/f_type_array/tests/unit/c/{test-type_array-array_lengths_decimate_by.c => test-type_array-number_unsignedss_decimate_by.c} (51%) create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_decimate_by.h rename level_0/f_type_array/tests/unit/c/{test-type_array-array_lengths_decrease_by.c => test-type_array-number_unsignedss_decrease_by.c} (51%) create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_decrease_by.h rename level_0/f_type_array/tests/unit/c/{test-type_array-array_lengths_increase.c => test-type_array-number_unsignedss_increase.c} (54%) create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_increase.h rename level_0/f_type_array/tests/unit/c/{test-type_array-array_lengthss_increase_by.c => test-type_array-number_unsignedss_increase_by.c} (53%) create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_increase_by.h rename level_0/f_type_array/tests/unit/c/{test-type_array-array_lengthss_resize.c => test-type_array-number_unsignedss_resize.c} (50%) create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_resize.h create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_adjust.c create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_adjust.h create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_append.c create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_append.h create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_append_all.c create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_append_all.h create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_decimate_by.c create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_decimate_by.h create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_decrease_by.c create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_decrease_by.h create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_increase.c create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_increase.h create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_increase_by.c create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_increase_by.h create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_resize.c create mode 100644 level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_resize.h diff --git a/build/disable/level_0/f_type.h b/build/disable/level_0/f_type.h index 634e5db..5b3e72a 100644 --- a/build/disable/level_0/f_type.h +++ b/build/disable/level_0/f_type.h @@ -1,7 +1,4 @@ #define _di_compiler_attributes_d_ -#define _di_f_array_lengthss_t_ -#define _di_f_array_lengths_t_ -#define _di_f_array_length_t_ #define _di_f_cellss_t_ #define _di_f_cells_t_ #define _di_f_cell_t_ diff --git a/build/disable/level_0/f_type_array.h b/build/disable/level_0/f_type_array.h index 7a07292..0a0477e 100644 --- a/build/disable/level_0/f_type_array.h +++ b/build/disable/level_0/f_type_array.h @@ -1,21 +1,3 @@ -#define _di_f_array_lengths_adjust_ -#define _di_f_array_lengths_append_ -#define _di_f_array_lengths_append_all_ -#define _di_f_array_lengths_decimate_by_ -#define _di_f_array_lengths_decrease_by_ -#define _di_f_array_lengths_increase_ -#define _di_f_array_lengths_increase_by_ -#define _di_f_array_lengths_resize_ -#define _di_f_array_lengthss_adjust_ -#define _di_f_array_lengthss_append_ -#define _di_f_array_lengthss_append_all_ -#define _di_f_array_lengthss_decimate_by_ -#define _di_f_array_lengthss_decrease_by_ -#define _di_f_array_lengthss_increase_ -#define _di_f_array_lengthss_increase_by_ -#define _di_f_array_lengthss_resize_ -#define _di_f_array_lengthss_t_ -#define _di_f_array_lengths_t_ #define _di_f_cells_adjust_ #define _di_f_cells_append_ #define _di_f_cells_append_all_ @@ -142,6 +124,24 @@ #define _di_f_int8ss_resize_ #define _di_f_int8ss_t_ #define _di_f_int8_t_ +#define _di_f_number_unsigneds_adjust_ +#define _di_f_number_unsigneds_append_ +#define _di_f_number_unsigneds_append_all_ +#define _di_f_number_unsigneds_decimate_by_ +#define _di_f_number_unsigneds_decrease_by_ +#define _di_f_number_unsigneds_increase_ +#define _di_f_number_unsigneds_increase_by_ +#define _di_f_number_unsigneds_resize_ +#define _di_f_number_unsignedss_adjust_ +#define _di_f_number_unsignedss_append_ +#define _di_f_number_unsignedss_append_all_ +#define _di_f_number_unsignedss_decimate_by_ +#define _di_f_number_unsignedss_decrease_by_ +#define _di_f_number_unsignedss_increase_ +#define _di_f_number_unsignedss_increase_by_ +#define _di_f_number_unsignedss_resize_ +#define _di_f_number_unsignedss_t_ +#define _di_f_number_unsigneds_t_ #define _di_f_states_adjust_ #define _di_f_states_append_ #define _di_f_states_append_all_ diff --git a/build/level_0/settings b/build/level_0/settings index 65a6e2a..f01bb55 100644 --- a/build/level_0/settings +++ b/build/level_0/settings @@ -72,8 +72,8 @@ build_sources_library string/quantity.c string/quantitys.c string/quantityss.c build_sources_library string/range.c string/ranges.c string/rangess.c build_sources_library string/static.c string/statics.c string/staticss.c build_sources_library string/triple.c string/triples.c string/tripless.c -build_sources_library type_array/array_length.c type_array/cell.c type_array/fll_id.c type_array/int8.c type_array/int16.c type_array/int32.c type_array/int64.c type_array/int128.c type_array/state.c type_array/status.c type_array/uint8.c type_array/uint16.c type_array/uint32.c type_array/uint64.c type_array/uint128.c -build_sources_library type_array/private-array_length.c type_array/private-cell.c type_array/private-fll_id.c type_array/private-int8.c type_array/private-int16.c type_array/private-int32.c type_array/private-int64.c type_array/private-int128.c type_array/private-state.c type_array/private-status.c type_array/private-uint8.c type_array/private-uint16.c type_array/private-uint32.c type_array/private-uint64.c type_array/private-uint128.c +build_sources_library type_array/cell.c type_array/fll_id.c type_array/int8.c type_array/int16.c type_array/int32.c type_array/int64.c type_array/int128.c type_array/number_unsigned.c type_array/state.c type_array/status.c type_array/uint8.c type_array/uint16.c type_array/uint32.c type_array/uint64.c type_array/uint128.c +build_sources_library type_array/private-cell.c type_array/private-fll_id.c type_array/private-int8.c type_array/private-int16.c type_array/private-int32.c type_array/private-int64.c type_array/private-int128.c type_array/private-number_unsinged.c type_array/private-state.c type_array/private-status.c type_array/private-uint8.c type_array/private-uint16.c type_array/private-uint32.c type_array/private-uint64.c type_array/private-uint128.c build_sources_library utf.c private-utf.c private-utf_alphabetic.c private-utf_combining.c private-utf_control.c private-utf_digit.c private-utf_emoji.c private-utf_numeric.c private-utf_phonetic.c private-utf_private.c private-utf_punctuation.c private-utf_subscript.c private-utf_superscript.c private-utf_symbol.c private-utf_unassigned.c private-utf_valid.c private-utf_whitespace.c private-utf_wide.c private-utf_word.c private-utf_zero_width.c build_sources_library utf/common.c utf/convert.c build_sources_library utf/dynamic.c utf/dynamics.c utf/dynamicss.c @@ -125,7 +125,7 @@ build_sources_headers string/static.h string/statics.h string/staticss.h build_sources_headers string/triple.h string/triples.h string/tripless.h build_sources_headers type.h type_file.h build_sources_headers type_array.h type_array/common.h -build_sources_headers type_array/array_length.h type_array/cell.h type_array/fll_id.h type_array/int8.h type_array/int16.h type_array/int32.h type_array/int64.h type_array/int128.h type_array/state.h type_array/status.h type_array/uint8.h type_array/uint16.h type_array/uint32.h type_array/uint64.h type_array/uint128.h +build_sources_headers type_array/cell.h type_array/fll_id.h type_array/int8.h type_array/int16.h type_array/int32.h type_array/int64.h type_array/int128.h type_array/number_unsigned.h type_array/state.h type_array/status.h type_array/uint8.h type_array/uint16.h type_array/uint32.h type_array/uint64.h type_array/uint128.h build_sources_headers utf.h utf/common.h utf/convert.h utf/dynamic.h utf/dynamics.h utf/dynamicss.h utf/is.h utf/is_character.h utf/map.h utf/maps.h utf/mapss.h utf/map_multi.h utf/map_multis.h utf/map_multiss.h utf/static.h utf/statics.h utf/staticss.h utf/string.h utf/triple.h utf/triples.h utf/tripless.h build_sources_headers-thread thread.h thread/attribute.h thread/barrier.h thread/barrier_attribute.h thread/condition.h thread/condition_attribute.h thread/id.h thread/key.h thread/lock.h thread/lock_attribute.h thread/mutex.h thread/mutex_attribute.h thread/once.h thread/semaphore.h thread/set.h thread/spin.h diff --git a/build/monolithic/settings b/build/monolithic/settings index 3ad08b3..e00dc31 100644 --- a/build/monolithic/settings +++ b/build/monolithic/settings @@ -72,8 +72,8 @@ build_sources_library level_0/string/quantity.c level_0/string/quantitys.c level build_sources_library level_0/string/range.c level_0/string/ranges.c level_0/string/rangess.c build_sources_library level_0/string/static.c level_0/string/statics.c level_0/string/staticss.c build_sources_library level_0/string/triple.c level_0/string/triples.c level_0/string/tripless.c -build_sources_library level_0/type_array/array_length.c level_0/type_array/cell.c level_0/type_array/fll_id.c level_0/type_array/int8.c level_0/type_array/int16.c level_0/type_array/int32.c level_0/type_array/int64.c level_0/type_array/int128.c level_0/type_array/state.c level_0/type_array/status.c level_0/type_array/uint8.c level_0/type_array/uint16.c level_0/type_array/uint32.c level_0/type_array/uint64.c level_0/type_array/uint128.c -build_sources_library level_0/type_array/private-array_length.c level_0/type_array/private-cell.c level_0/type_array/private-fll_id.c level_0/type_array/private-int8.c level_0/type_array/private-int16.c level_0/type_array/private-int32.c level_0/type_array/private-int64.c level_0/type_array/private-int128.c level_0/type_array/private-state.c level_0/type_array/private-status.c level_0/type_array/private-uint8.c level_0/type_array/private-uint16.c level_0/type_array/private-uint32.c level_0/type_array/private-uint64.c level_0/type_array/private-uint128.c +build_sources_library level_0/type_array/cell.c level_0/type_array/fll_id.c level_0/type_array/int8.c level_0/type_array/int16.c level_0/type_array/int32.c level_0/type_array/int64.c level_0/type_array/int128.c level_0/type_array/number_unsigned.c level_0/type_array/state.c level_0/type_array/status.c level_0/type_array/uint8.c level_0/type_array/uint16.c level_0/type_array/uint32.c level_0/type_array/uint64.c level_0/type_array/uint128.c +build_sources_library level_0/type_array/private-cell.c level_0/type_array/private-fll_id.c level_0/type_array/private-int8.c level_0/type_array/private-int16.c level_0/type_array/private-int32.c level_0/type_array/private-int64.c level_0/type_array/private-int128.c level_0/type_array/private-number_unsigned.c level_0/type_array/private-state.c level_0/type_array/private-status.c level_0/type_array/private-uint8.c level_0/type_array/private-uint16.c level_0/type_array/private-uint32.c level_0/type_array/private-uint64.c level_0/type_array/private-uint128.c build_sources_library level_0/utf.c level_0/private-utf.c level_0/private-utf_alphabetic.c level_0/private-utf_combining.c level_0/private-utf_control.c level_0/private-utf_digit.c level_0/private-utf_emoji.c level_0/private-utf_numeric.c level_0/private-utf_phonetic.c level_0/private-utf_private.c level_0/private-utf_punctuation.c level_0/private-utf_subscript.c level_0/private-utf_superscript.c level_0/private-utf_symbol.c level_0/private-utf_unassigned.c level_0/private-utf_valid.c level_0/private-utf_whitespace.c level_0/private-utf_wide.c level_0/private-utf_word.c level_0/private-utf_zero_width.c build_sources_library level_0/utf/common.c level_0/utf/convert.c build_sources_library level_0/utf/dynamic.c level_0/utf/dynamics.c level_0/utf/dynamicss.c @@ -147,7 +147,7 @@ build_sources_headers level_0/string/static.h level_0/string/statics.h level_0/s build_sources_headers level_0/string/triple.h level_0/string/triples.h level_0/string/tripless.h build_sources_headers level_0/type.h level_0/type_file.h build_sources_headers level_0/type_array.h level_0/type_array/common.h -build_sources_headers level_0/type_array/array_length.h level_0/type_array/cell.h level_0/type_array/fll_id.h level_0/type_array/int8.h level_0/type_array/int16.h level_0/type_array/int32.h level_0/type_array/int64.h level_0/type_array/int128.h level_0/type_array/state.h level_0/type_array/status.h level_0/type_array/uint8.h level_0/type_array/uint16.h level_0/type_array/uint32.h level_0/type_array/uint64.h level_0/type_array/uint128.h +build_sources_headers level_0/type_array/cell.h level_0/type_array/fll_id.h level_0/type_array/int8.h level_0/type_array/int16.h level_0/type_array/int32.h level_0/type_array/int64.h level_0/type_array/int128.h level_0/type_array/number_unsigned.h level_0/type_array/state.h level_0/type_array/status.h level_0/type_array/uint8.h level_0/type_array/uint16.h level_0/type_array/uint32.h level_0/type_array/uint64.h level_0/type_array/uint128.h build_sources_headers level_0/utf.h level_0/utf/common.h level_0/utf/convert.h level_0/utf/dynamic.h level_0/utf/dynamics.h level_0/utf/dynamicss.h level_0/utf/is.h level_0/utf/is_character.h level_0/utf/map.h level_0/utf/maps.h level_0/utf/mapss.h level_0/utf/map_multi.h level_0/utf/map_multis.h level_0/utf/map_multiss.h level_0/utf/static.h level_0/utf/statics.h level_0/utf/staticss.h level_0/utf/string.h level_0/utf/triple.h level_0/utf/triples.h level_0/utf/tripless.h build_sources_headers level_1/control_group.h diff --git a/build/stand_alone/byte_dump.config.h b/build/stand_alone/byte_dump.config.h index 3091404..616182f 100644 --- a/build/stand_alone/byte_dump.config.h +++ b/build/stand_alone/byte_dump.config.h @@ -149,7 +149,6 @@ #define _di_f_file_write_range_ #define _di_f_file_write_until_ - #define _di_f_memory_adjust_ //#define _di_f_memory_default_d_ #define _di_f_memory_delete_ @@ -164,6 +163,26 @@ #define _di_f_memory_structure_increase_by_ #define _di_f_memory_structure_resize_ +#define _di_f_number_unsigneds_adjust_ +#define _di_f_number_unsigneds_append_ +#define _di_f_number_unsigneds_append_all_ +#define _di_f_number_unsigneds_decimate_by_ +#define _di_f_number_unsigneds_decrease_by_ +//#define _di_f_number_unsigneds_increase_ +//#define _di_f_number_unsigneds_increase_by_ +//#define _di_f_number_unsigneds_resize_ +#define _di_f_number_unsignedss_adjust_ +#define _di_f_number_unsignedss_append_ +#define _di_f_number_unsignedss_append_all_ +#define _di_f_number_unsignedss_decimate_by_ +#define _di_f_number_unsignedss_decrease_by_ +#define _di_f_number_unsignedss_increase_ +#define _di_f_number_unsignedss_increase_by_ +#define _di_f_number_unsignedss_resize_ +#define _di_f_number_unsignedss_t_ +//#define _di_f_number_unsigneds_t_ +//#define _di_f_number_unsigned_t_ + #define _di_f_pipe_error_exists_ //#define _di_f_pipe_input_exists_ #define _di_f_pipe_output_exists_ @@ -479,24 +498,6 @@ //#define _di_f_string_triples_t_ //#define _di_f_string_triple_t_ -#define _di_f_array_lengths_adjust_ -#define _di_f_array_lengths_append_ -#define _di_f_array_lengths_append_all_ -#define _di_f_array_lengths_decimate_by_ -#define _di_f_array_lengths_decrease_by_ -//#define _di_f_array_lengths_increase_ -//#define _di_f_array_lengths_increase_by_ -//#define _di_f_array_lengths_resize_ -#define _di_f_array_lengthss_adjust_ -#define _di_f_array_lengthss_append_ -#define _di_f_array_lengthss_append_all_ -#define _di_f_array_lengthss_decimate_by_ -#define _di_f_array_lengthss_decrease_by_ -#define _di_f_array_lengthss_increase_ -#define _di_f_array_lengthss_increase_by_ -#define _di_f_array_lengthss_resize_ -//#define _di_f_array_lengthss_t_ -//#define _di_f_array_lengths_t_ #define _di_f_cells_adjust_ #define _di_f_cells_append_ #define _di_f_cells_append_all_ diff --git a/build/stand_alone/byte_dump.settings b/build/stand_alone/byte_dump.settings index 3f4a695..6f92837 100644 --- a/build/stand_alone/byte_dump.settings +++ b/build/stand_alone/byte_dump.settings @@ -32,8 +32,8 @@ build_sources_program fll/level_0/pipe.c build_sources_program fll/level_0/print.c fll/level_0/private-print.c fll/level_0/print/common.c fll/level_0/print/to.c fll/level_0/print/private-to.c build_sources_program fll/level_0/signal.c build_sources_program fll/level_0/string.c fll/level_0/private-string.c fll/level_0/string/common.c fll/level_0/string/dynamic.c fll/level_0/string/map.c fll/level_0/string/map_multi.c fll/level_0/string/private-dynamic.c fll/level_0/string/private-map.c fll/level_0/string/private-map_multi.c fll/level_0/string/private-quantity.c fll/level_0/string/private-range.c fll/level_0/string/private-triple.c fll/level_0/string/quantity.c fll/level_0/string/range.c fll/level_0/string/static.c fll/level_0/string/triple.c -build_sources_program fll/level_0/type_array/array_length.c fll/level_0/type_array/cell.c fll/level_0/type_array/fll_id.c fll/level_0/type_array/int8.c fll/level_0/type_array/int16.c fll/level_0/type_array/int32.c fll/level_0/type_array/int64.c fll/level_0/type_array/int128.c fll/level_0/type_array/state.c fll/level_0/type_array/status.c fll/level_0/type_array/uint8.c fll/level_0/type_array/uint16.c fll/level_0/type_array/uint32.c fll/level_0/type_array/uint64.c fll/level_0/type_array/uint128.c -build_sources_program fll/level_0/type_array/private-array_length.c fll/level_0/type_array/private-cell.c fll/level_0/type_array/private-fll_id.c fll/level_0/type_array/private-int8.c fll/level_0/type_array/private-int16.c fll/level_0/type_array/private-int32.c fll/level_0/type_array/private-int64.c fll/level_0/type_array/private-int128.c fll/level_0/type_array/private-state.c fll/level_0/type_array/private-status.c fll/level_0/type_array/private-uint8.c fll/level_0/type_array/private-uint16.c fll/level_0/type_array/private-uint32.c fll/level_0/type_array/private-uint64.c fll/level_0/type_array/private-uint128.c +build_sources_program fll/level_0/type_array/cell.c fll/level_0/type_array/fll_id.c fll/level_0/type_array/int8.c fll/level_0/type_array/int16.c fll/level_0/type_array/int32.c fll/level_0/type_array/int64.c fll/level_0/type_array/int128.c fll/level_0/type_array/number_unsigned.c fll/level_0/type_array/state.c fll/level_0/type_array/status.c fll/level_0/type_array/uint8.c fll/level_0/type_array/uint16.c fll/level_0/type_array/uint32.c fll/level_0/type_array/uint64.c fll/level_0/type_array/uint128.c +build_sources_program fll/level_0/type_array/private-cell.c fll/level_0/type_array/private-fll_id.c fll/level_0/type_array/private-int8.c fll/level_0/type_array/private-int16.c fll/level_0/type_array/private-int32.c fll/level_0/type_array/private-int64.c fll/level_0/type_array/private-int128.c fll/level_0/type_array/private-number_unsigned.c fll/level_0/type_array/private-state.c fll/level_0/type_array/private-status.c fll/level_0/type_array/private-uint8.c fll/level_0/type_array/private-uint16.c fll/level_0/type_array/private-uint32.c fll/level_0/type_array/private-uint64.c fll/level_0/type_array/private-uint128.c build_sources_program fll/level_0/utf.c fll/level_0/private-utf.c fll/level_0/private-utf_alphabetic.c fll/level_0/private-utf_combining.c fll/level_0/private-utf_control.c fll/level_0/private-utf_digit.c fll/level_0/private-utf_emoji.c fll/level_0/private-utf_numeric.c fll/level_0/private-utf_phonetic.c fll/level_0/private-utf_private.c fll/level_0/private-utf_punctuation.c fll/level_0/private-utf_subscript.c fll/level_0/private-utf_superscript.c fll/level_0/private-utf_symbol.c fll/level_0/private-utf_unassigned.c fll/level_0/private-utf_valid.c fll/level_0/private-utf_whitespace.c fll/level_0/private-utf_wide.c fll/level_0/private-utf_word.c fll/level_0/private-utf_zero_width.c build_sources_program fll/level_0/utf/common.c fll/level_0/utf/convert.c fll/level_0/utf/dynamic.c fll/level_0/utf/is.c fll/level_0/utf/is_character.c fll/level_0/utf/map.c fll/level_0/utf/map_multi.c fll/level_0/utf/static.c fll/level_0/utf/string.c fll/level_0/utf/triple.c fll/level_0/utf/private-dynamic.c fll/level_0/utf/private-map.c fll/level_0/utf/private-map_multi.c fll/level_0/utf/private-triple.c fll/level_0/utf/private-string.c diff --git a/build/stand_alone/fake.config.h b/build/stand_alone/fake.config.h index 5bd320e..6f8e8d3 100644 --- a/build/stand_alone/fake.config.h +++ b/build/stand_alone/fake.config.h @@ -37,26 +37,6 @@ #define _di_f_accounts_t_ //#define _di_f_account_t_ -#define _di_f_array_lengths_adjust_ -#define _di_f_array_lengths_append_ -#define _di_f_array_lengths_append_all_ -#define _di_f_array_lengths_decimate_by_ -#define _di_f_array_lengths_decrease_by_ -//#define _di_f_array_lengths_increase_ -//#define _di_f_array_lengths_increase_by_ -//#define _di_f_array_lengths_resize_ -#define _di_f_array_lengthss_adjust_ -#define _di_f_array_lengthss_append_ -#define _di_f_array_lengthss_append_all_ -#define _di_f_array_lengthss_decimate_by_ -#define _di_f_array_lengthss_decrease_by_ -#define _di_f_array_lengthss_increase_ -#define _di_f_array_lengthss_increase_by_ -#define _di_f_array_lengthss_resize_ -#define _di_f_array_lengthss_t_ -//#define _di_f_array_lengths_t_ -//#define _di_f_array_length_t_ - #define _di_f_capability_ambient_get_ #define _di_f_capability_ambient_reset_ #define _di_f_capability_ambient_set_ @@ -1175,6 +1155,26 @@ //#define _di_f_mode_t_ +#define _di_f_number_unsigneds_adjust_ +#define _di_f_number_unsigneds_append_ +#define _di_f_number_unsigneds_append_all_ +#define _di_f_number_unsigneds_decimate_by_ +#define _di_f_number_unsigneds_decrease_by_ +//#define _di_f_number_unsigneds_increase_ +//#define _di_f_number_unsigneds_increase_by_ +//#define _di_f_number_unsigneds_resize_ +#define _di_f_number_unsignedss_adjust_ +#define _di_f_number_unsignedss_append_ +#define _di_f_number_unsignedss_append_all_ +#define _di_f_number_unsignedss_decimate_by_ +#define _di_f_number_unsignedss_decrease_by_ +#define _di_f_number_unsignedss_increase_ +#define _di_f_number_unsignedss_increase_by_ +#define _di_f_number_unsignedss_resize_ +#define _di_f_number_unsignedss_t_ +//#define _di_f_number_unsigneds_t_ +//#define _di_f_number_unsigned_t_ + #define _di_f_parse_dynamic_partial_fll_identify_ #define _di_f_parse_dynamic_seek_line_to_utf_character_ #define _di_f_parse_dynamic_seek_line_until_graph_ diff --git a/build/stand_alone/fake.settings b/build/stand_alone/fake.settings index 535322e..56fa4e4 100644 --- a/build/stand_alone/fake.settings +++ b/build/stand_alone/fake.settings @@ -54,8 +54,8 @@ build_sources_program fll/level_0/rip.c fll/level_0/rip/utf.c fll/level_0/privat build_sources_program fll/level_0/signal.c build_sources_program fll/level_0/string.c fll/level_0/private-string.c fll/level_0/string/common.c fll/level_0/string/private-dynamic.c fll/level_0/string/private-dynamics.c fll/level_0/string/private-dynamicss.c fll/level_0/string/private-maps.c fll/level_0/string/private-mapss.c fll/level_0/string/private-map_multis.c fll/level_0/string/private-map_multiss.c fll/level_0/string/private-quantitys.c fll/level_0/string/private-quantityss.c fll/level_0/string/private-ranges.c fll/level_0/string/private-rangess.c fll/level_0/string/private-triples.c fll/level_0/string/private-tripless.c build_sources_program fll/level_0/string/dynamic.c fll/level_0/string/dynamics.c fll/level_0/string/dynamicss.c fll/level_0/string/map.c fll/level_0/string/maps.c fll/level_0/string/mapss.c fll/level_0/string/map_multi.c fll/level_0/string/map_multis.c fll/level_0/string/map_multiss.c fll/level_0/string/quantity.c fll/level_0/string/quantitys.c fll/level_0/string/quantityss.c fll/level_0/string/range.c fll/level_0/string/ranges.c fll/level_0/string/rangess.c fll/level_0/string/static.c fll/level_0/string/statics.c fll/level_0/string/staticss.c fll/level_0/string/triple.c fll/level_0/string/triples.c fll/level_0/string/tripless.c -build_sources_program fll/level_0/type_array/array_length.c fll/level_0/type_array/cell.c fll/level_0/type_array/fll_id.c fll/level_0/type_array/int8.c fll/level_0/type_array/int16.c fll/level_0/type_array/int32.c fll/level_0/type_array/int64.c fll/level_0/type_array/int128.c fll/level_0/type_array/state.c fll/level_0/type_array/status.c fll/level_0/type_array/uint8.c fll/level_0/type_array/uint16.c fll/level_0/type_array/uint32.c fll/level_0/type_array/uint64.c fll/level_0/type_array/uint128.c -build_sources_program fll/level_0/type_array/private-array_length.c fll/level_0/type_array/private-cell.c fll/level_0/type_array/private-fll_id.c fll/level_0/type_array/private-int8.c fll/level_0/type_array/private-int16.c fll/level_0/type_array/private-int32.c fll/level_0/type_array/private-int64.c fll/level_0/type_array/private-int128.c fll/level_0/type_array/private-state.c fll/level_0/type_array/private-status.c fll/level_0/type_array/private-uint8.c fll/level_0/type_array/private-uint16.c fll/level_0/type_array/private-uint32.c fll/level_0/type_array/private-uint64.c fll/level_0/type_array/private-uint128.c +build_sources_program fll/level_0/type_array/cell.c fll/level_0/type_array/fll_id.c fll/level_0/type_array/int8.c fll/level_0/type_array/int16.c fll/level_0/type_array/int32.c fll/level_0/type_array/int64.c fll/level_0/type_array/int128.c fll/level_0/type_array/number_unsigned.c fll/level_0/type_array/state.c fll/level_0/type_array/status.c fll/level_0/type_array/uint8.c fll/level_0/type_array/uint16.c fll/level_0/type_array/uint32.c fll/level_0/type_array/uint64.c fll/level_0/type_array/uint128.c +build_sources_program fll/level_0/type_array/private-cell.c fll/level_0/type_array/private-fll_id.c fll/level_0/type_array/private-int8.c fll/level_0/type_array/private-int16.c fll/level_0/type_array/private-int32.c fll/level_0/type_array/private-int64.c fll/level_0/type_array/private-int128.c fll/level_0/type_array/private-number_unsigned.c fll/level_0/type_array/private-state.c fll/level_0/type_array/private-status.c fll/level_0/type_array/private-uint8.c fll/level_0/type_array/private-uint16.c fll/level_0/type_array/private-uint32.c fll/level_0/type_array/private-uint64.c fll/level_0/type_array/private-uint128.c build_sources_program fll/level_0/utf.c fll/level_0/private-utf.c fll/level_0/private-utf_alphabetic.c fll/level_0/private-utf_combining.c fll/level_0/private-utf_control.c fll/level_0/private-utf_digit.c fll/level_0/private-utf_emoji.c fll/level_0/private-utf_numeric.c fll/level_0/private-utf_phonetic.c fll/level_0/private-utf_private.c fll/level_0/private-utf_punctuation.c fll/level_0/private-utf_subscript.c fll/level_0/private-utf_superscript.c fll/level_0/private-utf_symbol.c fll/level_0/private-utf_unassigned.c fll/level_0/private-utf_valid.c fll/level_0/private-utf_whitespace.c fll/level_0/private-utf_wide.c fll/level_0/private-utf_word.c fll/level_0/private-utf_zero_width.c build_sources_program fll/level_0/utf/common.c fll/level_0/utf/convert.c fll/level_0/utf/dynamic.c fll/level_0/utf/dynamics.c fll/level_0/utf/dynamicss.c fll/level_0/utf/is.c fll/level_0/utf/is_character.c fll/level_0/utf/map.c fll/level_0/utf/maps.c fll/level_0/utf/mapss.c fll/level_0/utf/map_multi.c fll/level_0/utf/map_multis.c fll/level_0/utf/map_multiss.c fll/level_0/utf/static.c fll/level_0/utf/statics.c fll/level_0/utf/staticss.c fll/level_0/utf/string.c fll/level_0/utf/triple.c fll/level_0/utf/triples.c fll/level_0/utf/tripless.c build_sources_program fll/level_0/utf/private-dynamic.c fll/level_0/utf/private-dynamics.c fll/level_0/utf/private-dynamicss.c fll/level_0/utf/private-maps.c fll/level_0/utf/private-mapss.c fll/level_0/utf/private-map_multis.c fll/level_0/utf/private-map_multiss.c fll/level_0/utf/private-string.c fll/level_0/utf/private-triples.c fll/level_0/utf/private-tripless.c diff --git a/build/stand_alone/firewall.config.h b/build/stand_alone/firewall.config.h index 58ee930..428e4b9 100644 --- a/build/stand_alone/firewall.config.h +++ b/build/stand_alone/firewall.config.h @@ -397,6 +397,26 @@ #define _di_f_memory_structure_increase_by_ #define _di_f_memory_structure_resize_ +#define _di_f_number_unsigneds_adjust_ +#define _di_f_number_unsigneds_append_ +#define _di_f_number_unsigneds_append_all_ +#define _di_f_number_unsigneds_decimate_by_ +#define _di_f_number_unsigneds_decrease_by_ +//#define _di_f_number_unsigneds_increase_ +//#define _di_f_number_unsigneds_increase_by_ +//#define _di_f_number_unsigneds_resize_ +#define _di_f_number_unsignedss_adjust_ +#define _di_f_number_unsignedss_append_ +#define _di_f_number_unsignedss_append_all_ +#define _di_f_number_unsignedss_decimate_by_ +#define _di_f_number_unsignedss_decrease_by_ +#define _di_f_number_unsignedss_increase_ +#define _di_f_number_unsignedss_increase_by_ +#define _di_f_number_unsignedss_resize_ +#define _di_f_number_unsignedss_t_ +//#define _di_f_number_unsigneds_t_ +//#define _di_f_number_unsigned_t_ + #define _di_f_path_change_ #define _di_f_path_change_at_ #define _di_f_path_current_ @@ -960,24 +980,6 @@ #define _di_f_thread_spin_unlock_ #define _di_f_thread_unlock_ -#define _di_f_array_lengths_adjust_ -#define _di_f_array_lengths_append_ -#define _di_f_array_lengths_append_all_ -#define _di_f_array_lengths_decimate_by_ -#define _di_f_array_lengths_decrease_by_ -//#define _di_f_array_lengths_increase_ -//#define _di_f_array_lengths_increase_by_ -//#define _di_f_array_lengths_resize_ -#define _di_f_array_lengthss_adjust_ -#define _di_f_array_lengthss_append_ -#define _di_f_array_lengthss_append_all_ -#define _di_f_array_lengthss_decimate_by_ -#define _di_f_array_lengthss_decrease_by_ -#define _di_f_array_lengthss_increase_ -#define _di_f_array_lengthss_increase_by_ -#define _di_f_array_lengthss_resize_ -//#define _di_f_array_lengthss_t_ -//#define _di_f_array_lengths_t_ #define _di_f_cells_adjust_ #define _di_f_cells_append_ #define _di_f_cells_append_all_ diff --git a/build/stand_alone/firewall.settings b/build/stand_alone/firewall.settings index 8b640ca..b198f46 100644 --- a/build/stand_alone/firewall.settings +++ b/build/stand_alone/firewall.settings @@ -42,8 +42,8 @@ build_sources_program fll/level_0/print.c fll/level_0/private-print.c fll/level_ build_sources_program fll/level_0/signal.c build_sources_program fll/level_0/string.c fll/level_0/private-string.c fll/level_0/string/common.c fll/level_0/string/dynamic.c fll/level_0/string/map.c fll/level_0/string/map_multi.c fll/level_0/string/private-dynamic.c fll/level_0/string/private-map.c fll/level_0/string/private-map_multi.c fll/level_0/string/private-quantity.c fll/level_0/string/private-range.c fll/level_0/string/private-triple.c fll/level_0/string/quantity.c fll/level_0/string/range.c fll/level_0/string/static.c fll/level_0/string/triple.c build_sources_program fll/level_0/thread.c fll/level_0/private-thread.c fll/level_0/thread/attribute.c fll/level_0/thread/barrier.c fll/level_0/thread/barrier_attribute.c fll/level_0/thread/condition.c fll/level_0/thread/condition_attribute.c fll/level_0/thread/id.c fll/level_0/thread/key.c fll/level_0/thread/lock.c fll/level_0/thread/lock_attribute.c fll/level_0/thread/mutex.c fll/level_0/thread/mutex_attribute.c fll/level_0/thread/once.c fll/level_0/thread/semaphore.c fll/level_0/thread/set.c fll/level_0/thread/spin.c -build_sources_program fll/level_0/type_array/array_length.c fll/level_0/type_array/cell.c fll/level_0/type_array/fll_id.c fll/level_0/type_array/int8.c fll/level_0/type_array/int16.c fll/level_0/type_array/int32.c fll/level_0/type_array/int64.c fll/level_0/type_array/int128.c fll/level_0/type_array/state.c fll/level_0/type_array/status.c fll/level_0/type_array/uint8.c fll/level_0/type_array/uint16.c fll/level_0/type_array/uint32.c fll/level_0/type_array/uint64.c fll/level_0/type_array/uint128.c -build_sources_program fll/level_0/type_array/private-array_length.c fll/level_0/type_array/private-cell.c fll/level_0/type_array/private-fll_id.c fll/level_0/type_array/private-int8.c fll/level_0/type_array/private-int16.c fll/level_0/type_array/private-int32.c fll/level_0/type_array/private-int64.c fll/level_0/type_array/private-int128.c fll/level_0/type_array/private-state.c fll/level_0/type_array/private-status.c fll/level_0/type_array/private-uint8.c fll/level_0/type_array/private-uint16.c fll/level_0/type_array/private-uint32.c fll/level_0/type_array/private-uint64.c fll/level_0/type_array/private-uint128.c +build_sources_program fll/level_0/type_array/cell.c fll/level_0/type_array/fll_id.c fll/level_0/type_array/int8.c fll/level_0/type_array/int16.c fll/level_0/type_array/int32.c fll/level_0/type_array/int64.c fll/level_0/type_array/int128.c fll/level_0/type_array/number_unsigned.c fll/level_0/type_array/state.c fll/level_0/type_array/status.c fll/level_0/type_array/uint8.c fll/level_0/type_array/uint16.c fll/level_0/type_array/uint32.c fll/level_0/type_array/uint64.c fll/level_0/type_array/uint128.c +build_sources_program fll/level_0/type_array/private-cell.c fll/level_0/type_array/private-fll_id.c fll/level_0/type_array/private-int8.c fll/level_0/type_array/private-int16.c fll/level_0/type_array/private-int32.c fll/level_0/type_array/private-int64.c fll/level_0/type_array/private-int128.c fll/level_0/type_array/private-number_unsigned.c fll/level_0/type_array/private-state.c fll/level_0/type_array/private-status.c fll/level_0/type_array/private-uint8.c fll/level_0/type_array/private-uint16.c fll/level_0/type_array/private-uint32.c fll/level_0/type_array/private-uint64.c fll/level_0/type_array/private-uint128.c build_sources_program fll/level_0/utf.c fll/level_0/private-utf.c fll/level_0/private-utf_alphabetic.c fll/level_0/private-utf_combining.c fll/level_0/private-utf_control.c fll/level_0/private-utf_digit.c fll/level_0/private-utf_emoji.c fll/level_0/private-utf_numeric.c fll/level_0/private-utf_phonetic.c fll/level_0/private-utf_private.c fll/level_0/private-utf_punctuation.c fll/level_0/private-utf_subscript.c fll/level_0/private-utf_superscript.c fll/level_0/private-utf_symbol.c fll/level_0/private-utf_unassigned.c fll/level_0/private-utf_valid.c fll/level_0/private-utf_whitespace.c fll/level_0/private-utf_wide.c fll/level_0/private-utf_word.c fll/level_0/private-utf_zero_width.c build_sources_program fll/level_0/utf/common.c fll/level_0/utf/convert.c fll/level_0/utf/dynamic.c fll/level_0/utf/is.c fll/level_0/utf/is_character.c fll/level_0/utf/map.c fll/level_0/utf/map_multi.c fll/level_0/utf/static.c fll/level_0/utf/string.c fll/level_0/utf/triple.c fll/level_0/utf/private-dynamic.c fll/level_0/utf/private-map.c fll/level_0/utf/private-map_multi.c fll/level_0/utf/private-triple.c fll/level_0/utf/private-string.c diff --git a/build/stand_alone/utf8.config.h b/build/stand_alone/utf8.config.h index daf7af6..0b1875c 100644 --- a/build/stand_alone/utf8.config.h +++ b/build/stand_alone/utf8.config.h @@ -163,6 +163,26 @@ #define _di_f_memory_structure_increase_by_ #define _di_f_memory_structure_resize_ +#define _di_f_number_unsigneds_adjust_ +#define _di_f_number_unsigneds_append_ +#define _di_f_number_unsigneds_append_all_ +#define _di_f_number_unsigneds_decimate_by_ +#define _di_f_number_unsigneds_decrease_by_ +//#define _di_f_number_unsigneds_increase_ +//#define _di_f_number_unsigneds_increase_by_ +//#define _di_f_number_unsigneds_resize_ +#define _di_f_number_unsignedss_adjust_ +#define _di_f_number_unsignedss_append_ +#define _di_f_number_unsignedss_append_all_ +#define _di_f_number_unsignedss_decimate_by_ +#define _di_f_number_unsignedss_decrease_by_ +#define _di_f_number_unsignedss_increase_ +#define _di_f_number_unsignedss_increase_by_ +#define _di_f_number_unsignedss_resize_ +#define _di_f_number_unsignedss_t_ +//#define _di_f_number_unsigneds_t_ +//#define _di_f_number_unsigned_t_ + #define _di_f_pipe_error_exists_ //#define _di_f_pipe_input_exists_ #define _di_f_pipe_output_exists_ @@ -477,24 +497,6 @@ //#define _di_f_string_triples_t_ //#define _di_f_string_triple_t_ -#define _di_f_array_lengths_adjust_ -#define _di_f_array_lengths_append_ -#define _di_f_array_lengths_append_all_ -#define _di_f_array_lengths_decimate_by_ -#define _di_f_array_lengths_decrease_by_ -//#define _di_f_array_lengths_increase_ -//#define _di_f_array_lengths_increase_by_ -//#define _di_f_array_lengths_resize_ -#define _di_f_array_lengthss_adjust_ -#define _di_f_array_lengthss_append_ -#define _di_f_array_lengthss_append_all_ -#define _di_f_array_lengthss_decimate_by_ -#define _di_f_array_lengthss_decrease_by_ -#define _di_f_array_lengthss_increase_ -#define _di_f_array_lengthss_increase_by_ -#define _di_f_array_lengthss_resize_ -#define _di_f_array_lengthss_t_ -//#define _di_f_array_lengths_t_ #define _di_f_cells_adjust_ #define _di_f_cells_append_ #define _di_f_cells_append_all_ diff --git a/build/stand_alone/utf8.settings b/build/stand_alone/utf8.settings index 415d88c..8f5c91b 100644 --- a/build/stand_alone/utf8.settings +++ b/build/stand_alone/utf8.settings @@ -33,8 +33,8 @@ build_sources_program fll/level_0/print.c fll/level_0/private-print.c fll/level_ build_sources_program fll/level_0/signal.c build_sources_program fll/level_0/string.c fll/level_0/private-string.c fll/level_0/string/common.c fll/level_0/string/private-dynamic.c fll/level_0/string/private-dynamics.c fll/level_0/string/private-dynamicss.c fll/level_0/string/private-maps.c fll/level_0/string/private-mapss.c fll/level_0/string/private-map_multis.c fll/level_0/string/private-map_multiss.c fll/level_0/string/private-quantitys.c fll/level_0/string/private-quantityss.c fll/level_0/string/private-ranges.c fll/level_0/string/private-rangess.c fll/level_0/string/private-triples.c fll/level_0/string/private-tripless.c build_sources_program fll/level_0/string/dynamic.c fll/level_0/string/dynamics.c fll/level_0/string/dynamicss.c fll/level_0/string/map.c fll/level_0/string/maps.c fll/level_0/string/mapss.c fll/level_0/string/map_multi.c fll/level_0/string/map_multis.c fll/level_0/string/map_multiss.c fll/level_0/string/quantity.c fll/level_0/string/quantitys.c fll/level_0/string/quantityss.c fll/level_0/string/range.c fll/level_0/string/ranges.c fll/level_0/string/rangess.c fll/level_0/string/static.c fll/level_0/string/statics.c fll/level_0/string/staticss.c fll/level_0/string/triple.c fll/level_0/string/triples.c fll/level_0/string/tripless.c -build_sources_program fll/level_0/type_array/array_length.c fll/level_0/type_array/cell.c fll/level_0/type_array/fll_id.c fll/level_0/type_array/int8.c fll/level_0/type_array/int16.c fll/level_0/type_array/int32.c fll/level_0/type_array/int64.c fll/level_0/type_array/int128.c fll/level_0/type_array/state.c fll/level_0/type_array/status.c fll/level_0/type_array/uint8.c fll/level_0/type_array/uint16.c fll/level_0/type_array/uint32.c fll/level_0/type_array/uint64.c fll/level_0/type_array/uint128.c -build_sources_program fll/level_0/type_array/private-array_length.c fll/level_0/type_array/private-cell.c fll/level_0/type_array/private-fll_id.c fll/level_0/type_array/private-int8.c fll/level_0/type_array/private-int16.c fll/level_0/type_array/private-int32.c fll/level_0/type_array/private-int64.c fll/level_0/type_array/private-int128.c fll/level_0/type_array/private-state.c fll/level_0/type_array/private-status.c fll/level_0/type_array/private-uint8.c fll/level_0/type_array/private-uint16.c fll/level_0/type_array/private-uint32.c fll/level_0/type_array/private-uint64.c fll/level_0/type_array/private-uint128.c +build_sources_program fll/level_0/type_array/cell.c fll/level_0/type_array/fll_id.c fll/level_0/type_array/int8.c fll/level_0/type_array/int16.c fll/level_0/type_array/int32.c fll/level_0/type_array/int64.c fll/level_0/type_array/int128.c fll/level_0/type_array/number_unsigned.c fll/level_0/type_array/state.c fll/level_0/type_array/status.c fll/level_0/type_array/uint8.c fll/level_0/type_array/uint16.c fll/level_0/type_array/uint32.c fll/level_0/type_array/uint64.c fll/level_0/type_array/uint128.c +build_sources_program fll/level_0/type_array/private-cell.c fll/level_0/type_array/private-fll_id.c fll/level_0/type_array/private-int8.c fll/level_0/type_array/private-int16.c fll/level_0/type_array/private-int32.c fll/level_0/type_array/private-int64.c fll/level_0/type_array/private-int128.c fll/level_0/type_array/private-number_unsigned.c fll/level_0/type_array/private-state.c fll/level_0/type_array/private-status.c fll/level_0/type_array/private-uint8.c fll/level_0/type_array/private-uint16.c fll/level_0/type_array/private-uint32.c fll/level_0/type_array/private-uint64.c fll/level_0/type_array/private-uint128.c build_sources_program fll/level_0/utf.c fll/level_0/private-utf.c fll/level_0/private-utf_alphabetic.c fll/level_0/private-utf_combining.c fll/level_0/private-utf_control.c fll/level_0/private-utf_digit.c fll/level_0/private-utf_emoji.c fll/level_0/private-utf_numeric.c fll/level_0/private-utf_phonetic.c fll/level_0/private-utf_private.c fll/level_0/private-utf_punctuation.c fll/level_0/private-utf_subscript.c fll/level_0/private-utf_superscript.c fll/level_0/private-utf_symbol.c fll/level_0/private-utf_unassigned.c fll/level_0/private-utf_valid.c fll/level_0/private-utf_whitespace.c fll/level_0/private-utf_wide.c fll/level_0/private-utf_word.c fll/level_0/private-utf_zero_width.c build_sources_program fll/level_0/utf/common.c fll/level_0/utf/convert.c fll/level_0/utf/dynamic.c fll/level_0/utf/dynamics.c fll/level_0/utf/dynamicss.c fll/level_0/utf/is.c fll/level_0/utf/is_character.c fll/level_0/utf/map.c fll/level_0/utf/maps.c fll/level_0/utf/mapss.c fll/level_0/utf/map_multi.c fll/level_0/utf/map_multis.c fll/level_0/utf/map_multiss.c fll/level_0/utf/static.c fll/level_0/utf/statics.c fll/level_0/utf/staticss.c fll/level_0/utf/string.c fll/level_0/utf/triple.c fll/level_0/utf/triples.c fll/level_0/utf/tripless.c build_sources_program fll/level_0/utf/private-dynamic.c fll/level_0/utf/private-dynamics.c fll/level_0/utf/private-dynamicss.c fll/level_0/utf/private-maps.c fll/level_0/utf/private-mapss.c fll/level_0/utf/private-map_multis.c fll/level_0/utf/private-map_multiss.c fll/level_0/utf/private-string.c fll/level_0/utf/private-triples.c fll/level_0/utf/private-tripless.c diff --git a/level_0/f_account/c/account.c b/level_0/f_account/c/account.c index ae15a63..4c3fee1 100644 --- a/level_0/f_account/c/account.c +++ b/level_0/f_account/c/account.c @@ -282,7 +282,7 @@ extern "C" { else { if (!pointer) return F_exist_not; - const f_array_length_t name_length = strnlen(group_data.gr_name, length); + const f_number_unsigned_t name_length = strnlen(group_data.gr_name, length); name->used = 0; @@ -317,7 +317,7 @@ extern "C" { if (!pointer) return F_exist_not; - const f_array_length_t name_length = strnlen(group_data.gr_name, length); + const f_number_unsigned_t name_length = strnlen(group_data.gr_name, length); name->used = 0; @@ -454,7 +454,7 @@ extern "C" { else { if (!pointer) return F_exist_not; - const f_array_length_t name_length = strnlen(password.pw_name, length); + const f_number_unsigned_t name_length = strnlen(password.pw_name, length); name->used = 0; @@ -489,7 +489,7 @@ extern "C" { if (!pointer) return F_exist_not; - const f_array_length_t name_length = strnlen(password.pw_name, length); + const f_number_unsigned_t name_length = strnlen(password.pw_name, length); name->used = 0; diff --git a/level_0/f_account/c/account/accounts.c b/level_0/f_account/c/account/accounts.c index 346d309..fa325f1 100644 --- a/level_0/f_account/c/account/accounts.c +++ b/level_0/f_account/c/account/accounts.c @@ -27,7 +27,7 @@ extern "C" { #endif // _di_f_account_destroy_ #ifndef _di_f_accounts_adjust_ - f_status_t f_accounts_adjust(const f_array_length_t length, f_accounts_t *accounts) { + f_status_t f_accounts_adjust(const f_number_unsigned_t length, f_accounts_t *accounts) { #ifndef _di_level_0_parameter_checking_ if (!accounts) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -59,7 +59,7 @@ extern "C" { #endif // _di_f_accounts_append_all_ #ifndef _di_f_accounts_decimate_by_ - f_status_t f_accounts_decimate_by(const f_array_length_t amount, f_accounts_t *accounts) { + f_status_t f_accounts_decimate_by(const f_number_unsigned_t amount, f_accounts_t *accounts) { #ifndef _di_level_0_parameter_checking_ if (!accounts) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -75,7 +75,7 @@ extern "C" { #endif // _di_f_accounts_decimate_by_ #ifndef _di_f_accounts_decrease_by_ - f_status_t f_accounts_decrease_by(const f_array_length_t amount, f_accounts_t *accounts) { + f_status_t f_accounts_decrease_by(const f_number_unsigned_t amount, f_accounts_t *accounts) { #ifndef _di_level_0_parameter_checking_ if (!accounts) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -91,20 +91,20 @@ extern "C" { #endif // _di_f_accounts_decrease_by_ #ifndef _di_f_accounts_increase_ - f_status_t f_accounts_increase(const f_array_length_t step, f_accounts_t *accounts) { + f_status_t f_accounts_increase(const f_number_unsigned_t step, f_accounts_t *accounts) { #ifndef _di_level_0_parameter_checking_ if (!accounts) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && accounts->used + 1 > accounts->size) { - f_array_length_t size = accounts->used + step; + f_number_unsigned_t size = accounts->used + step; - if (size > F_array_length_t_size_d) { - if (accounts->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (accounts->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_accounts_resize(size, accounts); @@ -115,7 +115,7 @@ extern "C" { #endif // _di_f_accounts_increase_ #ifndef _di_f_accounts_increase_by_ - f_status_t f_accounts_increase_by(const f_array_length_t amount, f_accounts_t *accounts) { + f_status_t f_accounts_increase_by(const f_number_unsigned_t amount, f_accounts_t *accounts) { #ifndef _di_level_0_parameter_checking_ if (!accounts) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -123,7 +123,7 @@ extern "C" { if (!amount) return F_data_not; if (accounts->used + amount > accounts->size) { - if (accounts->used + amount > F_array_length_t_size_d) { + if (accounts->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -135,7 +135,7 @@ extern "C" { #endif // _di_f_accounts_increase_by_ #ifndef _di_f_accounts_resize_ - f_status_t f_accounts_resize(const f_array_length_t length, f_accounts_t *accounts) { + f_status_t f_accounts_resize(const f_number_unsigned_t length, f_accounts_t *accounts) { #ifndef _di_level_0_parameter_checking_ if (!accounts) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -145,7 +145,7 @@ extern "C" { #endif // _di_f_accounts_resize_ #ifndef _di_f_accountss_adjust_ - f_status_t f_accountss_adjust(const f_array_length_t length, f_accountss_t *accountss) { + f_status_t f_accountss_adjust(const f_number_unsigned_t length, f_accountss_t *accountss) { #ifndef _di_level_0_parameter_checking_ if (!accountss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -193,7 +193,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].used = 0; @@ -208,7 +208,7 @@ extern "C" { #endif // _di_f_accountss_append_all_ #ifndef _di_f_accountss_decimate_by_ - f_status_t f_accountss_decimate_by(const f_array_length_t amount, f_accountss_t *accountss) { + f_status_t f_accountss_decimate_by(const f_number_unsigned_t amount, f_accountss_t *accountss) { #ifndef _di_level_0_parameter_checking_ if (!accountss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -224,7 +224,7 @@ extern "C" { #endif // _di_f_accountss_decimate_by_ #ifndef _di_f_accountss_decrease_by_ - f_status_t f_accountss_decrease_by(const f_array_length_t amount, f_accountss_t *accountss) { + f_status_t f_accountss_decrease_by(const f_number_unsigned_t amount, f_accountss_t *accountss) { #ifndef _di_level_0_parameter_checking_ if (!accountss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -240,20 +240,20 @@ extern "C" { #endif // _di_f_accountss_decrease_by_ #ifndef _di_f_accountss_increase_ - f_status_t f_accountss_increase(const f_array_length_t step, f_accountss_t *accountss) { + f_status_t f_accountss_increase(const f_number_unsigned_t step, f_accountss_t *accountss) { #ifndef _di_level_0_parameter_checking_ if (!accountss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && accountss->used + 1 > accountss->size) { - f_array_length_t size = accountss->used + step; + f_number_unsigned_t size = accountss->used + step; - if (size > F_array_length_t_size_d) { - if (accountss->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (accountss->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_accountss_resize(size, accountss); @@ -264,7 +264,7 @@ extern "C" { #endif // _di_f_accountss_increase_ #ifndef _di_f_accountss_increase_by_ - f_status_t f_accountss_increase_by(const f_array_length_t amount, f_accountss_t *accountss) { + f_status_t f_accountss_increase_by(const f_number_unsigned_t amount, f_accountss_t *accountss) { #ifndef _di_level_0_parameter_checking_ if (!accountss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -272,7 +272,7 @@ extern "C" { if (!amount) return F_data_not; if (accountss->used + amount > accountss->size) { - if (accountss->used + amount > F_array_length_t_size_d) { + if (accountss->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -284,7 +284,7 @@ extern "C" { #endif // _di_f_accountss_increase_by_ #ifndef _di_f_accountss_resize_ - f_status_t f_accountss_resize(const f_array_length_t length, f_accountss_t *accountss) { + f_status_t f_accountss_resize(const f_number_unsigned_t length, f_accountss_t *accountss) { #ifndef _di_level_0_parameter_checking_ if (!accountss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_account/c/account/accounts.h b/level_0/f_account/c/account/accounts.h index 5f94925..0fd8049 100644 --- a/level_0/f_account/c/account/accounts.h +++ b/level_0/f_account/c/account/accounts.h @@ -74,7 +74,7 @@ extern "C" { * @see f_string_dynamic_adjust() */ #ifndef _di_f_accounts_adjust_ - extern f_status_t f_accounts_adjust(const f_array_length_t length, f_accounts_t *accounts); + extern f_status_t f_accounts_adjust(const f_number_unsigned_t length, f_accounts_t *accounts); #endif // _di_f_accounts_adjust_ /** @@ -150,7 +150,7 @@ extern "C" { * @see f_string_dynamic_adjust() */ #ifndef _di_f_accounts_decimate_by_ - extern f_status_t f_accounts_decimate_by(const f_array_length_t amount, f_accounts_t *accounts); + extern f_status_t f_accounts_decimate_by(const f_number_unsigned_t amount, f_accounts_t *accounts); #endif // _di_f_accounts_decimate_by_ /** @@ -178,13 +178,13 @@ extern "C" { * @see f_string_dynamic_resize() */ #ifndef _di_f_accounts_decrease_by_ - extern f_status_t f_accounts_decrease_by(const f_array_length_t amount, f_accounts_t *accounts); + extern f_status_t f_accounts_decrease_by(const f_number_unsigned_t amount, f_accounts_t *accounts); #endif // _di_f_accounts_decrease_by_ /** * Increase the size of the accounts array, but only if necesary. * - * If the given length is too large for the buffer, then attempt to set max buffer size (F_array_length_t_size_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -207,14 +207,14 @@ extern "C" { * @see f_string_dynamic_resize() */ #ifndef _di_f_accounts_increase_ - extern f_status_t f_accounts_increase(const f_array_length_t step, f_accounts_t *accounts); + extern f_status_t f_accounts_increase(const f_number_unsigned_t step, f_accounts_t *accounts); #endif // _di_f_accounts_increase_ /** * Resize the accounts 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -236,7 +236,7 @@ extern "C" { * @see f_string_dynamic_resize() */ #ifndef _di_f_accounts_increase_by_ - extern f_status_t f_accounts_increase_by(const f_array_length_t amount, f_accounts_t *accounts); + extern f_status_t f_accounts_increase_by(const f_number_unsigned_t amount, f_accounts_t *accounts); #endif // _di_f_accounts_increase_by_ /** @@ -259,7 +259,7 @@ extern "C" { * @see f_string_dynamic_resize() */ #ifndef _di_f_accounts_resize_ - extern f_status_t f_accounts_resize(const f_array_length_t length, f_accounts_t *accounts); + extern f_status_t f_accounts_resize(const f_number_unsigned_t length, f_accounts_t *accounts); #endif // _di_f_accounts_resize_ /** @@ -282,7 +282,7 @@ extern "C" { * @see f_string_dynamic_adjust() */ #ifndef _di_f_accountss_adjust_ - extern f_status_t f_accountss_adjust(const f_array_length_t length, f_accountss_t *accountss); + extern f_status_t f_accountss_adjust(const f_number_unsigned_t length, f_accountss_t *accountss); #endif // _di_f_accountss_adjust_ /** @@ -357,7 +357,7 @@ extern "C" { * @see f_string_dynamic_adjust() */ #ifndef _di_f_accountss_decimate_by_ - extern f_status_t f_accountss_decimate_by(const f_array_length_t amount, f_accountss_t *accountss); + extern f_status_t f_accountss_decimate_by(const f_number_unsigned_t amount, f_accountss_t *accountss); #endif // _di_f_accountss_decimate_by_ /** @@ -384,13 +384,13 @@ extern "C" { * @see f_string_dynamic_resize() */ #ifndef _di_f_accountss_decrease_by_ - extern f_status_t f_accountss_decrease_by(const f_array_length_t amount, f_accountss_t *accountss); + extern f_status_t f_accountss_decrease_by(const f_number_unsigned_t amount, f_accountss_t *accountss); #endif // _di_f_accountss_decrease_by_ /** * Increase the size of the string accountss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -413,14 +413,14 @@ extern "C" { * @see f_string_dynamic_resize() */ #ifndef _di_f_accountss_increase_ - extern f_status_t f_accountss_increase(const f_array_length_t step, f_accountss_t *accountss); + extern f_status_t f_accountss_increase(const f_number_unsigned_t step, f_accountss_t *accountss); #endif // _di_f_accountss_increase_ /** * Resize the string accountss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -442,7 +442,7 @@ extern "C" { * @see f_string_dynamic_resize() */ #ifndef _di_f_accountss_increase_by_ - extern f_status_t f_accountss_increase_by(const f_array_length_t amount, f_accountss_t *accountss); + extern f_status_t f_accountss_increase_by(const f_number_unsigned_t amount, f_accountss_t *accountss); #endif // _di_f_accountss_increase_by_ /** @@ -465,7 +465,7 @@ extern "C" { * @see f_string_dynamic_resize() */ #ifndef _di_f_accountss_resize_ - extern f_status_t f_accountss_resize(const f_array_length_t length, f_accountss_t *accountss); + extern f_status_t f_accountss_resize(const f_number_unsigned_t length, f_accountss_t *accountss); #endif // _di_f_accountss_resize_ #ifdef __cplusplus diff --git a/level_0/f_account/c/account/common.h b/level_0/f_account/c/account/common.h index c64a199..f73a252 100644 --- a/level_0/f_account/c/account/common.h +++ b/level_0/f_account/c/account/common.h @@ -85,8 +85,8 @@ extern "C" { typedef struct { f_account_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_accounts_t; #define f_accounts_t_initialize { 0, 0, 0 } @@ -119,8 +119,8 @@ extern "C" { typedef struct { f_accounts_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_accountss_t; #define f_accountss_t_initialize { 0, 0, 0 } diff --git a/level_0/f_account/c/account/private-accounts.c b/level_0/f_account/c/account/private-accounts.c index ffd7d78..e3969d5 100644 --- a/level_0/f_account/c/account/private-accounts.c +++ b/level_0/f_account/c/account/private-accounts.c @@ -51,12 +51,12 @@ extern "C" { #endif // !defined(_di_f_account_destroy_) || !defined(_di_f_accounts_adjust_) || !defined(_di_f_accounts_decimate_by_) || !defined(_di_f_accountss_adjust_) || !defined(_di_f_accountss_decimate_by_) #if !defined(_di_f_accounts_adjust_) || !defined(_di_f_accounts_decimate_by_) || !defined(_di_f_accountss_adjust_) || !defined(_di_f_accountss_decimate_by_) - f_status_t private_f_accounts_adjust(const f_array_length_t length, f_accounts_t *accounts) { + f_status_t private_f_accounts_adjust(const f_number_unsigned_t length, f_accounts_t *accounts) { f_status_t status = F_none; if (length < accounts->size) { - for (f_array_length_t i = length; i < accounts->size; ++i) { + for (f_number_unsigned_t i = length; i < accounts->size; ++i) { status = private_f_account_destroy(&accounts->array[i]); if (F_status_is_error(status)) return status; @@ -123,7 +123,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].home.used = 0; destination->array[destination->used].label.used = 0; @@ -152,12 +152,12 @@ extern "C" { #endif // !defined(_di_f_accounts_append_) || !defined(_di_f_accounts_append_all_) || !defined(_di_f_accountss_append_all_) #if !defined(_di_f_accounts_resize_) || !defined(_di_f_accounts_append_) || !defined(_di_f_accounts_decimate_by_) || !defined(_di_f_accountss_append_) || !defined(_di_f_accountss_decrease_by_) || !defined(_di_f_accountss_increase_) || !defined(_di_f_accountss_increase_by_) || !defined(_di_f_accountss_resize_) - f_status_t private_f_accounts_resize(const f_array_length_t length, f_accounts_t *accounts) { + f_status_t private_f_accounts_resize(const f_number_unsigned_t length, f_accounts_t *accounts) { f_status_t status = F_none; if (length < accounts->size) { - for (f_array_length_t i = length; i < accounts->size; ++i) { + for (f_number_unsigned_t i = length; i < accounts->size; ++i) { status = f_string_dynamic_resize(0, &accounts->array[i].home); if (F_status_is_error(status)) return status; @@ -190,11 +190,11 @@ extern "C" { #endif // !defined(_di_f_accounts_resize_) || !defined(_di_f_accounts_append_) || !defined(_di_f_accounts_decimate_by_) || !defined(_di_f_accountss_append_) || !defined(_di_f_accountss_decrease_by_) || !defined(_di_f_accountss_increase_) || !defined(_di_f_accountss_increase_by_) || !defined(_di_f_accountss_resize_) #if !defined(_di_f_accountss_adjust_) || !defined(_di_f_accountss_decimate_by_) - f_status_t private_f_accountss_adjust(const f_array_length_t length, f_accountss_t *accountss) { + f_status_t private_f_accountss_adjust(const f_number_unsigned_t length, f_accountss_t *accountss) { f_status_t status = F_none; - for (f_array_length_t i = length; i < accountss->size; ++i) { + for (f_number_unsigned_t i = length; i < accountss->size; ++i) { status = private_f_accounts_adjust(0, &accountss->array[i]); if (F_status_is_error(status)) return status; @@ -217,11 +217,11 @@ extern "C" { #endif // !defined(_di_f_accountss_adjust_) || !defined(_di_f_accountss_decimate_by_) #if !defined(_di_f_accountss_decrease_by_) || !defined(_di_f_accountss_increase_) || !defined(_di_f_accountss_increase_by_) || !defined(_di_f_accountss_resize_) - f_status_t private_f_accountss_resize(const f_array_length_t length, f_accountss_t *accountss) { + f_status_t private_f_accountss_resize(const f_number_unsigned_t length, f_accountss_t *accountss) { f_status_t status = F_none; - for (f_array_length_t i = length; i < accountss->size; ++i) { + for (f_number_unsigned_t i = length; i < accountss->size; ++i) { status = private_f_accounts_resize(0, &accountss->array[i]); if (F_status_is_error(status)) return status; diff --git a/level_0/f_account/c/account/private-accounts.h b/level_0/f_account/c/account/private-accounts.h index 3bf0f7d..6483ed4 100644 --- a/level_0/f_account/c/account/private-accounts.h +++ b/level_0/f_account/c/account/private-accounts.h @@ -95,7 +95,7 @@ extern "C" { * @see f_accountss_decimate_by() */ #if !defined(_di_f_accounts_adjust_) || !defined(_di_f_accounts_decimate_by_) || !defined(_di_f_accountss_adjust_) || !defined(_di_f_accountss_decimate_by_) - extern f_status_t private_f_accounts_adjust(const f_array_length_t length, f_accounts_t *accounts) F_attribute_visibility_internal_d; + extern f_status_t private_f_accounts_adjust(const f_number_unsigned_t length, f_accounts_t *accounts) F_attribute_visibility_internal_d; #endif // !defined(_di_f_accounts_adjust_) || !defined(_di_f_accounts_decimate_by_) || !defined(_di_f_accountss_adjust_) || !defined(_di_f_accountss_decimate_by_) /** @@ -181,7 +181,7 @@ extern "C" { * @see f_accountss_resize() */ #if !defined(_di_f_accounts_resize_) || !defined(_di_f_accounts_append_) || !defined(_di_f_accounts_decimate_by_) || !defined(_di_f_accountss_append_) || !defined(_di_f_accountss_decrease_by_) || !defined(_di_f_accountss_increase_) || !defined(_di_f_accountss_increase_by_) || !defined(_di_f_accountss_resize_) - extern f_status_t private_f_accounts_resize(const f_array_length_t length, f_accounts_t *accounts) F_attribute_visibility_internal_d; + extern f_status_t private_f_accounts_resize(const f_number_unsigned_t length, f_accounts_t *accounts) F_attribute_visibility_internal_d; #endif // !defined(_di_f_accounts_resize_) || !defined(_di_f_accounts_append_) || !defined(_di_f_accounts_decimate_by_) || !defined(_di_f_accountss_append_) || !defined(_di_f_accountss_decrease_by_) || !defined(_di_f_accountss_increase_) || !defined(_di_f_accountss_increase_by_) || !defined(_di_f_accountss_resize_) /** @@ -212,7 +212,7 @@ extern "C" { * @see f_accountss_decimate_by() */ #if !defined(_di_f_accountss_adjust_) || !defined(_di_f_accountss_decimate_by_) - extern f_status_t private_f_accountss_adjust(const f_array_length_t length, f_accountss_t *accountss) F_attribute_visibility_internal_d; + extern f_status_t private_f_accountss_adjust(const f_number_unsigned_t length, f_accountss_t *accountss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_accountss_adjust_) || !defined(_di_f_accountss_decimate_by_) /** @@ -242,7 +242,7 @@ extern "C" { * @see f_accountss_resize() */ #if !defined(_di_f_accountss_decrease_by_) || !defined(_di_f_accountss_increase_) || !defined(_di_f_accountss_increase_by_) || !defined(_di_f_accountss_resize_) - extern f_status_t private_f_accountss_resize(const f_array_length_t length, f_accountss_t *accountss) F_attribute_visibility_internal_d; + extern f_status_t private_f_accountss_resize(const f_number_unsigned_t length, f_accountss_t *accountss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_accountss_decrease_by_) || !defined(_di_f_accountss_increase_) || !defined(_di_f_accountss_increase_by_) || !defined(_di_f_accountss_resize_) #ifdef __cplusplus diff --git a/level_0/f_account/c/private-account.c b/level_0/f_account/c/private-account.c index 3511d3f..2132172 100644 --- a/level_0/f_account/c/private-account.c +++ b/level_0/f_account/c/private-account.c @@ -7,7 +7,7 @@ extern "C" { #endif #if !defined(_di_f_account_by_name_) || !defined(_di_f_account_by_id_) - f_status_t private_f_account_from_passwd(const struct passwd password, const f_array_length_t password_length, f_account_t * const account) { + f_status_t private_f_account_from_passwd(const struct passwd password, const f_number_unsigned_t password_length, f_account_t * const account) { f_status_t status = F_none; @@ -16,7 +16,7 @@ extern "C" { account->id_group = password.pw_gid; // Account home directory. - f_array_length_t string_length = strnlen(password.pw_dir, password_length); + f_number_unsigned_t string_length = strnlen(password.pw_dir, password_length); account->home.used = 0; diff --git a/level_0/f_account/c/private-account.h b/level_0/f_account/c/private-account.h index 799fae6..8ae1c92 100644 --- a/level_0/f_account/c/private-account.h +++ b/level_0/f_account/c/private-account.h @@ -37,7 +37,7 @@ extern "C" { * @see f_string_dynamic_increase_by() */ #if !defined(_di_f_account_by_name_) || !defined(_di_f_account_by_id_) - extern f_status_t private_f_account_from_passwd(const struct passwd password, const f_array_length_t password_length, f_account_t * const account) F_attribute_visibility_internal_d; + extern f_status_t private_f_account_from_passwd(const struct passwd password, const f_number_unsigned_t password_length, f_account_t * const account) F_attribute_visibility_internal_d; #endif // !defined(_di_f_account_by_name_) || !defined(_di_f_account_by_id_) #ifdef __cplusplus diff --git a/level_0/f_account/data/build/structures b/level_0/f_account/data/build/structures index 69f4066..fcd2683 100644 --- a/level_0/f_account/data/build/structures +++ b/level_0/f_account/data/build/structures @@ -10,8 +10,8 @@ f_account_t: f_accounts_t: f_account_t - f_array_length_t + f_number_unsigned_t f_accountss_t: f_accounts_t - f_array_length_t + f_number_unsigned_t diff --git a/level_0/f_account/tests/unit/c/test-account-ss_append.c b/level_0/f_account/tests/unit/c/test-account-ss_append.c index 829a37f..0815349 100644 --- a/level_0/f_account/tests/unit/c/test-account-ss_append.c +++ b/level_0/f_account/tests/unit/c/test-account-ss_append.c @@ -76,7 +76,7 @@ void test__f_accountss_append__works(void **state) { assert_int_equal(destination.array[0].used, sources.used); assert_int_equal(destination.array[0].size, sources.used); - for (f_array_length_t i = 0; i < destination.array[0].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[0].used; ++i) { assert_string_equal(destination.array[0].array[i].home.string, source.home.string); assert_string_equal(destination.array[0].array[i].label.string, source.label.string); @@ -92,7 +92,7 @@ void test__f_accountss_append__works(void **state) { } // for } - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_account/tests/unit/c/test-account-ss_append_all.c b/level_0/f_account/tests/unit/c/test-account-ss_append_all.c index 0e3765d..09afa82 100644 --- a/level_0/f_account/tests/unit/c/test-account-ss_append_all.c +++ b/level_0/f_account/tests/unit/c/test-account-ss_append_all.c @@ -91,7 +91,7 @@ void test__f_accountss_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { assert_int_equal(destination.array[i].used, length_inner); assert_int_equal(destination.array[i].size, length_inner); @@ -110,11 +110,11 @@ void test__f_accountss_append_all__works(void **state) { } // for } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { free((void *) source.array[i].array); } // for - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_capability/c/capability.c b/level_0/f_capability/c/capability.c index 8ed51d9..4431926 100644 --- a/level_0/f_capability/c/capability.c +++ b/level_0/f_capability/c/capability.c @@ -1049,7 +1049,7 @@ extern "C" { char *result = cap_to_name(code); if (result) { - const f_array_length_t length = strlen(result); + const f_number_unsigned_t length = strlen(result); if (name->used + length + 1 > name->size) { if (name->used + length + 1 > F_string_t_size_d) { diff --git a/level_0/f_color/tests/unit/c/test-color-context_delete.c b/level_0/f_color/tests/unit/c/test-color-context_delete.c index bbbe942..567b35f 100644 --- a/level_0/f_color/tests/unit/c/test-color-context_delete.c +++ b/level_0/f_color/tests/unit/c/test-color-context_delete.c @@ -7,7 +7,7 @@ extern "C" { void test__f_color_context_delete__frees_memory(void **state) { - const f_array_length_t size = 3; + const f_number_unsigned_t size = 3; f_color_context_t context = f_color_context_t_initialize; diff --git a/level_0/f_color/tests/unit/c/test-color-context_destroy.c b/level_0/f_color/tests/unit/c/test-color-context_destroy.c index c85acd3..0d768f0 100644 --- a/level_0/f_color/tests/unit/c/test-color-context_destroy.c +++ b/level_0/f_color/tests/unit/c/test-color-context_destroy.c @@ -7,7 +7,7 @@ extern "C" { void test__f_color_context_destroy__frees_memory(void **state) { - const f_array_length_t size = 3; + const f_number_unsigned_t size = 3; f_color_context_t context = f_color_context_t_initialize; diff --git a/level_0/f_compare/c/compare.c b/level_0/f_compare/c/compare.c index fb1cb57..625fb88 100644 --- a/level_0/f_compare/c/compare.c +++ b/level_0/f_compare/c/compare.c @@ -6,21 +6,21 @@ extern "C" { #endif #ifndef _di_f_compare_ - f_status_t f_compare(const f_string_t string1, const f_string_t string2, const f_array_length_t length1, const f_array_length_t length2) { + f_status_t f_compare(const f_string_t string1, const f_string_t string2, const f_number_unsigned_t length1, const f_number_unsigned_t length2) { return private_f_compare(string1, string2, 0, 0, length1, length2); } #endif // _di_f_compare_ #ifndef _di_f_compare_except_ - f_status_t f_compare_except(const f_string_t string1, const f_string_t string2, const f_array_length_t length1, const f_array_length_t length2, const f_array_lengths_t except1, const f_array_lengths_t except2) { + f_status_t f_compare_except(const f_string_t string1, const f_string_t string2, const f_number_unsigned_t length1, const f_number_unsigned_t length2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_except(string1, string2, 0, 0, length1, length2, except1, except2); } #endif // _di_f_compare_except_ #ifndef _di_f_compare_except_trim_ - f_status_t f_compare_except_trim(const f_string_t string1, const f_string_t string2, const f_array_length_t length1, const f_array_length_t length2, const f_array_lengths_t except1, const f_array_lengths_t except2) { + f_status_t f_compare_except_trim(const f_string_t string1, const f_string_t string2, const f_number_unsigned_t length1, const f_number_unsigned_t length2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_except_trim(string1, string2, 0, 0, length1, length2, except1, except2); } @@ -34,35 +34,35 @@ extern "C" { #endif // _di_f_compare_dynamic_ #ifndef _di_f_compare_dynamic_except_ - f_status_t f_compare_dynamic_except(const f_string_static_t string1, const f_string_static_t string2, const f_array_lengths_t except1, const f_array_lengths_t except2) { + f_status_t f_compare_dynamic_except(const f_string_static_t string1, const f_string_static_t string2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_except(string1.string, string2.string, 0, 0, string1.used, string2.used, except1, except2); } #endif // _di_f_compare_dynamic_except_ #ifndef _di_f_compare_dynamic_except_string_ - f_status_t f_compare_dynamic_except_string(const f_string_t string1, const f_string_static_t string2, const f_array_length_t length1, const f_array_lengths_t except1, const f_array_lengths_t except2) { + f_status_t f_compare_dynamic_except_string(const f_string_t string1, const f_string_static_t string2, const f_number_unsigned_t length1, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_except(string1, string2.string, 0, 0, length1, string2.used, except1, except2); } #endif // _di_f_compare_dynamic_except_string_ #ifndef _di_f_compare_dynamic_except_trim_ - f_status_t f_compare_dynamic_except_trim(const f_string_static_t string1, const f_string_static_t string2, const f_array_lengths_t except1, const f_array_lengths_t except2) { + f_status_t f_compare_dynamic_except_trim(const f_string_static_t string1, const f_string_static_t string2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_except_trim(string1.string, string2.string, 0, 0, string1.used, string2.used, except1, except2); } #endif // _di_f_compare_dynamic_except_trim_ #ifndef _di_f_compare_dynamic_except_trim_string_ - f_status_t f_compare_dynamic_except_trim_string(const f_string_t string1, const f_string_static_t string2, const f_array_length_t length1, const f_array_lengths_t except1, const f_array_lengths_t except2) { + f_status_t f_compare_dynamic_except_trim_string(const f_string_t string1, const f_string_static_t string2, const f_number_unsigned_t length1, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_except_trim(string1, string2.string, 0, 0, length1, string2.used, except1, except2); } #endif // _di_f_compare_dynamic_except_trim_string_ #ifndef _di_f_compare_dynamic_string_ - f_status_t f_compare_dynamic_string(const f_string_t string1, const f_string_static_t string2, const f_array_length_t length1) { + f_status_t f_compare_dynamic_string(const f_string_t string1, const f_string_static_t string2, const f_number_unsigned_t length1) { return private_f_compare(string1, string2.string, 0, 0, length1, string2.used); } @@ -76,7 +76,7 @@ extern "C" { #endif // _di_f_compare_dynamic_trim_ #ifndef _di_f_compare_dynamic_trim_string_ - f_status_t f_compare_dynamic_trim_string(const f_string_t string1, const f_string_static_t string2, const f_array_length_t length1) { + f_status_t f_compare_dynamic_trim_string(const f_string_t string1, const f_string_static_t string2, const f_number_unsigned_t length1) { return private_f_compare_trim(string1, string2.string, 0, 0, length1, string2.used); } @@ -117,7 +117,7 @@ extern "C" { #endif // _di_f_compare_dynamic_partial_dynamic_ #ifndef _di_f_compare_dynamic_partial_string_ - f_status_t f_compare_dynamic_partial_string(const f_string_t string1, const f_string_static_t string2, const f_array_length_t length1, const f_string_range_t range2) { + f_status_t f_compare_dynamic_partial_string(const f_string_t string1, const f_string_static_t string2, const f_number_unsigned_t length1, const f_string_range_t range2) { return private_f_compare( string1, @@ -133,7 +133,7 @@ extern "C" { #endif // _di_f_compare_dynamic_partial_string_ #ifndef _di_f_compare_dynamic_partial_except_ - f_status_t f_compare_dynamic_partial_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_array_lengths_t except1, const f_array_lengths_t except2) { + f_status_t f_compare_dynamic_partial_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_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_except( string1.string, @@ -153,7 +153,7 @@ extern "C" { #endif // _di_f_compare_dynamic_partial_except_ #ifndef _di_f_compare_dynamic_partial_except_dynamic_ - f_status_t f_compare_dynamic_partial_except_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range2, const f_array_lengths_t except1, const f_array_lengths_t except2) { + f_status_t f_compare_dynamic_partial_except_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_except( string1.string, @@ -171,7 +171,7 @@ extern "C" { #endif // _di_f_compare_dynamic_partial_except_dynamic_ #ifndef _di_f_compare_dynamic_partial_except_string_ - f_status_t f_compare_dynamic_partial_except_string(const f_string_t string1, const f_string_static_t string2, const f_array_length_t length1, const f_string_range_t range2, const f_array_lengths_t except1, const f_array_lengths_t except2) { + f_status_t f_compare_dynamic_partial_except_string(const f_string_t string1, const f_string_static_t string2, const f_number_unsigned_t length1, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_except( string1, @@ -189,7 +189,7 @@ extern "C" { #endif // _di_f_compare_dynamic_partial_except_string_ #ifndef _di_f_compare_dynamic_partial_except_trim_ - f_status_t f_compare_dynamic_partial_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_array_lengths_t except1, const f_array_lengths_t except2) { + f_status_t f_compare_dynamic_partial_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_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_except_trim( string1.string, @@ -209,7 +209,7 @@ extern "C" { #endif // _di_f_compare_dynamic_partial_except_trim_ #ifndef _di_f_compare_dynamic_partial_except_trim_dynamic_ - f_status_t f_compare_dynamic_partial_except_trim_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range2, const f_array_lengths_t except1, const f_array_lengths_t except2) { + f_status_t f_compare_dynamic_partial_except_trim_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_except_trim( string1.string, @@ -227,7 +227,7 @@ extern "C" { #endif // _di_f_compare_dynamic_partial_except_trim_dynamic_ #ifndef _di_f_compare_dynamic_partial_except_trim_string_ - f_status_t f_compare_dynamic_partial_except_trim_string(const f_string_t string1, const f_string_static_t string2, const f_array_length_t length1, const f_string_range_t range2, const f_array_lengths_t except1, const f_array_lengths_t except2) { + f_status_t f_compare_dynamic_partial_except_trim_string(const f_string_t string1, const f_string_static_t string2, const f_number_unsigned_t length1, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_except_trim( string1, @@ -279,7 +279,7 @@ extern "C" { #endif // _di_f_compare_dynamic_partial_trim_dynamic_ #ifndef _di_f_compare_dynamic_partial_trim_string_ - f_status_t f_compare_dynamic_partial_trim_string(const f_string_t string1, const f_string_static_t string2, const f_array_length_t length1, const f_string_range_t range2) { + f_status_t f_compare_dynamic_partial_trim_string(const f_string_t string1, const f_string_static_t string2, const f_number_unsigned_t length1, const f_string_range_t range2) { return private_f_compare_trim( string1, @@ -295,7 +295,7 @@ extern "C" { #endif // _di_f_compare_dynamic_partial_trim_string_ #ifndef _di_f_compare_trim_ - f_status_t f_compare_trim(const f_string_t string1, const f_string_t string2, const f_array_length_t length1, const f_array_length_t length2) { + f_status_t f_compare_trim(const f_string_t string1, const f_string_t string2, const f_number_unsigned_t length1, const f_number_unsigned_t length2) { return private_f_compare_trim(string1, string2, 0, 0, length1, length2); } diff --git a/level_0/f_compare/c/compare.h b/level_0/f_compare/c/compare.h index 7f8df9c..8f725c7 100644 --- a/level_0/f_compare/c/compare.h +++ b/level_0/f_compare/c/compare.h @@ -48,7 +48,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_compare_ - extern f_status_t f_compare(const f_string_t string1, const f_string_t string2, const f_array_length_t length1, const f_array_length_t length2); + extern f_status_t f_compare(const f_string_t string1, const f_string_t string2, const f_number_unsigned_t length1, const f_number_unsigned_t length2); #endif // _di_f_compare_ /** @@ -80,7 +80,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_compare_except_ - extern f_status_t f_compare_except(const f_string_t string1, const f_string_t string2, const f_array_length_t length1, const f_array_length_t length2, const f_array_lengths_t except1, const f_array_lengths_t except2); + extern f_status_t f_compare_except(const f_string_t string1, const f_string_t string2, const f_number_unsigned_t length1, const f_number_unsigned_t length2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_except_ /** @@ -119,7 +119,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_f_compare_except_trim_ - extern f_status_t f_compare_except_trim(const f_string_t string1, const f_string_t string2, const f_array_length_t length1, const f_array_length_t length2, const f_array_lengths_t except1, const f_array_lengths_t except2); + extern f_status_t f_compare_except_trim(const f_string_t string1, const f_string_t string2, const f_number_unsigned_t length1, const f_number_unsigned_t length2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_except_trim_ /** @@ -168,7 +168,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_compare_dynamic_except_ - extern f_status_t f_compare_dynamic_except(const f_string_static_t string1, const f_string_static_t string2, const f_array_lengths_t except1, const f_array_lengths_t except2); + extern f_status_t f_compare_dynamic_except(const f_string_static_t string1, const f_string_static_t string2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_dynamic_except_ /** @@ -206,7 +206,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_f_compare_dynamic_except_string_ - extern f_status_t f_compare_dynamic_except_string(const f_string_t string1, const f_string_static_t string2, const f_array_length_t length1, const f_array_lengths_t except1, const f_array_lengths_t except2); + extern f_status_t f_compare_dynamic_except_string(const f_string_t string1, const f_string_static_t string2, const f_number_unsigned_t length1, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_dynamic_except_string_ /** @@ -241,7 +241,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_f_compare_dynamic_except_trim_ - extern f_status_t f_compare_dynamic_except_trim(const f_string_static_t string1, const f_string_static_t string2, const f_array_lengths_t except1, const f_array_lengths_t except2); + extern f_status_t f_compare_dynamic_except_trim(const f_string_static_t string1, const f_string_static_t string2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_dynamic_except_trim_ /** @@ -280,7 +280,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_f_compare_dynamic_except_trim_string_ - extern f_status_t f_compare_dynamic_except_trim_string(const f_string_t string1, const f_string_static_t string2, const f_array_length_t length1, const f_array_lengths_t except1, const f_array_lengths_t except2); + extern f_status_t f_compare_dynamic_except_trim_string(const f_string_t string1, const f_string_static_t string2, const f_number_unsigned_t length1, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_dynamic_except_trim_string_ /** @@ -311,7 +311,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_f_compare_dynamic_string_ - extern f_status_t f_compare_dynamic_string(const f_string_t string1, const f_string_static_t string2, const f_array_length_t length1); + extern f_status_t f_compare_dynamic_string(const f_string_t string1, const f_string_static_t string2, const f_number_unsigned_t length1); #endif // _di_f_compare_dynamic_string_ /** @@ -371,7 +371,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_f_compare_dynamic_trim_string_ - extern f_status_t f_compare_dynamic_trim_string(const f_string_t string1, const f_string_static_t string2, const f_array_length_t length1); + extern f_status_t f_compare_dynamic_trim_string(const f_string_t string1, const f_string_static_t string2, const f_number_unsigned_t length1); #endif // _di_f_compare_dynamic_trim_string_ /** @@ -451,7 +451,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_compare_dynamic_partial_except_ - extern f_status_t f_compare_dynamic_partial_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_array_lengths_t except1, const f_array_lengths_t except2); + extern f_status_t f_compare_dynamic_partial_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_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_dynamic_partial_except_ /** @@ -481,7 +481,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_compare_dynamic_partial_except_dynamic_ - extern f_status_t f_compare_dynamic_partial_except_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range2, const f_array_lengths_t except1, const f_array_lengths_t except2); + extern f_status_t f_compare_dynamic_partial_except_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_dynamic_partial_except_dynamic_ /** @@ -515,7 +515,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_compare_dynamic_partial_except_string_ - extern f_status_t f_compare_dynamic_partial_except_string(const f_string_t string1, const f_string_static_t string2, const f_array_length_t length1, const f_string_range_t range2, const f_array_lengths_t except1, const f_array_lengths_t except2); + extern f_status_t f_compare_dynamic_partial_except_string(const f_string_t string1, const f_string_static_t string2, const f_number_unsigned_t length1, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_dynamic_partial_except_string_ /** @@ -554,7 +554,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_f_compare_dynamic_partial_except_trim_ - extern f_status_t f_compare_dynamic_partial_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_array_lengths_t except1, const f_array_lengths_t except2); + extern f_status_t f_compare_dynamic_partial_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_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_dynamic_partial_except_trim_ /** @@ -591,7 +591,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_f_compare_dynamic_partial_except_trim_dynamic_ - extern f_status_t f_compare_dynamic_partial_except_trim_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range2, const f_array_lengths_t except1, const f_array_lengths_t except2); + extern f_status_t f_compare_dynamic_partial_except_trim_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_dynamic_partial_except_trim_dynamic_ /** @@ -632,7 +632,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_f_compare_dynamic_partial_except_trim_string_ - extern f_status_t f_compare_dynamic_partial_except_trim_string(const f_string_t string1, const f_string_static_t string2, const f_array_length_t length1, const f_string_range_t range2, const f_array_lengths_t except1, const f_array_lengths_t except2); + extern f_status_t f_compare_dynamic_partial_except_trim_string(const f_string_t string1, const f_string_static_t string2, const f_number_unsigned_t length1, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_dynamic_partial_except_trim_string_ /** @@ -659,7 +659,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_compare_dynamic_partial_string_ - extern f_status_t f_compare_dynamic_partial_string(const f_string_t string1, const f_string_static_t string2, const f_array_length_t length1, const f_string_range_t range2); + extern f_status_t f_compare_dynamic_partial_string(const f_string_t string1, const f_string_static_t string2, const f_number_unsigned_t length1, const f_string_range_t range2); #endif // _di_f_compare_dynamic_partial_string_ /** @@ -755,7 +755,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_f_compare_dynamic_partial_trim_string_ - extern f_status_t f_compare_dynamic_partial_trim_string(const f_string_t string1, const f_string_static_t string2, const f_array_length_t length1, const f_string_range_t range2); + extern f_status_t f_compare_dynamic_partial_trim_string(const f_string_t string1, const f_string_static_t string2, const f_number_unsigned_t length1, const f_string_range_t range2); #endif // _di_f_compare_dynamic_partial_trim_string_ /** @@ -787,7 +787,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_f_compare_trim_ - extern f_status_t f_compare_trim(const f_string_t string1, const f_string_t string2, const f_array_length_t length1, const f_array_length_t length2); + extern f_status_t f_compare_trim(const f_string_t string1, const f_string_t string2, const f_number_unsigned_t length1, const f_number_unsigned_t length2); #endif // _di_f_compare_trim_ #ifdef __cplusplus diff --git a/level_0/f_compare/c/compare/private-utf.c b/level_0/f_compare/c/compare/private-utf.c index 5ed05f3..e6c778c 100644 --- a/level_0/f_compare/c/compare/private-utf.c +++ b/level_0/f_compare/c/compare/private-utf.c @@ -6,10 +6,10 @@ extern "C" { #endif #if !defined(_di_f_compare_utf_) || !defined(_di_f_compare_utf_dynamic_) || !defined(_di_f_compare_utf_dynamic_string_) || !defined(_di_f_compare_utf_dynamic_partial_) || !defined(_di_f_compare_utf_dynamic_partial_dynamic_) || !defined(_di_f_compare_utf_dynamic_partial_string_) - f_status_t private_f_compare_utf(const f_utf_string_t string1, const f_utf_string_t string2, const f_array_length_t offset1, const f_array_length_t offset2, const f_array_length_t stop1, const f_array_length_t stop2) { + f_status_t private_f_compare_utf(const f_utf_string_t string1, const f_utf_string_t string2, const f_number_unsigned_t offset1, const f_number_unsigned_t offset2, const f_number_unsigned_t stop1, const f_number_unsigned_t stop2) { - f_array_length_t i1 = offset1; - f_array_length_t i2 = offset2; + f_number_unsigned_t i1 = offset1; + f_number_unsigned_t i2 = offset2; for (; i1 < stop1 && i2 < stop2; ++i1, ++i2) { @@ -38,13 +38,13 @@ extern "C" { #endif // !defined(_di_f_compare_utf_) || !defined(_di_f_compare_utf_dynamic_) || !defined(_di_f_compare_utf_dynamic_string_) || !defined(_di_f_compare_utf_dynamic_partial_) || !defined(_di_f_compare_utf_dynamic_partial_dynamic_) || !defined(_di_f_compare_utf_dynamic_partial_string_) #if !defined(_di_f_compare_utf_dynamic_except_) || !defined(_di_f_compare_utf_dynamic_except_string_) || !defined(_di_f_compare_utf_dynamic_partial_except_) || !defined(_di_f_compare_utf_dynamic_partial_except_dynamic_) || !defined(_di_f_compare_utf_dynamic_partial_except_string_) || !defined(_di_f_compare_utf_except_) - f_status_t private_f_compare_utf_except(const f_utf_string_t string1, const f_utf_string_t string2, const f_array_length_t offset1, const f_array_length_t offset2, const f_array_length_t stop1, const f_array_length_t stop2, const f_array_lengths_t except1, const f_array_lengths_t except2) { + f_status_t private_f_compare_utf_except(const f_utf_string_t string1, const f_utf_string_t string2, const f_number_unsigned_t offset1, const f_number_unsigned_t offset2, const f_number_unsigned_t stop1, const f_number_unsigned_t stop2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { - f_array_length_t i1 = offset1; - f_array_length_t i2 = offset2; + f_number_unsigned_t i1 = offset1; + f_number_unsigned_t i2 = offset2; - f_array_length_t e1 = 0; - f_array_length_t e2 = 0; + f_number_unsigned_t e1 = 0; + f_number_unsigned_t e2 = 0; while (i1 < stop1 && i2 < stop2) { @@ -102,15 +102,15 @@ extern "C" { #endif // !defined(_di_f_compare_utf_dynamic_except_) || !defined(_di_f_compare_utf_dynamic_except_string_) || !defined(_di_f_compare_utf_dynamic_partial_except_) || !defined(_di_f_compare_utf_dynamic_partial_except_dynamic_) || !defined(_di_f_compare_utf_dynamic_partial_except_string_) || !defined(_di_f_compare_utf_except_) #if !defined(_di_f_compare_utf_dynamic_except_trim_) || !defined(_di_f_compare_utf_dynamic_except_trim_string_) || !defined(_di_f_compare_utf_dynamic_partial_except_trim_) || !defined(_di_f_compare_utf_dynamic_partial_except_trim_dynamic_) || !defined(_di_f_compare_utf_dynamic_partial_except_trim_string_) || !defined(_di_f_compare_utf_except_trim_) - f_status_t private_f_compare_utf_except_trim(const f_utf_string_t string1, const f_utf_string_t string2, const f_array_length_t offset1, const f_array_length_t offset2, const f_array_length_t stop1, const f_array_length_t stop2, const f_array_lengths_t except1, const f_array_lengths_t except2) { + f_status_t private_f_compare_utf_except_trim(const f_utf_string_t string1, const f_utf_string_t string2, const f_number_unsigned_t offset1, const f_number_unsigned_t offset2, const f_number_unsigned_t stop1, const f_number_unsigned_t stop2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { - f_array_length_t i1 = offset1; - f_array_length_t i2 = offset2; + f_number_unsigned_t i1 = offset1; + f_number_unsigned_t i2 = offset2; - f_array_length_t e1 = 0; - f_array_length_t e2 = 0; + f_number_unsigned_t e1 = 0; + f_number_unsigned_t e2 = 0; - f_array_length_t previous = 0; + f_number_unsigned_t previous = 0; f_status_t status = F_none; @@ -192,16 +192,16 @@ extern "C" { previous = i2; } // for - f_array_length_t last1 = i1; - f_array_length_t last2 = i2; + f_number_unsigned_t last1 = i1; + f_number_unsigned_t last2 = i2; { // The size1 and size2 are to represent to total number of characters after trim that are not ignored via "except". - f_array_length_t size1 = 0; - f_array_length_t size2 = 0; + f_number_unsigned_t size1 = 0; + f_number_unsigned_t size2 = 0; - f_array_length_t j = 0; - f_array_length_t ej = e1; + f_number_unsigned_t j = 0; + f_number_unsigned_t ej = e1; // Determine where the last non-whitespace is in string1. for (j = i1; j < stop1; ++j) { @@ -350,11 +350,11 @@ extern "C" { #endif // !defined(_di_f_compare_utf_dynamic_except_trim_) || !defined(_di_f_compare_utf_dynamic_except_trim_string_) || !defined(_di_f_compare_utf_dynamic_partial_except_trim_) || !defined(_di_f_compare_utf_dynamic_partial_except_trim_dynamic_) || !defined(_di_f_compare_utf_dynamic_partial_except_trim_string_) || !defined(_di_f_compare_utf_except_trim_) #if !defined(_di_f_compare_utf_dynamic_trim_) || !defined(_di_f_compare_utf_dynamic_trim_string_) || !defined(_di_f_compare_utf_dynamic_partial_trim_) || !defined(_di_f_compare_utf_dynamic_partial_trim_dynamic_) || !defined(_di_f_compare_utf_dynamic_partial_trim_string_) || !defined(_di_f_compare_utf_trim_) - f_status_t private_f_compare_utf_trim(const f_utf_string_t string1, const f_utf_string_t string2, const f_array_length_t offset1, const f_array_length_t offset2, const f_array_length_t stop1, const f_array_length_t stop2) { + f_status_t private_f_compare_utf_trim(const f_utf_string_t string1, const f_utf_string_t string2, const f_number_unsigned_t offset1, const f_number_unsigned_t offset2, const f_number_unsigned_t stop1, const f_number_unsigned_t stop2) { - f_array_length_t i1 = offset1; - f_array_length_t i2 = offset2; - f_array_length_t previous = 0; + f_number_unsigned_t i1 = offset1; + f_number_unsigned_t i2 = offset2; + f_number_unsigned_t previous = 0; f_status_t status = F_none; // Skip past leading whitespace in string1. @@ -427,18 +427,18 @@ extern "C" { previous = i2; } // for - f_array_length_t last1 = i1; - f_array_length_t last2 = i2; + f_number_unsigned_t last1 = i1; + f_number_unsigned_t last2 = i2; { // Size1 and size2 are to represent to total number of characters after trim. - f_array_length_t size1 = 0; - f_array_length_t size2 = 0; + f_number_unsigned_t size1 = 0; + f_number_unsigned_t size2 = 0; previous = i1; // Determine where the last non-whitespace is in string1. - for (f_array_length_t j = i1; j < stop1; j += macro_f_utf_byte_width(string1[j])) { + for (f_number_unsigned_t j = i1; j < stop1; j += macro_f_utf_byte_width(string1[j])) { // Skip past NULL in string1. while (j < stop1 && !string1[j]) ++j; @@ -485,7 +485,7 @@ extern "C" { previous = i2; // Determine where the last non-whitespace is in string2. - for (f_array_length_t j = i2; j < stop2; j += macro_f_utf_byte_width(string2[j])) { + for (f_number_unsigned_t j = i2; j < stop2; j += macro_f_utf_byte_width(string2[j])) { // Skip past NULL in string2. while (j < stop2 && !string2[j]) ++j; diff --git a/level_0/f_compare/c/compare/private-utf.h b/level_0/f_compare/c/compare/private-utf.h index db506e3..7160543 100644 --- a/level_0/f_compare/c/compare/private-utf.h +++ b/level_0/f_compare/c/compare/private-utf.h @@ -45,7 +45,7 @@ extern "C" { * @see f_compare_utf_dynamic_partial_string() */ #if !defined(_di_f_compare_utf_) || !defined(_di_f_compare_utf_dynamic_) || !defined(_di_f_compare_utf_dynamic_string_) || !defined(_di_f_compare_utf_dynamic_partial_) || !defined(_di_f_compare_utf_dynamic_partial_dynamic_) || !defined(_di_f_compare_utf_dynamic_partial_string_) - extern f_status_t private_f_compare_utf(const f_utf_string_t string1, const f_utf_string_t string2, const f_array_length_t offset1, const f_array_length_t offset2, const f_array_length_t stop1, const f_array_length_t stop2) F_attribute_visibility_internal_d; + extern f_status_t private_f_compare_utf(const f_utf_string_t string1, const f_utf_string_t string2, const f_number_unsigned_t offset1, const f_number_unsigned_t offset2, const f_number_unsigned_t stop1, const f_number_unsigned_t stop2) F_attribute_visibility_internal_d; #endif // !defined(_di_f_compare_utf_) || !defined(_di_f_compare_utf_dynamic_) || !defined(_di_f_compare_utf_dynamic_string_) || !defined(_di_f_compare_utf_dynamic_partial_) || !defined(_di_f_compare_utf_dynamic_partial_dynamic_) || !defined(_di_f_compare_utf_dynamic_partial_string_) /** @@ -84,7 +84,7 @@ extern "C" { * @see f_compare_utf_except_ */ #if !defined(_di_f_compare_utf_dynamic_except_) || !defined(_di_f_compare_utf_dynamic_except_string_) || !defined(_di_f_compare_utf_dynamic_partial_except_) || !defined(_di_f_compare_utf_dynamic_partial_except_dynamic_) || !defined(_di_f_compare_utf_dynamic_partial_except_string_) || !defined(_di_f_compare_utf_except_) - extern f_status_t private_f_compare_utf_except(const f_utf_string_t string1, const f_utf_string_t string2, const f_array_length_t offset1, const f_array_length_t offset2, const f_array_length_t stop1, const f_array_length_t stop2, const f_array_lengths_t except1, const f_array_lengths_t except2) F_attribute_visibility_internal_d; + extern f_status_t private_f_compare_utf_except(const f_utf_string_t string1, const f_utf_string_t string2, const f_number_unsigned_t offset1, const f_number_unsigned_t offset2, const f_number_unsigned_t stop1, const f_number_unsigned_t stop2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) F_attribute_visibility_internal_d; #endif // !defined(_di_f_compare_utf_dynamic_except_) || !defined(_di_f_compare_utf_dynamic_except_string_) || !defined(_di_f_compare_utf_dynamic_partial_except_) || !defined(_di_f_compare_utf_dynamic_partial_except_dynamic_) || !defined(_di_f_compare_utf_dynamic_partial_except_string_) || !defined(_di_f_compare_utf_except_) /** @@ -131,7 +131,7 @@ extern "C" { * @see f_compare_utf_except_trim() */ #if !defined(_di_f_compare_utf_dynamic_except_trim_) || !defined(_di_f_compare_utf_dynamic_except_trim_string_) || !defined(_di_f_compare_utf_dynamic_partial_except_trim_) || !defined(_di_f_compare_utf_dynamic_partial_except_trim_dynamic_) || !defined(_di_f_compare_utf_dynamic_partial_except_trim_string_) || !defined(_di_f_compare_utf_except_trim_) - extern f_status_t private_f_compare_utf_except_trim(const f_utf_string_t string1, const f_utf_string_t string2, const f_array_length_t offset1, const f_array_length_t offset2, const f_array_length_t stop1, const f_array_length_t stop2, const f_array_lengths_t except1, const f_array_lengths_t except2) F_attribute_visibility_internal_d; + extern f_status_t private_f_compare_utf_except_trim(const f_utf_string_t string1, const f_utf_string_t string2, const f_number_unsigned_t offset1, const f_number_unsigned_t offset2, const f_number_unsigned_t stop1, const f_number_unsigned_t stop2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) F_attribute_visibility_internal_d; #endif // !defined(_di_f_compare_utf_dynamic_except_trim_) || !defined(_di_f_compare_utf_dynamic_except_trim_string_) || !defined(_di_f_compare_utf_dynamic_partial_except_trim_) || !defined(_di_f_compare_utf_dynamic_partial_except_trim_dynamic_) || !defined(_di_f_compare_utf_dynamic_partial_except_trim_string_) || !defined(_di_f_compare_utf_except_trim_) /** @@ -172,7 +172,7 @@ extern "C" { * @see f_compare_utf_trim() */ #if !defined(_di_f_compare_utf_dynamic_trim_) || !defined(_di_f_compare_utf_dynamic_trim_string_) || !defined(_di_f_compare_utf_dynamic_partial_trim_) || !defined(_di_f_compare_utf_dynamic_partial_trim_dynamic_) || !defined(_di_f_compare_utf_dynamic_partial_trim_string_) || !defined(_di_f_compare_utf_trim_) - extern f_status_t private_f_compare_utf_trim(const f_utf_string_t string1, const f_utf_string_t string2, const f_array_length_t offset1, const f_array_length_t offset2, const f_array_length_t stop1, const f_array_length_t stop2) F_attribute_visibility_internal_d; + extern f_status_t private_f_compare_utf_trim(const f_utf_string_t string1, const f_utf_string_t string2, const f_number_unsigned_t offset1, const f_number_unsigned_t offset2, const f_number_unsigned_t stop1, const f_number_unsigned_t stop2) F_attribute_visibility_internal_d; #endif // !defined(_di_f_compare_utf_dynamic_trim_) || !defined(_di_f_compare_utf_dynamic_trim_string_) || !defined(_di_f_compare_utf_dynamic_partial_trim_) || !defined(_di_f_compare_utf_dynamic_partial_trim_dynamic_) || !defined(_di_f_compare_utf_dynamic_partial_trim_string_) || !defined(_di_f_compare_utf_trim_) #ifdef __cplusplus diff --git a/level_0/f_compare/c/compare/utf.c b/level_0/f_compare/c/compare/utf.c index cbc6a47..13af375 100644 --- a/level_0/f_compare/c/compare/utf.c +++ b/level_0/f_compare/c/compare/utf.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_f_compare_utf_ - f_status_t f_compare_utf(const f_utf_string_t string1, const f_utf_string_t string2, const f_array_length_t length1, const f_array_length_t length2) { + f_status_t f_compare_utf(const f_utf_string_t string1, const f_utf_string_t string2, const f_number_unsigned_t length1, const f_number_unsigned_t length2) { return private_f_compare_utf(string1, string2, 0, 0, length1, length2); } @@ -20,35 +20,35 @@ extern "C" { #endif // _di_f_compare_utf_dynamic_ #ifndef _di_f_compare_utf_dynamic_except_ - f_status_t f_compare_utf_dynamic_except(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_array_lengths_t except1, const f_array_lengths_t except2) { + f_status_t f_compare_utf_dynamic_except(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_utf_except(string1.string, string2.string, 0, 0, string1.used, string2.used, except1, except2); } #endif // _di_f_compare_utf_dynamic_except_ #ifndef _di_f_compare_utf_dynamic_except_string_ - f_status_t f_compare_utf_dynamic_except_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_array_length_t length1, const f_array_lengths_t except1, const f_array_lengths_t except2) { + f_status_t f_compare_utf_dynamic_except_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_number_unsigned_t length1, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_utf_except(string1, string2.string, 0, 0, length1, string2.used, except1, except2); } #endif // _di_f_compare_utf_dynamic_except_string_ #ifndef _di_f_compare_utf_dynamic_except_trim_ - f_status_t f_compare_utf_dynamic_except_trim(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_array_lengths_t except1, const f_array_lengths_t except2) { + f_status_t f_compare_utf_dynamic_except_trim(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_utf_except_trim(string1.string, string2.string, 0, 0, string1.used, string2.used, except1, except2); } #endif // _di_f_compare_utf_dynamic_except_trim_ #ifndef _di_f_compare_utf_dynamic_except_trim_string_ - f_status_t f_compare_utf_dynamic_except_trim_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_array_length_t length1, const f_array_lengths_t except1, const f_array_lengths_t except2) { + f_status_t f_compare_utf_dynamic_except_trim_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_number_unsigned_t length1, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_utf_except_trim(string1, string2.string, 0, 0, length1, string2.used, except1, except2); } #endif // _di_f_compare_utf_dynamic_except_trim_string_ #ifndef _di_f_compare_utf_dynamic_string_ - f_status_t f_compare_utf_dynamic_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_array_length_t length1) { + f_status_t f_compare_utf_dynamic_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_number_unsigned_t length1) { return private_f_compare_utf(string1, string2.string, 0, 0, length1, string2.used); } @@ -62,7 +62,7 @@ extern "C" { #endif // _di_f_compare_utf_dynamic_trim_ #ifndef _di_f_compare_utf_dynamic_trim_string_ - f_status_t f_compare_utf_dynamic_trim_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_array_length_t length1) { + f_status_t f_compare_utf_dynamic_trim_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_number_unsigned_t length1) { return private_f_compare_utf_trim(string1, string2.string, 0, 0, length1, string2.used); } @@ -103,7 +103,7 @@ extern "C" { #endif // _di_f_compare_utf_dynamic_partial_dynamic_ #ifndef _di_f_compare_utf_dynamic_partial_string_ - f_status_t f_compare_utf_dynamic_partial_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_array_length_t length1, const f_string_range_t range2) { + f_status_t f_compare_utf_dynamic_partial_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_number_unsigned_t length1, const f_string_range_t range2) { return private_f_compare_utf( string1, @@ -119,7 +119,7 @@ extern "C" { #endif // _di_f_compare_utf_dynamic_partial_string_ #ifndef _di_f_compare_utf_dynamic_partial_except_ - f_status_t f_compare_utf_dynamic_partial_except(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2, const f_array_lengths_t except1, const f_array_lengths_t except2) { + f_status_t f_compare_utf_dynamic_partial_except(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_utf_except( string1.string, @@ -139,7 +139,7 @@ extern "C" { #endif // _di_f_compare_utf_dynamic_partial_except_ #ifndef _di_f_compare_utf_dynamic_partial_except_dynamic_ - f_status_t f_compare_utf_dynamic_partial_except_dynamic(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_string_range_t range2, const f_array_lengths_t except1, const f_array_lengths_t except2) { + f_status_t f_compare_utf_dynamic_partial_except_dynamic(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_utf_except( string1.string, @@ -157,7 +157,7 @@ extern "C" { #endif // _di_f_compare_utf_dynamic_partial_except_dynamic_ #ifndef _di_f_compare_utf_dynamic_partial_except_string_ - f_status_t f_compare_utf_dynamic_partial_except_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_array_length_t length1, const f_string_range_t range2, const f_array_lengths_t except1, const f_array_lengths_t except2) { + f_status_t f_compare_utf_dynamic_partial_except_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_number_unsigned_t length1, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_utf_except( string1, @@ -175,7 +175,7 @@ extern "C" { #endif // _di_f_compare_utf_dynamic_partial_except_string_ #ifndef _di_f_compare_utf_dynamic_partial_except_trim_ - f_status_t f_compare_utf_dynamic_partial_except_trim(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2, const f_array_lengths_t except1, const f_array_lengths_t except2) { + f_status_t f_compare_utf_dynamic_partial_except_trim(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_utf_except_trim( string1.string, @@ -195,7 +195,7 @@ extern "C" { #endif // _di_f_compare_utf_dynamic_partial_except_trim_ #ifndef _di_f_compare_utf_dynamic_partial_except_trim_dynamic_ - f_status_t f_compare_utf_dynamic_partial_except_trim_dynamic(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_string_range_t range2, const f_array_lengths_t except1, const f_array_lengths_t except2) { + f_status_t f_compare_utf_dynamic_partial_except_trim_dynamic(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_utf_except_trim( string1.string, @@ -213,7 +213,7 @@ extern "C" { #endif // _di_f_compare_utf_dynamic_partial_except_trim_dynamic_ #ifndef _di_f_compare_utf_dynamic_partial_except_trim_string_ - f_status_t f_compare_utf_dynamic_partial_except_trim_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_array_length_t length1, const f_string_range_t range2, const f_array_lengths_t except1, const f_array_lengths_t except2) { + f_status_t f_compare_utf_dynamic_partial_except_trim_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_number_unsigned_t length1, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_utf_except_trim( string1, @@ -265,7 +265,7 @@ extern "C" { #endif // _di_f_compare_utf_dynamic_partial_trim_dynamic_ #ifndef _di_f_compare_utf_dynamic_partial_trim_string_ - f_status_t f_compare_utf_dynamic_partial_trim_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_array_length_t length1, const f_string_range_t range2) { + f_status_t f_compare_utf_dynamic_partial_trim_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_number_unsigned_t length1, const f_string_range_t range2) { return private_f_compare_utf_trim( string1, @@ -281,21 +281,21 @@ extern "C" { #endif // _di_f_compare_utf_dynamic_partial_trim_string_ #ifndef _di_f_compare_utf_except_ - f_status_t f_compare_utf_except(const f_utf_string_t string1, const f_utf_string_t string2, const f_array_length_t length1, const f_array_length_t length2, const f_array_lengths_t except1, const f_array_lengths_t except2) { + f_status_t f_compare_utf_except(const f_utf_string_t string1, const f_utf_string_t string2, const f_number_unsigned_t length1, const f_number_unsigned_t length2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_utf_except(string1, string2, 0, 0, length1, length2, except1, except2); } #endif // _di_f_compare_utf_except_ #ifndef _di_f_compare_utf_except_trim_ - f_status_t f_compare_utf_except_trim(const f_utf_string_t string1, const f_utf_string_t string2, const f_array_length_t length1, const f_array_length_t length2, const f_array_lengths_t except1, const f_array_lengths_t except2) { + f_status_t f_compare_utf_except_trim(const f_utf_string_t string1, const f_utf_string_t string2, const f_number_unsigned_t length1, const f_number_unsigned_t length2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { return private_f_compare_utf_except_trim(string1, string2, 0, 0, length1, length2, except1, except2); } #endif // _di_f_compare_utf_except_trim_ #ifndef _di_f_compare_utf_trim_ - f_status_t f_compare_utf_trim(const f_utf_string_t string1, const f_utf_string_t string2, const f_array_length_t length1, const f_array_length_t length2) { + f_status_t f_compare_utf_trim(const f_utf_string_t string1, const f_utf_string_t string2, const f_number_unsigned_t length1, const f_number_unsigned_t length2) { return private_f_compare_utf_trim(string1, string2, 0, 0, length1, length2); } diff --git a/level_0/f_compare/c/compare/utf.h b/level_0/f_compare/c/compare/utf.h index 3788534..bc628f0 100644 --- a/level_0/f_compare/c/compare/utf.h +++ b/level_0/f_compare/c/compare/utf.h @@ -36,7 +36,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_compare_utf_ - extern f_status_t f_compare_utf(const f_utf_string_t string1, const f_utf_string_t string2, const f_array_length_t length1, const f_array_length_t length2); + extern f_status_t f_compare_utf(const f_utf_string_t string1, const f_utf_string_t string2, const f_number_unsigned_t length1, const f_number_unsigned_t length2); #endif // _di_f_compare_utf_ /** @@ -86,7 +86,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_compare_utf_dynamic_except_ - extern f_status_t f_compare_utf_dynamic_except(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_array_lengths_t except1, const f_array_lengths_t except2); + extern f_status_t f_compare_utf_dynamic_except(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_utf_dynamic_except_ /** @@ -124,7 +124,7 @@ extern "C" { * @see f_utf_character_is_whitespace() */ #ifndef _di_f_compare_utf_dynamic_except_string_ - extern f_status_t f_compare_utf_dynamic_except_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_array_length_t length1, const f_array_lengths_t except1, const f_array_lengths_t except2); + extern f_status_t f_compare_utf_dynamic_except_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_number_unsigned_t length1, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_utf_dynamic_except_string_ /** @@ -159,7 +159,7 @@ extern "C" { * @see f_utf_character_is_whitespace() */ #ifndef _di_f_compare_utf_dynamic_except_trim_ - extern f_status_t f_compare_utf_dynamic_except_trim(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_array_lengths_t except1, const f_array_lengths_t except2); + extern f_status_t f_compare_utf_dynamic_except_trim(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_utf_dynamic_except_trim_ /** @@ -198,7 +198,7 @@ extern "C" { * @see f_utf_character_is_whitespace() */ #ifndef _di_f_compare_utf_dynamic_except_trim_string_ - extern f_status_t f_compare_utf_dynamic_except_trim_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_array_length_t length1, const f_array_lengths_t except1, const f_array_lengths_t except2); + extern f_status_t f_compare_utf_dynamic_except_trim_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_number_unsigned_t length1, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_utf_dynamic_except_trim_string_ /** @@ -229,7 +229,7 @@ extern "C" { * @see f_utf_character_is_whitespace() */ #ifndef _di_f_compare_utf_dynamic_string_ - extern f_status_t f_compare_utf_dynamic_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_array_length_t length1); + extern f_status_t f_compare_utf_dynamic_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_number_unsigned_t length1); #endif // _di_f_compare_utf_dynamic_string_ /** @@ -290,7 +290,7 @@ extern "C" { * @see f_utf_character_is_whitespace() */ #ifndef _di_f_compare_utf_dynamic_trim_string_ - extern f_status_t f_compare_utf_dynamic_trim_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_array_length_t length1); + extern f_status_t f_compare_utf_dynamic_trim_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_number_unsigned_t length1); #endif // _di_f_compare_utf_dynamic_trim_string_ /** @@ -370,7 +370,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_compare_utf_dynamic_partial_except_ - extern f_status_t f_compare_utf_dynamic_partial_except(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2, const f_array_lengths_t except1, const f_array_lengths_t except2); + extern f_status_t f_compare_utf_dynamic_partial_except(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_utf_dynamic_partial_except_ /** @@ -400,7 +400,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_compare_utf_dynamic_partial_except_dynamic_ - extern f_status_t f_compare_utf_dynamic_partial_except_dynamic(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_string_range_t range2, const f_array_lengths_t except1, const f_array_lengths_t except2); + extern f_status_t f_compare_utf_dynamic_partial_except_dynamic(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_utf_dynamic_partial_except_dynamic_ /** @@ -434,7 +434,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_compare_utf_dynamic_partial_except_string_ - extern f_status_t f_compare_utf_dynamic_partial_except_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_array_length_t length1, const f_string_range_t range2, const f_array_lengths_t except1, const f_array_lengths_t except2); + extern f_status_t f_compare_utf_dynamic_partial_except_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_number_unsigned_t length1, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_utf_dynamic_partial_except_string_ /** @@ -473,7 +473,7 @@ extern "C" { * @see f_utf_character_is_whitespace() */ #ifndef _di_f_compare_utf_dynamic_partial_except_trim_ - extern f_status_t f_compare_utf_dynamic_partial_except_trim(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2, const f_array_lengths_t except1, const f_array_lengths_t except2); + extern f_status_t f_compare_utf_dynamic_partial_except_trim(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_utf_dynamic_partial_except_trim_ /** @@ -510,7 +510,7 @@ extern "C" { * @see f_utf_character_is_whitespace() */ #ifndef _di_f_compare_utf_dynamic_partial_except_trim_dynamic_ - extern f_status_t f_compare_utf_dynamic_partial_except_trim_dynamic(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_string_range_t range2, const f_array_lengths_t except1, const f_array_lengths_t except2); + extern f_status_t f_compare_utf_dynamic_partial_except_trim_dynamic(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_utf_dynamic_partial_except_trim_dynamic_ /** @@ -551,7 +551,7 @@ extern "C" { * @see f_utf_character_is_whitespace() */ #ifndef _di_f_compare_utf_dynamic_partial_except_trim_string_ - extern f_status_t f_compare_utf_dynamic_partial_except_trim_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_array_length_t length1, const f_string_range_t range2, const f_array_lengths_t except1, const f_array_lengths_t except2); + extern f_status_t f_compare_utf_dynamic_partial_except_trim_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_number_unsigned_t length1, const f_string_range_t range2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_utf_dynamic_partial_except_trim_string_ /** @@ -578,7 +578,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_compare_utf_dynamic_partial_string_ - extern f_status_t f_compare_utf_dynamic_partial_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_array_length_t length1, const f_string_range_t range2); + extern f_status_t f_compare_utf_dynamic_partial_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_number_unsigned_t length1, const f_string_range_t range2); #endif // _di_f_compare_utf_dynamic_partial_string_ /** @@ -674,7 +674,7 @@ extern "C" { * @see f_utf_character_is_whitespace() */ #ifndef _di_f_compare_utf_dynamic_partial_trim_string_ - extern f_status_t f_compare_utf_dynamic_partial_trim_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_array_length_t length1, const f_string_range_t range2); + extern f_status_t f_compare_utf_dynamic_partial_trim_string(const f_utf_string_t string1, const f_utf_string_static_t string2, const f_number_unsigned_t length1, const f_string_range_t range2); #endif // _di_f_compare_utf_dynamic_partial_trim_string_ /** @@ -706,7 +706,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_compare_utf_except_ - extern f_status_t f_compare_utf_except(const f_utf_string_t string1, const f_utf_string_t string2, const f_array_length_t length1, const f_array_length_t length2, const f_array_lengths_t except1, const f_array_lengths_t except2); + extern f_status_t f_compare_utf_except(const f_utf_string_t string1, const f_utf_string_t string2, const f_number_unsigned_t length1, const f_number_unsigned_t length2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_utf_except_ /** @@ -745,7 +745,7 @@ extern "C" { * @see f_utf_character_is_whitespace() */ #ifndef _di_f_compare_utf_except_trim_ - extern f_status_t f_compare_utf_except_trim(const f_utf_string_t string1, const f_utf_string_t string2, const f_array_length_t length1, const f_array_length_t length2, const f_array_lengths_t except1, const f_array_lengths_t except2); + extern f_status_t f_compare_utf_except_trim(const f_utf_string_t string1, const f_utf_string_t string2, const f_number_unsigned_t length1, const f_number_unsigned_t length2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2); #endif // _di_f_compare_utf_except_trim_ /** @@ -775,7 +775,7 @@ extern "C" { * @see f_utf_character_is_whitespace() */ #ifndef _di_f_compare_utf_trim_ - extern f_status_t f_compare_utf_trim(const f_utf_string_t string1, const f_utf_string_t string2, const f_array_length_t length1, const f_array_length_t length2); + extern f_status_t f_compare_utf_trim(const f_utf_string_t string1, const f_utf_string_t string2, const f_number_unsigned_t length1, const f_number_unsigned_t length2); #endif // _di_f_compare_utf_trim_ #ifdef __cplusplus diff --git a/level_0/f_compare/c/private-compare.c b/level_0/f_compare/c/private-compare.c index ca5c81d..9c4ba27 100644 --- a/level_0/f_compare/c/private-compare.c +++ b/level_0/f_compare/c/private-compare.c @@ -6,10 +6,10 @@ extern "C" { #endif #if !defined(_di_f_compare_) || !defined(_di_f_compare_dynamic_) || !defined(_di_f_compare_dynamic_string_) || !defined(_di_f_compare_dynamic_partial_) || !defined(_di_f_compare_dynamic_partial_dynamic_) - f_status_t private_f_compare(const f_string_t string1, const f_string_t string2, const f_array_length_t offset1, const f_array_length_t offset2, const f_array_length_t stop1, const f_array_length_t stop2) { + f_status_t private_f_compare(const f_string_t string1, const f_string_t string2, const f_number_unsigned_t offset1, const f_number_unsigned_t offset2, const f_number_unsigned_t stop1, const f_number_unsigned_t stop2) { - f_array_length_t i1 = offset1; - f_array_length_t i2 = offset2; + f_number_unsigned_t i1 = offset1; + f_number_unsigned_t i2 = offset2; for (; i1 < stop1 && i2 < stop2; ++i1, ++i2) { @@ -38,13 +38,13 @@ extern "C" { #endif // !defined(_di_f_compare_) || !defined(_di_f_compare_dynamic_) || !defined(_di_f_compare_dynamic_string_) || !defined(_di_f_compare_dynamic_partial_) || !defined(_di_f_compare_dynamic_partial_dynamic_) #if !defined(_di_f_compare_dynamic_except_) || !defined(_di_f_compare_dynamic_except_string_) || !defined(_di_f_compare_dynamic_partial_except_) || !defined(_di_f_compare_dynamic_partial_except_dynamic_) || !defined(_di_f_compare_dynamic_partial_except_string_) || !defined(_di_f_compare_except_) - f_status_t private_f_compare_except(const f_string_t string1, const f_string_t string2, const f_array_length_t offset1, const f_array_length_t offset2, const f_array_length_t stop1, const f_array_length_t stop2, const f_array_lengths_t except1, const f_array_lengths_t except2) { + f_status_t private_f_compare_except(const f_string_t string1, const f_string_t string2, const f_number_unsigned_t offset1, const f_number_unsigned_t offset2, const f_number_unsigned_t stop1, const f_number_unsigned_t stop2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { - f_array_length_t i1 = offset1; - f_array_length_t i2 = offset2; + f_number_unsigned_t i1 = offset1; + f_number_unsigned_t i2 = offset2; - f_array_length_t e1 = 0; - f_array_length_t e2 = 0; + f_number_unsigned_t e1 = 0; + f_number_unsigned_t e2 = 0; while (i1 < stop1 && i2 < stop2) { @@ -102,17 +102,17 @@ extern "C" { #endif // !defined(_di_f_compare_dynamic_except_) || !defined(_di_f_compare_dynamic_except_string_) || !defined(_di_f_compare_dynamic_partial_except_) || !defined(_di_f_compare_dynamic_partial_except_dynamic_) || !defined(_di_f_compare_dynamic_partial_except_string_) || !defined(_di_f_compare_except_) #if !defined(_di_f_compare_dynamic_except_trim_) || !defined(_di_f_compare_dynamic_except_trim_string_) || !defined(_di_f_compare_dynamic_partial_except_trim_) || !defined(_di_f_compare_dynamic_partial_except_trim_dynamic_) || !defined(_di_f_compare_dynamic_partial_except_trim_string_) || !defined(_di_f_compare_except_trim_) - f_status_t private_f_compare_except_trim(const f_string_t string1, const f_string_t string2, const f_array_length_t offset1, const f_array_length_t offset2, const f_array_length_t stop1, const f_array_length_t stop2, const f_array_lengths_t except1, const f_array_lengths_t except2) { + f_status_t private_f_compare_except_trim(const f_string_t string1, const f_string_t string2, const f_number_unsigned_t offset1, const f_number_unsigned_t offset2, const f_number_unsigned_t stop1, const f_number_unsigned_t stop2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) { - f_array_length_t i1 = offset1; - f_array_length_t i2 = offset2; + f_number_unsigned_t i1 = offset1; + f_number_unsigned_t i2 = offset2; - f_array_length_t e1 = 0; - f_array_length_t e2 = 0; + f_number_unsigned_t e1 = 0; + f_number_unsigned_t e2 = 0; uint8_t width = 0; - f_array_length_t width_max = 0; - f_array_length_t previous = 0; + f_number_unsigned_t width_max = 0; + f_number_unsigned_t previous = 0; f_status_t status = F_none; @@ -212,16 +212,16 @@ extern "C" { previous = i2; } // for - f_array_length_t last1 = i1; - f_array_length_t last2 = i2; + f_number_unsigned_t last1 = i1; + f_number_unsigned_t last2 = i2; { // The size1 and size2 are to represent to total number of characters after trim that are not ignored via "except". - f_array_length_t size1 = 0; - f_array_length_t size2 = 0; + f_number_unsigned_t size1 = 0; + f_number_unsigned_t size2 = 0; - f_array_length_t j = 0; - f_array_length_t ej = e1; + f_number_unsigned_t j = 0; + f_number_unsigned_t ej = e1; // Determine where the last non-whitespace is in string1. for (j = i1; j < stop1; j += width) { @@ -387,11 +387,11 @@ extern "C" { #endif // !defined(_di_f_compare_dynamic_except_trim_) || !defined(_di_f_compare_dynamic_except_trim_string_) || !defined(_di_f_compare_dynamic_partial_except_trim_) || !defined(_di_f_compare_dynamic_partial_except_trim_dynamic_) || !defined(_di_f_compare_dynamic_partial_except_trim_string_) || !defined(_di_f_compare_except_trim_) #if !defined(_di_f_compare_dynamic_trim_) || !defined(_di_f_compare_dynamic_trim_string_) || !defined(_di_f_compare_dynamic_partial_trim_) || !defined(_di_f_compare_dynamic_partial_trim_dynamic_) || !defined(_di_f_compare_dynamic_partial_trim_string_) || !defined(_di_f_compare_trim_) - f_status_t private_f_compare_trim(const f_string_t string1, const f_string_t string2, const f_array_length_t offset1, const f_array_length_t offset2, const f_array_length_t stop1, const f_array_length_t stop2) { + f_status_t private_f_compare_trim(const f_string_t string1, const f_string_t string2, const f_number_unsigned_t offset1, const f_number_unsigned_t offset2, const f_number_unsigned_t stop1, const f_number_unsigned_t stop2) { - f_array_length_t i1 = offset1; - f_array_length_t i2 = offset2; - f_array_length_t previous = 0; + f_number_unsigned_t i1 = offset1; + f_number_unsigned_t i2 = offset2; + f_number_unsigned_t previous = 0; f_status_t status = F_none; // Skip past leading whitespace in string1. @@ -464,18 +464,18 @@ extern "C" { previous = i2; } // for - f_array_length_t last1 = i1; - f_array_length_t last2 = i2; + f_number_unsigned_t last1 = i1; + f_number_unsigned_t last2 = i2; { // Size1 and size2 are to represent to total number of characters after trim. - f_array_length_t size1 = 0; - f_array_length_t size2 = 0; + f_number_unsigned_t size1 = 0; + f_number_unsigned_t size2 = 0; previous = i1; // Determine where the last non-whitespace is in string1. - for (f_array_length_t j = i1; j < stop1; j += macro_f_utf_byte_width(string1[j])) { + for (f_number_unsigned_t j = i1; j < stop1; j += macro_f_utf_byte_width(string1[j])) { // Skip past NULL in string1. while (j < stop1 && !string1[j]) ++j; @@ -522,7 +522,7 @@ extern "C" { previous = i2; // Determine where the last non-whitespace is in string2. - for (f_array_length_t j = i2; j < stop2; j += macro_f_utf_byte_width(string2[j])) { + for (f_number_unsigned_t j = i2; j < stop2; j += macro_f_utf_byte_width(string2[j])) { // Skip past NULL in string2. while (j < stop2 && !string2[j]) ++j; diff --git a/level_0/f_compare/c/private-compare.h b/level_0/f_compare/c/private-compare.h index 3a9d6ba..873d8f7 100644 --- a/level_0/f_compare/c/private-compare.h +++ b/level_0/f_compare/c/private-compare.h @@ -44,7 +44,7 @@ extern "C" { * @see f_compare_dynamic_partial_dynamic() */ #if !defined(_di_f_compare_) || !defined(_di_f_compare_dynamic_) || !defined(_di_f_compare_dynamic_string_) || !defined(_di_f_compare_dynamic_partial_) || !defined(_di_f_compare_dynamic_partial_dynamic_) - extern f_status_t private_f_compare(const f_string_t string1, const f_string_t string2, const f_array_length_t offset1, const f_array_length_t offset2, const f_array_length_t stop1, const f_array_length_t stop2) F_attribute_visibility_internal_d; + extern f_status_t private_f_compare(const f_string_t string1, const f_string_t string2, const f_number_unsigned_t offset1, const f_number_unsigned_t offset2, const f_number_unsigned_t stop1, const f_number_unsigned_t stop2) F_attribute_visibility_internal_d; #endif // !defined(_di_f_compare_) || !defined(_di_f_compare_dynamic_) || !defined(_di_f_compare_dynamic_string_) || !defined(_di_f_compare_dynamic_partial_) || !defined(_di_f_compare_dynamic_partial_dynamic_) /** @@ -83,7 +83,7 @@ extern "C" { * @see f_compare_except() */ #if !defined(_di_f_compare_dynamic_except_) || !defined(_di_f_compare_dynamic_except_string_) || !defined(_di_f_compare_dynamic_partial_except_) || !defined(_di_f_compare_dynamic_partial_except_dynamic_) || !defined(_di_f_compare_dynamic_partial_except_string_) || !defined(_di_f_compare_except_) - extern f_status_t private_f_compare_except(const f_string_t string1, const f_string_t string2, const f_array_length_t offset1, const f_array_length_t offset2, const f_array_length_t stop1, const f_array_length_t stop2, const f_array_lengths_t except1, const f_array_lengths_t except2) F_attribute_visibility_internal_d; + extern f_status_t private_f_compare_except(const f_string_t string1, const f_string_t string2, const f_number_unsigned_t offset1, const f_number_unsigned_t offset2, const f_number_unsigned_t stop1, const f_number_unsigned_t stop2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) F_attribute_visibility_internal_d; #endif // !defined(_di_f_compare_dynamic_except_) || !defined(_di_f_compare_dynamic_except_string_) || !defined(_di_f_compare_dynamic_partial_except_) || !defined(_di_f_compare_dynamic_partial_except_dynamic_) || !defined(_di_f_compare_dynamic_partial_except_string_) || !defined(_di_f_compare_except_) /** @@ -130,7 +130,7 @@ extern "C" { * @see f_compare_except_trim() */ #if !defined(_di_f_compare_dynamic_except_trim_) || !defined(_di_f_compare_dynamic_except_trim_string_) || !defined(_di_f_compare_dynamic_partial_except_trim_) || !defined(_di_f_compare_dynamic_partial_except_trim_dynamic_) || !defined(_di_f_compare_dynamic_partial_except_trim_string_) || !defined(_di_f_compare_except_trim_) - extern f_status_t private_f_compare_except_trim(const f_string_t string1, const f_string_t string2, const f_array_length_t offset1, const f_array_length_t offset2, const f_array_length_t stop1, const f_array_length_t stop2, const f_array_lengths_t except1, const f_array_lengths_t except2) F_attribute_visibility_internal_d; + extern f_status_t private_f_compare_except_trim(const f_string_t string1, const f_string_t string2, const f_number_unsigned_t offset1, const f_number_unsigned_t offset2, const f_number_unsigned_t stop1, const f_number_unsigned_t stop2, const f_number_unsigneds_t except1, const f_number_unsigneds_t except2) F_attribute_visibility_internal_d; #endif // !defined(_di_f_compare_dynamic_except_trim_) || !defined(_di_f_compare_dynamic_except_trim_string_) || !defined(_di_f_compare_dynamic_partial_except_trim_) || !defined(_di_f_compare_dynamic_partial_except_trim_dynamic_) || !defined(_di_f_compare_dynamic_partial_except_trim_string_) || !defined(_di_f_compare_except_trim_) /** @@ -171,7 +171,7 @@ extern "C" { * @see f_compare_trim() */ #if !defined(_di_f_compare_dynamic_trim_) || !defined(_di_f_compare_dynamic_trim_string_) || !defined(_di_f_compare_dynamic_partial_trim_) || !defined(_di_f_compare_dynamic_partial_trim_dynamic_) || !defined(_di_f_compare_dynamic_partial_trim_string_) || !defined(_di_f_compare_trim_) - extern f_status_t private_f_compare_trim(const f_string_t string1, const f_string_t string2, const f_array_length_t offset1, const f_array_length_t offset2, const f_array_length_t stop1, const f_array_length_t stop2) F_attribute_visibility_internal_d; + extern f_status_t private_f_compare_trim(const f_string_t string1, const f_string_t string2, const f_number_unsigned_t offset1, const f_number_unsigned_t offset2, const f_number_unsigned_t stop1, const f_number_unsigned_t stop2) F_attribute_visibility_internal_d; #endif // !defined(_di_f_compare_dynamic_trim_) || !defined(_di_f_compare_dynamic_trim_string_) || !defined(_di_f_compare_dynamic_partial_trim_) || !defined(_di_f_compare_dynamic_partial_trim_dynamic_) || !defined(_di_f_compare_dynamic_partial_trim_string_) || !defined(_di_f_compare_trim_) #ifdef __cplusplus diff --git a/level_0/f_compare/tests/unit/c/test-compare-dynamic_except.c b/level_0/f_compare/tests/unit/c/test-compare-dynamic_except.c index dae843a..3fab89b 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-dynamic_except.c +++ b/level_0/f_compare/tests/unit/c/test-compare-dynamic_except.c @@ -256,11 +256,11 @@ void test__f_compare_dynamic_except__works(void **state) { F_equal_to, }; - f_array_length_t except_1[] = { + f_number_unsigned_t except_1[] = { 0, 1, 2, 3, }; - const f_array_lengths_t excepts_1 = macro_f_array_lengths_t_initialize_1(except_1, 0, 4); - const f_array_lengths_t excepts_2 = f_array_lengths_t_initialize; + const f_number_unsigneds_t excepts_1 = macro_f_number_unsigneds_t_initialize_1(except_1, 0, 4); + const f_number_unsigneds_t excepts_2 = f_number_unsigneds_t_initialize; uint8_t i = 0; for (; i < 64; ++i) { diff --git a/level_0/f_compare/tests/unit/c/test-compare-dynamic_except_string.c b/level_0/f_compare/tests/unit/c/test-compare-dynamic_except_string.c index 1549f26..8d73e9a 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-dynamic_except_string.c +++ b/level_0/f_compare/tests/unit/c/test-compare-dynamic_except_string.c @@ -256,11 +256,11 @@ void test__f_compare_dynamic_except_string__works(void **state) { F_equal_to, }; - f_array_length_t except_1[] = { + f_number_unsigned_t except_1[] = { 0, 1, 2, 3, }; - const f_array_lengths_t excepts_1 = macro_f_array_lengths_t_initialize_1(except_1, 0, 4); - const f_array_lengths_t excepts_2 = f_array_lengths_t_initialize; + const f_number_unsigneds_t excepts_1 = macro_f_number_unsigneds_t_initialize_1(except_1, 0, 4); + const f_number_unsigneds_t excepts_2 = f_number_unsigneds_t_initialize; uint8_t i = 0; for (; i < 64; ++i) { diff --git a/level_0/f_compare/tests/unit/c/test-compare-dynamic_except_trim.c b/level_0/f_compare/tests/unit/c/test-compare-dynamic_except_trim.c index 44ae923..5af82f6 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-dynamic_except_trim.c +++ b/level_0/f_compare/tests/unit/c/test-compare-dynamic_except_trim.c @@ -269,11 +269,11 @@ void test__f_compare_dynamic_except_trim__works(void **state) { F_equal_to, }; - f_array_length_t except_1[] = { + f_number_unsigned_t except_1[] = { 0, 1, 2, 3, }; - const f_array_lengths_t excepts_1 = macro_f_array_lengths_t_initialize_1(except_1, 0, 4); - const f_array_lengths_t excepts_2 = f_array_lengths_t_initialize; + const f_number_unsigneds_t excepts_1 = macro_f_number_unsigneds_t_initialize_1(except_1, 0, 4); + const f_number_unsigneds_t excepts_2 = f_number_unsigneds_t_initialize; uint8_t i = 0; for (; i < 64; ++i) { diff --git a/level_0/f_compare/tests/unit/c/test-compare-dynamic_except_trim_string.c b/level_0/f_compare/tests/unit/c/test-compare-dynamic_except_trim_string.c index 6e9564c..34cef87 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-dynamic_except_trim_string.c +++ b/level_0/f_compare/tests/unit/c/test-compare-dynamic_except_trim_string.c @@ -269,11 +269,11 @@ void test__f_compare_dynamic_except_trim_string__works(void **state) { F_equal_to, }; - f_array_length_t except_1[] = { + f_number_unsigned_t except_1[] = { 0, 1, 2, 3, }; - const f_array_lengths_t excepts_1 = macro_f_array_lengths_t_initialize_1(except_1, 0, 4); - const f_array_lengths_t excepts_2 = f_array_lengths_t_initialize; + const f_number_unsigneds_t excepts_1 = macro_f_number_unsigneds_t_initialize_1(except_1, 0, 4); + const f_number_unsigneds_t excepts_2 = f_number_unsigneds_t_initialize; uint8_t i = 0; for (; i < 64; ++i) { diff --git a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except.c b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except.c index dd66d10..05b8e08 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except.c +++ b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except.c @@ -259,11 +259,11 @@ void test__f_compare_dynamic_partial_except__works(void **state) { F_equal_to, }; - f_array_length_t except_1[] = { + f_number_unsigned_t except_1[] = { 0, 1, 2, 3, }; - const f_array_lengths_t excepts_1 = macro_f_array_lengths_t_initialize_1(except_1, 0, 4); - const f_array_lengths_t excepts_2 = f_array_lengths_t_initialize; + const f_number_unsigneds_t excepts_1 = macro_f_number_unsigneds_t_initialize_1(except_1, 0, 4); + const f_number_unsigneds_t excepts_2 = f_number_unsigneds_t_initialize; uint8_t i = 0; f_status_t status = F_none; diff --git a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_dynamic.c b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_dynamic.c index b740edd..ffcdebb 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_dynamic.c +++ b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_dynamic.c @@ -258,11 +258,11 @@ void test__f_compare_dynamic_partial_except_dynamic__works(void **state) { F_equal_to, }; - f_array_length_t except_1[] = { + f_number_unsigned_t except_1[] = { 0, 1, 2, 3, }; - const f_array_lengths_t excepts_1 = macro_f_array_lengths_t_initialize_1(except_1, 0, 4); - const f_array_lengths_t excepts_2 = f_array_lengths_t_initialize; + const f_number_unsigneds_t excepts_1 = macro_f_number_unsigneds_t_initialize_1(except_1, 0, 4); + const f_number_unsigneds_t excepts_2 = f_number_unsigneds_t_initialize; uint8_t i = 0; f_status_t status = F_none; diff --git a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_string.c b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_string.c index 0796ebd..2478e80 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_string.c +++ b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_string.c @@ -259,11 +259,11 @@ void test__f_compare_dynamic_partial_except_string__works(void **state) { F_equal_to, }; - f_array_length_t except_1[] = { + f_number_unsigned_t except_1[] = { 0, 1, 2, 3, }; - const f_array_lengths_t excepts_1 = macro_f_array_lengths_t_initialize_1(except_1, 0, 4); - const f_array_lengths_t excepts_2 = f_array_lengths_t_initialize; + const f_number_unsigneds_t excepts_1 = macro_f_number_unsigneds_t_initialize_1(except_1, 0, 4); + const f_number_unsigneds_t excepts_2 = f_number_unsigneds_t_initialize; uint8_t i = 0; f_status_t status = F_none; diff --git a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_trim.c b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_trim.c index 257cac3..948461e 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_trim.c +++ b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_trim.c @@ -272,11 +272,11 @@ void test__f_compare_dynamic_partial_except_trim__works(void **state) { F_equal_to, }; - f_array_length_t except_1[] = { + f_number_unsigned_t except_1[] = { 0, 1, 2, 3, }; - const f_array_lengths_t excepts_1 = macro_f_array_lengths_t_initialize_1(except_1, 0, 4); - const f_array_lengths_t excepts_2 = f_array_lengths_t_initialize; + const f_number_unsigneds_t excepts_1 = macro_f_number_unsigneds_t_initialize_1(except_1, 0, 4); + const f_number_unsigneds_t excepts_2 = f_number_unsigneds_t_initialize; uint8_t i = 0; f_status_t status = F_none; diff --git a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_trim_dynamic.c b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_trim_dynamic.c index de13512..95c234d 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_trim_dynamic.c +++ b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_trim_dynamic.c @@ -271,11 +271,11 @@ void test__f_compare_dynamic_partial_except_trim_dynamic__works(void **state) { F_equal_to, }; - f_array_length_t except_1[] = { + f_number_unsigned_t except_1[] = { 0, 1, 2, 3, }; - const f_array_lengths_t excepts_1 = macro_f_array_lengths_t_initialize_1(except_1, 0, 4); - const f_array_lengths_t excepts_2 = f_array_lengths_t_initialize; + const f_number_unsigneds_t excepts_1 = macro_f_number_unsigneds_t_initialize_1(except_1, 0, 4); + const f_number_unsigneds_t excepts_2 = f_number_unsigneds_t_initialize; uint8_t i = 0; f_status_t status = F_none; diff --git a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_trim_string.c b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_trim_string.c index ffce2b7..0e1273b 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_trim_string.c +++ b/level_0/f_compare/tests/unit/c/test-compare-dynamic_partial_except_trim_string.c @@ -272,11 +272,11 @@ void test__f_compare_dynamic_partial_except_trim_string__works(void **state) { F_equal_to, }; - f_array_length_t except_1[] = { + f_number_unsigned_t except_1[] = { 0, 1, 2, 3, }; - const f_array_lengths_t excepts_1 = macro_f_array_lengths_t_initialize_1(except_1, 0, 4); - const f_array_lengths_t excepts_2 = f_array_lengths_t_initialize; + const f_number_unsigneds_t excepts_1 = macro_f_number_unsigneds_t_initialize_1(except_1, 0, 4); + const f_number_unsigneds_t excepts_2 = f_number_unsigneds_t_initialize; uint8_t i = 0; f_status_t status = F_none; diff --git a/level_0/f_compare/tests/unit/c/test-compare-except.c b/level_0/f_compare/tests/unit/c/test-compare-except.c index 2a05023..fff1ff8 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-except.c +++ b/level_0/f_compare/tests/unit/c/test-compare-except.c @@ -256,11 +256,11 @@ void test__f_compare_except__works(void **state) { F_equal_to, }; - f_array_length_t except_1[] = { + f_number_unsigned_t except_1[] = { 0, 1, 2, 3, }; - const f_array_lengths_t excepts_1 = macro_f_array_lengths_t_initialize_1(except_1, 0, 4); - const f_array_lengths_t excepts_2 = f_array_lengths_t_initialize; + const f_number_unsigneds_t excepts_1 = macro_f_number_unsigneds_t_initialize_1(except_1, 0, 4); + const f_number_unsigneds_t excepts_2 = f_number_unsigneds_t_initialize; uint8_t i = 0; for (; i < 64; ++i) { diff --git a/level_0/f_compare/tests/unit/c/test-compare-except_trim.c b/level_0/f_compare/tests/unit/c/test-compare-except_trim.c index 23d5c7e..18375df 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-except_trim.c +++ b/level_0/f_compare/tests/unit/c/test-compare-except_trim.c @@ -269,11 +269,11 @@ void test__f_compare_except_trim__works(void **state) { F_equal_to, }; - f_array_length_t except_1[] = { + f_number_unsigned_t except_1[] = { 0, 1, 2, 3, }; - const f_array_lengths_t excepts_1 = macro_f_array_lengths_t_initialize_1(except_1, 0, 4); - const f_array_lengths_t excepts_2 = f_array_lengths_t_initialize; + const f_number_unsigneds_t excepts_1 = macro_f_number_unsigneds_t_initialize_1(except_1, 0, 4); + const f_number_unsigneds_t excepts_2 = f_number_unsigneds_t_initialize; uint8_t i = 0; for (; i < 64; ++i) { diff --git a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_except.c b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_except.c index 72de2fe..03ced6e 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_except.c +++ b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_except.c @@ -256,11 +256,11 @@ void test__f_compare_utf_dynamic_except__works(void **state) { F_equal_to, }; - f_array_length_t except_1[] = { + f_number_unsigned_t except_1[] = { 0, 1, 2, 3, }; - const f_array_lengths_t excepts_1 = macro_f_array_lengths_t_initialize_1(except_1, 0, 4); - const f_array_lengths_t excepts_2 = f_array_lengths_t_initialize; + const f_number_unsigneds_t excepts_1 = macro_f_number_unsigneds_t_initialize_1(except_1, 0, 4); + const f_number_unsigneds_t excepts_2 = f_number_unsigneds_t_initialize; uint8_t i = 0; f_status_t status = F_none; diff --git a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_except_string.c b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_except_string.c index 0386105..072ac55 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_except_string.c +++ b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_except_string.c @@ -256,11 +256,11 @@ void test__f_compare_utf_dynamic_except_string__works(void **state) { F_equal_to, }; - f_array_length_t except_1[] = { + f_number_unsigned_t except_1[] = { 0, 1, 2, 3, }; - const f_array_lengths_t excepts_1 = macro_f_array_lengths_t_initialize_1(except_1, 0, 4); - const f_array_lengths_t excepts_2 = f_array_lengths_t_initialize; + const f_number_unsigneds_t excepts_1 = macro_f_number_unsigneds_t_initialize_1(except_1, 0, 4); + const f_number_unsigneds_t excepts_2 = f_number_unsigneds_t_initialize; uint8_t i = 0; f_status_t status = F_none; diff --git a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_except_trim.c b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_except_trim.c index 102c5a6..16c9f7f 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_except_trim.c +++ b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_except_trim.c @@ -269,11 +269,11 @@ void test__f_compare_utf_dynamic_except_trim__works(void **state) { F_equal_to, }; - f_array_length_t except_1[] = { + f_number_unsigned_t except_1[] = { 0, 1, 2, 3, }; - const f_array_lengths_t excepts_1 = macro_f_array_lengths_t_initialize_1(except_1, 0, 4); - const f_array_lengths_t excepts_2 = f_array_lengths_t_initialize; + const f_number_unsigneds_t excepts_1 = macro_f_number_unsigneds_t_initialize_1(except_1, 0, 4); + const f_number_unsigneds_t excepts_2 = f_number_unsigneds_t_initialize; uint8_t i = 0; f_status_t status = F_none; diff --git a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_except_trim_string.c b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_except_trim_string.c index b25b741..89bffd2 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_except_trim_string.c +++ b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_except_trim_string.c @@ -269,11 +269,11 @@ void test__f_compare_utf_dynamic_except_trim_string__works(void **state) { F_equal_to, }; - f_array_length_t except_1[] = { + f_number_unsigned_t except_1[] = { 0, 1, 2, 3, }; - const f_array_lengths_t excepts_1 = macro_f_array_lengths_t_initialize_1(except_1, 0, 4); - const f_array_lengths_t excepts_2 = f_array_lengths_t_initialize; + const f_number_unsigneds_t excepts_1 = macro_f_number_unsigneds_t_initialize_1(except_1, 0, 4); + const f_number_unsigneds_t excepts_2 = f_number_unsigneds_t_initialize; uint8_t i = 0; f_status_t status = F_none; diff --git a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except.c b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except.c index 1ca31e8..7dad0eb 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except.c +++ b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except.c @@ -259,11 +259,11 @@ void test__f_compare_utf_dynamic_partial_except__works(void **state) { F_equal_to, }; - f_array_length_t except_1[] = { + f_number_unsigned_t except_1[] = { 0, 1, 2, 3, }; - const f_array_lengths_t excepts_1 = macro_f_array_lengths_t_initialize_1(except_1, 0, 4); - const f_array_lengths_t excepts_2 = f_array_lengths_t_initialize; + const f_number_unsigneds_t excepts_1 = macro_f_number_unsigneds_t_initialize_1(except_1, 0, 4); + const f_number_unsigneds_t excepts_2 = f_number_unsigneds_t_initialize; uint8_t i = 0; f_status_t status = F_none; diff --git a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_dynamic.c b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_dynamic.c index 483b889..9acba79 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_dynamic.c +++ b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_dynamic.c @@ -258,11 +258,11 @@ void test__f_compare_utf_dynamic_partial_except_dynamic__works(void **state) { F_equal_to, }; - f_array_length_t except_1[] = { + f_number_unsigned_t except_1[] = { 0, 1, 2, 3, }; - const f_array_lengths_t excepts_1 = macro_f_array_lengths_t_initialize_1(except_1, 0, 4); - const f_array_lengths_t excepts_2 = f_array_lengths_t_initialize; + const f_number_unsigneds_t excepts_1 = macro_f_number_unsigneds_t_initialize_1(except_1, 0, 4); + const f_number_unsigneds_t excepts_2 = f_number_unsigneds_t_initialize; uint8_t i = 0; f_status_t status = F_none; diff --git a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_string.c b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_string.c index 835ddb9..6bd052a 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_string.c +++ b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_string.c @@ -259,11 +259,11 @@ void test__f_compare_utf_dynamic_partial_except_string__works(void **state) { F_equal_to, }; - f_array_length_t except_1[] = { + f_number_unsigned_t except_1[] = { 0, 1, 2, 3, }; - const f_array_lengths_t excepts_1 = macro_f_array_lengths_t_initialize_1(except_1, 0, 4); - const f_array_lengths_t excepts_2 = f_array_lengths_t_initialize; + const f_number_unsigneds_t excepts_1 = macro_f_number_unsigneds_t_initialize_1(except_1, 0, 4); + const f_number_unsigneds_t excepts_2 = f_number_unsigneds_t_initialize; uint8_t i = 0; f_status_t status = F_none; diff --git a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_trim.c b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_trim.c index 2223c52..e3b6331 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_trim.c +++ b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_trim.c @@ -272,11 +272,11 @@ void test__f_compare_utf_dynamic_partial_except_trim__works(void **state) { F_equal_to, }; - f_array_length_t except_1[] = { + f_number_unsigned_t except_1[] = { 0, 1, 2, 3, }; - const f_array_lengths_t excepts_1 = macro_f_array_lengths_t_initialize_1(except_1, 0, 4); - const f_array_lengths_t excepts_2 = f_array_lengths_t_initialize; + const f_number_unsigneds_t excepts_1 = macro_f_number_unsigneds_t_initialize_1(except_1, 0, 4); + const f_number_unsigneds_t excepts_2 = f_number_unsigneds_t_initialize; uint8_t i = 0; f_status_t status = F_none; diff --git a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_trim_dynamic.c b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_trim_dynamic.c index 8b6e865..08c904e 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_trim_dynamic.c +++ b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_trim_dynamic.c @@ -271,11 +271,11 @@ void test__f_compare_utf_dynamic_partial_except_trim_dynamic__works(void **state F_equal_to, }; - f_array_length_t except_1[] = { + f_number_unsigned_t except_1[] = { 0, 1, 2, 3, }; - const f_array_lengths_t excepts_1 = macro_f_array_lengths_t_initialize_1(except_1, 0, 4); - const f_array_lengths_t excepts_2 = f_array_lengths_t_initialize; + const f_number_unsigneds_t excepts_1 = macro_f_number_unsigneds_t_initialize_1(except_1, 0, 4); + const f_number_unsigneds_t excepts_2 = f_number_unsigneds_t_initialize; uint8_t i = 0; f_status_t status = F_none; diff --git a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_trim_string.c b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_trim_string.c index aed1497..bac0089 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_trim_string.c +++ b/level_0/f_compare/tests/unit/c/test-compare-utf_dynamic_partial_except_trim_string.c @@ -272,11 +272,11 @@ void test__f_compare_utf_dynamic_partial_except_trim_string__works(void **state) F_equal_to, }; - f_array_length_t except_1[] = { + f_number_unsigned_t except_1[] = { 0, 1, 2, 3, }; - const f_array_lengths_t excepts_1 = macro_f_array_lengths_t_initialize_1(except_1, 0, 4); - const f_array_lengths_t excepts_2 = f_array_lengths_t_initialize; + const f_number_unsigneds_t excepts_1 = macro_f_number_unsigneds_t_initialize_1(except_1, 0, 4); + const f_number_unsigneds_t excepts_2 = f_number_unsigneds_t_initialize; uint8_t i = 0; f_status_t status = F_none; diff --git a/level_0/f_compare/tests/unit/c/test-compare-utf_except.c b/level_0/f_compare/tests/unit/c/test-compare-utf_except.c index 9fceedb..d4a1a16 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-utf_except.c +++ b/level_0/f_compare/tests/unit/c/test-compare-utf_except.c @@ -256,11 +256,11 @@ void test__f_compare_utf_except__works(void **state) { F_equal_to, }; - f_array_length_t except_1[] = { + f_number_unsigned_t except_1[] = { 0, 1, 2, 3, }; - const f_array_lengths_t excepts_1 = macro_f_array_lengths_t_initialize_1(except_1, 0, 4); - const f_array_lengths_t excepts_2 = f_array_lengths_t_initialize; + const f_number_unsigneds_t excepts_1 = macro_f_number_unsigneds_t_initialize_1(except_1, 0, 4); + const f_number_unsigneds_t excepts_2 = f_number_unsigneds_t_initialize; uint8_t i = 0; f_status_t status = F_none; diff --git a/level_0/f_compare/tests/unit/c/test-compare-utf_except_trim.c b/level_0/f_compare/tests/unit/c/test-compare-utf_except_trim.c index 0e96825..fc87ac4 100644 --- a/level_0/f_compare/tests/unit/c/test-compare-utf_except_trim.c +++ b/level_0/f_compare/tests/unit/c/test-compare-utf_except_trim.c @@ -269,11 +269,11 @@ void test__f_compare_utf_except_trim__works(void **state) { F_equal_to, }; - f_array_length_t except_1[] = { + f_number_unsigned_t except_1[] = { 0, 1, 2, 3, }; - const f_array_lengths_t excepts_1 = macro_f_array_lengths_t_initialize_1(except_1, 0, 4); - const f_array_lengths_t excepts_2 = f_array_lengths_t_initialize; + const f_number_unsigneds_t excepts_1 = macro_f_number_unsigneds_t_initialize_1(except_1, 0, 4); + const f_number_unsigneds_t excepts_2 = f_number_unsigneds_t_initialize; uint8_t i = 0; f_status_t status = F_none; diff --git a/level_0/f_compare/tests/unit/c/test-compare.c b/level_0/f_compare/tests/unit/c/test-compare.c index 545910f..493676e 100644 --- a/level_0/f_compare/tests/unit/c/test-compare.c +++ b/level_0/f_compare/tests/unit/c/test-compare.c @@ -141,7 +141,7 @@ f_status_t test_convert_dynamic_to_utf(const f_string_static_t dynamic, f_utf_st utf->used = 0; - for (f_array_length_t i = 0; i < dynamic.used; ++i, ++utf->used) { + for (f_number_unsigned_t i = 0; i < dynamic.used; ++i, ++utf->used) { status = f_utf_char_to_character(dynamic.string + i, dynamic.used - i, &utf->string[i]); if (F_status_is_error(status)) return status; diff --git a/level_0/f_console/c/console.c b/level_0/f_console/c/console.c index b476b86..161541b 100644 --- a/level_0/f_console/c/console.c +++ b/level_0/f_console/c/console.c @@ -13,7 +13,7 @@ extern "C" { if (!arguments.envp) return F_data_not; - f_array_length_t total = 0; + f_number_unsigned_t total = 0; while (arguments.envp[total]) { ++total; @@ -26,7 +26,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; arguments.envp[i]; ++i) { + for (f_number_unsigned_t i = 0; arguments.envp[i]; ++i) { for (total = 0; arguments.envp[i][total]; ++total) { if (arguments.envp[i][total] == f_string_ascii_equal_s.string[0]) break; @@ -71,7 +71,7 @@ extern "C" { #endif // _di_f_console_identify_ #ifndef _di_f_console_parameter_prioritize_left_ - f_status_t f_console_parameter_prioritize_left(const f_console_parameters_t parameters, const f_uint16s_t choices, f_array_length_t * const decision) { + f_status_t f_console_parameter_prioritize_left(const f_console_parameters_t parameters, const f_uint16s_t choices, f_number_unsigned_t * const decision) { #ifndef _di_level_0_parameter_checking_ if (!decision) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -79,11 +79,11 @@ extern "C" { if (!choices.used) return F_data_not; if (!parameters.used) return F_data_not; - f_array_length_t location = 0; - f_array_length_t location_sub = 0; - f_array_length_t priority = 0; + f_number_unsigned_t location = 0; + f_number_unsigned_t location_sub = 0; + f_number_unsigned_t priority = 0; - for (f_array_length_t i = 0; i < choices.used; ++i) { + for (f_number_unsigned_t i = 0; i < choices.used; ++i) { if (choices.array[i] > parameters.used) return F_status_set_error(F_parameter); @@ -110,7 +110,7 @@ extern "C" { #endif // _di_f_console_parameter_prioritize_left_ #ifndef _di_f_console_parameter_prioritize_right_ - f_status_t f_console_parameter_prioritize_right(const f_console_parameters_t parameters, const f_uint16s_t choices, f_array_length_t * const decision) { + f_status_t f_console_parameter_prioritize_right(const f_console_parameters_t parameters, const f_uint16s_t choices, f_number_unsigned_t * const decision) { #ifndef _di_level_0_parameter_checking_ if (!decision) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -118,11 +118,11 @@ extern "C" { if (!choices.used) return F_data_not; if (!parameters.used) return F_data_not; - f_array_length_t location = 0; - f_array_length_t location_sub = 0; - f_array_length_t priority = 0; + f_number_unsigned_t location = 0; + f_number_unsigned_t location_sub = 0; + f_number_unsigned_t priority = 0; - for (f_array_length_t i = 0; i < choices.used; ++i) { + for (f_number_unsigned_t i = 0; i < choices.used; ++i) { if (choices.array[i] > parameters.used) return F_status_set_error(F_parameter); @@ -174,7 +174,7 @@ extern "C" { state->status = f_string_dynamics_increase_by(arguments.argc, ¶meters->arguments); if (F_status_is_error(state->status)) return; - state->status = f_array_lengths_increase(state->step_small, &process.needs); + state->status = f_number_unsigneds_increase(state->step_small, &process.needs); if (F_status_is_error(state->status)) return; // Append the program name parameter as a static string. @@ -185,8 +185,8 @@ extern "C" { // Parameter 0 represents the program name so skip it. process.location = 1; - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; f_utf_char_t utf_argument = 0; f_utf_char_t utf_console = 0; @@ -359,7 +359,7 @@ extern "C" { process.location_sub = 1; process.needs.used = 0; - state->status = f_array_lengths_increase_by(parameters->arguments.array[process.location].used, &process.needs); + state->status = f_number_unsigneds_increase_by(parameters->arguments.array[process.location].used, &process.needs); if (F_status_is_error(state->status)) break; // The process.location_sub is used on a per-increment basis (such as 'tar -xcf', the '-' would have an increment of 1, therefore x, c, and f would all be three separate parameters). @@ -423,10 +423,10 @@ extern "C" { } if (state->status == F_process) { - state->status = f_array_lengths_increase(state->step_small, ¶meters->array[i].locations); + state->status = f_number_unsigneds_increase(state->step_small, ¶meters->array[i].locations); if (F_status_is_error(state->status)) break; - state->status = f_array_lengths_increase(state->step_small, ¶meters->array[i].locations_sub); + state->status = f_number_unsigneds_increase(state->step_small, ¶meters->array[i].locations_sub); if (F_status_is_error(state->status)) break; if (parameters->array[i].location != process.location) { @@ -442,7 +442,7 @@ extern "C" { process.needs.array[process.needs.used++] = i; } // for - state->status = f_array_lengths_increase_by(process.needs.used, ¶meters->array[i].values); + state->status = f_number_unsigneds_increase_by(process.needs.used, ¶meters->array[i].values); if (F_status_is_error(state->status)) break; } @@ -585,10 +585,10 @@ extern "C" { } if (state->status == F_process && process.found && i < parameters->used) { - state->status = f_array_lengths_increase(state->step_small, ¶meters->array[i].locations); + state->status = f_number_unsigneds_increase(state->step_small, ¶meters->array[i].locations); if (F_status_is_error(state->status)) break; - state->status = f_array_lengths_increase(state->step_small, ¶meters->array[i].locations_sub); + state->status = f_number_unsigneds_increase(state->step_small, ¶meters->array[i].locations_sub); if (F_status_is_error(state->status)) break; parameters->array[i].result |= process.result | f_console_result_found_e; @@ -601,7 +601,7 @@ extern "C" { process.needs.array[process.needs.used++] = i; } // for - state->status = f_array_lengths_increase_by(process.needs.used, ¶meters->array[i].values); + state->status = f_number_unsigneds_increase_by(process.needs.used, ¶meters->array[i].values); if (F_status_is_error(state->status)) break; } @@ -626,7 +626,7 @@ extern "C" { } if (state->status == F_process) { - state->status = f_array_lengths_increase(state->step_small, ¶meters->remaining); + state->status = f_number_unsigneds_increase(state->step_small, ¶meters->remaining); if (F_status_is_error(state->status)) break; parameters->remaining.array[parameters->remaining.used++] = process.location; @@ -669,7 +669,7 @@ extern "C" { } } - f_array_lengths_resize(0, &process.needs); + f_number_unsigneds_resize(0, &process.needs); } #endif // _di_f_console_parameter_process_ diff --git a/level_0/f_console/c/console.h b/level_0/f_console/c/console.h index ae05720..899b745 100644 --- a/level_0/f_console/c/console.h +++ b/level_0/f_console/c/console.h @@ -96,7 +96,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_console_parameter_prioritize_left_ - extern f_status_t f_console_parameter_prioritize_left(const f_console_parameters_t parameters, const f_uint16s_t choices, f_array_length_t * const decision); + extern f_status_t f_console_parameter_prioritize_left(const f_console_parameters_t parameters, const f_uint16s_t choices, f_number_unsigned_t * const decision); #endif // _di_f_console_parameter_prioritize_left_ /** @@ -127,7 +127,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_console_parameter_prioritize_right_ - extern f_status_t f_console_parameter_prioritize_right(const f_console_parameters_t parameters, const f_uint16s_t choices, f_array_length_t * const decision); + extern f_status_t f_console_parameter_prioritize_right(const f_console_parameters_t parameters, const f_uint16s_t choices, f_number_unsigned_t * const decision); #endif // _di_f_console_parameter_prioritize_right_ /** @@ -175,13 +175,13 @@ extern "C" { * (optional) A variable passed to the callback, if provided. * Set to NULL to not use. * - * Errors (with error bit) from: f_array_lengths_increase(). - * Errors (with error bit) from: f_array_lengths_increase_by(). + * Errors (with error bit) from: f_number_unsigneds_increase(). + * Errors (with error bit) from: f_number_unsigneds_increase_by(). * Errors (with error bit) from: f_string_dynamics_increase_by(). * Errors (with error bit) from: f_utf_char_to_character(). * - * @see f_array_lengths_increase() - * @see f_array_lengths_increase_by() + * @see f_number_unsigneds_increase() + * @see f_number_unsigneds_increase_by() * @see f_string_dynamics_increase_by() * @see f_utf_char_to_character() */ diff --git a/level_0/f_console/c/console/common.c b/level_0/f_console/c/console/common.c index 8022cab..6dfd769 100644 --- a/level_0/f_console/c/console/common.c +++ b/level_0/f_console/c/console/common.c @@ -150,7 +150,7 @@ extern "C" { if (!state) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ - return f_array_lengths_resize(0, &state->needs); + return f_number_unsigneds_resize(0, &state->needs); } #endif // _di_f_console_parameter_state_delete_ @@ -160,7 +160,7 @@ extern "C" { if (!state) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ - return f_array_lengths_adjust(0, &state->needs); + return f_number_unsigneds_adjust(0, &state->needs); } #endif // _di_f_console_parameter_state_destroy_ @@ -172,22 +172,22 @@ extern "C" { f_status_t status = F_none; - for (f_array_length_t i = 0; i < parameters->used; ++i) { + for (f_number_unsigned_t i = 0; i < parameters->used; ++i) { - status = f_array_lengths_resize(0, ¶meters->array[i].locations); + status = f_number_unsigneds_resize(0, ¶meters->array[i].locations); if (F_status_is_error(status)) return status; - status = f_array_lengths_resize(0, ¶meters->array[i].locations_sub); + status = f_number_unsigneds_resize(0, ¶meters->array[i].locations_sub); if (F_status_is_error(status)) return status; - status = f_array_lengths_resize(0, ¶meters->array[i].values); + status = f_number_unsigneds_resize(0, ¶meters->array[i].values); if (F_status_is_error(status)) return status; } // for status = f_string_dynamics_resize(0, ¶meters->arguments); if (F_status_is_error(status)) return status; - status = f_array_lengths_resize(0, ¶meters->remaining); + status = f_number_unsigneds_resize(0, ¶meters->remaining); if (F_status_is_error(status)) return status; return F_none; @@ -202,22 +202,22 @@ extern "C" { f_status_t status = F_none; - for (f_array_length_t i = 0; i < parameters->used; ++i) { + for (f_number_unsigned_t i = 0; i < parameters->used; ++i) { - status = f_array_lengths_adjust(0, ¶meters->array[i].locations); + status = f_number_unsigneds_adjust(0, ¶meters->array[i].locations); if (F_status_is_error(status)) return status; - status = f_array_lengths_adjust(0, ¶meters->array[i].locations_sub); + status = f_number_unsigneds_adjust(0, ¶meters->array[i].locations_sub); if (F_status_is_error(status)) return status; - status = f_array_lengths_adjust(0, ¶meters->array[i].values); + status = f_number_unsigneds_adjust(0, ¶meters->array[i].values); if (F_status_is_error(status)) return status; } // for status = f_string_dynamics_adjust(0, ¶meters->arguments); if (F_status_is_error(status)) return status; - status = f_array_lengths_adjust(0, ¶meters->remaining); + status = f_number_unsigneds_adjust(0, ¶meters->remaining); if (F_status_is_error(status)) return status; return F_none; diff --git a/level_0/f_console/c/console/common.h b/level_0/f_console/c/console/common.h index 29c0b1d..32744f1 100644 --- a/level_0/f_console/c/console/common.h +++ b/level_0/f_console/c/console/common.h @@ -19,7 +19,7 @@ extern "C" { /** * The maximum size for a single parameter (the length of the string representing the parameter). * - * The ideal parameter value is F_array_length_t_size_d, which generally defaults to 2^64 (unsigned). + * The ideal parameter value is F_number_t_size_unsigned_d, which generally defaults to 2^64 (unsigned). * However, the libc/POSIX appears to limit this to 2^63 (signed). */ #ifndef _di_f_console_length_size_d_ @@ -320,10 +320,10 @@ extern "C" { f_console_result_t result; f_state_t *state; - f_array_length_t at; - f_array_length_t location; - f_array_length_t location_sub; - f_array_lengths_t needs; + f_number_unsigned_t at; + f_number_unsigned_t location; + f_number_unsigned_t location_sub; + f_number_unsigneds_t needs; } f_console_parameter_state_t; #define f_console_parameter_state_t_initialize { \ @@ -333,10 +333,10 @@ extern "C" { F_false, \ f_console_result_t_initialize, \ 0, \ - f_array_length_t_initialize, \ - f_array_length_t_initialize, \ - f_array_length_t_initialize, \ - f_array_lengths_t_initialize, \ + f_number_unsigned_t_initialize, \ + f_number_unsigned_t_initialize, \ + f_number_unsigned_t_initialize, \ + f_number_unsigneds_t_initialize, \ } #endif // _di_f_console_parameter_state_t_ @@ -377,18 +377,18 @@ extern "C" { f_string_static_t match_long; f_string_static_t match_simple; - f_array_length_t values_total; + f_number_unsigned_t values_total; f_console_flag_t flag; f_console_result_t result; - f_array_length_t location; - f_array_length_t location_sub; + f_number_unsigned_t location; + f_number_unsigned_t location_sub; - f_array_lengths_t locations; - f_array_lengths_t locations_sub; + f_number_unsigneds_t locations; + f_number_unsigneds_t locations_sub; - f_array_lengths_t values; + f_number_unsigneds_t values; } f_console_parameter_t; #define f_console_parameter_t_initialize { \ @@ -397,12 +397,12 @@ extern "C" { f_string_static_t_initialize, \ f_console_flag_t_initialize, \ f_console_result_t_initialize, \ - f_array_length_t_initialize, \ - f_array_length_t_initialize, \ - f_array_length_t_initialize, \ - f_array_lengths_t_initialize, \ - f_array_lengths_t_initialize, \ - f_array_lengths_t_initialize, \ + f_number_unsigned_t_initialize, \ + f_number_unsigned_t_initialize, \ + f_number_unsigned_t_initialize, \ + f_number_unsigneds_t_initialize, \ + f_number_unsigneds_t_initialize, \ + f_number_unsigneds_t_initialize, \ } #define macro_f_console_parameter_t_initialize_1(match_short, match_long, match_simple, values_total, flag, result, location, location_sub, locations, locations_sub, values) { \ @@ -429,9 +429,9 @@ extern "C" { f_console_result_none_e, \ 0, \ 0, \ - f_array_lengths_t_initialize, \ - f_array_lengths_t_initialize, \ - f_array_lengths_t_initialize, \ + f_number_unsigneds_t_initialize, \ + f_number_unsigneds_t_initialize, \ + f_number_unsigneds_t_initialize, \ } #define macro_f_console_parameter_t_initialize_3(match_short, match_long, values_total, flag) { \ @@ -443,9 +443,9 @@ extern "C" { f_console_result_none_e, \ 0, \ 0, \ - f_array_lengths_t_initialize, \ - f_array_lengths_t_initialize, \ - f_array_lengths_t_initialize, \ + f_number_unsigneds_t_initialize, \ + f_number_unsigneds_t_initialize, \ + f_number_unsigneds_t_initialize, \ } #define macro_f_console_parameter_t_initialize_4(match_short, values_total, flag) { \ @@ -457,9 +457,9 @@ extern "C" { f_console_result_none_e, \ 0, \ 0, \ - f_array_lengths_t_initialize, \ - f_array_lengths_t_initialize, \ - f_array_lengths_t_initialize, \ + f_number_unsigneds_t_initialize, \ + f_number_unsigneds_t_initialize, \ + f_number_unsigneds_t_initialize, \ } #define macro_f_console_parameter_t_initialize_5(match_long, values_total, flag) { \ @@ -471,9 +471,9 @@ extern "C" { f_console_result_none_e, \ 0, \ 0, \ - f_array_lengths_t_initialize, \ - f_array_lengths_t_initialize, \ - f_array_lengths_t_initialize, \ + f_number_unsigneds_t_initialize, \ + f_number_unsigneds_t_initialize, \ + f_number_unsigneds_t_initialize, \ } #define macro_f_console_parameter_t_initialize_6(match_simple, values_total, flag) { \ @@ -485,9 +485,9 @@ extern "C" { f_console_result_none_e, \ 0, \ 0, \ - f_array_lengths_t_initialize, \ - f_array_lengths_t_initialize, \ - f_array_lengths_t_initialize, \ + f_number_unsigneds_t_initialize, \ + f_number_unsigneds_t_initialize, \ + f_number_unsigneds_t_initialize, \ } #endif // _di_f_console_parameter_t_ @@ -525,8 +525,8 @@ extern "C" { typedef struct { f_console_parameter_t *array; f_string_dynamics_t arguments; - f_array_lengths_t remaining; - f_array_length_t used; + f_number_unsigneds_t remaining; + f_number_unsigned_t used; void (*callback)(const f_console_arguments_t arguments, void * const parameters, f_console_parameter_state_t * const state, void * const data); } f_console_parameters_t; @@ -534,7 +534,7 @@ extern "C" { #define f_console_parameters_t_initialize { \ 0, \ f_string_dynamics_t_initialize, \ - f_array_lengths_t_initialize, \ + f_number_unsigneds_t_initialize, \ 0, \ 0 \ } @@ -542,7 +542,7 @@ extern "C" { #define macro_f_console_parameters_t_initialize_1(parameters, used, callback) { \ parameters, \ f_string_dynamics_t_initialize, \ - f_array_lengths_t_initialize, \ + f_number_unsigneds_t_initialize, \ used, \ callback \ } @@ -784,10 +784,10 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. * * Errors (with error bit) from: f_string_dynamics_resize(). - * Errors (with error bit) from: f_array_lengths_resize(). + * Errors (with error bit) from: f_number_unsigneds_resize(). * * @see f_string_dynamics_resize() - * @see f_array_lengths_resize() + * @see f_number_unsigneds_resize() */ #ifndef _di_f_console_parameter_state_delete_ extern f_status_t f_console_parameter_state_delete(f_console_parameter_state_t * const state); @@ -805,10 +805,10 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. * * Errors (with error bit) from: f_string_dynamics_adjust(). - * Errors (with error bit) from: f_array_lengths_adjust(). + * Errors (with error bit) from: f_number_unsigneds_adjust(). * * @see f_string_dynamics_adjust() - * @see f_array_lengths_adjust() + * @see f_number_unsigneds_adjust() */ #ifndef _di_f_console_parameter_state_destroy_ extern f_status_t f_console_parameter_state_destroy(f_console_parameter_state_t * const state); @@ -826,10 +826,10 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. * * Errors (with error bit) from: f_string_dynamics_resize(). - * Errors (with error bit) from: f_array_lengths_resize(). + * Errors (with error bit) from: f_number_unsigneds_resize(). * * @see f_string_dynamics_resize() - * @see f_array_lengths_resize() + * @see f_number_unsigneds_resize() */ #ifndef _di_f_console_parameters_delete_ extern f_status_t f_console_parameters_delete(f_console_parameters_t * const parameters); @@ -847,10 +847,10 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. * * Errors (with error bit) from: f_string_dynamics_adjust(). - * Errors (with error bit) from: f_array_lengths_adjust(). + * Errors (with error bit) from: f_number_unsigneds_adjust(). * * @see f_string_dynamics_adjust() - * @see f_array_lengths_adjust() + * @see f_number_unsigneds_adjust() */ #ifndef _di_f_console_parameters_destroy_ extern f_status_t f_console_parameters_destroy(f_console_parameters_t * const parameters); diff --git a/level_0/f_console/c/private-console.c b/level_0/f_console/c/private-console.c index 05e0fab..53cbe86 100644 --- a/level_0/f_console/c/private-console.c +++ b/level_0/f_console/c/private-console.c @@ -13,7 +13,7 @@ extern "C" { if (!input) return F_data_not; // Only the first three characters need to be scanned. - const f_array_length_t length = strnlen(input, 3); + const f_number_unsigned_t length = strnlen(input, 3); if (!length) return F_data_not; if (input[0] == f_console_symbol_short_normal_s.string[0]) { diff --git a/level_0/f_console/tests/unit/c/test-console-parameter_prioritize_left.c b/level_0/f_console/tests/unit/c/test-console-parameter_prioritize_left.c index 13ec017..05dd24a 100644 --- a/level_0/f_console/tests/unit/c/test-console-parameter_prioritize_left.c +++ b/level_0/f_console/tests/unit/c/test-console-parameter_prioritize_left.c @@ -9,7 +9,7 @@ void test__f_console_parameter_prioritize_left__fails(void **state) { f_console_parameters_t parameters = f_console_parameters_t_initialize; f_uint16s_t choices = f_uint16s_t_initialize; - f_array_length_t decision = f_array_length_t_initialize; + f_number_unsigned_t decision = f_number_unsigned_t_initialize; { uint16_t choices_array[1] = { 20 }; @@ -41,7 +41,7 @@ void test__f_console_parameter_prioritize_left__parameter_checking(void **state) } { - uint16_t choices_array[1] = { f_array_length_t_initialize }; + uint16_t choices_array[1] = { f_number_unsigned_t_initialize }; choices.array = choices_array; const f_status_t status = f_console_parameter_prioritize_left(parameters, choices, 0); @@ -56,7 +56,7 @@ void test__f_console_parameter_prioritize_left__works(void **state) { f_console_parameters_t parameters = f_console_parameters_t_initialize; f_uint16s_t choices = f_uint16s_t_initialize; - f_array_length_t decision = f_array_length_t_initialize; + f_number_unsigned_t decision = f_number_unsigned_t_initialize; { uint16_t choices_array[1] = { 0 }; diff --git a/level_0/f_console/tests/unit/c/test-console-parameter_prioritize_right.c b/level_0/f_console/tests/unit/c/test-console-parameter_prioritize_right.c index a2bf287..083276b 100644 --- a/level_0/f_console/tests/unit/c/test-console-parameter_prioritize_right.c +++ b/level_0/f_console/tests/unit/c/test-console-parameter_prioritize_right.c @@ -9,7 +9,7 @@ void test__f_console_parameter_prioritize_right__fails(void **state) { f_console_parameters_t parameters = f_console_parameters_t_initialize; f_uint16s_t choices = f_uint16s_t_initialize; - f_array_length_t decision = f_array_length_t_initialize; + f_number_unsigned_t decision = f_number_unsigned_t_initialize; { uint16_t choices_array[1] = { 20 }; @@ -41,7 +41,7 @@ void test__f_console_parameter_prioritize_right__parameter_checking(void **state } { - uint16_t choices_array[1] = { f_array_length_t_initialize }; + uint16_t choices_array[1] = { f_number_unsigned_t_initialize }; choices.array = choices_array; const f_status_t status = f_console_parameter_prioritize_right(parameters, choices, 0); @@ -56,7 +56,7 @@ void test__f_console_parameter_prioritize_right__works(void **state) { f_console_parameters_t parameters = f_console_parameters_t_initialize; f_uint16s_t choices = f_uint16s_t_initialize; - f_array_length_t decision = f_array_length_t_initialize; + f_number_unsigned_t decision = f_number_unsigned_t_initialize; { uint16_t choices_array[1] = { 0 }; diff --git a/level_0/f_console/tests/unit/c/test-console-parameters_delete.c b/level_0/f_console/tests/unit/c/test-console-parameters_delete.c index 2f1ac32..44bfdbe 100644 --- a/level_0/f_console/tests/unit/c/test-console-parameters_delete.c +++ b/level_0/f_console/tests/unit/c/test-console-parameters_delete.c @@ -7,7 +7,7 @@ extern "C" { void test__f_console_parameters_delete__frees_memory(void **state) { - const f_array_length_t size = 3; + const f_number_unsigned_t size = 3; f_console_parameters_t parameters = f_console_parameters_t_initialize; f_console_parameter_t parameter = f_console_parameter_t_initialize; @@ -25,7 +25,7 @@ void test__f_console_parameters_delete__frees_memory(void **state) { } { - const f_status_t status = f_array_lengths_resize(3, ¶meters.array[0].locations); + const f_status_t status = f_number_unsigneds_resize(3, ¶meters.array[0].locations); assert_int_equal(status, F_none); assert_int_not_equal(parameters.array[0].locations.size, 0); @@ -33,7 +33,7 @@ void test__f_console_parameters_delete__frees_memory(void **state) { } { - const f_status_t status = f_array_lengths_resize(size, ¶meters.array[0].locations_sub); + const f_status_t status = f_number_unsigneds_resize(size, ¶meters.array[0].locations_sub); assert_int_equal(status, F_none); assert_int_not_equal(parameters.array[0].locations_sub.size, 0); diff --git a/level_0/f_console/tests/unit/c/test-console-parameters_destroy.c b/level_0/f_console/tests/unit/c/test-console-parameters_destroy.c index 527dbbf..c79c3d9 100644 --- a/level_0/f_console/tests/unit/c/test-console-parameters_destroy.c +++ b/level_0/f_console/tests/unit/c/test-console-parameters_destroy.c @@ -7,7 +7,7 @@ extern "C" { void test__f_console_parameters_destroy__frees_memory(void **state) { - const f_array_length_t size = 3; + const f_number_unsigned_t size = 3; f_console_parameters_t parameters = f_console_parameters_t_initialize; f_console_parameter_t parameter = f_console_parameter_t_initialize; @@ -25,7 +25,7 @@ void test__f_console_parameters_destroy__frees_memory(void **state) { } { - const f_status_t status = f_array_lengths_resize(size, ¶meters.array[0].locations); + const f_status_t status = f_number_unsigneds_resize(size, ¶meters.array[0].locations); assert_int_equal(status, F_none); assert_int_not_equal(parameters.array[0].locations.size, 0); @@ -33,7 +33,7 @@ void test__f_console_parameters_destroy__frees_memory(void **state) { } { - const f_status_t status = f_array_lengths_resize(size, ¶meters.array[0].locations_sub); + const f_status_t status = f_number_unsigneds_resize(size, ¶meters.array[0].locations_sub); assert_int_equal(status, F_none); assert_int_not_equal(parameters.array[0].locations_sub.size, 0); diff --git a/level_0/f_conversion/c/private-conversion.c b/level_0/f_conversion/c/private-conversion.c index a0bc5ae..3affaa8 100644 --- a/level_0/f_conversion/c/private-conversion.c +++ b/level_0/f_conversion/c/private-conversion.c @@ -267,7 +267,7 @@ extern "C" { } if (character) { - f_array_length_t count = 0; + f_number_unsigned_t count = 0; while (count < character->used) { diff --git a/level_0/f_directory/c/directory.c b/level_0/f_directory/c/directory.c index 438d24b..11f5379 100644 --- a/level_0/f_directory/c/directory.c +++ b/level_0/f_directory/c/directory.c @@ -161,7 +161,7 @@ extern "C" { } size_t i = 0; - f_array_length_t size = 0; + f_number_unsigned_t size = 0; for (; i < length; ++i) { diff --git a/level_0/f_directory/c/directory/private-type.c b/level_0/f_directory/c/directory/private-type.c index 0bc2d93..c46c6d9 100644 --- a/level_0/f_directory/c/directory/private-type.c +++ b/level_0/f_directory/c/directory/private-type.c @@ -6,11 +6,11 @@ extern "C" { #endif #if !defined(_di_f_directory_statuss_adjust_) || !defined(_di_f_directory_statuss_decimate_by_) - f_status_t private_f_directory_statuss_adjust(const f_array_length_t length, f_directory_statuss_t * const statuss) { + f_status_t private_f_directory_statuss_adjust(const f_number_unsigned_t length, f_directory_statuss_t * const statuss) { f_status_t status = F_none; - for (f_array_length_t i = length; i < statuss->size; ++i) { + for (f_number_unsigned_t i = length; i < statuss->size; ++i) { status = f_string_dynamic_adjust(0, &statuss->array[i].path); if (F_status_is_error(status)) return status; @@ -33,11 +33,11 @@ extern "C" { #endif // !defined(_di_f_directory_statuss_adjust_) || !defined(_di_f_directory_statuss_decimate_by_) #if !defined(_di_f_directory_statuss_decrease_by_) || !defined(_di_f_directory_statuss_increase_) || !defined(_di_f_directory_statuss_increase_by_) || !defined(_di_f_directory_statuss_resize_) - f_status_t private_f_directory_statuss_resize(const f_array_length_t length, f_directory_statuss_t * const statuss) { + f_status_t private_f_directory_statuss_resize(const f_number_unsigned_t length, f_directory_statuss_t * const statuss) { f_status_t status = F_none; - for (f_array_length_t i = length; i < statuss->size; ++i) { + for (f_number_unsigned_t i = length; i < statuss->size; ++i) { status = f_string_dynamic_resize(0, &statuss->array[i].path); if (F_status_is_error(status)) return status; diff --git a/level_0/f_directory/c/directory/private-type.h b/level_0/f_directory/c/directory/private-type.h index f79de9a..6131478 100644 --- a/level_0/f_directory/c/directory/private-type.h +++ b/level_0/f_directory/c/directory/private-type.h @@ -38,7 +38,7 @@ extern "C" { * @see f_memory_adjust() */ #if !defined(_di_f_directory_statuss_adjust_) || !defined(_di_f_directory_statuss_decimate_by_) - extern f_status_t private_f_directory_statuss_adjust(const f_array_length_t length, f_directory_statuss_t * const statuss) F_attribute_visibility_internal_d; + extern f_status_t private_f_directory_statuss_adjust(const f_number_unsigned_t length, f_directory_statuss_t * const statuss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_directory_statuss_adjust_) || !defined(_di_f_directory_statuss_decimate_by_) /** @@ -65,7 +65,7 @@ extern "C" { * @see f_memory_resize() */ #if !defined(_di_f_directory_statuss_decrease_by_) || !defined(_di_f_directory_statuss_increase_) || !defined(_di_f_directory_statuss_increase_by_) || !defined(_di_f_directory_statuss_resize_) - extern f_status_t private_f_directory_statuss_resize(const f_array_length_t length, f_directory_statuss_t * const statuss) F_attribute_visibility_internal_d; + extern f_status_t private_f_directory_statuss_resize(const f_number_unsigned_t length, f_directory_statuss_t * const statuss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_directory_statuss_decrease_by_) || !defined(_di_f_directory_statuss_increase_) || !defined(_di_f_directory_statuss_increase_by_) || !defined(_di_f_directory_statuss_resize_) #ifdef __cplusplus diff --git a/level_0/f_directory/c/directory/type.c b/level_0/f_directory/c/directory/type.c index ab54806..ead2c3e 100644 --- a/level_0/f_directory/c/directory/type.c +++ b/level_0/f_directory/c/directory/type.c @@ -74,7 +74,7 @@ extern "C" { #endif // _di_f_directory_recurse_do_destroy_ #ifndef _di_f_directory_statuss_adjust_ - f_status_t f_directory_statuss_adjust(const f_array_length_t length, f_directory_statuss_t * const statuss) { + f_status_t f_directory_statuss_adjust(const f_number_unsigned_t length, f_directory_statuss_t * const statuss) { #ifndef _di_level_0_parameter_checking_ if (!statuss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -84,7 +84,7 @@ extern "C" { #endif // _di_f_directory_statuss_adjust_ #ifndef _di_f_directory_statuss_decimate_by_ - f_status_t f_directory_statuss_decimate_by(const f_array_length_t amount, f_directory_statuss_t * const statuss) { + f_status_t f_directory_statuss_decimate_by(const f_number_unsigned_t amount, f_directory_statuss_t * const statuss) { #ifndef _di_level_0_parameter_checking_ if (!statuss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -100,7 +100,7 @@ extern "C" { #endif // _di_f_directory_statuss_decimate_by_ #ifndef _di_f_directory_statuss_decrease_by_ - f_status_t f_directory_statuss_decrease_by(const f_array_length_t amount, f_directory_statuss_t * const statuss) { + f_status_t f_directory_statuss_decrease_by(const f_number_unsigned_t amount, f_directory_statuss_t * const statuss) { #ifndef _di_level_0_parameter_checking_ if (!statuss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -116,18 +116,18 @@ extern "C" { #endif // _di_f_directory_statuss_decrease_by_ #ifndef _di_f_directory_statuss_increase_ - f_status_t f_directory_statuss_increase(const f_array_length_t step, f_directory_statuss_t * const statuss) { + f_status_t f_directory_statuss_increase(const f_number_unsigned_t step, f_directory_statuss_t * const statuss) { #ifndef _di_level_0_parameter_checking_ if (!statuss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && statuss->used + 1 > statuss->size) { - f_array_length_t size = statuss->used + step; + f_number_unsigned_t size = statuss->used + step; - if (size > F_array_length_t_size_d) { - if (statuss->used + 1 > F_array_length_t_size_d) return F_status_set_error(F_array_too_large); + if (size > F_number_t_size_unsigned_d) { + if (statuss->used + 1 > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large); - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_directory_statuss_resize(size, statuss); @@ -138,7 +138,7 @@ extern "C" { #endif // _di_f_directory_statuss_increase_ #ifndef _di_f_directory_statuss_increase_by_ - f_status_t f_directory_statuss_increase_by(const f_array_length_t amount, f_directory_statuss_t * const statuss) { + f_status_t f_directory_statuss_increase_by(const f_number_unsigned_t amount, f_directory_statuss_t * const statuss) { #ifndef _di_level_0_parameter_checking_ if (!statuss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -146,7 +146,7 @@ extern "C" { if (!amount) return F_data_not; if (statuss->used + amount > statuss->size) { - if (statuss->used + amount > F_array_length_t_size_d) return F_status_set_error(F_array_too_large); + if (statuss->used + amount > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large); return private_f_directory_statuss_resize(statuss->used + amount, statuss); } @@ -156,7 +156,7 @@ extern "C" { #endif // _di_f_directory_statuss_increase_by_ #ifndef _di_f_directory_statuss_resize_ - f_status_t f_directory_statuss_resize(const f_array_length_t length, f_directory_statuss_t * const statuss) { + f_status_t f_directory_statuss_resize(const f_number_unsigned_t length, f_directory_statuss_t * const statuss) { #ifndef _di_level_0_parameter_checking_ if (!statuss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_directory/c/directory/type.h b/level_0/f_directory/c/directory/type.h index 9705920..94af61e 100644 --- a/level_0/f_directory/c/directory/type.h +++ b/level_0/f_directory/c/directory/type.h @@ -99,8 +99,8 @@ extern "C" { #ifndef _di_f_directory_statuss_t_ typedef struct { f_directory_status_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_directory_statuss_t; #define f_directory_statuss_t_initialize { 0, 0, 0 } @@ -152,7 +152,7 @@ extern "C" { */ #ifndef _di_f_directory_recurse_do_t_ typedef struct { - f_array_length_t depth; + f_number_unsigned_t depth; f_number_unsigned_t depth_max; uint16_t flag; f_mode_t mode; @@ -309,7 +309,7 @@ extern "C" { * @see f_string_dynamic_resize() */ #ifndef _di_f_directory_statuss_adjust_ - extern f_status_t f_directory_statuss_adjust(const f_array_length_t length, f_directory_statuss_t * const statuss); + extern f_status_t f_directory_statuss_adjust(const f_number_unsigned_t length, f_directory_statuss_t * const statuss); #endif // _di_f_directory_statuss_adjust_ /** @@ -335,7 +335,7 @@ extern "C" { * @see f_string_dynamic_resize() */ #ifndef _di_f_directory_statuss_decimate_by_ - extern f_status_t f_directory_statuss_decimate_by(const f_array_length_t amount, f_directory_statuss_t * const statuss); + extern f_status_t f_directory_statuss_decimate_by(const f_number_unsigned_t amount, f_directory_statuss_t * const statuss); #endif // _di_f_directory_statuss_decimate_by_ /** @@ -361,13 +361,13 @@ extern "C" { * @see f_string_dynamic_resize() */ #ifndef _di_f_directory_statuss_decrease_by_ - extern f_status_t f_directory_statuss_decrease_by(const f_array_length_t amount, f_directory_statuss_t * const statuss); + extern f_status_t f_directory_statuss_decrease_by(const f_number_unsigned_t amount, f_directory_statuss_t * const statuss); #endif // _di_f_directory_statuss_decrease_by_ /** * Increase the size of all parts of the directory statuss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -387,14 +387,14 @@ extern "C" { * @see f_string_dynamic_resize() */ #ifndef _di_f_directory_statuss_increase_ - extern f_status_t f_directory_statuss_increase(const f_array_length_t step, f_directory_statuss_t * const statuss); + extern f_status_t f_directory_statuss_increase(const f_number_unsigned_t step, f_directory_statuss_t * const statuss); #endif // _di_f_directory_statuss_increase_ /** * Resize all parts of the directory statuss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -413,7 +413,7 @@ extern "C" { * @see f_string_dynamic_resize() */ #ifndef _di_f_directory_statuss_increase_by_ - extern f_status_t f_directory_statuss_increase_by(const f_array_length_t amount, f_directory_statuss_t * const statuss); + extern f_status_t f_directory_statuss_increase_by(const f_number_unsigned_t amount, f_directory_statuss_t * const statuss); #endif // _di_f_directory_statuss_increase_by_ /** @@ -434,7 +434,7 @@ extern "C" { * @see f_string_dynamic_resize() */ #ifndef _di_f_directory_statuss_resize_ - extern f_status_t f_directory_statuss_resize(const f_array_length_t length, f_directory_statuss_t * const statuss); + extern f_status_t f_directory_statuss_resize(const f_number_unsigned_t length, f_directory_statuss_t * const statuss); #endif // _di_f_directory_statuss_resize_ #ifdef __cplusplus diff --git a/level_0/f_environment/c/environment.c b/level_0/f_environment/c/environment.c index 66bf895..7c80399 100644 --- a/level_0/f_environment/c/environment.c +++ b/level_0/f_environment/c/environment.c @@ -49,7 +49,7 @@ extern char **environ; return F_exist_not; } - const f_array_length_t size = strnlen(result, f_environment_max_length_d); + const f_number_unsigned_t size = strnlen(result, f_environment_max_length_d); if (size) { const f_status_t status = f_string_dynamic_increase_by(size + 1, value); diff --git a/level_0/f_file/c/file.c b/level_0/f_file/c/file.c index 812beb0..5f9a499 100644 --- a/level_0/f_file/c/file.c +++ b/level_0/f_file/c/file.c @@ -1028,7 +1028,7 @@ extern "C" { mode_umask |= F_file_mode_t_block_world_d & F_file_mode_t_mask_bit_execute_d; } - for (f_array_length_t i = 0; syntax && i < code.used; ++i) { + for (f_number_unsigned_t i = 0; syntax && i < code.used; ++i) { if (code.string[i] == f_string_ascii_u_s.string[0]) { on |= 1; @@ -1214,7 +1214,7 @@ extern "C" { // 1 = add, 2 = replace, 3 = subtract. uint8_t how = 0; - f_array_length_t i = 0; + f_number_unsigned_t i = 0; if (code.string[0] == f_string_ascii_plus_s.string[0]) { how = 1; @@ -1242,7 +1242,7 @@ extern "C" { } // while if (i < code.used) { - f_array_length_t j = 0; + f_number_unsigned_t j = 0; // Do not tolerate overly large numbers. if (code.used - i > 4) return F_status_set_error(F_syntax); @@ -1455,7 +1455,7 @@ extern "C" { char *path_to_name = basename(path_argument); - const f_array_length_t size = strnlen(path_to_name, path.used); + const f_number_unsigned_t size = strnlen(path_to_name, path.used); const f_status_t status = f_string_dynamic_increase_by(size + 1, name_base); if (F_status_is_error(status)) return status; @@ -1484,7 +1484,7 @@ extern "C" { char *path_to_name = dirname(path_argument); - const f_array_length_t size = strnlen(path_to_name, path.used); + const f_number_unsigned_t size = strnlen(path_to_name, path.used); { const f_status_t status = f_string_dynamic_increase_by(size + 1, name_directory); @@ -1631,7 +1631,7 @@ extern "C" { #endif // _di_f_file_read_block_ #ifndef _di_f_file_read_until_ - f_status_t f_file_read_until(const f_file_t file, const f_array_length_t total, f_string_dynamic_t * const buffer) { + f_status_t f_file_read_until(const f_file_t file, const f_number_unsigned_t total, f_string_dynamic_t * const buffer) { #ifndef _di_level_0_parameter_checking_ if (!file.size_read) return F_status_set_error(F_parameter); if (!buffer) return F_status_set_error(F_parameter); @@ -1640,8 +1640,8 @@ extern "C" { if (file.id == -1) return F_file_descriptor_not; if (!total) return F_data_not; - f_array_length_t buffer_size = file.size_read; - f_array_length_t buffer_count = 0; + f_number_unsigned_t buffer_size = file.size_read; + f_number_unsigned_t buffer_count = 0; f_status_t status = F_none; ssize_t size_read = 0; @@ -2109,7 +2109,7 @@ extern "C" { #endif // _di_f_file_umask_set_ #ifndef _di_f_file_write_ - f_status_t f_file_write(const f_file_t file, const f_string_static_t buffer, f_array_length_t * const written) { + f_status_t f_file_write(const f_file_t file, const f_string_static_t buffer, f_number_unsigned_t * const written) { if (file.id == -1 || !buffer.used || !file.size_write) { if (written) *written = 0; @@ -2124,7 +2124,7 @@ extern "C" { if (status == F_none && *written == buffer.used) return F_none_eos; } else { - f_array_length_t written_local = 0; + f_number_unsigned_t written_local = 0; const f_status_t status = private_f_file_write_until(file, buffer, buffer.used, &written_local); if (F_status_is_error(status)) return status; @@ -2137,7 +2137,7 @@ extern "C" { #endif // _di_f_file_write_ #ifndef _di_f_file_write_block_ - f_status_t f_file_write_block(const f_file_t file, const f_string_static_t buffer, f_array_length_t * const written) { + f_status_t f_file_write_block(const f_file_t file, const f_string_static_t buffer, f_number_unsigned_t * const written) { if (file.id == -1 || !buffer.used || !file.size_write) { if (written) *written = 0; @@ -2145,7 +2145,7 @@ extern "C" { return file.id == -1 ? F_file_descriptor_not : F_data_not; } - const f_array_length_t write_max = file.size_write > buffer.used ? buffer.used : file.size_write; + const f_number_unsigned_t write_max = file.size_write > buffer.used ? buffer.used : file.size_write; if (written) { const f_status_t status = private_f_file_write_until(file, buffer, write_max, written); @@ -2157,7 +2157,7 @@ extern "C" { } } else { - f_array_length_t written_local = 0; + f_number_unsigned_t written_local = 0; const f_status_t status = private_f_file_write_until(file, buffer, write_max, &written_local); if (F_status_is_error(status)) return status; @@ -2173,7 +2173,7 @@ extern "C" { #endif // _di_f_file_write_block_ #ifndef _di_f_file_write_until_ - f_status_t f_file_write_until(const f_file_t file, const f_string_static_t buffer, const f_array_length_t total, f_array_length_t * const written) { + f_status_t f_file_write_until(const f_file_t file, const f_string_static_t buffer, const f_number_unsigned_t total, f_number_unsigned_t * const written) { if (file.id == -1 || !buffer.used || !total || !file.size_write) { if (written) *written = 0; @@ -2181,7 +2181,7 @@ extern "C" { return file.id == -1 ? F_file_descriptor_not : F_data_not; } - const f_array_length_t write_max = total > buffer.used ? buffer.used : total; + const f_number_unsigned_t write_max = total > buffer.used ? buffer.used : total; if (written) { const f_status_t status = private_f_file_write_until(file, buffer, write_max, written); @@ -2193,7 +2193,7 @@ extern "C" { } } else { - f_array_length_t written_local = 0; + f_number_unsigned_t written_local = 0; const f_status_t status = private_f_file_write_until(file, buffer, buffer.used, &written_local); if (F_status_is_error(status)) return status; @@ -2209,7 +2209,7 @@ extern "C" { #endif // _di_f_file_write_until_ #ifndef _di_f_file_write_range_ - 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_array_length_t * const 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_number_unsigned_t * const written) { if (file.id == -1 || !buffer.used || range.start > range.stop || range.start >= buffer.used || !file.size_write) { if (written) { @@ -2219,7 +2219,7 @@ extern "C" { return file.id == -1 ? F_file_descriptor_not : F_data_not; } - const f_array_length_t write_max = (range.stop - range.start) + 1 > buffer.used ? buffer.used : (range.stop - range.start) + 1; + const f_number_unsigned_t write_max = (range.stop - range.start) + 1 > buffer.used ? buffer.used : (range.stop - range.start) + 1; if (written) { const f_string_static_t buffer_adjusted = macro_f_string_static_t_initialize_1(buffer.string + range.start, 0, buffer.used - range.start); @@ -2234,7 +2234,7 @@ extern "C" { } else { const f_string_static_t buffer_adjusted = macro_f_string_static_t_initialize_1(buffer.string + range.start, 0, buffer.used - range.start); - f_array_length_t written_local = 0; + f_number_unsigned_t written_local = 0; const f_status_t status = private_f_file_write_until(file, buffer_adjusted, write_max, &written_local); if (F_status_is_error(status)) return status; diff --git a/level_0/f_file/c/file.h b/level_0/f_file/c/file.h index befba24..9f5fafa 100644 --- a/level_0/f_file/c/file.h +++ b/level_0/f_file/c/file.h @@ -1599,7 +1599,7 @@ extern "C" { * @see read() */ #ifndef _di_f_file_read_until_ - extern f_status_t f_file_read_until(const f_file_t file, const f_array_length_t total, f_string_dynamic_t * const buffer); + extern f_status_t f_file_read_until(const f_file_t file, const f_number_unsigned_t total, f_string_dynamic_t * const buffer); #endif // _di_f_file_read_until_ /** @@ -2283,7 +2283,7 @@ extern "C" { * @see write() */ #ifndef _di_f_file_write_ - extern f_status_t f_file_write(const f_file_t file, const f_string_static_t buffer, f_array_length_t * const written); + extern f_status_t f_file_write(const f_file_t file, const f_string_static_t buffer, f_number_unsigned_t * const written); #endif // _di_f_file_write_ /** @@ -2318,7 +2318,7 @@ extern "C" { * @see write() */ #ifndef _di_f_file_write_block_ - extern f_status_t f_file_write_block(const f_file_t file, const f_string_static_t buffer, f_array_length_t * const written); + extern f_status_t f_file_write_block(const f_file_t file, const f_string_static_t buffer, f_number_unsigned_t * const written); #endif // _di_f_file_write_block_ /** @@ -2353,7 +2353,7 @@ extern "C" { * @see write() */ #ifndef _di_f_file_write_until_ - extern f_status_t f_file_write_until(const f_file_t file, const f_string_static_t buffer, const f_array_length_t total, f_array_length_t * const written); + extern f_status_t f_file_write_until(const f_file_t file, const f_string_static_t buffer, const f_number_unsigned_t total, f_number_unsigned_t * const written); #endif // _di_f_file_write_until_ /** @@ -2387,7 +2387,7 @@ extern "C" { * @see write() */ #ifndef _di_f_file_write_range_ - 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_array_length_t * const 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_number_unsigned_t * const written); #endif // _di_f_file_write_range_ #ifdef __cplusplus diff --git a/level_0/f_file/c/file/stream.c b/level_0/f_file/c/file/stream.c index cecbb21..25b7ce4 100644 --- a/level_0/f_file/c/file/stream.c +++ b/level_0/f_file/c/file/stream.c @@ -287,7 +287,7 @@ extern "C" { #endif // _di_f_file_stream_read_block_ #ifndef _di_f_file_stream_read_until_ - f_status_t f_file_stream_read_until(const f_file_t file, const f_array_length_t total, f_string_dynamic_t * const buffer) { + f_status_t f_file_stream_read_until(const f_file_t file, const f_number_unsigned_t total, f_string_dynamic_t * const buffer) { #ifndef _di_level_0_parameter_checking_ if (!file.size_read) return F_status_set_error(F_parameter); if (!buffer) return F_status_set_error(F_parameter); @@ -320,8 +320,8 @@ extern "C" { } } - f_array_length_t buffer_size = file.size_read; - f_array_length_t buffer_count = 0; + f_number_unsigned_t buffer_size = file.size_read; + f_number_unsigned_t buffer_count = 0; size_t size_read = 0; @@ -415,7 +415,7 @@ extern "C" { #endif // _di_f_file_stream_unlock_ #ifndef _di_f_file_stream_write_ - f_status_t f_file_stream_write(const f_file_t file, const f_string_static_t buffer, f_array_length_t * const written) { + f_status_t f_file_stream_write(const f_file_t file, const f_string_static_t buffer, f_number_unsigned_t * const written) { if (!file.stream || !buffer.used || !file.size_write) { if (written) { @@ -433,7 +433,7 @@ extern "C" { if (status == F_none && *written == buffer.used) return F_none_eos; } else { - f_array_length_t written_local = 0; + f_number_unsigned_t written_local = 0; status = private_f_file_stream_write_until(file, buffer, buffer.used, &written_local); @@ -447,7 +447,7 @@ extern "C" { #endif // _di_f_file_stream_write_ #ifndef _di_f_file_stream_write_block_ - f_status_t f_file_stream_write_block(const f_file_t file, const f_string_static_t buffer, f_array_length_t * const written) { + f_status_t f_file_stream_write_block(const f_file_t file, const f_string_static_t buffer, f_number_unsigned_t * const written) { if (!file.stream || !buffer.used || !file.size_write) { if (written) { @@ -457,7 +457,7 @@ extern "C" { return file.stream ? F_data_not : F_stream_not; } - const f_array_length_t write_max = file.size_write > buffer.used ? buffer.used : file.size_write; + const f_number_unsigned_t write_max = file.size_write > buffer.used ? buffer.used : file.size_write; f_status_t status = F_none; @@ -470,7 +470,7 @@ extern "C" { } } else { - f_array_length_t written_local = 0; + f_number_unsigned_t written_local = 0; status = private_f_file_stream_write_until(file, buffer, write_max, &written_local); @@ -487,7 +487,7 @@ extern "C" { #endif // _di_f_file_stream_write_block_ #ifndef _di_f_file_stream_write_until_ - f_status_t f_file_stream_write_until(const f_file_t file, const f_string_static_t buffer, const f_array_length_t total, f_array_length_t * const written) { + f_status_t f_file_stream_write_until(const f_file_t file, const f_string_static_t buffer, const f_number_unsigned_t total, f_number_unsigned_t * const written) { if (!file.stream || !buffer.used || !total || !file.size_write) { if (written) { @@ -497,7 +497,7 @@ extern "C" { return file.stream ? F_data_not : F_stream_not; } - const f_array_length_t write_max = total > buffer.used ? buffer.used : total; + const f_number_unsigned_t write_max = total > buffer.used ? buffer.used : total; f_status_t status = F_none; @@ -510,7 +510,7 @@ extern "C" { } } else { - f_array_length_t written_local = 0; + f_number_unsigned_t written_local = 0; status = private_f_file_stream_write_until(file, buffer, buffer.used, &written_local); @@ -527,7 +527,7 @@ extern "C" { #endif // _di_f_file_stream_write_until_ #ifndef _di_f_file_stream_write_range_ - f_status_t f_file_stream_write_range(const f_file_t file, const f_string_static_t buffer, const f_string_range_t range, f_array_length_t * const written) { + f_status_t f_file_stream_write_range(const f_file_t file, const f_string_static_t buffer, const f_string_range_t range, f_number_unsigned_t * const written) { if (!file.stream || !buffer.used || range.start > range.stop || range.start >= buffer.used || !file.size_write) { if (written) { @@ -537,7 +537,7 @@ extern "C" { return file.stream ? F_data_not : F_stream_not; } - const f_array_length_t write_max = (range.stop - range.start) + 1 > buffer.used ? buffer.used : (range.stop - range.start) + 1; + const f_number_unsigned_t write_max = (range.stop - range.start) + 1 > buffer.used ? buffer.used : (range.stop - range.start) + 1; const f_string_static_t buffer_adjusted = macro_f_string_static_t_initialize_1(buffer.string + range.start, 0, buffer.used - range.start); f_status_t status = F_none; @@ -551,7 +551,7 @@ extern "C" { } } else { - f_array_length_t written_local = 0; + f_number_unsigned_t written_local = 0; status = private_f_file_stream_write_until(file, buffer_adjusted, write_max, &written_local); diff --git a/level_0/f_file/c/file/stream.h b/level_0/f_file/c/file/stream.h index f46fd3a..4202431 100644 --- a/level_0/f_file/c/file/stream.h +++ b/level_0/f_file/c/file/stream.h @@ -318,7 +318,7 @@ extern "C" { * @see f_string_dynamic_increase_by() */ #ifndef _di_f_file_stream_read_until_ - extern f_status_t f_file_stream_read_until(const f_file_t file, const f_array_length_t total, f_string_dynamic_t * const buffer); + extern f_status_t f_file_stream_read_until(const f_file_t file, const f_number_unsigned_t total, f_string_dynamic_t * const buffer); #endif // _di_f_file_stream_read_until_ /** @@ -416,7 +416,7 @@ extern "C" { * @see funlockfile() */ #ifndef _di_f_file_stream_write_ - extern f_status_t f_file_stream_write(const f_file_t file, const f_string_static_t buffer, f_array_length_t * const written); + extern f_status_t f_file_stream_write(const f_file_t file, const f_string_static_t buffer, f_number_unsigned_t * const written); #endif // _di_f_file_stream_write_ /** @@ -452,7 +452,7 @@ extern "C" { * @see funlockfile() */ #ifndef _di_f_file_stream_write_block_ - extern f_status_t f_file_stream_write_block(const f_file_t file, const f_string_static_t buffer, f_array_length_t * const written); + extern f_status_t f_file_stream_write_block(const f_file_t file, const f_string_static_t buffer, f_number_unsigned_t * const written); #endif // _di_f_file_stream_write_block_ /** @@ -489,7 +489,7 @@ extern "C" { * @see funlockfile() */ #ifndef _di_f_file_stream_write_until_ - extern f_status_t f_file_stream_write_until(const f_file_t file, const f_string_static_t buffer, const f_array_length_t total, f_array_length_t * const written); + extern f_status_t f_file_stream_write_until(const f_file_t file, const f_string_static_t buffer, const f_number_unsigned_t total, f_number_unsigned_t * const written); #endif // _di_f_file_stream_write_until_ /** @@ -518,7 +518,7 @@ extern "C" { * @see fwrite_unlocked() */ #ifndef _di_f_file_stream_write_range_ - extern f_status_t f_file_stream_write_range(const f_file_t file, const f_string_static_t buffer, const f_string_range_t range, f_array_length_t * const written); + extern f_status_t f_file_stream_write_range(const f_file_t file, const f_string_static_t buffer, const f_string_range_t range, f_number_unsigned_t * const written); #endif // _di_f_file_stream_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 0be7546..4dcc92b 100644 --- a/level_0/f_file/c/private-file.c +++ b/level_0/f_file/c/private-file.c @@ -649,13 +649,13 @@ extern "C" { #endif // !defined(_di_f_file_stream_open_descriptor_) || !defined(_di_f_file_stream_open_) || !defined(_di_f_file_stream_reopen_) #if !defined(_di_f_file_stream_write_) || !defined(_di_f_file_stream_write_block_) || !defined(_di_f_file_stream_write_until) || !defined(_di_f_file_stream_write_range) - f_status_t private_f_file_stream_write_until(const f_file_t file, const f_string_static_t buffer, const f_array_length_t total, f_array_length_t * const written) { + f_status_t private_f_file_stream_write_until(const f_file_t file, const f_string_static_t buffer, const f_number_unsigned_t total, f_number_unsigned_t * const written) { *written = 0; - f_array_length_t write_amount = 1; - f_array_length_t write_size = file.size_write; - f_array_length_t write_max = total; + f_number_unsigned_t write_amount = 1; + f_number_unsigned_t write_size = file.size_write; + f_number_unsigned_t write_max = total; ssize_t size_write = 0; @@ -699,12 +699,12 @@ extern "C" { #endif // !defined(_di_f_file_stream_write_) || !defined(_di_f_file_stream_write_block_) || !defined(_di_f_file_stream_write_until) || !defined(_di_f_file_stream_write_range) #if !defined(_di_f_file_write_) || !defined(_di_f_file_write_block_) || !defined(_di_f_file_write_until) || !defined(_di_f_file_write_range) - f_status_t private_f_file_write_until(const f_file_t file, const f_string_static_t buffer, const f_array_length_t total, f_array_length_t * const written) { + f_status_t private_f_file_write_until(const f_file_t file, const f_string_static_t buffer, const f_number_unsigned_t total, f_number_unsigned_t * const written) { *written = 0; - f_array_length_t write_size = file.size_write; - f_array_length_t write_max = total; + f_number_unsigned_t write_size = file.size_write; + f_number_unsigned_t write_max = total; ssize_t size_write = 0; diff --git a/level_0/f_file/c/private-file.h b/level_0/f_file/c/private-file.h index baa6307..e14327c 100644 --- a/level_0/f_file/c/private-file.h +++ b/level_0/f_file/c/private-file.h @@ -891,7 +891,7 @@ extern "C" { * @see f_file_stream_write_until() */ #if !defined(_di_f_file_stream_write_) || !defined(_di_f_file_stream_write_block_) || !defined(_di_f_file_stream_write_until) || !defined(_di_f_file_stream_write_range) - extern f_status_t private_f_file_stream_write_until(const f_file_t file, const f_string_static_t buffer, const f_array_length_t total, f_array_length_t * const written) F_attribute_visibility_internal_d; + extern f_status_t private_f_file_stream_write_until(const f_file_t file, const f_string_static_t buffer, const f_number_unsigned_t total, f_number_unsigned_t * const written) F_attribute_visibility_internal_d; #endif // !defined(_di_f_file_stream_write_) || !defined(_di_f_file_stream_write_block_) || !defined(_di_f_file_stream_write_until) || !defined(_di_f_file_stream_write_range) /** @@ -930,7 +930,7 @@ extern "C" { * @see f_file_write_until() */ #if !defined(_di_f_file_write_) || !defined(_di_f_file_write_block_) || !defined(_di_f_file_write_until) || !defined(_di_f_file_write_range) - extern f_status_t private_f_file_write_until(const f_file_t file, const f_string_static_t buffer, const f_array_length_t total, f_array_length_t * const written) F_attribute_visibility_internal_d; + extern f_status_t private_f_file_write_until(const f_file_t file, const f_string_static_t buffer, const f_number_unsigned_t total, f_number_unsigned_t * const written) F_attribute_visibility_internal_d; #endif // !defined(_di_f_file_write_) || !defined(_di_f_file_write_block_) || !defined(_di_f_file_write_until) || !defined(_di_f_file_write_range) #ifdef __cplusplus diff --git a/level_0/f_file/tests/unit/c/test-file-mode_to_mode.c b/level_0/f_file/tests/unit/c/test-file-mode_to_mode.c index 2804400..46ece8b 100644 --- a/level_0/f_file/tests/unit/c/test-file-mode_to_mode.c +++ b/level_0/f_file/tests/unit/c/test-file-mode_to_mode.c @@ -80,7 +80,7 @@ void test__f_file_mode_to_mode__works(void **state) { F_file_mode_all_wx_d, }; - for (f_array_length_t i = 0; i < 28; ++i) { + for (f_number_unsigned_t i = 0; i < 28; ++i) { mode_t mode = 0; diff --git a/level_0/f_file/tests/unit/c/test-file-stream_write.c b/level_0/f_file/tests/unit/c/test-file-stream_write.c index df11499..6394e1c 100644 --- a/level_0/f_file/tests/unit/c/test-file-stream_write.c +++ b/level_0/f_file/tests/unit/c/test-file-stream_write.c @@ -46,7 +46,7 @@ void test__f_file_stream_write__returns_data_not(void **state) { } { - f_array_length_t written = 1; + f_number_unsigned_t written = 1; const f_status_t status = f_file_stream_write(file, f_string_empty_s, &written); diff --git a/level_0/f_file/tests/unit/c/test-file-stream_write_block.c b/level_0/f_file/tests/unit/c/test-file-stream_write_block.c index 9d1a110..da7c9ba 100644 --- a/level_0/f_file/tests/unit/c/test-file-stream_write_block.c +++ b/level_0/f_file/tests/unit/c/test-file-stream_write_block.c @@ -47,7 +47,7 @@ void test__f_file_stream_write_block__returns_data_not(void **state) { } { - f_array_length_t written = 1; + f_number_unsigned_t written = 1; const f_status_t status = f_file_stream_write_block(file, f_string_empty_s, &written); @@ -61,7 +61,7 @@ void test__f_file_stream_write_block__works(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); { - f_array_length_t written = 0; + f_number_unsigned_t written = 0; f_file_t file = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); file.size_write = 1; diff --git a/level_0/f_file/tests/unit/c/test-file-stream_write_range.c b/level_0/f_file/tests/unit/c/test-file-stream_write_range.c index 8ce7104..9b29a09 100644 --- a/level_0/f_file/tests/unit/c/test-file-stream_write_range.c +++ b/level_0/f_file/tests/unit/c/test-file-stream_write_range.c @@ -68,7 +68,7 @@ void test__f_file_stream_write_range__returns_data_not(void **state) { { const f_string_range_t range = f_string_range_t_initialize; - f_array_length_t written = 1; + f_number_unsigned_t written = 1; const f_status_t status = f_file_stream_write_range(file, f_string_empty_s, range, &written); @@ -80,7 +80,7 @@ void test__f_file_stream_write_range__returns_data_not(void **state) { const f_string_range_t range = f_string_range_t_initialize; const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - f_array_length_t written = 1; + f_number_unsigned_t written = 1; const f_status_t status = f_file_stream_write_range(file, test, range, &written); @@ -91,7 +91,7 @@ void test__f_file_stream_write_range__returns_data_not(void **state) { { const f_string_range_t range = macro_f_string_range_t_initialize_1(0, 0); - f_array_length_t written = 1; + f_number_unsigned_t written = 1; const f_status_t status = f_file_stream_write_range(file, f_string_empty_s, range, &written); diff --git a/level_0/f_file/tests/unit/c/test-file-stream_write_until.c b/level_0/f_file/tests/unit/c/test-file-stream_write_until.c index bdf0dfa..a0e106a 100644 --- a/level_0/f_file/tests/unit/c/test-file-stream_write_until.c +++ b/level_0/f_file/tests/unit/c/test-file-stream_write_until.c @@ -60,7 +60,7 @@ void test__f_file_stream_write_until__returns_data_not(void **state) { } { - f_array_length_t written = 1; + f_number_unsigned_t written = 1; const f_status_t status = f_file_stream_write_until(file, f_string_empty_s, 0, &written); @@ -69,7 +69,7 @@ void test__f_file_stream_write_until__returns_data_not(void **state) { } { - f_array_length_t written = 1; + f_number_unsigned_t written = 1; const f_status_t status = f_file_stream_write_until(file, test, 0, &written); @@ -78,7 +78,7 @@ void test__f_file_stream_write_until__returns_data_not(void **state) { } { - f_array_length_t written = 1; + f_number_unsigned_t written = 1; const f_status_t status = f_file_stream_write_until(file, f_string_empty_s, 1, &written); diff --git a/level_0/f_file/tests/unit/c/test-file-write.c b/level_0/f_file/tests/unit/c/test-file-write.c index 54fa441..f7d89ef 100644 --- a/level_0/f_file/tests/unit/c/test-file-write.c +++ b/level_0/f_file/tests/unit/c/test-file-write.c @@ -88,7 +88,7 @@ void test__f_file_write__returns_data_not(void **state) { } { - f_array_length_t written = 1; + f_number_unsigned_t written = 1; const f_status_t status = f_file_write(file, f_string_empty_s, &written); diff --git a/level_0/f_file/tests/unit/c/test-file-write_block.c b/level_0/f_file/tests/unit/c/test-file-write_block.c index cf6e6e7..d875c3e 100644 --- a/level_0/f_file/tests/unit/c/test-file-write_block.c +++ b/level_0/f_file/tests/unit/c/test-file-write_block.c @@ -72,7 +72,7 @@ void test__f_file_write_block__returns_data_not(void **state) { } { - f_array_length_t written = 1; + f_number_unsigned_t written = 1; const f_status_t status = f_file_write_block(file, f_string_empty_s, &written); diff --git a/level_0/f_file/tests/unit/c/test-file-write_range.c b/level_0/f_file/tests/unit/c/test-file-write_range.c index 6ac54c2..4869706 100644 --- a/level_0/f_file/tests/unit/c/test-file-write_range.c +++ b/level_0/f_file/tests/unit/c/test-file-write_range.c @@ -95,7 +95,7 @@ void test__f_file_write_range__returns_data_not(void **state) { { const f_string_range_t range = f_string_range_t_initialize; - f_array_length_t written = 1; + f_number_unsigned_t written = 1; const f_status_t status = f_file_write_range(file, f_string_empty_s, range, &written); @@ -107,7 +107,7 @@ void test__f_file_write_range__returns_data_not(void **state) { const f_string_range_t range = f_string_range_t_initialize; const f_string_static_t path = macro_f_string_static_t_initialize_1("test", 0, 4); - f_array_length_t written = 1; + f_number_unsigned_t written = 1; const f_status_t status = f_file_write_range(file, path, range, &written); @@ -118,7 +118,7 @@ void test__f_file_write_range__returns_data_not(void **state) { { const f_string_range_t range = macro_f_string_range_t_initialize_1(0, 0); - f_array_length_t written = 1; + f_number_unsigned_t written = 1; const f_status_t status = f_file_write_range(file, f_string_empty_s, range, &written); diff --git a/level_0/f_file/tests/unit/c/test-file-write_until.c b/level_0/f_file/tests/unit/c/test-file-write_until.c index ca723ef..4861115 100644 --- a/level_0/f_file/tests/unit/c/test-file-write_until.c +++ b/level_0/f_file/tests/unit/c/test-file-write_until.c @@ -86,7 +86,7 @@ void test__f_file_write_until__returns_data_not(void **state) { } { - f_array_length_t written = 1; + f_number_unsigned_t written = 1; const f_status_t status = f_file_write_until(file, f_string_empty_s, 0, &written); @@ -95,7 +95,7 @@ void test__f_file_write_until__returns_data_not(void **state) { } { - f_array_length_t written = 1; + f_number_unsigned_t written = 1; const f_status_t status = f_file_write_until(file, path, 0, &written); @@ -104,7 +104,7 @@ void test__f_file_write_until__returns_data_not(void **state) { } { - f_array_length_t written = 1; + f_number_unsigned_t written = 1; const f_status_t status = f_file_write_until(file, f_string_empty_s, 1, &written); diff --git a/level_0/f_fss/c/fss.c b/level_0/f_fss/c/fss.c index a937920..b6e31fc 100644 --- a/level_0/f_fss/c/fss.c +++ b/level_0/f_fss/c/fss.c @@ -23,7 +23,7 @@ extern "C" { return; } - for (f_array_length_t i = 0; i < delimits.used; ++i) { + for (f_number_unsigned_t i = 0; i < delimits.used; ++i) { if (delimits.array[i] < buffer->used) { buffer->string[delimits.array[i]] = f_fss_placeholder_s.string[0]; @@ -52,7 +52,7 @@ extern "C" { return; } - for (f_array_length_t i = 0; i < delimits.used; ++i) { + for (f_number_unsigned_t i = 0; i < delimits.used; ++i) { if (delimits.array[i] < buffer->used && delimits.array[i] >= range.start && delimits.array[i] <= range.stop) { buffer->string[delimits.array[i]] = f_fss_placeholder_s.string[0]; @@ -64,7 +64,7 @@ extern "C" { #endif // _di_f_fss_apply_delimit_range_ #ifndef _di_f_fss_count_lines_ - void f_fss_count_lines(const f_string_static_t buffer, const f_array_length_t before, f_array_length_t * const line, f_state_t * const state) { + void f_fss_count_lines(const f_string_static_t buffer, const f_number_unsigned_t before, f_number_unsigned_t * const line, f_state_t * const state) { #ifndef _di_level_0_parameter_checking_ if (!state) return; @@ -81,7 +81,7 @@ extern "C" { return; } - for (f_array_length_t i = 0; i < before && i < buffer.used; i += macro_f_utf_byte_width(buffer.string[i])) { + for (f_number_unsigned_t i = 0; i < before && i < buffer.used; i += macro_f_utf_byte_width(buffer.string[i])) { if (buffer.string[i] == f_fss_eol_s.string[0]) { ++(*line); @@ -93,7 +93,7 @@ extern "C" { #endif // _di_f_fss_count_lines_ #ifndef _di_f_fss_count_lines_range_ - void f_fss_count_lines_range(const f_string_static_t buffer, const f_string_range_t range, f_array_length_t * const line, f_state_t * const state) { + void f_fss_count_lines_range(const f_string_static_t buffer, const f_string_range_t range, f_number_unsigned_t * const line, f_state_t * const state) { #ifndef _di_level_0_parameter_checking_ if (!state) return; @@ -110,7 +110,7 @@ extern "C" { return; } - for (f_array_length_t i = range.start; i <= range.stop && i < buffer.used; i += macro_f_utf_byte_width(buffer.string[i])) { + for (f_number_unsigned_t i = range.start; i <= range.stop && i < buffer.used; i += macro_f_utf_byte_width(buffer.string[i])) { if (buffer.string[i] == f_fss_eol_s.string[0]) { ++(*line); @@ -165,7 +165,7 @@ extern "C" { return F_false; } - f_array_length_t width_max = (range.stop - range.start) + 1; + f_number_unsigned_t width_max = (range.stop - range.start) + 1; if (width_max > buffer.used - range.start) { width_max = buffer.used - range.start; @@ -192,7 +192,7 @@ extern "C" { return F_false; } - f_array_length_t width_max = (range.stop - range.start) + 1; + f_number_unsigned_t width_max = (range.stop - range.start) + 1; if (width_max > buffer.used - range.start) { width_max = buffer.used - range.start; @@ -219,7 +219,7 @@ extern "C" { return F_false; } - f_array_length_t width_max = (range.stop - range.start) + 1; + f_number_unsigned_t width_max = (range.stop - range.start) + 1; if (width_max > buffer.used - range.start) { width_max = buffer.used - range.start; @@ -258,7 +258,7 @@ extern "C" { return F_false; } - f_array_length_t width_max = (range.stop - range.start) + 1; + f_number_unsigned_t width_max = (range.stop - range.start) + 1; if (width_max > buffer.used - range.start) { width_max = buffer.used - range.start; @@ -370,7 +370,7 @@ extern "C" { } uint8_t width = 0; - f_array_length_t width_max = (range->stop - range->start) + 1; + f_number_unsigned_t width_max = (range->stop - range->start) + 1; if (width_max > buffer.used - range->start) { width_max = buffer.used - range->start; diff --git a/level_0/f_fss/c/fss.h b/level_0/f_fss/c/fss.h index c514dae..18424a4 100644 --- a/level_0/f_fss/c/fss.h +++ b/level_0/f_fss/c/fss.h @@ -105,7 +105,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_count_lines_ - extern void f_fss_count_lines(const f_string_static_t buffer, const f_array_length_t before, f_array_length_t * const line, f_state_t * const state); + extern void f_fss_count_lines(const f_string_static_t buffer, const f_number_unsigned_t before, f_number_unsigned_t * const line, f_state_t * const state); #endif // _di_f_fss_count_lines_ /** @@ -133,7 +133,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_count_lines_range_ - extern void f_fss_count_lines_range(const f_string_static_t buffer, const f_string_range_t range, f_array_length_t * const line, f_state_t * const state); + extern void f_fss_count_lines_range(const f_string_static_t buffer, const f_string_range_t range, f_number_unsigned_t * const line, f_state_t * const state); #endif // _di_f_fss_count_lines_range_ /** diff --git a/level_0/f_fss/c/fss/delimit.h b/level_0/f_fss/c/fss/delimit.h index 5e6e964..455214f 100644 --- a/level_0/f_fss/c/fss/delimit.h +++ b/level_0/f_fss/c/fss/delimit.h @@ -20,11 +20,11 @@ extern "C" { * Designate an fss delimit location. */ #ifndef _di_f_fss_delimit_t_ - typedef f_array_length_t f_fss_delimit_t; + typedef f_number_unsigned_t f_fss_delimit_t; - #define f_fss_delimit_t_initialize f_array_length_t_initialize + #define f_fss_delimit_t_initialize f_number_unsigned_t_initialize - #define macro_f_fss_delimit_t_initialize_1(delimit) macro_f_array_length_t_initialize_1(delimit) + #define macro_f_fss_delimit_t_initialize_1(delimit) delimit #endif // _di_f_fss_delimit_t_ /** @@ -35,25 +35,25 @@ extern "C" { * used: Total number of allocated spaces used. */ #ifndef _di_f_fss_delimits_t_ - typedef f_array_lengths_t f_fss_delimits_t; + typedef f_number_unsigneds_t f_fss_delimits_t; - #define f_fss_delimits_t_initialize f_array_lengths_t_initialize + #define f_fss_delimits_t_initialize f_number_unsigneds_t_initialize - #define macro_f_fss_delimits_t_initialize_1(array, size, used) macro_f_array_lengths_t_initialize_1(array, size, used) - #define macro_f_fss_delimits_t_initialize_2(array, length) macro_f_array_lengths_t_initialize_2(array, length) + #define macro_f_fss_delimits_t_initialize_1(array, size, used) macro_f_number_unsigneds_t_initialize_1(array, size, used) + #define macro_f_fss_delimits_t_initialize_2(array, length) macro_f_number_unsigneds_t_initialize_2(array, length) - #define macro_f_fss_delimits_t_clear(delimits) macro_f_array_lengths_t_clear(delimits) + #define macro_f_fss_delimits_t_clear(delimits) macro_f_number_unsigneds_t_clear(delimits) - #define macro_f_fss_delimits_t_resize(status, delimits, length) macro_f_array_lengths_t_resize(status, delimits, length) - #define macro_f_fss_delimits_t_adjust(status, delimits, length) macro_f_array_lengths_t_adjust(status, delimits, length) + #define macro_f_fss_delimits_t_resize(status, delimits, length) macro_f_number_unsigneds_t_resize(status, delimits, length) + #define macro_f_fss_delimits_t_adjust(status, delimits, length) macro_f_number_unsigneds_t_adjust(status, delimits, length) - #define macro_f_fss_delimits_t_delete_simple(delimits) macro_f_array_lengths_t_delete_simple(delimits) - #define macro_f_fss_delimits_t_destroy_simple(delimits) macro_f_array_lengths_t_destroy_simple(delimits) + #define macro_f_fss_delimits_t_delete_simple(delimits) macro_f_number_unsigneds_t_delete_simple(delimits) + #define macro_f_fss_delimits_t_destroy_simple(delimits) macro_f_number_unsigneds_t_destroy_simple(delimits) - #define macro_f_fss_delimits_t_increase(status, step, delimits) macro_f_array_lengths_t_increase(status, step, delimits) - #define macro_f_fss_delimits_t_increase_by(status, delimits, amount) macro_f_array_lengths_t_increase_by(status, delimits, amount) - #define macro_f_fss_delimits_t_decrease_by(status, delimits, amount) macro_f_array_lengths_t_decrease_by(status, delimits, amount) - #define macro_f_fss_delimits_t_decimate_by(status, delimits, amount) macro_f_array_lengths_t_decimate_by(status, delimits, amount) + #define macro_f_fss_delimits_t_increase(status, step, delimits) macro_f_number_unsigneds_t_increase(status, step, delimits) + #define macro_f_fss_delimits_t_increase_by(status, delimits, amount) macro_f_number_unsigneds_t_increase_by(status, delimits, amount) + #define macro_f_fss_delimits_t_decrease_by(status, delimits, amount) macro_f_number_unsigneds_t_decrease_by(status, delimits, amount) + #define macro_f_fss_delimits_t_decimate_by(status, delimits, amount) macro_f_number_unsigneds_t_decimate_by(status, delimits, amount) #endif // _di_f_fss_delimits_t_ /** @@ -64,25 +64,25 @@ extern "C" { * used: Total number of allocated spaces used. */ #ifndef _di_f_fss_delimitss_t_ - typedef f_array_lengthss_t f_fss_delimitss_t; + typedef f_number_unsignedss_t f_fss_delimitss_t; - #define f_fss_delimitss_t_initialize f_array_lengthss_t_initialize + #define f_fss_delimitss_t_initialize f_number_unsignedss_t_initialize - #define macro_f_fss_delimitss_t_initialize_1(array, size, used) macro_f_array_lengthss_t_initialize_1(array, size, used) - #define macro_f_fss_delimitss_t_initialize_2(array, length) macro_f_array_lengthss_t_initialize_2(array, length) + #define macro_f_fss_delimitss_t_initialize_1(array, size, used) macro_f_number_unsignedss_t_initialize_1(array, size, used) + #define macro_f_fss_delimitss_t_initialize_2(array, length) macro_f_number_unsignedss_t_initialize_2(array, length) - #define macro_f_fss_delimitss_t_clear(delimitss) macro_f_array_lengthss_t_clear(delimitss) + #define macro_f_fss_delimitss_t_clear(delimitss) macro_f_number_unsignedss_t_clear(delimitss) - #define macro_f_fss_delimitss_t_resize(status, delimitss, length) macro_f_array_lengthss_t_resize(status, delimitss, length) - #define macro_f_fss_delimitss_t_adjust(status, delimitss, length) macro_f_array_lengthss_t_adjust(status, delimitss, length) + #define macro_f_fss_delimitss_t_resize(status, delimitss, length) macro_f_number_unsignedss_t_resize(status, delimitss, length) + #define macro_f_fss_delimitss_t_adjust(status, delimitss, length) macro_f_number_unsignedss_t_adjust(status, delimitss, length) - #define macro_f_fss_delimitss_t_delete_simple(delimitss) macro_f_array_lengthss_t_delete_simple(delimitss) - #define macro_f_fss_delimitss_t_destroy_simple(delimitss) macro_f_array_lengthss_t_destroy_simple(delimitss) + #define macro_f_fss_delimitss_t_delete_simple(delimitss) macro_f_number_unsignedss_t_delete_simple(delimitss) + #define macro_f_fss_delimitss_t_destroy_simple(delimitss) macro_f_number_unsignedss_t_destroy_simple(delimitss) - #define macro_f_fss_delimitss_t_increase(status, step, delimitss) macro_f_array_lengthss_t_increase(status, step, delimitss) - #define macro_f_fss_delimitss_t_increase_by(status, delimitss, amount) macro_f_array_lengthss_t_increase_by(status, delimitss, amount) - #define macro_f_fss_delimitss_t_decrease_by(status, delimitss, amount) macro_f_array_lengthss_t_decrease_by(status, delimitss, amount) - #define macro_f_fss_delimitss_t_decimate_by(status, delimitss, amount) macro_f_array_lengthss_t_decimate_by(status, delimitss, amount) + #define macro_f_fss_delimitss_t_increase(status, step, delimitss) macro_f_number_unsignedss_t_increase(status, step, delimitss) + #define macro_f_fss_delimitss_t_increase_by(status, delimitss, amount) macro_f_number_unsignedss_t_increase_by(status, delimitss, amount) + #define macro_f_fss_delimitss_t_decrease_by(status, delimitss, amount) macro_f_number_unsignedss_t_decrease_by(status, delimitss, amount) + #define macro_f_fss_delimitss_t_decimate_by(status, delimitss, amount) macro_f_number_unsignedss_t_decimate_by(status, delimitss, amount) #endif // _di_f_fss_delimitss_t_ #ifdef __cplusplus diff --git a/level_0/f_fss/c/fss/named.c b/level_0/f_fss/c/fss/named.c index 27dd66d..e13eee9 100644 --- a/level_0/f_fss/c/fss/named.c +++ b/level_0/f_fss/c/fss/named.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_f_fss_named_adjust_ - f_status_t f_fss_named_adjust(const f_array_length_t length, f_fss_named_t * const named) { + f_status_t f_fss_named_adjust(const f_number_unsigned_t length, f_fss_named_t * const named) { #ifndef _di_level_0_parameter_checking_ if (!named) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -16,7 +16,7 @@ extern "C" { #endif // _di_f_fss_named_adjust_ #ifndef _di_f_fss_named_decimate_by_ - f_status_t f_fss_named_decimate_by(const f_array_length_t amount, f_fss_named_t * const named) { + f_status_t f_fss_named_decimate_by(const f_number_unsigned_t amount, f_fss_named_t * const named) { #ifndef _di_level_0_parameter_checking_ if (!named) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -32,7 +32,7 @@ extern "C" { #endif // _di_f_fss_named_decimate_by_ #ifndef _di_f_fss_named_decrease_by_ - f_status_t f_fss_named_decrease_by(const f_array_length_t amount, f_fss_named_t * const named) { + f_status_t f_fss_named_decrease_by(const f_number_unsigned_t amount, f_fss_named_t * const named) { #ifndef _di_level_0_parameter_checking_ if (!named) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -48,20 +48,20 @@ extern "C" { #endif // _di_f_fss_named_decrease_by_ #ifndef _di_f_fss_named_increase_ - f_status_t f_fss_named_increase(const f_array_length_t step, f_fss_named_t * const named) { + f_status_t f_fss_named_increase(const f_number_unsigned_t step, f_fss_named_t * const named) { #ifndef _di_level_0_parameter_checking_ if (!named) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && named->objects.used + 1 > named->objects.size) { - f_array_length_t size = named->objects.used + step; + f_number_unsigned_t size = named->objects.used + step; - if (size > F_array_length_t_size_d) { - if (named->objects.used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (named->objects.used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_fss_named_resize(size, named); @@ -72,7 +72,7 @@ extern "C" { #endif // _di_f_fss_named_increase_ #ifndef _di_f_fss_named_increase_by_ - f_status_t f_fss_named_increase_by(const f_array_length_t amount, f_fss_named_t * const named) { + f_status_t f_fss_named_increase_by(const f_number_unsigned_t amount, f_fss_named_t * const named) { #ifndef _di_level_0_parameter_checking_ if (!named) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -80,7 +80,7 @@ extern "C" { if (!amount) return F_data_not; if (named->objects.used + amount > named->objects.size) { - if (named->objects.used + amount > F_array_length_t_size_d) { + if (named->objects.used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -92,7 +92,7 @@ extern "C" { #endif // _di_f_fss_named_increase_by_ #ifndef _di_f_fss_named_resize_ - f_status_t f_fss_named_resize(const f_array_length_t length, f_fss_named_t * const named) { + f_status_t f_fss_named_resize(const f_number_unsigned_t length, f_fss_named_t * const named) { #ifndef _di_level_0_parameter_checking_ if (!named) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -102,7 +102,7 @@ extern "C" { #endif // _di_f_fss_named_resize_ #ifndef _di_f_fss_nameds_adjust_ - f_status_t f_fss_nameds_adjust(const f_array_length_t length, f_fss_nameds_t * const nameds) { + f_status_t f_fss_nameds_adjust(const f_number_unsigned_t length, f_fss_nameds_t * const nameds) { #ifndef _di_level_0_parameter_checking_ if (!nameds) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -112,7 +112,7 @@ extern "C" { #endif // _di_f_fss_nameds_adjust_ #ifndef _di_f_fss_nameds_decimate_by_ - f_status_t f_fss_nameds_decimate_by(const f_array_length_t amount, f_fss_nameds_t * const nameds) { + f_status_t f_fss_nameds_decimate_by(const f_number_unsigned_t amount, f_fss_nameds_t * const nameds) { #ifndef _di_level_0_parameter_checking_ if (!nameds) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -128,7 +128,7 @@ extern "C" { #endif // _di_f_fss_nameds_decimate_by_ #ifndef _di_f_fss_nameds_decrease_by_ - f_status_t f_fss_nameds_decrease_by(const f_array_length_t amount, f_fss_nameds_t * const nameds) { + f_status_t f_fss_nameds_decrease_by(const f_number_unsigned_t amount, f_fss_nameds_t * const nameds) { #ifndef _di_level_0_parameter_checking_ if (!nameds) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -144,20 +144,20 @@ extern "C" { #endif // _di_f_fss_nameds_decrease_by_ #ifndef _di_f_fss_nameds_increase_ - f_status_t f_fss_nameds_increase(const f_array_length_t step, f_fss_nameds_t * const nameds) { + f_status_t f_fss_nameds_increase(const f_number_unsigned_t step, f_fss_nameds_t * const nameds) { #ifndef _di_level_0_parameter_checking_ if (!nameds) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && nameds->used + 1 > nameds->size) { - f_array_length_t size = nameds->used + step; + f_number_unsigned_t size = nameds->used + step; - if (size > F_array_length_t_size_d) { - if (nameds->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (nameds->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_fss_nameds_resize(size, nameds); @@ -168,7 +168,7 @@ extern "C" { #endif // _di_f_fss_nameds_increase_ #ifndef _di_f_fss_nameds_increase_by_ - f_status_t f_fss_nameds_increase_by(const f_array_length_t amount, f_fss_nameds_t * const nameds) { + f_status_t f_fss_nameds_increase_by(const f_number_unsigned_t amount, f_fss_nameds_t * const nameds) { #ifndef _di_level_0_parameter_checking_ if (!nameds) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -176,7 +176,7 @@ extern "C" { if (!amount) return F_data_not; if (nameds->used + amount > nameds->size) { - if (nameds->used + amount > F_array_length_t_size_d) { + if (nameds->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -188,7 +188,7 @@ extern "C" { #endif // _di_f_fss_nameds_increase_by_ #ifndef _di_f_fss_nameds_resize_ - f_status_t f_fss_nameds_resize(const f_array_length_t length, f_fss_nameds_t * const nameds) { + f_status_t f_fss_nameds_resize(const f_number_unsigned_t length, f_fss_nameds_t * const nameds) { #ifndef _di_level_0_parameter_checking_ if (!nameds) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_fss/c/fss/named.h b/level_0/f_fss/c/fss/named.h index dc2440e..8dbcb91 100644 --- a/level_0/f_fss/c/fss/named.h +++ b/level_0/f_fss/c/fss/named.h @@ -38,7 +38,7 @@ extern "C" { #define f_fss_named_t_initialize { f_fss_object_t_initialize, f_fss_objects_t_initialize, f_fss_contents_t_initialize, f_uint8ss_t_initialize } - #define macro_f_fss_named_t_initialize_1(name, objects, contents, quotess) macro_f_array_lengths_t_initialize_1(name, objects, contents, quotess) + #define macro_f_fss_named_t_initialize_1(name, objects, contents, quotess) macro_f_number_unsigneds_t_initialize_1(name, objects, contents, quotess) #define macro_f_fss_named_t_clear(named) \ macro_f_fss_object_t_clear(named.name) \ @@ -69,8 +69,8 @@ extern "C" { typedef struct { f_fss_named_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_fss_nameds_t; #define f_fss_nameds_t_initialize { 0, 0, 0 } @@ -107,7 +107,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_named_adjust_ - extern f_status_t f_fss_named_adjust(const f_array_length_t length, f_fss_named_t * const named); + extern f_status_t f_fss_named_adjust(const f_number_unsigned_t length, f_fss_named_t * const named); #endif // _di_f_fss_named_adjust_ /** @@ -130,7 +130,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_named_decimate_by_ - extern f_status_t f_fss_named_decimate_by(const f_array_length_t amount, f_fss_named_t * const named); + extern f_status_t f_fss_named_decimate_by(const f_number_unsigned_t amount, f_fss_named_t * const named); #endif // _di_f_fss_named_decimate_by_ /** @@ -153,13 +153,13 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_named_decrease_by_ - extern f_status_t f_fss_named_decrease_by(const f_array_length_t amount, f_fss_named_t * const named); + extern f_status_t f_fss_named_decrease_by(const f_number_unsigned_t amount, f_fss_named_t * const named); #endif // _di_f_fss_named_decrease_by_ /** * Increase the size of all parts of the named 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -177,14 +177,14 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_named_increase_ - extern f_status_t f_fss_named_increase(const f_array_length_t step, f_fss_named_t * const named); + extern f_status_t f_fss_named_increase(const f_number_unsigned_t step, f_fss_named_t * const named); #endif // _di_f_fss_named_increase_ /** * Resize all parts of the named 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -201,7 +201,7 @@ extern "C" { * F_array_too_large (with error bit) if the new array length is too large. */ #ifndef _di_f_fss_named_increase_by_ - extern f_status_t f_fss_named_increase_by(const f_array_length_t amount, f_fss_named_t * const named); + extern f_status_t f_fss_named_increase_by(const f_number_unsigned_t amount, f_fss_named_t * const named); #endif // _di_f_fss_named_increase_by_ /** @@ -219,7 +219,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_named_resize_ - extern f_status_t f_fss_named_resize(const f_array_length_t length, f_fss_named_t * const named); + extern f_status_t f_fss_named_resize(const f_number_unsigned_t length, f_fss_named_t * const named); #endif // _di_f_fss_named_resize_ /** @@ -237,7 +237,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_nameds_adjust_ - extern f_status_t f_fss_nameds_adjust(const f_array_length_t length, f_fss_nameds_t * const nameds); + extern f_status_t f_fss_nameds_adjust(const f_number_unsigned_t length, f_fss_nameds_t * const nameds); #endif // _di_f_fss_nameds_adjust_ /** @@ -259,7 +259,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_nameds_decimate_by_ - extern f_status_t f_fss_nameds_decimate_by(const f_array_length_t amount, f_fss_nameds_t * const nameds); + extern f_status_t f_fss_nameds_decimate_by(const f_number_unsigned_t amount, f_fss_nameds_t * const nameds); #endif // _di_f_fss_nameds_decimate_by_ /** @@ -281,13 +281,13 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_nameds_decrease_by_ - extern f_status_t f_fss_nameds_decrease_by(const f_array_length_t amount, f_fss_nameds_t * const nameds); + extern f_status_t f_fss_nameds_decrease_by(const f_number_unsigned_t amount, f_fss_nameds_t * const nameds); #endif // _di_f_fss_nameds_decrease_by_ /** * Increase the size of the nameds 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -305,14 +305,14 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_nameds_increase_ - extern f_status_t f_fss_nameds_increase(const f_array_length_t step, f_fss_nameds_t * const nameds); + extern f_status_t f_fss_nameds_increase(const f_number_unsigned_t step, f_fss_nameds_t * const nameds); #endif // _di_f_fss_nameds_increase_ /** * Resize the nameds 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -329,7 +329,7 @@ extern "C" { * F_array_too_large (with error bit) if the new array length is too large. */ #ifndef _di_f_fss_nameds_increase_by_ - extern f_status_t f_fss_nameds_increase_by(const f_array_length_t amount, f_fss_nameds_t * const nameds); + extern f_status_t f_fss_nameds_increase_by(const f_number_unsigned_t amount, f_fss_nameds_t * const nameds); #endif // _di_f_fss_nameds_increase_by_ /** @@ -347,7 +347,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_nameds_resize_ - extern f_status_t f_fss_nameds_resize(const f_array_length_t length, f_fss_nameds_t * const nameds); + extern f_status_t f_fss_nameds_resize(const f_number_unsigned_t length, f_fss_nameds_t * const nameds); #endif // _di_f_fss_nameds_resize_ #ifdef __cplusplus diff --git a/level_0/f_fss/c/fss/nest.c b/level_0/f_fss/c/fss/nest.c index 887f3b3..eebc1d9 100644 --- a/level_0/f_fss/c/fss/nest.c +++ b/level_0/f_fss/c/fss/nest.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_f_fss_items_adjust_ - f_status_t f_fss_items_adjust(const f_array_length_t length, f_fss_items_t * const items) { + f_status_t f_fss_items_adjust(const f_number_unsigned_t length, f_fss_items_t * const items) { #ifndef _di_level_0_parameter_checking_ if (!items) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -16,7 +16,7 @@ extern "C" { #endif // _di_f_fss_items_adjust_ #ifndef _di_f_fss_items_decimate_by_ - f_status_t f_fss_items_decimate_by(const f_array_length_t amount, f_fss_items_t * const items) { + f_status_t f_fss_items_decimate_by(const f_number_unsigned_t amount, f_fss_items_t * const items) { #ifndef _di_level_0_parameter_checking_ if (!items) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -32,7 +32,7 @@ extern "C" { #endif // _di_f_fss_items_decimate_by_ #ifndef _di_f_fss_items_decrease_by_ - f_status_t f_fss_items_decrease_by(const f_array_length_t amount, f_fss_items_t * const items) { + f_status_t f_fss_items_decrease_by(const f_number_unsigned_t amount, f_fss_items_t * const items) { #ifndef _di_level_0_parameter_checking_ if (!items) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -48,20 +48,20 @@ extern "C" { #endif // _di_f_fss_items_decrease_by_ #ifndef _di_f_fss_items_increase_ - f_status_t f_fss_items_increase(const f_array_length_t step, f_fss_items_t * const items) { + f_status_t f_fss_items_increase(const f_number_unsigned_t step, f_fss_items_t * const items) { #ifndef _di_level_0_parameter_checking_ if (!items) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && items->used + 1 > items->size) { - f_array_length_t size = items->used + step; + f_number_unsigned_t size = items->used + step; - if (size > F_array_length_t_size_d) { - if (items->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (items->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_fss_items_resize(size, items); @@ -72,7 +72,7 @@ extern "C" { #endif // _di_f_fss_items_increase_ #ifndef _di_f_fss_items_increase_by_ - f_status_t f_fss_items_increase_by(const f_array_length_t amount, f_fss_items_t * const items) { + f_status_t f_fss_items_increase_by(const f_number_unsigned_t amount, f_fss_items_t * const items) { #ifndef _di_level_0_parameter_checking_ if (!items) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -80,7 +80,7 @@ extern "C" { if (!amount) return F_data_not; if (items->used + amount > items->size) { - if (items->used + amount > F_array_length_t_size_d) { + if (items->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -92,7 +92,7 @@ extern "C" { #endif // _di_f_fss_items_increase_by_ #ifndef _di_f_fss_items_resize_ - f_status_t f_fss_items_resize(const f_array_length_t length, f_fss_items_t * const items) { + f_status_t f_fss_items_resize(const f_number_unsigned_t length, f_fss_items_t * const items) { #ifndef _di_level_0_parameter_checking_ if (!items) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -102,7 +102,7 @@ extern "C" { #endif // _di_f_fss_items_resize_ #ifndef _di_f_fss_nest_adjust_ - f_status_t f_fss_nest_adjust(const f_array_length_t length, f_fss_nest_t * const nest) { + f_status_t f_fss_nest_adjust(const f_number_unsigned_t length, f_fss_nest_t * const nest) { #ifndef _di_level_0_parameter_checking_ if (!nest) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -112,7 +112,7 @@ extern "C" { #endif // _di_f_fss_nest_adjust_ #ifndef _di_f_fss_nest_decimate_by_ - f_status_t f_fss_nest_decimate_by(const f_array_length_t amount, f_fss_nest_t * const nest) { + f_status_t f_fss_nest_decimate_by(const f_number_unsigned_t amount, f_fss_nest_t * const nest) { #ifndef _di_level_0_parameter_checking_ if (!nest) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -128,7 +128,7 @@ extern "C" { #endif // _di_f_fss_nest_decimate_by_ #ifndef _di_f_fss_nest_decrease_by_ - f_status_t f_fss_nest_decrease_by(const f_array_length_t amount, f_fss_nest_t * const nest) { + f_status_t f_fss_nest_decrease_by(const f_number_unsigned_t amount, f_fss_nest_t * const nest) { #ifndef _di_level_0_parameter_checking_ if (!nest) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -144,20 +144,20 @@ extern "C" { #endif // _di_f_fss_nest_decrease_by_ #ifndef _di_f_fss_nest_increase_ - f_status_t f_fss_nest_increase(const f_array_length_t step, f_fss_nest_t * const nest) { + f_status_t f_fss_nest_increase(const f_number_unsigned_t step, f_fss_nest_t * const nest) { #ifndef _di_level_0_parameter_checking_ if (!nest) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && nest->used + 1 > nest->size) { - f_array_length_t size = nest->used + step; + f_number_unsigned_t size = nest->used + step; - if (size > F_array_length_t_size_d) { - if (nest->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (nest->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_fss_nest_resize(size, nest); @@ -168,7 +168,7 @@ extern "C" { #endif // _di_f_fss_nest_increase_ #ifndef _di_f_fss_nest_increase_by_ - f_status_t f_fss_nest_increase_by(const f_array_length_t amount, f_fss_nest_t * const nest) { + f_status_t f_fss_nest_increase_by(const f_number_unsigned_t amount, f_fss_nest_t * const nest) { #ifndef _di_level_0_parameter_checking_ if (!nest) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -176,7 +176,7 @@ extern "C" { if (!amount) return F_data_not; if (nest->used + amount > nest->size) { - if (nest->used + amount > F_array_length_t_size_d) { + if (nest->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -188,7 +188,7 @@ extern "C" { #endif // _di_f_fss_nest_increase_by_ #ifndef _di_f_fss_nest_resize_ - f_status_t f_fss_nest_resize(const f_array_length_t length, f_fss_nest_t * const nest) { + f_status_t f_fss_nest_resize(const f_number_unsigned_t length, f_fss_nest_t * const nest) { #ifndef _di_level_0_parameter_checking_ if (!nest) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -198,7 +198,7 @@ extern "C" { #endif // _di_f_fss_nest_resize_ #ifndef _di_f_fss_nests_adjust_ - f_status_t f_fss_nests_adjust(const f_array_length_t length, f_fss_nests_t * const nests) { + f_status_t f_fss_nests_adjust(const f_number_unsigned_t length, f_fss_nests_t * const nests) { #ifndef _di_level_0_parameter_checking_ if (!nests) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -208,7 +208,7 @@ extern "C" { #endif // _di_f_fss_nests_adjust_ #ifndef _di_f_fss_nests_decimate_by_ - f_status_t f_fss_nests_decimate_by(const f_array_length_t amount, f_fss_nests_t * const nests) { + f_status_t f_fss_nests_decimate_by(const f_number_unsigned_t amount, f_fss_nests_t * const nests) { #ifndef _di_level_0_parameter_checking_ if (!nests) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -224,7 +224,7 @@ extern "C" { #endif // _di_f_fss_nests_decimate_by_ #ifndef _di_f_fss_nests_decrease_by_ - f_status_t f_fss_nests_decrease_by(const f_array_length_t amount, f_fss_nests_t * const nests) { + f_status_t f_fss_nests_decrease_by(const f_number_unsigned_t amount, f_fss_nests_t * const nests) { #ifndef _di_level_0_parameter_checking_ if (!nests) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -240,20 +240,20 @@ extern "C" { #endif // _di_f_fss_nests_decrease_by_ #ifndef _di_f_fss_nests_increase_ - f_status_t f_fss_nests_increase(const f_array_length_t step, f_fss_nests_t * const nests) { + f_status_t f_fss_nests_increase(const f_number_unsigned_t step, f_fss_nests_t * const nests) { #ifndef _di_level_0_parameter_checking_ if (!nests) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && nests->used + 1 > nests->size) { - f_array_length_t size = nests->used + step; + f_number_unsigned_t size = nests->used + step; - if (size > F_array_length_t_size_d) { - if (nests->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (nests->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_fss_nests_resize(size, nests); @@ -264,7 +264,7 @@ extern "C" { #endif // _di_f_fss_nests_increase_ #ifndef _di_f_fss_nests_increase_by_ - f_status_t f_fss_nests_increase_by(const f_array_length_t amount, f_fss_nests_t * const nests) { + f_status_t f_fss_nests_increase_by(const f_number_unsigned_t amount, f_fss_nests_t * const nests) { #ifndef _di_level_0_parameter_checking_ if (!nests) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -272,7 +272,7 @@ extern "C" { if (!amount) return F_data_not; if (nests->used + amount > nests->size) { - if (nests->used + amount > F_array_length_t_size_d) { + if (nests->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -284,7 +284,7 @@ extern "C" { #endif // _di_f_fss_nests_increase_by_ #ifndef _di_f_fss_nests_resize_ - f_status_t f_fss_nests_resize(const f_array_length_t length, f_fss_nests_t * const nests) { + f_status_t f_fss_nests_resize(const f_number_unsigned_t length, f_fss_nests_t * const nests) { #ifndef _di_level_0_parameter_checking_ if (!nests) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_fss/c/fss/nest.h b/level_0/f_fss/c/fss/nest.h index e47e336..f401dc4 100644 --- a/level_0/f_fss/c/fss/nest.h +++ b/level_0/f_fss/c/fss/nest.h @@ -36,12 +36,12 @@ extern "C" { f_fss_object_t object; f_fss_content_t content; - f_array_length_t parent; + f_number_unsigned_t parent; } f_fss_item_t; #define f_fss_item_t_initialize { f_fss_object_t_initialize, f_fss_content_t_initialize, 0 } - #define macro_f_fss_item_t_initialize_1(object, content, parent) macro_f_array_lengths_t_initialize_1(object, content, parent) + #define macro_f_fss_item_t_initialize_1(object, content, parent) macro_f_number_unsigneds_t_initialize_1(object, content, parent) #define macro_f_fss_item_t_clear(item) \ macro_f_fss_object_t_clear(item.object); \ @@ -92,8 +92,8 @@ extern "C" { typedef struct { f_fss_item_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_fss_items_t; #define f_fss_items_t_initialize { 0, 0, 0 } @@ -130,8 +130,8 @@ extern "C" { typedef struct { f_fss_items_t *depth; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_fss_nest_t; #define f_fss_nest_t_initialize { 0, 0, 0 } @@ -164,8 +164,8 @@ extern "C" { typedef struct { f_fss_nest_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_fss_nests_t; #define f_fss_nests_t_initialize { 0, 0, 0 } @@ -202,7 +202,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_items_adjust_ - extern f_status_t f_fss_items_adjust(const f_array_length_t length, f_fss_items_t * const items); + extern f_status_t f_fss_items_adjust(const f_number_unsigned_t length, f_fss_items_t * const items); #endif // _di_f_fss_items_adjust_ /** @@ -225,7 +225,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_items_decimate_by_ - extern f_status_t f_fss_items_decimate_by(const f_array_length_t amount, f_fss_items_t * const items); + extern f_status_t f_fss_items_decimate_by(const f_number_unsigned_t amount, f_fss_items_t * const items); #endif // _di_f_fss_items_decimate_by_ /** @@ -247,13 +247,13 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_items_decrease_by_ - extern f_status_t f_fss_items_decrease_by(const f_array_length_t amount, f_fss_items_t * const items); + extern f_status_t f_fss_items_decrease_by(const f_number_unsigned_t amount, f_fss_items_t * const items); #endif // _di_f_fss_items_decrease_by_ /** * Increase the size of the items 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -271,14 +271,14 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_items_increase_ - extern f_status_t f_fss_items_increase(const f_array_length_t step, f_fss_items_t * const items); + extern f_status_t f_fss_items_increase(const f_number_unsigned_t step, f_fss_items_t * const items); #endif // _di_f_fss_items_increase_ /** * Resize the items 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -295,7 +295,7 @@ extern "C" { * F_array_too_large (with error bit) if the new array length is too large. */ #ifndef _di_f_fss_items_increase_by_ - extern f_status_t f_fss_items_increase_by(const f_array_length_t amount, f_fss_items_t * const items); + extern f_status_t f_fss_items_increase_by(const f_number_unsigned_t amount, f_fss_items_t * const items); #endif // _di_f_fss_items_increase_by_ /** @@ -313,7 +313,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_items_resize_ - extern f_status_t f_fss_items_resize(const f_array_length_t length, f_fss_items_t * const items); + extern f_status_t f_fss_items_resize(const f_number_unsigned_t length, f_fss_items_t * const items); #endif // _di_f_fss_items_resize_ /** @@ -331,7 +331,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_nest_adjust_ - extern f_status_t f_fss_nest_adjust(const f_array_length_t length, f_fss_nest_t * const nest); + extern f_status_t f_fss_nest_adjust(const f_number_unsigned_t length, f_fss_nest_t * const nest); #endif // _di_f_fss_nest_adjust_ /** @@ -354,7 +354,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_nest_decimate_by_ - extern f_status_t f_fss_nest_decimate_by(const f_array_length_t amount, f_fss_nest_t * const nest); + extern f_status_t f_fss_nest_decimate_by(const f_number_unsigned_t amount, f_fss_nest_t * const nest); #endif // _di_f_fss_nest_decimate_by_ /** @@ -376,13 +376,13 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_nest_decrease_by_ - extern f_status_t f_fss_nest_decrease_by(const f_array_length_t amount, f_fss_nest_t * const nest); + extern f_status_t f_fss_nest_decrease_by(const f_number_unsigned_t amount, f_fss_nest_t * const nest); #endif // _di_f_fss_nest_decrease_by_ /** * Increase the size of the nest 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -400,14 +400,14 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_nest_increase_ - extern f_status_t f_fss_nest_increase(const f_array_length_t step, f_fss_nest_t * const nest); + extern f_status_t f_fss_nest_increase(const f_number_unsigned_t step, f_fss_nest_t * const nest); #endif // _di_f_fss_nest_increase_ /** * Resize the nest 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -424,7 +424,7 @@ extern "C" { * F_array_too_large (with error bit) if the new array length is too large. */ #ifndef _di_f_fss_nest_increase_by_ - extern f_status_t f_fss_nest_increase_by(const f_array_length_t amount, f_fss_nest_t * const nest); + extern f_status_t f_fss_nest_increase_by(const f_number_unsigned_t amount, f_fss_nest_t * const nest); #endif // _di_f_fss_nest_increase_by_ /** @@ -442,7 +442,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_nest_resize_ - extern f_status_t f_fss_nest_resize(const f_array_length_t length, f_fss_nest_t * const nest); + extern f_status_t f_fss_nest_resize(const f_number_unsigned_t length, f_fss_nest_t * const nest); #endif // _di_f_fss_nest_resize_ /** @@ -460,7 +460,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_nests_adjust_ - extern f_status_t f_fss_nests_adjust(const f_array_length_t length, f_fss_nests_t * const nests); + extern f_status_t f_fss_nests_adjust(const f_number_unsigned_t length, f_fss_nests_t * const nests); #endif // _di_f_fss_nests_adjust_ /** @@ -482,7 +482,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_nests_decimate_by_ - extern f_status_t f_fss_nests_decimate_by(const f_array_length_t amount, f_fss_nests_t * const nests); + extern f_status_t f_fss_nests_decimate_by(const f_number_unsigned_t amount, f_fss_nests_t * const nests); #endif // _di_f_fss_nests_decimate_by_ /** @@ -504,13 +504,13 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_nests_decrease_by_ - extern f_status_t f_fss_nests_decrease_by(const f_array_length_t amount, f_fss_nests_t * const nests); + extern f_status_t f_fss_nests_decrease_by(const f_number_unsigned_t amount, f_fss_nests_t * const nests); #endif // _di_f_fss_nests_decrease_by_ /** * Increase the size of the nests 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -528,14 +528,14 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_nests_increase_ - extern f_status_t f_fss_nests_increase(const f_array_length_t step, f_fss_nests_t * const nests); + extern f_status_t f_fss_nests_increase(const f_number_unsigned_t step, f_fss_nests_t * const nests); #endif // _di_f_fss_nests_increase_ /** * Resize the nests 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -552,7 +552,7 @@ extern "C" { * F_array_too_large (with error bit) if the new array length is too large. */ #ifndef _di_f_fss_nests_increase_by_ - extern f_status_t f_fss_nests_increase_by(const f_array_length_t amount, f_fss_nests_t * const nests); + extern f_status_t f_fss_nests_increase_by(const f_number_unsigned_t amount, f_fss_nests_t * const nests); #endif // _di_f_fss_nests_increase_by_ /** @@ -570,7 +570,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_nests_resize_ - extern f_status_t f_fss_nests_resize(const f_array_length_t length, f_fss_nests_t * const nests); + extern f_status_t f_fss_nests_resize(const f_number_unsigned_t length, f_fss_nests_t * const nests); #endif // _di_f_fss_nests_resize_ #ifdef __cplusplus diff --git a/level_0/f_fss/c/fss/set.c b/level_0/f_fss/c/fss/set.c index e783cfe..2cdac5d 100644 --- a/level_0/f_fss/c/fss/set.c +++ b/level_0/f_fss/c/fss/set.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_f_fss_set_adjust_ - f_status_t f_fss_set_adjust(const f_array_length_t length, f_fss_set_t * const set) { + f_status_t f_fss_set_adjust(const f_number_unsigned_t length, f_fss_set_t * const set) { #ifndef _di_level_0_parameter_checking_ if (!set) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -16,7 +16,7 @@ extern "C" { #endif // _di_f_fss_set_adjust_ #ifndef _di_f_fss_set_decimate_by_ - f_status_t f_fss_set_decimate_by(const f_array_length_t amount, f_fss_set_t * const set) { + f_status_t f_fss_set_decimate_by(const f_number_unsigned_t amount, f_fss_set_t * const set) { #ifndef _di_level_0_parameter_checking_ if (!set) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -32,7 +32,7 @@ extern "C" { #endif // _di_f_fss_set_decimate_by_ #ifndef _di_f_fss_set_decrease_by_ - f_status_t f_fss_set_decrease_by(const f_array_length_t amount, f_fss_set_t * const set) { + f_status_t f_fss_set_decrease_by(const f_number_unsigned_t amount, f_fss_set_t * const set) { #ifndef _di_level_0_parameter_checking_ if (!set) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -48,20 +48,20 @@ extern "C" { #endif // _di_f_fss_set_decrease_by_ #ifndef _di_f_fss_set_increase_ - f_status_t f_fss_set_increase(const f_array_length_t step, f_fss_set_t * const set) { + f_status_t f_fss_set_increase(const f_number_unsigned_t step, f_fss_set_t * const set) { #ifndef _di_level_0_parameter_checking_ if (!set) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && set->objects.used + 1 > set->objects.size) { - f_array_length_t size = set->objects.used + step; + f_number_unsigned_t size = set->objects.used + step; - if (size > F_array_length_t_size_d) { - if (set->objects.used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (set->objects.used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_fss_set_resize(size, set); @@ -72,7 +72,7 @@ extern "C" { #endif // _di_f_fss_set_increase_ #ifndef _di_f_fss_set_increase_by_ - f_status_t f_fss_set_increase_by(const f_array_length_t amount, f_fss_set_t * const set) { + f_status_t f_fss_set_increase_by(const f_number_unsigned_t amount, f_fss_set_t * const set) { #ifndef _di_level_0_parameter_checking_ if (!set) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -80,7 +80,7 @@ extern "C" { if (!amount) return F_data_not; if (set->objects.used + amount > set->objects.size) { - if (set->objects.used + amount > F_array_length_t_size_d) { + if (set->objects.used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -92,7 +92,7 @@ extern "C" { #endif // _di_f_fss_set_increase_by_ #ifndef _di_f_fss_set_resize_ - f_status_t f_fss_set_resize(const f_array_length_t length, f_fss_set_t * const set) { + f_status_t f_fss_set_resize(const f_number_unsigned_t length, f_fss_set_t * const set) { #ifndef _di_level_0_parameter_checking_ if (!set) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -102,7 +102,7 @@ extern "C" { #endif // _di_f_fss_set_resize_ #ifndef _di_f_fss_set_quote_adjust_ - f_status_t f_fss_set_quote_adjust(const f_array_length_t length, f_fss_set_quote_t * const set_quote) { + f_status_t f_fss_set_quote_adjust(const f_number_unsigned_t length, f_fss_set_quote_t * const set_quote) { #ifndef _di_level_0_parameter_checking_ if (!set_quote) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -112,7 +112,7 @@ extern "C" { #endif // _di_f_fss_set_quote_adjust_ #ifndef _di_f_fss_set_quote_decimate_by_ - f_status_t f_fss_set_quote_decimate_by(const f_array_length_t amount, f_fss_set_quote_t * const set_quote) { + f_status_t f_fss_set_quote_decimate_by(const f_number_unsigned_t amount, f_fss_set_quote_t * const set_quote) { #ifndef _di_level_0_parameter_checking_ if (!set_quote) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -128,7 +128,7 @@ extern "C" { #endif // _di_f_fss_set_quote_decimate_by_ #ifndef _di_f_fss_set_quote_decrease_by_ - f_status_t f_fss_set_quote_decrease_by(const f_array_length_t amount, f_fss_set_quote_t * const set_quote) { + f_status_t f_fss_set_quote_decrease_by(const f_number_unsigned_t amount, f_fss_set_quote_t * const set_quote) { #ifndef _di_level_0_parameter_checking_ if (!set_quote) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -144,20 +144,20 @@ extern "C" { #endif // _di_f_fss_set_quote_decrease_by_ #ifndef _di_f_fss_set_quote_increase_ - f_status_t f_fss_set_quote_increase(const f_array_length_t step, f_fss_set_quote_t * const set_quote) { + f_status_t f_fss_set_quote_increase(const f_number_unsigned_t step, f_fss_set_quote_t * const set_quote) { #ifndef _di_level_0_parameter_checking_ if (!set_quote) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && set_quote->objects.used + 1 > set_quote->objects.size) { - f_array_length_t size = set_quote->objects.used + step; + f_number_unsigned_t size = set_quote->objects.used + step; - if (size > F_array_length_t_size_d) { - if (set_quote->objects.used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (set_quote->objects.used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_fss_set_quote_resize(size, set_quote); @@ -168,7 +168,7 @@ extern "C" { #endif // _di_f_fss_set_quote_increase_ #ifndef _di_f_fss_set_quote_increase_by_ - f_status_t f_fss_set_quote_increase_by(const f_array_length_t amount, f_fss_set_quote_t * const set_quote) { + f_status_t f_fss_set_quote_increase_by(const f_number_unsigned_t amount, f_fss_set_quote_t * const set_quote) { #ifndef _di_level_0_parameter_checking_ if (!set_quote) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -176,7 +176,7 @@ extern "C" { if (!amount) return F_data_not; if (set_quote->objects.used + amount > set_quote->objects.size) { - if (set_quote->objects.used + amount > F_array_length_t_size_d) { + if (set_quote->objects.used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -188,7 +188,7 @@ extern "C" { #endif // _di_f_fss_set_quote_increase_by_ #ifndef _di_f_fss_set_quote_resize_ - f_status_t f_fss_set_quote_resize(const f_array_length_t length, f_fss_set_quote_t * const set_quote) { + f_status_t f_fss_set_quote_resize(const f_number_unsigned_t length, f_fss_set_quote_t * const set_quote) { #ifndef _di_level_0_parameter_checking_ if (!set_quote) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -198,7 +198,7 @@ extern "C" { #endif // _di_f_fss_set_quote_resize_ #ifndef _di_f_fss_set_quotes_adjust_ - f_status_t f_fss_set_quotes_adjust(const f_array_length_t length, f_fss_set_quotes_t * const set_quotes) { + f_status_t f_fss_set_quotes_adjust(const f_number_unsigned_t length, f_fss_set_quotes_t * const set_quotes) { #ifndef _di_level_0_parameter_checking_ if (!set_quotes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -208,7 +208,7 @@ extern "C" { #endif // _di_f_fss_set_quotes_adjust_ #ifndef _di_f_fss_set_quotes_decimate_by_ - f_status_t f_fss_set_quotes_decimate_by(const f_array_length_t amount, f_fss_set_quotes_t * const set_quotes) { + f_status_t f_fss_set_quotes_decimate_by(const f_number_unsigned_t amount, f_fss_set_quotes_t * const set_quotes) { #ifndef _di_level_0_parameter_checking_ if (!set_quotes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -224,7 +224,7 @@ extern "C" { #endif // _di_f_fss_set_quotes_decimate_by_ #ifndef _di_f_fss_set_quotes_decrease_by_ - f_status_t f_fss_set_quotes_decrease_by(const f_array_length_t amount, f_fss_set_quotes_t * const set_quotes) { + f_status_t f_fss_set_quotes_decrease_by(const f_number_unsigned_t amount, f_fss_set_quotes_t * const set_quotes) { #ifndef _di_level_0_parameter_checking_ if (!set_quotes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -240,20 +240,20 @@ extern "C" { #endif // _di_f_fss_set_quotes_decrease_by_ #ifndef _di_f_fss_set_quotes_increase_ - f_status_t f_fss_set_quotes_increase(const f_array_length_t step, f_fss_set_quotes_t * const set_quotes) { + f_status_t f_fss_set_quotes_increase(const f_number_unsigned_t step, f_fss_set_quotes_t * const set_quotes) { #ifndef _di_level_0_parameter_checking_ if (!set_quotes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && set_quotes->used + 1 > set_quotes->size) { - f_array_length_t size = set_quotes->used + step; + f_number_unsigned_t size = set_quotes->used + step; - if (size > F_array_length_t_size_d) { - if (set_quotes->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (set_quotes->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_fss_set_quotes_resize(size, set_quotes); @@ -264,7 +264,7 @@ extern "C" { #endif // _di_f_fss_set_quotes_increase_ #ifndef _di_f_fss_set_quotes_increase_by_ - f_status_t f_fss_set_quotes_increase_by(const f_array_length_t amount, f_fss_set_quotes_t * const set_quotes) { + f_status_t f_fss_set_quotes_increase_by(const f_number_unsigned_t amount, f_fss_set_quotes_t * const set_quotes) { #ifndef _di_level_0_parameter_checking_ if (!set_quotes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -272,7 +272,7 @@ extern "C" { if (!amount) return F_data_not; if (set_quotes->used + amount > set_quotes->size) { - if (set_quotes->used + amount > F_array_length_t_size_d) { + if (set_quotes->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -284,7 +284,7 @@ extern "C" { #endif // _di_f_fss_set_quotes_increase_by_ #ifndef _di_f_fss_set_quotes_resize_ - f_status_t f_fss_set_quotes_resize(const f_array_length_t length, f_fss_set_quotes_t * const set_quotes) { + f_status_t f_fss_set_quotes_resize(const f_number_unsigned_t length, f_fss_set_quotes_t * const set_quotes) { #ifndef _di_level_0_parameter_checking_ if (!set_quotes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -294,7 +294,7 @@ extern "C" { #endif // _di_f_fss_set_quotes_resize_ #ifndef _di_f_fss_sets_adjust_ - f_status_t f_fss_sets_adjust(const f_array_length_t length, f_fss_sets_t *sets) { + f_status_t f_fss_sets_adjust(const f_number_unsigned_t length, f_fss_sets_t *sets) { #ifndef _di_level_0_parameter_checking_ if (!sets) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -304,7 +304,7 @@ extern "C" { #endif // _di_f_fss_sets_adjust_ #ifndef _di_f_fss_sets_decimate_by_ - f_status_t f_fss_sets_decimate_by(const f_array_length_t amount, f_fss_sets_t * const sets) { + f_status_t f_fss_sets_decimate_by(const f_number_unsigned_t amount, f_fss_sets_t * const sets) { #ifndef _di_level_0_parameter_checking_ if (!sets) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -320,7 +320,7 @@ extern "C" { #endif // _di_f_fss_sets_decimate_by_ #ifndef _di_f_fss_sets_decrease_by_ - f_status_t f_fss_sets_decrease_by(const f_array_length_t amount, f_fss_sets_t * const sets) { + f_status_t f_fss_sets_decrease_by(const f_number_unsigned_t amount, f_fss_sets_t * const sets) { #ifndef _di_level_0_parameter_checking_ if (!sets) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -336,20 +336,20 @@ extern "C" { #endif // _di_f_fss_sets_decrease_by_ #ifndef _di_f_fss_sets_increase_ - f_status_t f_fss_sets_increase(const f_array_length_t step, f_fss_sets_t * const sets) { + f_status_t f_fss_sets_increase(const f_number_unsigned_t step, f_fss_sets_t * const sets) { #ifndef _di_level_0_parameter_checking_ if (!sets) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && sets->used + 1 > sets->size) { - f_array_length_t size = sets->used + step; + f_number_unsigned_t size = sets->used + step; - if (size > F_array_length_t_size_d) { - if (sets->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (sets->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_fss_sets_resize(size, sets); @@ -360,7 +360,7 @@ extern "C" { #endif // _di_f_fss_sets_increase_ #ifndef _di_f_fss_sets_increase_by_ - f_status_t f_fss_sets_increase_by(const f_array_length_t amount, f_fss_sets_t * const sets) { + f_status_t f_fss_sets_increase_by(const f_number_unsigned_t amount, f_fss_sets_t * const sets) { #ifndef _di_level_0_parameter_checking_ if (!sets) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -368,7 +368,7 @@ extern "C" { if (!amount) return F_data_not; if (sets->used + amount > sets->size) { - if (sets->used + amount > F_array_length_t_size_d) { + if (sets->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -380,7 +380,7 @@ extern "C" { #endif // _di_f_fss_sets_increase_by_ #ifndef _di_f_fss_sets_resize_ - f_status_t f_fss_sets_resize(const f_array_length_t length, f_fss_sets_t * const sets) { + f_status_t f_fss_sets_resize(const f_number_unsigned_t length, f_fss_sets_t * const sets) { #ifndef _di_level_0_parameter_checking_ if (!sets) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_fss/c/fss/set.h b/level_0/f_fss/c/fss/set.h index e104980..17a5493 100644 --- a/level_0/f_fss/c/fss/set.h +++ b/level_0/f_fss/c/fss/set.h @@ -62,8 +62,8 @@ extern "C" { typedef struct { f_fss_set_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_fss_sets_t; #define f_fss_sets_t_initialize { 0, 0, 0 } @@ -138,8 +138,8 @@ extern "C" { typedef struct { f_fss_set_quote_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_fss_set_quotes_t; #define f_fss_set_quotes_t_initialize { 0, 0, 0 } @@ -176,7 +176,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_set_adjust_ - extern f_status_t f_fss_set_adjust(const f_array_length_t length, f_fss_set_t * const set); + extern f_status_t f_fss_set_adjust(const f_number_unsigned_t length, f_fss_set_t * const set); #endif // _di_f_fss_set_adjust_ /** @@ -199,7 +199,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_set_decimate_by_ - extern f_status_t f_fss_set_decimate_by(const f_array_length_t amount, f_fss_set_t * const set); + extern f_status_t f_fss_set_decimate_by(const f_number_unsigned_t amount, f_fss_set_t * const set); #endif // _di_f_fss_set_decimate_by_ /** @@ -221,13 +221,13 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_set_decrease_by_ - extern f_status_t f_fss_set_decrease_by(const f_array_length_t amount, f_fss_set_t * const set); + extern f_status_t f_fss_set_decrease_by(const f_number_unsigned_t amount, f_fss_set_t * const set); #endif // _di_f_fss_set_decrease_by_ /** * Increase the size of the 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -245,14 +245,14 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_set_increase_ - extern f_status_t f_fss_set_increase(const f_array_length_t step, f_fss_set_t * const set); + extern f_status_t f_fss_set_increase(const f_number_unsigned_t step, f_fss_set_t * const set); #endif // _di_f_fss_set_increase_ /** * Resize the 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -269,7 +269,7 @@ extern "C" { * F_array_too_large (with error bit) if the new array length is too large. */ #ifndef _di_f_fss_set_increase_by_ - extern f_status_t f_fss_set_increase_by(const f_array_length_t amount, f_fss_set_t * const set); + extern f_status_t f_fss_set_increase_by(const f_number_unsigned_t amount, f_fss_set_t * const set); #endif // _di_f_fss_set_increase_by_ /** @@ -287,7 +287,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_set_resize_ - extern f_status_t f_fss_set_resize(const f_array_length_t length, f_fss_set_t * const set); + extern f_status_t f_fss_set_resize(const f_number_unsigned_t length, f_fss_set_t * const set); #endif // _di_f_fss_set_resize_ /** @@ -305,7 +305,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_set_quote_adjust_ - extern f_status_t f_fss_set_quote_adjust(const f_array_length_t length, f_fss_set_quote_t * const set_quote); + extern f_status_t f_fss_set_quote_adjust(const f_number_unsigned_t length, f_fss_set_quote_t * const set_quote); #endif // _di_f_fss_set_quote_adjust_ /** @@ -328,7 +328,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_set_quote_decimate_by_ - extern f_status_t f_fss_set_quote_decimate_by(const f_array_length_t amount, f_fss_set_quote_t * const set_quote); + extern f_status_t f_fss_set_quote_decimate_by(const f_number_unsigned_t amount, f_fss_set_quote_t * const set_quote); #endif // _di_f_fss_set_quote_decimate_by_ /** @@ -350,13 +350,13 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_set_quote_decrease_by_ - extern f_status_t f_fss_set_quote_decrease_by(const f_array_length_t amount, f_fss_set_quote_t * const set_quote); + extern f_status_t f_fss_set_quote_decrease_by(const f_number_unsigned_t amount, f_fss_set_quote_t * const set_quote); #endif // _di_f_fss_set_quote_decrease_by_ /** * Increase the size of the set_quote array, but only if necessary. * - * If the given length is too large for the buffer, then attempt to set_quote max buffer size (F_array_length_t_size_d). + * If the given length is too large for the buffer, then attempt to set_quote max buffer size (F_number_t_size_unsigned_d). * If already set_quote to the maximum buffer size, then the resize will fail. * * @param step @@ -374,14 +374,14 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_set_quote_increase_ - extern f_status_t f_fss_set_quote_increase(const f_array_length_t step, f_fss_set_quote_t * const set_quote); + extern f_status_t f_fss_set_quote_increase(const f_number_unsigned_t step, f_fss_set_quote_t * const set_quote); #endif // _di_f_fss_set_quote_increase_ /** * Resize the set_quote 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_quote max buffer size (F_array_length_t_size_d). + * If the given length is too large for the buffer, then attempt to set_quote max buffer size (F_number_t_size_unsigned_d). * If already set_quote to the maximum buffer size, then the resize will fail. * * @param amount @@ -398,7 +398,7 @@ extern "C" { * F_array_too_large (with error bit) if the new array length is too large. */ #ifndef _di_f_fss_set_quote_increase_by_ - extern f_status_t f_fss_set_quote_increase_by(const f_array_length_t amount, f_fss_set_quote_t * const set_quote); + extern f_status_t f_fss_set_quote_increase_by(const f_number_unsigned_t amount, f_fss_set_quote_t * const set_quote); #endif // _di_f_fss_set_quote_increase_by_ /** @@ -416,7 +416,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_set_quote_resize_ - extern f_status_t f_fss_set_quote_resize(const f_array_length_t length, f_fss_set_quote_t * const set_quote); + extern f_status_t f_fss_set_quote_resize(const f_number_unsigned_t length, f_fss_set_quote_t * const set_quote); #endif // _di_f_fss_set_quote_resize_ /** @@ -434,7 +434,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_set_quotes_adjust_ - extern f_status_t f_fss_set_quotes_adjust(const f_array_length_t length, f_fss_set_quotes_t * const set_quotes); + extern f_status_t f_fss_set_quotes_adjust(const f_number_unsigned_t length, f_fss_set_quotes_t * const set_quotes); #endif // _di_f_fss_set_quotes_adjust_ /** @@ -457,7 +457,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_set_quotes_decimate_by_ - extern f_status_t f_fss_set_quotes_decimate_by(const f_array_length_t amount, f_fss_set_quotes_t * const set_quotes); + extern f_status_t f_fss_set_quotes_decimate_by(const f_number_unsigned_t amount, f_fss_set_quotes_t * const set_quotes); #endif // _di_f_fss_set_quotes_decimate_by_ /** @@ -479,13 +479,13 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_set_quotes_decrease_by_ - extern f_status_t f_fss_set_quotes_decrease_by(const f_array_length_t amount, f_fss_set_quotes_t * const set_quotes); + extern f_status_t f_fss_set_quotes_decrease_by(const f_number_unsigned_t amount, f_fss_set_quotes_t * const set_quotes); #endif // _di_f_fss_set_quotes_decrease_by_ /** * Increase the size of the set_quotes 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -503,14 +503,14 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_set_quotes_increase_ - extern f_status_t f_fss_set_quotes_increase(const f_array_length_t step, f_fss_set_quotes_t * const set_quotes); + extern f_status_t f_fss_set_quotes_increase(const f_number_unsigned_t step, f_fss_set_quotes_t * const set_quotes); #endif // _di_f_fss_set_quotes_increase_ /** * Resize the set_quotes 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -527,7 +527,7 @@ extern "C" { * F_array_too_large (with error bit) if the new array length is too large. */ #ifndef _di_f_fss_set_quotes_increase_by_ - extern f_status_t f_fss_set_quotes_increase_by(const f_array_length_t amount, f_fss_set_quotes_t * const set_quotes); + extern f_status_t f_fss_set_quotes_increase_by(const f_number_unsigned_t amount, f_fss_set_quotes_t * const set_quotes); #endif // _di_f_fss_set_quotes_increase_by_ /** @@ -545,7 +545,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_set_quotes_resize_ - extern f_status_t f_fss_set_quotes_resize(const f_array_length_t length, f_fss_set_quotes_t * const set_quotes); + extern f_status_t f_fss_set_quotes_resize(const f_number_unsigned_t length, f_fss_set_quotes_t * const set_quotes); #endif // _di_f_fss_set_quotes_resize_ /** @@ -563,7 +563,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_sets_adjust_ - extern f_status_t f_fss_sets_adjust(const f_array_length_t length, f_fss_sets_t * const sets); + extern f_status_t f_fss_sets_adjust(const f_number_unsigned_t length, f_fss_sets_t * const sets); #endif // _di_f_fss_sets_adjust_ /** @@ -586,7 +586,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_sets_decimate_by_ - extern f_status_t f_fss_sets_decimate_by(const f_array_length_t amount, f_fss_sets_t * const sets); + extern f_status_t f_fss_sets_decimate_by(const f_number_unsigned_t amount, f_fss_sets_t * const sets); #endif // _di_f_fss_sets_decimate_by_ /** @@ -608,13 +608,13 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_sets_decrease_by_ - extern f_status_t f_fss_sets_decrease_by(const f_array_length_t amount, f_fss_sets_t * const sets); + extern f_status_t f_fss_sets_decrease_by(const f_number_unsigned_t amount, f_fss_sets_t * const sets); #endif // _di_f_fss_sets_decrease_by_ /** * 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -632,14 +632,14 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_sets_increase_ - extern f_status_t f_fss_sets_increase(const f_array_length_t step, f_fss_sets_t * const sets); + extern f_status_t f_fss_sets_increase(const f_number_unsigned_t step, f_fss_sets_t * const sets); #endif // _di_f_fss_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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -656,7 +656,7 @@ extern "C" { * F_array_too_large (with error bit) if the new array length is too large. */ #ifndef _di_f_fss_sets_increase_by_ - extern f_status_t f_fss_sets_increase_by(const f_array_length_t amount, f_fss_sets_t * const sets); + extern f_status_t f_fss_sets_increase_by(const f_number_unsigned_t amount, f_fss_sets_t * const sets); #endif // _di_f_fss_sets_increase_by_ /** @@ -674,7 +674,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_sets_resize_ - extern f_status_t f_fss_sets_resize(const f_array_length_t length, f_fss_sets_t * const sets); + extern f_status_t f_fss_sets_resize(const f_number_unsigned_t length, f_fss_sets_t * const sets); #endif // _di_f_fss_sets_resize_ #ifdef __cplusplus diff --git a/level_0/f_fss/c/private-fss.c b/level_0/f_fss/c/private-fss.c index feb4929..71493b2 100644 --- a/level_0/f_fss/c/private-fss.c +++ b/level_0/f_fss/c/private-fss.c @@ -6,11 +6,11 @@ extern "C" { #endif #if !defined(_di_f_fss_items_adjust_) || !defined(_di_f_fss_items_decimate_by_) - f_status_t private_f_fss_items_adjust(const f_array_length_t length, f_fss_items_t * const items) { + f_status_t private_f_fss_items_adjust(const f_number_unsigned_t length, f_fss_items_t * const items) { f_status_t status = F_none; - for (f_array_length_t i = length; i < items->size; ++i) { + for (f_number_unsigned_t i = length; i < items->size; ++i) { status = f_string_ranges_adjust(0, &items->array[i].content); if (F_status_is_error(status)) return status; @@ -33,11 +33,11 @@ extern "C" { #endif // !defined(_di_f_fss_items_adjust_) || !defined(_di_f_fss_items_decimate_by_) #if !defined(_di_f_fss_items_decrease_by_) || !defined(_di_f_fss_items_increase_) || !defined(_di_f_fss_items_increase_by_) || !defined(_di_f_fss_items_resize_) - f_status_t private_f_fss_items_resize(const f_array_length_t length, f_fss_items_t * const items) { + f_status_t private_f_fss_items_resize(const f_number_unsigned_t length, f_fss_items_t * const items) { f_status_t status = F_none; - for (f_array_length_t i = length; i < items->size; ++i) { + for (f_number_unsigned_t i = length; i < items->size; ++i) { status = f_string_ranges_resize(0, &items->array[i].content); if (F_status_is_error(status)) return status; @@ -57,7 +57,7 @@ extern "C" { #endif // !defined(_di_f_fss_items_decrease_by_) || !defined(_di_f_fss_items_increase_) || !defined(_di_f_fss_items_increase_by_) || !defined(_di_f_fss_items_resize_) #if !defined(_di_f_fss_nameds_adjust_) || !defined(_di_f_fss_nameds_decimate_by_) - f_status_t private_f_fss_named_adjust(const f_array_length_t length, f_fss_named_t * const named) { + f_status_t private_f_fss_named_adjust(const f_number_unsigned_t length, f_fss_named_t * const named) { f_status_t status = F_none; @@ -75,7 +75,7 @@ extern "C" { #endif // !defined(_di_f_fss_nameds_adjust_) || !defined(_di_f_fss_nameds_decimate_by_) #if !defined(_di_f_fss_nameds_decrease_by_) || !defined(_di_f_fss_nameds_increase_) || !defined(_di_f_fss_nameds_increase_by_) || !defined(_di_f_fss_nameds_resize_) - f_status_t private_f_fss_named_resize(const f_array_length_t length, f_fss_named_t * const named) { + f_status_t private_f_fss_named_resize(const f_number_unsigned_t length, f_fss_named_t * const named) { f_status_t status = F_none; @@ -93,11 +93,11 @@ extern "C" { #endif // !defined(_di_f_fss_nameds_decrease_by_) || !defined(_di_f_fss_nameds_increase_) || !defined(_di_f_fss_nameds_increase_by_) || !defined(_di_f_fss_nameds_resize_) #if !defined(_di_f_fss_nameds_adjust_) || !defined(_di_f_fss_nameds_decimate_by_) - f_status_t private_f_fss_nameds_adjust(const f_array_length_t length, f_fss_nameds_t * const nameds) { + f_status_t private_f_fss_nameds_adjust(const f_number_unsigned_t length, f_fss_nameds_t * const nameds) { f_status_t status = F_none; - for (f_array_length_t i = length; i < nameds->size; ++i) { + for (f_number_unsigned_t i = length; i < nameds->size; ++i) { status = private_f_fss_named_adjust(0, &nameds->array[i]); if (F_status_is_error(status)) return status; @@ -120,11 +120,11 @@ extern "C" { #endif // !defined(_di_f_fss_nameds_adjust_) || !defined(_di_f_fss_nameds_decimate_by_) #if !defined(_di_f_fss_nameds_decrease_by_) || !defined(_di_f_fss_nameds_increase_) || !defined(_di_f_fss_nameds_increase_by_) || !defined(_di_f_fss_nameds_resize_) - f_status_t private_f_fss_nameds_resize(const f_array_length_t length, f_fss_nameds_t * const nameds) { + f_status_t private_f_fss_nameds_resize(const f_number_unsigned_t length, f_fss_nameds_t * const nameds) { f_status_t status = F_none; - for (f_array_length_t i = length; i < nameds->size; ++i) { + for (f_number_unsigned_t i = length; i < nameds->size; ++i) { status = private_f_fss_named_resize(0, &nameds->array[i]); if (F_status_is_error(status)) return status; @@ -144,11 +144,11 @@ extern "C" { #endif // !defined(_di_f_fss_nameds_decrease_by_) || !defined(_di_f_fss_nameds_increase_) || !defined(_di_f_fss_nameds_increase_by_) || !defined(_di_f_fss_nameds_resize_) #if !defined(_di_f_fss_nest_adjust_) || !defined(_di_f_fss_nest_decimate_by_) - f_status_t private_f_fss_nest_adjust(const f_array_length_t length, f_fss_nest_t * const nest) { + f_status_t private_f_fss_nest_adjust(const f_number_unsigned_t length, f_fss_nest_t * const nest) { f_status_t status = F_none; - for (f_array_length_t i = length; i < nest->size; ++i) { + for (f_number_unsigned_t i = length; i < nest->size; ++i) { status = private_f_fss_items_adjust(0, &nest->depth[i]); if (F_status_is_error(status)) return status; @@ -171,11 +171,11 @@ extern "C" { #endif // !defined(_di_f_fss_nest_adjust_) || !defined(_di_f_fss_nest_decimate_by_) #if !defined(_di_f_fss_nest_decrease_by_) || !defined(_di_f_fss_nest_increase_) || !defined(_di_f_fss_nest_increase_by_) || !defined(_di_f_fss_nest_resize_) - f_status_t private_f_fss_nest_resize(const f_array_length_t length, f_fss_nest_t * const nest) { + f_status_t private_f_fss_nest_resize(const f_number_unsigned_t length, f_fss_nest_t * const nest) { f_status_t status = F_none; - for (f_array_length_t i = length; i < nest->size; ++i) { + for (f_number_unsigned_t i = length; i < nest->size; ++i) { status = private_f_fss_items_resize(0, &nest->depth[i]); if (F_status_is_error(status)) return status; @@ -195,11 +195,11 @@ extern "C" { #endif // !defined(_di_f_fss_nest_decrease_by_) || !defined(_di_f_fss_nest_increase_) || !defined(_di_f_fss_nest_increase_by_) || !defined(_di_f_fss_nest_resize_) #if !defined(_di_f_fss_nests_adjust_) || !defined(_di_f_fss_nests_decimate_by_) - f_status_t private_f_fss_nests_adjust(const f_array_length_t length, f_fss_nests_t *nests) { + f_status_t private_f_fss_nests_adjust(const f_number_unsigned_t length, f_fss_nests_t *nests) { f_status_t status = F_none; - for (f_array_length_t i = length; i < nests->size; ++i) { + for (f_number_unsigned_t i = length; i < nests->size; ++i) { status = private_f_fss_nest_adjust(0, &nests->array[i]); if (F_status_is_error(status)) return status; @@ -222,11 +222,11 @@ extern "C" { #endif // !defined(_di_f_fss_nests_adjust_) || !defined(_di_f_fss_nests_decimate_by_) #if !defined(_di_f_fss_nests_decrease_by_) || !defined(_di_f_fss_nests_increase_) || !defined(_di_f_fss_nests_increase_by_) || !defined(_di_f_fss_nests_resize_) - f_status_t private_f_fss_nests_resize(const f_array_length_t length, f_fss_nests_t * const nests) { + f_status_t private_f_fss_nests_resize(const f_number_unsigned_t length, f_fss_nests_t * const nests) { f_status_t status = F_none; - for (f_array_length_t i = length; i < nests->size; ++i) { + for (f_number_unsigned_t i = length; i < nests->size; ++i) { status = private_f_fss_nest_resize(0, &nests->array[i]); if (F_status_is_error(status)) return status; @@ -246,7 +246,7 @@ extern "C" { #endif // !defined(_di_f_fss_nests_decrease_by_) || !defined(_di_f_fss_nests_increase_) || !defined(_di_f_fss_nests_increase_by_) || !defined(_di_f_fss_nests_resize_) #if !defined(_di_f_fss_set_adjust_) || !defined(_di_f_fss_set_decimate_by_) - f_status_t private_f_fss_set_adjust(const f_array_length_t length, f_fss_set_t * const set) { + f_status_t private_f_fss_set_adjust(const f_number_unsigned_t length, f_fss_set_t * const set) { f_status_t status = F_none; @@ -261,7 +261,7 @@ extern "C" { #endif // !defined(_di_f_fss_set_adjust_) || !defined(_di_f_fss_set_decimate_by_) #if !defined(_di_f_fss_set_decrease_by_) || !defined(_di_f_fss_set_increase_) || !defined(_di_f_fss_set_increase_by_) || !defined(_di_f_fss_set_resize_) - f_status_t private_f_fss_set_resize(const f_array_length_t length, f_fss_set_t *set) { + f_status_t private_f_fss_set_resize(const f_number_unsigned_t length, f_fss_set_t *set) { f_status_t status = F_none; @@ -276,7 +276,7 @@ extern "C" { #endif // !defined(_di_f_fss_set_decrease_by_) || !defined(_di_f_fss_set_increase_) || !defined(_di_f_fss_set_increase_by_) || !defined(_di_f_fss_set_resize_) #if !defined(_di_f_fss_set_quote_adjust_) || !defined(_di_f_fss_set_quote_decimate_by_) - f_status_t private_f_fss_set_quote_adjust(const f_array_length_t length, f_fss_set_quote_t * const set_quote) { + f_status_t private_f_fss_set_quote_adjust(const f_number_unsigned_t length, f_fss_set_quote_t * const set_quote) { f_status_t status = F_none; @@ -297,7 +297,7 @@ extern "C" { #endif // !defined(_di_f_fss_set_quote_adjust_) || !defined(_di_f_fss_set_quote_decimate_by_) #if !defined(_di_f_fss_set_quote_decrease_by_) || !defined(_di_f_fss_set_quote_increase_) || !defined(_di_f_fss_set_quote_increase_by_) || !defined(_di_f_fss_set_quote_resize_) - f_status_t private_f_fss_set_quote_resize(const f_array_length_t length, f_fss_set_quote_t * const set_quote) { + f_status_t private_f_fss_set_quote_resize(const f_number_unsigned_t length, f_fss_set_quote_t * const set_quote) { f_status_t status = F_none; @@ -318,11 +318,11 @@ extern "C" { #endif // !defined(_di_f_fss_set_quote_decrease_by_) || !defined(_di_f_fss_set_quote_increase_) || !defined(_di_f_fss_set_quote_increase_by_) || !defined(_di_f_fss_set_quote_resize_) #if !defined(_di_f_fss_set_quotes_adjust_) || !defined(_di_f_fss_set_quotes_decimate_by_) - f_status_t private_f_fss_set_quotes_adjust(const f_array_length_t length, f_fss_set_quotes_t * const set_quotes) { + f_status_t private_f_fss_set_quotes_adjust(const f_number_unsigned_t length, f_fss_set_quotes_t * const set_quotes) { f_status_t status = F_none; - for (f_array_length_t i = length; i < set_quotes->size; ++i) { + for (f_number_unsigned_t i = length; i < set_quotes->size; ++i) { status = f_string_ranges_adjust(0, &set_quotes->array[i].objects); if (F_status_is_error(status)) return status; @@ -354,11 +354,11 @@ extern "C" { #endif // !defined(_di_f_fss_set_quotes_adjust_) || !defined(_di_f_fss_set_quotes_decimate_by_) #if !defined(_di_f_fss_set_quotes_decrease_by_) || !defined(_di_f_fss_set_quotes_increase_) || !defined(_di_f_fss_set_quotes_increase_by_) || !defined(_di_f_fss_set_quotes_resize_) - f_status_t private_f_fss_set_quotes_resize(const f_array_length_t length, f_fss_set_quotes_t * const set_quotes) { + f_status_t private_f_fss_set_quotes_resize(const f_number_unsigned_t length, f_fss_set_quotes_t * const set_quotes) { f_status_t status = F_none; - for (f_array_length_t i = length; i < set_quotes->size; ++i) { + for (f_number_unsigned_t i = length; i < set_quotes->size; ++i) { status = f_string_ranges_resize(0, &set_quotes->array[i].objects); if (F_status_is_error(status)) return status; @@ -387,11 +387,11 @@ extern "C" { #endif // !defined(_di_f_fss_set_quotes_decrease_by_) || !defined(_di_f_fss_set_quotes_increase_) || !defined(_di_f_fss_set_quotes_increase_by_) || !defined(_di_f_fss_set_quotes_resize_) #if !defined(_di_f_fss_sets_adjust_) || !defined(_di_f_fss_sets_decimate_by_) - f_status_t private_f_fss_sets_adjust(const f_array_length_t length, f_fss_sets_t * const sets) { + f_status_t private_f_fss_sets_adjust(const f_number_unsigned_t length, f_fss_sets_t * const sets) { f_status_t status = F_none; - for (f_array_length_t i = length; i < sets->size; ++i) { + for (f_number_unsigned_t i = length; i < sets->size; ++i) { status = f_string_ranges_adjust(0, &sets->array[i].objects); if (F_status_is_error(status)) return status; @@ -417,11 +417,11 @@ extern "C" { #endif // !defined(_di_f_fss_sets_adjust_) || !defined(_di_f_fss_sets_decimate_by_) #if !defined(_di_f_fss_sets_decrease_by_) || !defined(_di_f_fss_sets_increase_) || !defined(_di_f_fss_sets_increase_by_) || !defined(_di_f_fss_sets_resize_) - f_status_t private_f_fss_sets_resize(const f_array_length_t length, f_fss_sets_t * const sets) { + f_status_t private_f_fss_sets_resize(const f_number_unsigned_t length, f_fss_sets_t * const sets) { f_status_t status = F_none; - for (f_array_length_t i = length; i < sets->size; ++i) { + for (f_number_unsigned_t i = length; i < sets->size; ++i) { status = f_string_ranges_resize(0, &sets->array[i].objects); if (F_status_is_error(status)) return status; diff --git a/level_0/f_fss/c/private-fss.h b/level_0/f_fss/c/private-fss.h index 64170d2..5761ef0 100644 --- a/level_0/f_fss/c/private-fss.h +++ b/level_0/f_fss/c/private-fss.h @@ -38,7 +38,7 @@ extern "C" { * @see f_memory_adjust() */ #if !defined(_di_f_fss_items_adjust_) || !defined(_di_f_fss_items_decimate_by_) - extern f_status_t private_f_fss_items_adjust(const f_array_length_t length, f_fss_items_t * const items) F_attribute_visibility_internal_d; + extern f_status_t private_f_fss_items_adjust(const f_number_unsigned_t length, f_fss_items_t * const items) F_attribute_visibility_internal_d; #endif // !defined(_di_f_fss_items_adjust_) || !defined(_di_f_fss_items_decimate_by_) /** @@ -66,7 +66,7 @@ extern "C" { * @see f_memory_resize() */ #if !defined(_di_f_fss_items_decrease_by_) || !defined(_di_f_fss_items_increase_) || !defined(_di_f_fss_items_increase_by_) || !defined(_di_f_fss_items_resize_) - extern f_status_t private_f_fss_items_resize(const f_array_length_t length, f_fss_items_t * const items) F_attribute_visibility_internal_d; + extern f_status_t private_f_fss_items_resize(const f_number_unsigned_t length, f_fss_items_t * const items) F_attribute_visibility_internal_d; #endif // !defined(_di_f_fss_items_decrease_by_) || !defined(_di_f_fss_items_increase_) || !defined(_di_f_fss_items_increase_by_) || !defined(_di_f_fss_items_resize_) /** @@ -94,7 +94,7 @@ extern "C" { * @see f_fss_nameds_decimate_by() */ #if !defined(_di_f_fss_nameds_adjust_) || !defined(_di_f_fss_nameds_decimate_by_) - extern f_status_t private_f_fss_named_adjust(const f_array_length_t length, f_fss_named_t * const named) F_attribute_visibility_internal_d; + extern f_status_t private_f_fss_named_adjust(const f_number_unsigned_t length, f_fss_named_t * const named) F_attribute_visibility_internal_d; #endif // !defined(_di_f_fss_nameds_adjust_) || !defined(_di_f_fss_nameds_decimate_by_) /** @@ -124,7 +124,7 @@ extern "C" { * @see f_fss_nameds_resize() */ #if !defined(_di_f_fss_nameds_decrease_by_) || !defined(_di_f_fss_nameds_increase_) || !defined(_di_f_fss_nameds_increase_by_) || !defined(_di_f_fss_nameds_resize_) - extern f_status_t private_f_fss_named_resize(const f_array_length_t length, f_fss_named_t * const named) F_attribute_visibility_internal_d; + extern f_status_t private_f_fss_named_resize(const f_number_unsigned_t length, f_fss_named_t * const named) F_attribute_visibility_internal_d; #endif // !defined(_di_f_fss_nameds_decrease_by_) || !defined(_di_f_fss_nameds_increase_) || !defined(_di_f_fss_nameds_increase_by_) || !defined(_di_f_fss_nameds_resize_) /** @@ -150,7 +150,7 @@ extern "C" { * @see f_memory_adjust() */ #if !defined(_di_f_fss_nameds_adjust_) || !defined(_di_f_fss_nameds_decimate_by_) - extern f_status_t private_f_fss_nameds_adjust(const f_array_length_t length, f_fss_nameds_t * const nameds) F_attribute_visibility_internal_d; + extern f_status_t private_f_fss_nameds_adjust(const f_number_unsigned_t length, f_fss_nameds_t * const nameds) F_attribute_visibility_internal_d; #endif // !defined(_di_f_fss_nameds_adjust_) || !defined(_di_f_fss_nameds_decimate_by_) /** @@ -178,7 +178,7 @@ extern "C" { * @see f_memory_resize() */ #if !defined(_di_f_fss_nameds_decrease_by_) || !defined(_di_f_fss_nameds_increase_) || !defined(_di_f_fss_nameds_increase_by_) || !defined(_di_f_fss_nameds_resize_) - extern f_status_t private_f_fss_nameds_resize(const f_array_length_t length, f_fss_nameds_t * const nameds) F_attribute_visibility_internal_d; + extern f_status_t private_f_fss_nameds_resize(const f_number_unsigned_t length, f_fss_nameds_t * const nameds) F_attribute_visibility_internal_d; #endif // !defined(_di_f_fss_nameds_decrease_by_) || !defined(_di_f_fss_nameds_increase_) || !defined(_di_f_fss_nameds_increase_by_) || !defined(_di_f_fss_nameds_resize_) /** @@ -204,7 +204,7 @@ extern "C" { * @see f_memory_adjust() */ #if !defined(_di_f_fss_nest_adjust_) || !defined(_di_f_fss_nest_decimate_by_) - extern f_status_t private_f_fss_nest_adjust(const f_array_length_t length, f_fss_nest_t * const nest) F_attribute_visibility_internal_d; + extern f_status_t private_f_fss_nest_adjust(const f_number_unsigned_t length, f_fss_nest_t * const nest) F_attribute_visibility_internal_d; #endif // !defined(_di_f_fss_nest_adjust_) || !defined(_di_f_fss_nest_decimate_by_) /** @@ -232,7 +232,7 @@ extern "C" { * @see f_memory_resize() */ #if !defined(_di_f_fss_nest_decrease_by_) || !defined(_di_f_fss_nest_increase_) || !defined(_di_f_fss_nest_increase_by_) || !defined(_di_f_fss_nest_resize_) - extern f_status_t private_f_fss_nest_resize(const f_array_length_t length, f_fss_nest_t * const nest) F_attribute_visibility_internal_d; + extern f_status_t private_f_fss_nest_resize(const f_number_unsigned_t length, f_fss_nest_t * const nest) F_attribute_visibility_internal_d; #endif // !defined(_di_f_fss_nest_decrease_by_) || !defined(_di_f_fss_nest_increase_) || !defined(_di_f_fss_nest_increase_by_) || !defined(_di_f_fss_nest_resize_) /** @@ -258,7 +258,7 @@ extern "C" { * @see f_memory_adjust() */ #if !defined(_di_f_fss_nests_adjust_) || !defined(_di_f_fss_nests_decimate_by_) - extern f_status_t private_f_fss_nests_adjust(const f_array_length_t length, f_fss_nests_t * const nests) F_attribute_visibility_internal_d; + extern f_status_t private_f_fss_nests_adjust(const f_number_unsigned_t length, f_fss_nests_t * const nests) F_attribute_visibility_internal_d; #endif // !defined(_di_f_fss_nests_adjust_) || !defined(_di_f_fss_nests_decimate_by_) /** @@ -286,7 +286,7 @@ extern "C" { * @see f_memory_resize() */ #if !defined(_di_f_fss_nests_decrease_by_) || !defined(_di_f_fss_nests_increase_) || !defined(_di_f_fss_nests_increase_by_) || !defined(_di_f_fss_nests_resize_) - extern f_status_t private_f_fss_nests_resize(const f_array_length_t length, f_fss_nests_t * const nests) F_attribute_visibility_internal_d; + extern f_status_t private_f_fss_nests_resize(const f_number_unsigned_t length, f_fss_nests_t * const nests) F_attribute_visibility_internal_d; #endif // !defined(_di_f_fss_nests_decrease_by_) || !defined(_di_f_fss_nests_increase_) || !defined(_di_f_fss_nests_increase_by_) || !defined(_di_f_fss_nests_resize_) /** @@ -312,7 +312,7 @@ extern "C" { * @see f_fss_set_decimate_by() */ #if !defined(_di_f_fss_set_adjust_) || !defined(_di_f_fss_set_decimate_by_) - extern f_status_t private_f_fss_set_adjust(const f_array_length_t length, f_fss_set_t * const set) F_attribute_visibility_internal_d; + extern f_status_t private_f_fss_set_adjust(const f_number_unsigned_t length, f_fss_set_t * const set) F_attribute_visibility_internal_d; #endif // !defined(_di_f_fss_set_adjust_) || !defined(_di_f_fss_set_decimate_by_) /** @@ -340,7 +340,7 @@ extern "C" { * @see f_fss_set_resize() */ #if !defined(_di_f_fss_set_decrease_by_) || !defined(_di_f_fss_set_increase_) || !defined(_di_f_fss_set_increase_by_) || !defined(_di_f_fss_set_resize_) - extern f_status_t private_f_fss_set_resize(const f_array_length_t length, f_fss_set_t * const set) F_attribute_visibility_internal_d; + extern f_status_t private_f_fss_set_resize(const f_number_unsigned_t length, f_fss_set_t * const set) F_attribute_visibility_internal_d; #endif // !defined(_di_f_fss_set_decrease_by_) || !defined(_di_f_fss_set_increase_) || !defined(_di_f_fss_set_increase_by_) || !defined(_di_f_fss_set_resize_) /** @@ -370,7 +370,7 @@ extern "C" { * @see f_fss_set_quote_decimate_by() */ #if !defined(_di_f_fss_set_quote_adjust_) || !defined(_di_f_fss_set_quote_decimate_by_) - extern f_status_t private_f_fss_set_quote_adjust(const f_array_length_t length, f_fss_set_quote_t * const set_quote) F_attribute_visibility_internal_d; + extern f_status_t private_f_fss_set_quote_adjust(const f_number_unsigned_t length, f_fss_set_quote_t * const set_quote) F_attribute_visibility_internal_d; #endif // !defined(_di_f_fss_set_quote_adjust_) || !defined(_di_f_fss_set_quote_decimate_by_) /** @@ -402,7 +402,7 @@ extern "C" { * @see f_fss_set_quote_resize() */ #if !defined(_di_f_fss_set_quote_decrease_by_) || !defined(_di_f_fss_set_quote_increase_) || !defined(_di_f_fss_set_quote_increase_by_) || !defined(_di_f_fss_set_quote_resize_) - extern f_status_t private_f_fss_set_quote_resize(const f_array_length_t length, f_fss_set_quote_t * const set_quote) F_attribute_visibility_internal_d; + extern f_status_t private_f_fss_set_quote_resize(const f_number_unsigned_t length, f_fss_set_quote_t * const set_quote) F_attribute_visibility_internal_d; #endif // !defined(_di_f_fss_set_quote_decrease_by_) || !defined(_di_f_fss_set_quote_increase_) || !defined(_di_f_fss_set_quote_increase_by_) || !defined(_di_f_fss_set_quote_resize_) /** @@ -434,7 +434,7 @@ extern "C" { * @see f_memory_adjust() */ #if !defined(_di_f_fss_set_quotes_adjust_) || !defined(_di_f_fss_set_quotes_decimate_by_) - extern f_status_t private_f_fss_set_quotes_adjust(const f_array_length_t length, f_fss_set_quotes_t * const set_quotes) F_attribute_visibility_internal_d; + extern f_status_t private_f_fss_set_quotes_adjust(const f_number_unsigned_t length, f_fss_set_quotes_t * const set_quotes) F_attribute_visibility_internal_d; #endif // !defined(_di_f_fss_set_quotes_adjust_) || !defined(_di_f_fss_set_quotes_decimate_by_) /** @@ -468,7 +468,7 @@ extern "C" { * @see f_memory_resize() */ #if !defined(_di_f_fss_set_quotes_decrease_by_) || !defined(_di_f_fss_set_quotes_increase_) || !defined(_di_f_fss_set_quotes_increase_by_) || !defined(_di_f_fss_set_quotes_resize_) - extern f_status_t private_f_fss_set_quotes_resize(const f_array_length_t length, f_fss_set_quotes_t * const set_quotes) F_attribute_visibility_internal_d; + extern f_status_t private_f_fss_set_quotes_resize(const f_number_unsigned_t length, f_fss_set_quotes_t * const set_quotes) F_attribute_visibility_internal_d; #endif // !defined(_di_f_fss_set_quotes_decrease_by_) || !defined(_di_f_fss_set_quotes_increase_) || !defined(_di_f_fss_set_quotes_increase_by_) || !defined(_di_f_fss_set_quotes_resize_) /** @@ -496,7 +496,7 @@ extern "C" { * @see f_memory_adjust() */ #if !defined(_di_f_fss_sets_adjust_) || !defined(_di_f_fss_sets_decimate_by_) - extern f_status_t private_f_fss_sets_adjust(const f_array_length_t length, f_fss_sets_t * const sets) F_attribute_visibility_internal_d; + extern f_status_t private_f_fss_sets_adjust(const f_number_unsigned_t length, f_fss_sets_t * const sets) F_attribute_visibility_internal_d; #endif // !defined(_di_f_fss_sets_adjust_) || !defined(_di_f_fss_sets_decimate_by_) /** @@ -526,7 +526,7 @@ extern "C" { * @see f_memory_resize() */ #if !defined(_di_f_fss_sets_decrease_by_) || !defined(_di_f_fss_sets_increase_) || !defined(_di_f_fss_sets_increase_by_) || !defined(_di_f_fss_sets_resize_) - extern f_status_t private_f_fss_sets_resize(const f_array_length_t length, f_fss_sets_t * const sets) F_attribute_visibility_internal_d; + extern f_status_t private_f_fss_sets_resize(const f_number_unsigned_t length, f_fss_sets_t * const sets) F_attribute_visibility_internal_d; #endif // !defined(_di_f_fss_sets_decrease_by_) || !defined(_di_f_fss_sets_increase_) || !defined(_di_f_fss_sets_increase_by_) || !defined(_di_f_fss_sets_resize_) #ifdef __cplusplus diff --git a/level_0/f_fss/tests/unit/c/test-fss-count_lines.c b/level_0/f_fss/tests/unit/c/test-fss-count_lines.c index 8d3571c..ed9696f 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-count_lines.c +++ b/level_0/f_fss/tests/unit/c/test-fss-count_lines.c @@ -22,7 +22,7 @@ void test__f_fss_count_lines__returns_data_not(void **state) { f_state_t state_data = f_state_t_initialize; { - f_array_length_t line = 0; + f_number_unsigned_t line = 0; f_fss_count_lines(f_string_empty_s, 0, &line, &state_data); @@ -42,8 +42,8 @@ void test__f_fss_count_lines__works(void **state) { macro_f_string_static_t_initialize_1("\n⸙\nfour\n全\n", 0, 14), }; - f_array_length_t line = 0; - f_array_length_t expect = 0; + f_number_unsigned_t line = 0; + f_number_unsigned_t expect = 0; for (uint8_t i = 0; i < 5; expect += ++i) { diff --git a/level_0/f_fss/tests/unit/c/test-fss-count_lines_range.c b/level_0/f_fss/tests/unit/c/test-fss-count_lines_range.c index 8e72e81..790f673 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-count_lines_range.c +++ b/level_0/f_fss/tests/unit/c/test-fss-count_lines_range.c @@ -23,7 +23,7 @@ void test__f_fss_count_lines_range__returns_data_not(void **state) { f_state_t state_data = f_state_t_initialize; { - f_array_length_t line = 0; + f_number_unsigned_t line = 0; f_string_range_t range = f_string_range_t_initialize; f_fss_count_lines_range(f_string_empty_s, range, &line, &state_data); @@ -32,7 +32,7 @@ void test__f_fss_count_lines_range__returns_data_not(void **state) { } { - f_array_length_t line = 0; + f_number_unsigned_t line = 0; f_string_range_t range = f_string_range_t_initialize; f_fss_count_lines_range(test, range, &line, &state_data); @@ -41,7 +41,7 @@ void test__f_fss_count_lines_range__returns_data_not(void **state) { } { - f_array_length_t line = 0; + f_number_unsigned_t line = 0; f_string_range_t range = macro_f_string_range_t_initialize_1(0, test.used - 1); f_fss_count_lines_range(f_string_empty_s, range, &line, &state_data); @@ -62,8 +62,8 @@ void test__f_fss_count_lines_range__works(void **state) { macro_f_string_static_t_initialize_1("\n⸙\nfour\n全\n", 0, 14), }; - f_array_length_t line = 0; - f_array_length_t expect = 0; + f_number_unsigned_t line = 0; + f_number_unsigned_t expect = 0; for (uint8_t i = 0; i < 5; expect += ++i) { diff --git a/level_0/f_fss/tests/unit/c/test-fss-is_combining.c b/level_0/f_fss/tests/unit/c/test-fss-is_combining.c index cfcd59a..73560cd 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-is_combining.c +++ b/level_0/f_fss/tests/unit/c/test-fss-is_combining.c @@ -38,7 +38,7 @@ void test__f_fss_is_combining__works(void **state) { }; // Apply an offset so that the combining character is combining into something inside the quotes rather than the quotes for convenience and code safety. - f_array_length_t offset[] = { + f_number_unsigned_t offset[] = { 0, 0, 0, @@ -52,7 +52,7 @@ void test__f_fss_is_combining__works(void **state) { 1, }; - for (f_array_length_t i = 0; i < 11; ++i) { + for (f_number_unsigned_t i = 0; i < 11; ++i) { const f_string_range_t range = macro_f_string_range_t_initialize_1(offset[i], tests[i].used - 1); diff --git a/level_0/f_fss/tests/unit/c/test-fss-is_graph.c b/level_0/f_fss/tests/unit/c/test-fss-is_graph.c index 7e637ba..06bae1e 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-is_graph.c +++ b/level_0/f_fss/tests/unit/c/test-fss-is_graph.c @@ -39,7 +39,7 @@ void test__f_fss_is_graph__works(void **state) { F_false, }; - for (f_array_length_t i = 0; i < 12; ++i) { + for (f_number_unsigned_t i = 0; i < 12; ++i) { const f_string_range_t range = macro_f_string_range_t_initialize_1(0, tests[i].used - 1); diff --git a/level_0/f_fss/tests/unit/c/test-fss-is_space.c b/level_0/f_fss/tests/unit/c/test-fss-is_space.c index ee50fdc..16dba3d 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-is_space.c +++ b/level_0/f_fss/tests/unit/c/test-fss-is_space.c @@ -39,7 +39,7 @@ void test__f_fss_is_space__works(void **state) { F_false, }; - for (f_array_length_t i = 0; i < 12; ++i) { + for (f_number_unsigned_t i = 0; i < 12; ++i) { const f_string_range_t range = macro_f_string_range_t_initialize_1(0, tests[i].used - 1); diff --git a/level_0/f_fss/tests/unit/c/test-fss-is_zero_width.c b/level_0/f_fss/tests/unit/c/test-fss-is_zero_width.c index 584b744..7cb28bf 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-is_zero_width.c +++ b/level_0/f_fss/tests/unit/c/test-fss-is_zero_width.c @@ -61,7 +61,7 @@ void test__f_fss_is_zero_width__works(void **state) { { .start = 1, .stop = 1 }, }; - for (f_array_length_t i = 0; i < 14; ++i) { + for (f_number_unsigned_t i = 0; i < 14; ++i) { const f_status_t status = f_fss_is_zero_width(tests[i], ranges[i], &state_data); diff --git a/level_0/f_fss/tests/unit/c/test-fss-seek_to_eol.c b/level_0/f_fss/tests/unit/c/test-fss-seek_to_eol.c index 356d90b..38a12a2 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-seek_to_eol.c +++ b/level_0/f_fss/tests/unit/c/test-fss-seek_to_eol.c @@ -81,7 +81,7 @@ void test__f_fss_seek_to_eol__works(void **state) { macro_f_string_range_t_initialize_1(1, tests[11].used - 2), }; - f_array_length_t expects[] = { + f_number_unsigned_t expects[] = { 2, 2, 0, diff --git a/level_0/f_fss/tests/unit/c/test-fss-skip_past_delimit.c b/level_0/f_fss/tests/unit/c/test-fss-skip_past_delimit.c index cb56493..0ec6812 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-skip_past_delimit.c +++ b/level_0/f_fss/tests/unit/c/test-fss-skip_past_delimit.c @@ -66,7 +66,7 @@ void test__f_fss_skip_past_delimit__works(void **state) { macro_f_string_static_t_initialize_1("\0\0\0test\0\0", 0, 9), }; - f_array_length_t expects[] = { + f_number_unsigned_t expects[] = { 0, 1, 3, diff --git a/level_0/f_fss/tests/unit/c/test-fss-skip_past_space.c b/level_0/f_fss/tests/unit/c/test-fss-skip_past_space.c index 4fa28e6..2ca804f 100644 --- a/level_0/f_fss/tests/unit/c/test-fss-skip_past_space.c +++ b/level_0/f_fss/tests/unit/c/test-fss-skip_past_space.c @@ -69,7 +69,7 @@ void test__f_fss_skip_past_space__works(void **state) { macro_f_string_static_t_initialize_1(" ́test", 0, 7), }; - f_array_length_t expects[] = { + f_number_unsigned_t expects[] = { 0, 1, 3, diff --git a/level_0/f_iki/c/iki.c b/level_0/f_iki/c/iki.c index c12011d..1ac4181 100644 --- a/level_0/f_iki/c/iki.c +++ b/level_0/f_iki/c/iki.c @@ -83,16 +83,16 @@ extern "C" { return; } - f_array_length_t width_max = 0; + f_number_unsigned_t width_max = 0; if (width_max > buffer->used - range->start) { width_max = buffer->used - range->start; } f_string_range_t found_vocabulary = f_string_range_t_initialize; - f_array_length_t found_content = 0; - f_array_length_t vocabulary_slash_first = 0; - const f_array_length_t delimits_used = data->delimits.used; + f_number_unsigned_t found_content = 0; + f_number_unsigned_t vocabulary_slash_first = 0; + const f_number_unsigned_t delimits_used = data->delimits.used; uint8_t quote = 0; uint8_t wrapped = F_false; // 0x0 (false) = not wapped, 0x1 (true) = wrapped, 0x2 = valid wrapped. @@ -215,7 +215,7 @@ extern "C" { // Save delimit for a would-be valid IKI that is now delimited. if (buffer->string[range->start] == f_iki_syntax_quote_single_s.string[0] || buffer->string[range->start] == f_iki_syntax_quote_double_s.string[0] || buffer->string[range->start] == f_iki_syntax_quote_backtick_s.string[0]) { - state->status = f_array_lengths_increase(state->step_small, &data->delimits); + state->status = f_number_unsigneds_increase(state->step_small, &data->delimits); if (F_status_is_error(state->status)) break; data->delimits.array[data->delimits.used++] = vocabulary_slash_first; @@ -354,8 +354,8 @@ extern "C" { } if (buffer->string[range->start] == f_iki_syntax_slash_s.string[0]) { - f_array_length_t content_slash_first = range->start; - f_array_length_t content_slash_total = 0; + f_number_unsigned_t content_slash_first = range->start; + f_number_unsigned_t content_slash_total = 0; while (range->start <= range->stop && range->start < buffer->used) { @@ -366,15 +366,15 @@ extern "C" { } if (buffer->string[range->start] == quote) { - f_array_length_t content_slash_delimits = content_slash_total / 2; + f_number_unsigned_t content_slash_delimits = content_slash_total / 2; f_string_range_t content_range = f_string_range_t_initialize; - f_array_length_t i = 0; + f_number_unsigned_t i = 0; if (content_slash_total % 2) { ++content_slash_delimits; } - state->status = f_array_lengths_increase_by(content_slash_delimits, &data->delimits); + state->status = f_number_unsigneds_increase_by(content_slash_delimits, &data->delimits); if (F_status_is_error(state->status)) break; content_range.start = content_slash_first; diff --git a/level_0/f_iki/c/iki/common.h b/level_0/f_iki/c/iki/common.h index c36afbc..20ecd83 100644 --- a/level_0/f_iki/c/iki/common.h +++ b/level_0/f_iki/c/iki/common.h @@ -202,14 +202,14 @@ extern "C" { #ifndef _di_f_iki_data_t_ typedef struct { f_string_ranges_t content; - f_array_lengths_t delimits; + f_number_unsigneds_t delimits; f_string_ranges_t variable; f_string_ranges_t vocabulary; } f_iki_data_t; #define f_iki_data_t_initialize { \ f_string_ranges_t_initialize, \ - f_array_lengths_t_initialize, \ + f_number_unsigneds_t_initialize, \ f_string_ranges_t_initialize, \ f_string_ranges_t_initialize, \ } @@ -218,7 +218,7 @@ extern "C" { #define macro_f_iki_data_t_clear(data) \ f_string_ranges_t_clear(data.content) \ - f_array_lengths_t_clear(data.delimits) \ + f_number_unsigneds_t_clear(data.delimits) \ f_string_ranges_t_clear(data.variable) \ f_string_ranges_t_clear(data.vocabulary) @@ -237,8 +237,8 @@ extern "C" { typedef struct { f_iki_data_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_iki_datas_t; #define f_iki_datas_t_initialize { 0, 0, 0 } @@ -271,8 +271,8 @@ extern "C" { typedef struct { f_iki_datas_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_iki_datass_t; #define f_iki_datass_t_initialize { 0, 0, 0 } diff --git a/level_0/f_iki/c/iki/data.c b/level_0/f_iki/c/iki/data.c index babfa87..039eeb5 100644 --- a/level_0/f_iki/c/iki/data.c +++ b/level_0/f_iki/c/iki/data.c @@ -15,7 +15,7 @@ extern "C" { f_status_t status = f_string_ranges_resize(0, &data->content); if (F_status_is_error(status)) return status; - status = f_array_lengths_resize(0, &data->delimits); + status = f_number_unsigneds_resize(0, &data->delimits); if (F_status_is_error(status)) return status; status = f_string_ranges_resize(0, &data->variable); @@ -37,7 +37,7 @@ extern "C" { f_status_t status = f_string_ranges_adjust(0, &data->content); if (F_status_is_error(status)) return status; - status = f_array_lengths_adjust(0, &data->delimits); + status = f_number_unsigneds_adjust(0, &data->delimits); if (F_status_is_error(status)) return status; status = f_string_ranges_adjust(0, &data->variable); @@ -51,7 +51,7 @@ extern "C" { #endif // _di_f_iki_data_destroy_ #ifndef _di_f_iki_datas_adjust_ - f_status_t f_iki_datas_adjust(const f_array_length_t length, f_iki_datas_t *datas) { + f_status_t f_iki_datas_adjust(const f_number_unsigned_t length, f_iki_datas_t *datas) { #ifndef _di_level_0_parameter_checking_ if (!datas) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -83,7 +83,7 @@ extern "C" { #endif // _di_f_iki_datas_append_all_ #ifndef _di_f_iki_datas_decimate_by_ - f_status_t f_iki_datas_decimate_by(const f_array_length_t amount, f_iki_datas_t *datas) { + f_status_t f_iki_datas_decimate_by(const f_number_unsigned_t amount, f_iki_datas_t *datas) { #ifndef _di_level_0_parameter_checking_ if (!datas) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -99,7 +99,7 @@ extern "C" { #endif // _di_f_iki_datas_decimate_by_ #ifndef _di_f_iki_datas_decrease_by_ - f_status_t f_iki_datas_decrease_by(const f_array_length_t amount, f_iki_datas_t *datas) { + f_status_t f_iki_datas_decrease_by(const f_number_unsigned_t amount, f_iki_datas_t *datas) { #ifndef _di_level_0_parameter_checking_ if (!datas) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -115,20 +115,20 @@ extern "C" { #endif // _di_f_iki_datas_decrease_by_ #ifndef _di_f_iki_datas_increase_ - f_status_t f_iki_datas_increase(const f_array_length_t step, f_iki_datas_t *datas) { + f_status_t f_iki_datas_increase(const f_number_unsigned_t step, f_iki_datas_t *datas) { #ifndef _di_level_0_parameter_checking_ if (!datas) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && datas->used + 1 > datas->size) { - f_array_length_t size = datas->used + step; + f_number_unsigned_t size = datas->used + step; - if (size > F_array_length_t_size_d) { - if (datas->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (datas->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_iki_datas_resize(size, datas); @@ -139,7 +139,7 @@ extern "C" { #endif // _di_f_iki_datas_increase_ #ifndef _di_f_iki_datas_increase_by_ - f_status_t f_iki_datas_increase_by(const f_array_length_t amount, f_iki_datas_t *datas) { + f_status_t f_iki_datas_increase_by(const f_number_unsigned_t amount, f_iki_datas_t *datas) { #ifndef _di_level_0_parameter_checking_ if (!datas) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -147,7 +147,7 @@ extern "C" { if (!amount) return F_data_not; if (datas->used + amount > datas->size) { - if (datas->used + amount > F_array_length_t_size_d) { + if (datas->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -159,7 +159,7 @@ extern "C" { #endif // _di_f_iki_datas_increase_by_ #ifndef _di_f_iki_datas_resize_ - f_status_t f_iki_datas_resize(const f_array_length_t length, f_iki_datas_t *datas) { + f_status_t f_iki_datas_resize(const f_number_unsigned_t length, f_iki_datas_t *datas) { #ifndef _di_level_0_parameter_checking_ if (!datas) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -169,7 +169,7 @@ extern "C" { #endif // _di_f_iki_datas_resize_ #ifndef _di_f_iki_datass_adjust_ - f_status_t f_iki_datass_adjust(const f_array_length_t length, f_iki_datass_t *datass) { + f_status_t f_iki_datass_adjust(const f_number_unsigned_t length, f_iki_datass_t *datass) { #ifndef _di_level_0_parameter_checking_ if (!datass) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -217,7 +217,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].used = 0; @@ -232,7 +232,7 @@ extern "C" { #endif // _di_f_iki_datass_append_all_ #ifndef _di_f_iki_datass_decimate_by_ - f_status_t f_iki_datass_decimate_by(const f_array_length_t amount, f_iki_datass_t *datass) { + f_status_t f_iki_datass_decimate_by(const f_number_unsigned_t amount, f_iki_datass_t *datass) { #ifndef _di_level_0_parameter_checking_ if (!datass) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -248,7 +248,7 @@ extern "C" { #endif // _di_f_iki_datass_decimate_by_ #ifndef _di_f_iki_datass_decrease_by_ - f_status_t f_iki_datass_decrease_by(const f_array_length_t amount, f_iki_datass_t *datass) { + f_status_t f_iki_datass_decrease_by(const f_number_unsigned_t amount, f_iki_datass_t *datass) { #ifndef _di_level_0_parameter_checking_ if (!datass) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -264,20 +264,20 @@ extern "C" { #endif // _di_f_iki_datass_decrease_by_ #ifndef _di_f_iki_datass_increase_ - f_status_t f_iki_datass_increase(const f_array_length_t step, f_iki_datass_t *datass) { + f_status_t f_iki_datass_increase(const f_number_unsigned_t step, f_iki_datass_t *datass) { #ifndef _di_level_0_parameter_checking_ if (!datass) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && datass->used + 1 > datass->size) { - f_array_length_t size = datass->used + step; + f_number_unsigned_t size = datass->used + step; - if (size > F_array_length_t_size_d) { - if (datass->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (datass->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_iki_datass_resize(size, datass); @@ -288,7 +288,7 @@ extern "C" { #endif // _di_f_iki_datass_increase_ #ifndef _di_f_iki_datass_increase_by_ - f_status_t f_iki_datass_increase_by(const f_array_length_t amount, f_iki_datass_t *datass) { + f_status_t f_iki_datass_increase_by(const f_number_unsigned_t amount, f_iki_datass_t *datass) { #ifndef _di_level_0_parameter_checking_ if (!datass) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -296,7 +296,7 @@ extern "C" { if (!amount) return F_data_not; if (datass->used + amount > datass->size) { - if (datass->used + amount > F_array_length_t_size_d) { + if (datass->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -308,7 +308,7 @@ extern "C" { #endif // _di_f_iki_datass_increase_by_ #ifndef _di_f_iki_datass_resize_ - f_status_t f_iki_datass_resize(const f_array_length_t length, f_iki_datass_t *datass) { + f_status_t f_iki_datass_resize(const f_number_unsigned_t length, f_iki_datass_t *datass) { #ifndef _di_level_0_parameter_checking_ if (!datass) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_iki/c/iki/data.h b/level_0/f_iki/c/iki/data.h index a21d97e..5e3f1c9 100644 --- a/level_0/f_iki/c/iki/data.h +++ b/level_0/f_iki/c/iki/data.h @@ -27,10 +27,10 @@ extern "C" { * * F_parameter (with error bit) if a parameter is invalid. * - * Errors (with error bit) from: f_array_lengths_resize(). + * Errors (with error bit) from: f_number_unsigneds_resize(). * Errors (with error bit) from: f_string_ranges_resize(). * - * @see f_array_lengths_resize() + * @see f_number_unsigneds_resize() * @see f_string_ranges_resize() */ #ifndef _di_f_iki_data_delete_ @@ -48,10 +48,10 @@ extern "C" { * * F_parameter (with error bit) if a parameter is invalid. * - * Errors (with error bit) from: f_array_lengths_adjust(). + * Errors (with error bit) from: f_number_unsigneds_adjust(). * Errors (with error bit) from: f_string_ranges_adjust(). * - * @see f_array_lengths_adjust() + * @see f_number_unsigneds_adjust() * @see f_string_ranges_adjust() */ #ifndef _di_f_iki_data_destroy_ @@ -74,7 +74,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_iki_datas_adjust_ - extern f_status_t f_iki_datas_adjust(const f_array_length_t length, f_iki_datas_t *datas); + extern f_status_t f_iki_datas_adjust(const f_number_unsigned_t length, f_iki_datas_t *datas); #endif // _di_f_iki_datas_adjust_ /** @@ -138,7 +138,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_iki_datas_decimate_by_ - extern f_status_t f_iki_datas_decimate_by(const f_array_length_t amount, f_iki_datas_t *datas); + extern f_status_t f_iki_datas_decimate_by(const f_number_unsigned_t amount, f_iki_datas_t *datas); #endif // _di_f_iki_datas_decimate_by_ /** @@ -162,13 +162,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_iki_datas_decrease_by_ - extern f_status_t f_iki_datas_decrease_by(const f_array_length_t amount, f_iki_datas_t *datas); + extern f_status_t f_iki_datas_decrease_by(const f_number_unsigned_t amount, f_iki_datas_t *datas); #endif // _di_f_iki_datas_decrease_by_ /** * Increase the size of the iki_datas array, but only if necesary. * - * If the given length is too large for the buffer, then attempt to set max buffer size (F_array_length_t_size_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -187,14 +187,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_iki_datas_increase_ - extern f_status_t f_iki_datas_increase(const f_array_length_t step, f_iki_datas_t *datas); + extern f_status_t f_iki_datas_increase(const f_number_unsigned_t step, f_iki_datas_t *datas); #endif // _di_f_iki_datas_increase_ /** * Resize the iki_datas 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -212,7 +212,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_iki_datas_increase_by_ - extern f_status_t f_iki_datas_increase_by(const f_array_length_t amount, f_iki_datas_t *datas); + extern f_status_t f_iki_datas_increase_by(const f_number_unsigned_t amount, f_iki_datas_t *datas); #endif // _di_f_iki_datas_increase_by_ /** @@ -231,7 +231,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_iki_datas_resize_ - extern f_status_t f_iki_datas_resize(const f_array_length_t length, f_iki_datas_t *datas); + extern f_status_t f_iki_datas_resize(const f_number_unsigned_t length, f_iki_datas_t *datas); #endif // _di_f_iki_datas_resize_ /** @@ -251,7 +251,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_iki_datass_adjust_ - extern f_status_t f_iki_datass_adjust(const f_array_length_t length, f_iki_datass_t *datass); + extern f_status_t f_iki_datass_adjust(const f_number_unsigned_t length, f_iki_datass_t *datass); #endif // _di_f_iki_datass_adjust_ /** @@ -316,7 +316,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_iki_datass_decimate_by_ - extern f_status_t f_iki_datass_decimate_by(const f_array_length_t amount, f_iki_datass_t *datass); + extern f_status_t f_iki_datass_decimate_by(const f_number_unsigned_t amount, f_iki_datass_t *datass); #endif // _di_f_iki_datass_decimate_by_ /** @@ -341,13 +341,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_iki_datass_decrease_by_ - extern f_status_t f_iki_datass_decrease_by(const f_array_length_t amount, f_iki_datass_t *datass); + extern f_status_t f_iki_datass_decrease_by(const f_number_unsigned_t amount, f_iki_datass_t *datass); #endif // _di_f_iki_datass_decrease_by_ /** * Increase the size of the iki_datass 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -366,14 +366,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_iki_datass_increase_ - extern f_status_t f_iki_datass_increase(const f_array_length_t step, f_iki_datass_t *datass); + extern f_status_t f_iki_datass_increase(const f_number_unsigned_t step, f_iki_datass_t *datass); #endif // _di_f_iki_datass_increase_ /** * Resize the iki_datass 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -391,7 +391,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_iki_datass_increase_by_ - extern f_status_t f_iki_datass_increase_by(const f_array_length_t amount, f_iki_datass_t *datass); + extern f_status_t f_iki_datass_increase_by(const f_number_unsigned_t amount, f_iki_datass_t *datass); #endif // _di_f_iki_datass_increase_by_ /** @@ -411,7 +411,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_iki_datass_resize_ - extern f_status_t f_iki_datass_resize(const f_array_length_t length, f_iki_datass_t *datass); + extern f_status_t f_iki_datass_resize(const f_number_unsigned_t length, f_iki_datass_t *datass); #endif // _di_f_iki_datass_resize_ #ifdef __cplusplus diff --git a/level_0/f_iki/c/iki/private-data.c b/level_0/f_iki/c/iki/private-data.c index 9be4bc3..aa11a69 100644 --- a/level_0/f_iki/c/iki/private-data.c +++ b/level_0/f_iki/c/iki/private-data.c @@ -6,20 +6,20 @@ extern "C" { #endif #if !defined(_di_f_iki_datas_adjust_) || !defined(_di_f_iki_datas_decimate_by_) - f_status_t private_f_iki_datas_adjust(const f_array_length_t length, f_iki_datas_t *datas) { + f_status_t private_f_iki_datas_adjust(const f_number_unsigned_t length, f_iki_datas_t *datas) { - if (datas->used + length > F_array_length_t_size_d) { + if (datas->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < datas->size; ++i) { + for (f_number_unsigned_t i = length; i < datas->size; ++i) { status = f_string_ranges_adjust(0, &datas->array[i].content); if (F_status_is_error(status)) return status; - status = f_array_lengths_adjust(0, &datas->array[i].delimits); + status = f_number_unsigneds_adjust(0, &datas->array[i].delimits); if (F_status_is_error(status)) return status; status = f_string_ranges_adjust(0, &datas->array[i].variable); @@ -63,7 +63,7 @@ extern "C" { } if (source.delimits.used) { - status = f_array_lengths_append_all(source.delimits, &destination->array[destination->used].delimits); + status = f_number_unsigneds_append_all(source.delimits, &destination->array[destination->used].delimits); if (F_status_is_error(status)) return status; } @@ -93,7 +93,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].content.used = 0; destination->array[destination->used].delimits.used = 0; @@ -106,7 +106,7 @@ extern "C" { } if (source.array[i].delimits.used) { - status = f_array_lengths_append_all(source.array[i].delimits, &destination->array[destination->used].delimits); + status = f_number_unsigneds_append_all(source.array[i].delimits, &destination->array[destination->used].delimits); if (F_status_is_error(status)) return status; } @@ -126,20 +126,20 @@ extern "C" { #endif // !defined(_di_f_iki_datas_append_) || !defined(_di_f_iki_datas_append_all_) || !defined(_di_f_iki_datass_append_all_) #if !defined(_di_f_iki_datas_append_) || !defined(_di_f_iki_datas_decrease_by_) || !defined(_di_f_iki_datas_increase_) || !defined(_di_f_iki_datas_increase_by_) || !defined(_di_f_iki_datas_resize_) - f_status_t private_f_iki_datas_resize(const f_array_length_t length, f_iki_datas_t *datas) { + f_status_t private_f_iki_datas_resize(const f_number_unsigned_t length, f_iki_datas_t *datas) { - if (datas->used + length > F_array_length_t_size_d) { + if (datas->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < datas->size; ++i) { + for (f_number_unsigned_t i = length; i < datas->size; ++i) { status = f_string_ranges_resize(0, &datas->array[i].content); if (F_status_is_error(status)) return status; - status = f_array_lengths_resize(0, &datas->array[i].delimits); + status = f_number_unsigneds_resize(0, &datas->array[i].delimits); if (F_status_is_error(status)) return status; status = f_string_ranges_resize(0, &datas->array[i].variable); @@ -163,11 +163,11 @@ extern "C" { #endif // !defined(_di_f_iki_datas_append_) || !defined(_di_f_iki_datas_decrease_by_) || !defined(_di_f_iki_datas_increase_) || !defined(_di_f_iki_datas_increase_by_) || !defined(_di_f_iki_datas_resize_) #if !defined(_di_f_iki_datass_adjust_) || !defined(_di_f_iki_datass_decimate_by_) - f_status_t private_f_iki_datass_adjust(const f_array_length_t length, f_iki_datass_t *datass) { + f_status_t private_f_iki_datass_adjust(const f_number_unsigned_t length, f_iki_datass_t *datass) { f_status_t status = F_none; - for (f_array_length_t i = length; i < datass->size; ++i) { + for (f_number_unsigned_t i = length; i < datass->size; ++i) { status = f_memory_destroy(datass->array[i].size, sizeof(f_iki_datas_t), (void **) & datass->array[i].array); if (F_status_is_error(status)) return status; @@ -190,11 +190,11 @@ extern "C" { #endif // !defined(_di_f_iki_datass_adjust_) || !defined(_di_f_iki_datass_decimate_by_) #if !defined(_di_f_iki_datass_decrease_by_) || !defined(_di_f_iki_datass_increase_) || !defined(_di_f_iki_datass_increase_by_) || !defined(_di_f_iki_datass_resize_) - f_status_t private_f_iki_datass_resize(const f_array_length_t length, f_iki_datass_t *datass) { + f_status_t private_f_iki_datass_resize(const f_number_unsigned_t length, f_iki_datass_t *datass) { f_status_t status = F_none; - for (f_array_length_t i = length; i < datass->size; ++i) { + for (f_number_unsigned_t i = length; i < datass->size; ++i) { status = f_memory_delete(datass->array[i].size, sizeof(f_iki_datas_t), (void **) & datass->array[i].array); if (F_status_is_error(status)) return status; diff --git a/level_0/f_iki/c/iki/private-data.h b/level_0/f_iki/c/iki/private-data.h index 2dace10..86783bb 100644 --- a/level_0/f_iki/c/iki/private-data.h +++ b/level_0/f_iki/c/iki/private-data.h @@ -35,7 +35,7 @@ extern "C" { * @see f_iki_datas_decimate_by() */ #if !defined(_di_f_iki_datas_adjust_) || !defined(_di_f_iki_datas_decimate_by_) - extern f_status_t private_f_iki_datas_adjust(const f_array_length_t length, f_iki_datas_t *datas) F_attribute_visibility_internal_d; + extern f_status_t private_f_iki_datas_adjust(const f_number_unsigned_t length, f_iki_datas_t *datas) F_attribute_visibility_internal_d; #endif // !defined(_di_f_iki_datas_adjust_) || !defined(_di_f_iki_datas_decimate_by_) /** @@ -107,7 +107,7 @@ extern "C" { * @see f_iki_datass_append() */ #if !defined(_di_f_iki_datas_resize_) || !defined(_di_f_iki_datas_append_) || !defined(_di_f_iki_datas_decimate_by_) || !defined(_di_f_iki_datass_append_) - extern f_status_t private_f_iki_datas_resize(const f_array_length_t length, f_iki_datas_t *datas) F_attribute_visibility_internal_d; + extern f_status_t private_f_iki_datas_resize(const f_number_unsigned_t length, f_iki_datas_t *datas) F_attribute_visibility_internal_d; #endif // !defined(_di_f_iki_datas_resize_) || !defined(_di_f_iki_datas_append_) || !defined(_di_f_iki_datas_decimate_by_) || !defined(_di_f_iki_datass_append_) /** @@ -135,7 +135,7 @@ extern "C" { * @see f_iki_datass_decimate_by() */ #if !defined(_di_f_iki_datass_adjust_) || !defined(_di_f_iki_datass_decimate_by_) - extern f_status_t private_f_iki_datass_adjust(const f_array_length_t length, f_iki_datass_t *datass) F_attribute_visibility_internal_d; + extern f_status_t private_f_iki_datass_adjust(const f_number_unsigned_t length, f_iki_datass_t *datass) F_attribute_visibility_internal_d; #endif // !defined(_di_f_iki_datass_adjust_) || !defined(_di_f_iki_datass_decimate_by_) /** @@ -165,7 +165,7 @@ extern "C" { * @see f_iki_datass_resize() */ #if !defined(_di_f_iki_datass_decrease_by_) || !defined(_di_f_iki_datass_increase_) || !defined(_di_f_iki_datass_increase_by_) || !defined(_di_f_iki_datass_resize_) - extern f_status_t private_f_iki_datass_resize(const f_array_length_t length, f_iki_datass_t *datass) F_attribute_visibility_internal_d; + extern f_status_t private_f_iki_datass_resize(const f_number_unsigned_t length, f_iki_datass_t *datass) F_attribute_visibility_internal_d; #endif // !defined(_di_f_iki_datass_decrease_by_) || !defined(_di_f_iki_datass_increase_) || !defined(_di_f_iki_datass_increase_by_) || !defined(_di_f_iki_datass_resize_) #ifdef __cplusplus diff --git a/level_0/f_iki/c/private-iki.c b/level_0/f_iki/c/private-iki.c index d972285..273c58b 100644 --- a/level_0/f_iki/c/private-iki.c +++ b/level_0/f_iki/c/private-iki.c @@ -6,11 +6,11 @@ extern "C" { #endif #if !defined(_di_f_iki_content_is_) || !defined(_di_f_iki_content_partial_is_) - f_status_t private_f_iki_content_partial_is(const f_string_t buffer, const f_array_length_t length, const f_char_t quote) { + f_status_t private_f_iki_content_partial_is(const f_string_t buffer, const f_number_unsigned_t length, const f_char_t quote) { - f_array_length_t delimits = 0; + f_number_unsigned_t delimits = 0; - for (f_array_length_t i = 0; i < length; i += macro_f_utf_byte_width(buffer[i])) { + for (f_number_unsigned_t i = 0; i < length; i += macro_f_utf_byte_width(buffer[i])) { if (buffer[i] == quote) { if (delimits && delimits % 2) { @@ -35,11 +35,11 @@ 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_status_t private_f_iki_object_partial_is(const f_string_t buffer, const f_array_length_t length) { + f_status_t private_f_iki_object_partial_is(const f_string_t buffer, const f_number_unsigned_t length) { f_status_t status = F_none; - for (f_array_length_t i = 0; i < length; i += macro_f_utf_byte_width(buffer[i])) { + for (f_number_unsigned_t i = 0; i < length; i += macro_f_utf_byte_width(buffer[i])) { status = f_utf_is_word_dash_plus(buffer + i, length - i, F_false); if (F_status_is_error(status)) return status; diff --git a/level_0/f_iki/c/private-iki.h b/level_0/f_iki/c/private-iki.h index d4585fa..bb63c1c 100644 --- a/level_0/f_iki/c/private-iki.h +++ b/level_0/f_iki/c/private-iki.h @@ -40,7 +40,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_status_t private_f_iki_content_partial_is(const f_string_t buffer, const f_array_length_t length, const f_char_t quote) F_attribute_visibility_internal_d; + extern f_status_t private_f_iki_content_partial_is(const f_string_t buffer, const f_number_unsigned_t length, const f_char_t quote) F_attribute_visibility_internal_d; #endif // !defined(_di_f_iki_content_is_) || !defined(_di_f_iki_content_partial_is_) /** @@ -57,16 +57,16 @@ extern "C" { * F_none on success. * F_data_not on success, but there is no reason to increase size (used + 1 <= size). * - * Errors (with error bit) from: f_array_lengths_adjust(). + * Errors (with error bit) from: f_number_unsigneds_adjust(). * Errors (with error bit) from: f_memory_adjust(). * Errors (with error bit) from: f_string_ranges_adjust(). * - * @see f_array_lengths_adjust() + * @see f_number_unsigneds_adjust() * @see f_memory_adjust() * @see f_string_ranges_adjust() */ #if !defined(_di_f_iki_datas_adjust_) || !defined(_di_f_iki_datas_decimate_by_) - extern f_status_t private_f_iki_datas_adjust(const f_array_length_t length, f_iki_datas_t *datas) F_attribute_visibility_internal_d; + extern f_status_t private_f_iki_datas_adjust(const f_number_unsigned_t length, f_iki_datas_t *datas) F_attribute_visibility_internal_d; #endif // !defined(_di_f_iki_datas_adjust_) || !defined(_di_f_iki_datas_decimate_by_) /** @@ -107,16 +107,16 @@ extern "C" { * F_none on success. * F_data_not on success, but there is no reason to increase size (used + 1 <= size). * - * Errors (with error bit) from: f_array_lengths_resize(). + * Errors (with error bit) from: f_number_unsigneds_resize(). * Errors (with error bit) from: f_memory_resize(). * Errors (with error bit) from: f_string_ranges_resize(). * - * @see f_array_lengths_resize() + * @see f_number_unsigneds_resize() * @see f_memory_resize() * @see f_string_ranges_resize() */ #if !defined(_di_f_iki_datas_append_) || !defined(_di_f_iki_datas_decrease_by_) || !defined(_di_f_iki_datas_increase_) || !defined(_di_f_iki_datas_increase_by_) || !defined(_di_f_iki_datas_resize_) - extern f_status_t private_f_iki_datas_resize(const f_array_length_t length, f_iki_datas_t *datas) F_attribute_visibility_internal_d; + extern f_status_t private_f_iki_datas_resize(const f_number_unsigned_t length, f_iki_datas_t *datas) F_attribute_visibility_internal_d; #endif // !defined(_di_f_iki_datas_append_) || !defined(_di_f_iki_datas_decrease_by_) || !defined(_di_f_iki_datas_increase_) || !defined(_di_f_iki_datas_increase_by_) || !defined(_di_f_iki_datas_resize_) /** @@ -144,7 +144,7 @@ extern "C" { * @see f_iki_datass_decimate_by() */ #if !defined(_di_f_iki_datass_adjust_) || !defined(_di_f_iki_datass_decimate_by_) - extern f_status_t private_f_iki_datass_adjust(const f_array_length_t length, f_iki_datass_t *datass) F_attribute_visibility_internal_d; + extern f_status_t private_f_iki_datass_adjust(const f_number_unsigned_t length, f_iki_datass_t *datass) F_attribute_visibility_internal_d; #endif // !defined(_di_f_iki_datass_adjust_) || !defined(_di_f_iki_datass_decimate_by_) /** @@ -174,7 +174,7 @@ extern "C" { * @see f_iki_datass_resize() */ #if !defined(_di_f_iki_datass_decrease_by_) || !defined(_di_f_iki_datass_increase_) || !defined(_di_f_iki_datass_increase_by_) || !defined(_di_f_iki_datass_resize_) - extern f_status_t private_f_iki_datass_resize(const f_array_length_t length, f_iki_datass_t *datass) F_attribute_visibility_internal_d; + extern f_status_t private_f_iki_datass_resize(const f_number_unsigned_t length, f_iki_datass_t *datass) F_attribute_visibility_internal_d; #endif // !defined(_di_f_iki_datass_decrease_by_) || !defined(_di_f_iki_datass_increase_) || !defined(_di_f_iki_datass_increase_by_) || !defined(_di_f_iki_datass_resize_) /** @@ -197,7 +197,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_status_t private_f_iki_object_partial_is(const f_string_t buffer, const f_array_length_t length) F_attribute_visibility_internal_d; + extern f_status_t private_f_iki_object_partial_is(const f_string_t buffer, const f_number_unsigned_t length) F_attribute_visibility_internal_d; #endif // !defined(_di_f_iki_object_is_) || !defined(_di_f_iki_object_partial_is_) #ifdef __cplusplus diff --git a/level_0/f_iki/tests/unit/c/test-iki-datas_append.c b/level_0/f_iki/tests/unit/c/test-iki-datas_append.c index f81780f..f518cf4 100644 --- a/level_0/f_iki/tests/unit/c/test-iki-datas_append.c +++ b/level_0/f_iki/tests/unit/c/test-iki-datas_append.c @@ -7,19 +7,19 @@ extern "C" { void test__f_iki_datas_append__works(void **state) { - const f_array_length_t length = 5; + const f_number_unsigned_t length = 5; f_iki_data_t source = f_iki_data_t_initialize; f_iki_datas_t destination = f_iki_datas_t_initialize; { - f_array_length_t i = 1; + f_number_unsigned_t i = 1; f_status_t status = f_string_ranges_resize(length, &source.content); assert_int_equal(status, F_none); assert_int_equal(source.content.size, length); - status = f_array_lengths_resize(length, &source.delimits); + status = f_number_unsigneds_resize(length, &source.delimits); assert_int_equal(status, F_none); assert_int_equal(source.delimits.size, length); @@ -67,7 +67,7 @@ void test__f_iki_datas_append__works(void **state) { assert_int_equal(destination.array[0].variable.used, source.variable.used); assert_int_equal(destination.array[0].vocabulary.used, source.vocabulary.used); - for (f_array_length_t i = 0; i < length; ++i) { + for (f_number_unsigned_t i = 0; i < length; ++i) { assert_int_equal(destination.array[0].content.array[i].start, source.content.array[i].start); assert_int_equal(destination.array[0].content.array[i].stop, source.content.array[i].stop); diff --git a/level_0/f_iki/tests/unit/c/test-iki-datas_append_all.c b/level_0/f_iki/tests/unit/c/test-iki-datas_append_all.c index e01ec3c..15336bb 100644 --- a/level_0/f_iki/tests/unit/c/test-iki-datas_append_all.c +++ b/level_0/f_iki/tests/unit/c/test-iki-datas_append_all.c @@ -17,8 +17,8 @@ void test__f_iki_datas_append_all__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(source.size, 2); - f_array_length_t i = 1; - f_array_length_t j = 0; + f_number_unsigned_t i = 1; + f_number_unsigned_t j = 0; for (; j < 2; ++j) { @@ -27,7 +27,7 @@ void test__f_iki_datas_append_all__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(source.array[j].content.size, length); - status = f_array_lengths_resize(length, &source.array[j].delimits); + status = f_number_unsigneds_resize(length, &source.array[j].delimits); assert_int_equal(status, F_none); assert_int_equal(source.array[j].delimits.size, length); @@ -76,14 +76,14 @@ void test__f_iki_datas_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t j = 0; j < 2; ++j) { + for (f_number_unsigned_t j = 0; j < 2; ++j) { assert_int_equal(destination.array[j].content.used, source.array[j].content.used); assert_int_equal(destination.array[j].delimits.used, source.array[j].delimits.used); assert_int_equal(destination.array[j].variable.used, source.array[j].variable.used); assert_int_equal(destination.array[j].vocabulary.used, source.array[j].vocabulary.used); - for (f_array_length_t i = 0; i < length; ++i) { + for (f_number_unsigned_t i = 0; i < length; ++i) { assert_int_equal(destination.array[j].content.array[i].start, source.array[j].content.array[i].start); assert_int_equal(destination.array[j].content.array[i].stop, source.array[j].content.array[i].stop); @@ -99,7 +99,7 @@ void test__f_iki_datas_append_all__works(void **state) { } // for } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { free((void *) source.array[i].content.array); free((void *) source.array[i].delimits.array); @@ -107,7 +107,7 @@ void test__f_iki_datas_append_all__works(void **state) { free((void *) source.array[i].vocabulary.array); } // for - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].content.array); free((void *) destination.array[i].delimits.array); diff --git a/level_0/f_iki/tests/unit/c/test-iki-datass_append.c b/level_0/f_iki/tests/unit/c/test-iki-datass_append.c index e69b5e0..bd23970 100644 --- a/level_0/f_iki/tests/unit/c/test-iki-datass_append.c +++ b/level_0/f_iki/tests/unit/c/test-iki-datass_append.c @@ -18,16 +18,16 @@ void test__f_iki_datass_append__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(source.size, length_outer); - f_array_length_t i = 1; + f_number_unsigned_t i = 1; - for (f_array_length_t j = 0; j < length_outer; ++j) { + for (f_number_unsigned_t j = 0; j < length_outer; ++j) { status = f_string_ranges_resize(length, &source.array[j].content); assert_int_equal(status, F_none); assert_int_equal(source.array[j].content.size, length); - status = f_array_lengths_resize(length, &source.array[j].delimits); + status = f_number_unsigneds_resize(length, &source.array[j].delimits); assert_int_equal(status, F_none); assert_int_equal(source.array[j].delimits.size, length); @@ -76,14 +76,14 @@ void test__f_iki_datass_append__works(void **state) { assert_int_equal(destination.used, 1); assert_int_equal(destination.array[0].used, source.used); - for (f_array_length_t j = 0; j < length_outer; ++j) { + for (f_number_unsigned_t j = 0; j < length_outer; ++j) { assert_int_equal(destination.array[0].array[j].content.used, source.array[j].content.used); assert_int_equal(destination.array[0].array[j].delimits.used, source.array[j].delimits.used); assert_int_equal(destination.array[0].array[j].variable.used, source.array[j].variable.used); assert_int_equal(destination.array[0].array[j].vocabulary.used, source.array[j].vocabulary.used); - for (f_array_length_t i = 0; i < length; ++i) { + for (f_number_unsigned_t i = 0; i < length; ++i) { assert_int_equal(destination.array[0].array[j].content.array[i].start, source.array[j].content.array[i].start); assert_int_equal(destination.array[0].array[j].content.array[i].stop, source.array[j].content.array[i].stop); @@ -99,7 +99,7 @@ void test__f_iki_datass_append__works(void **state) { } // for } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { free((void *) source.array[i].content.array); free((void *) source.array[i].delimits.array); @@ -107,9 +107,9 @@ void test__f_iki_datass_append__works(void **state) { free((void *) source.array[i].vocabulary.array); } // for - for (f_array_length_t j = 0; j < length_outer; ++j) { + for (f_number_unsigned_t j = 0; j < length_outer; ++j) { - for (f_array_length_t i = 0; i < destination.array[j].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[j].used; ++i) { free((void *) destination.array[j].array[i].content.array); free((void *) destination.array[j].array[i].delimits.array); diff --git a/level_0/f_iki/tests/unit/c/test-iki-datass_append_all.c b/level_0/f_iki/tests/unit/c/test-iki-datass_append_all.c index 9351919..4b4f405 100644 --- a/level_0/f_iki/tests/unit/c/test-iki-datass_append_all.c +++ b/level_0/f_iki/tests/unit/c/test-iki-datass_append_all.c @@ -19,8 +19,8 @@ void test__f_iki_datass_append_all__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(source.size, length_outer); - f_array_length_t i = 1; - f_array_length_t j = 0; + f_number_unsigned_t i = 1; + f_number_unsigned_t j = 0; for (; source.used < length_outer; ++source.used) { @@ -36,7 +36,7 @@ void test__f_iki_datass_append_all__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(source.array[source.used].array[j].content.size, length); - status = f_array_lengths_resize(length, &source.array[source.used].array[j].delimits); + status = f_number_unsigneds_resize(length, &source.array[source.used].array[j].delimits); assert_int_equal(status, F_none); assert_int_equal(source.array[source.used].array[j].delimits.size, length); @@ -84,16 +84,16 @@ void test__f_iki_datass_append_all__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, source.used); - for (f_array_length_t k = 0; k < length_outer; ++k) { + for (f_number_unsigned_t k = 0; k < length_outer; ++k) { - for (f_array_length_t j = 0; j < length_inner; ++j) { + for (f_number_unsigned_t j = 0; j < length_inner; ++j) { assert_int_equal(destination.array[k].array[j].content.used, source.array[k].array[j].content.used); assert_int_equal(destination.array[k].array[j].delimits.used, source.array[k].array[j].delimits.used); assert_int_equal(destination.array[k].array[j].variable.used, source.array[k].array[j].variable.used); assert_int_equal(destination.array[k].array[j].vocabulary.used, source.array[k].array[j].vocabulary.used); - for (f_array_length_t i = 0; i < length; ++i) { + for (f_number_unsigned_t i = 0; i < length; ++i) { assert_int_equal(destination.array[k].array[j].content.array[i].start, source.array[k].array[j].content.array[i].start); assert_int_equal(destination.array[k].array[j].content.array[i].stop, source.array[k].array[j].content.array[i].stop); @@ -110,9 +110,9 @@ void test__f_iki_datass_append_all__works(void **state) { } // for } - for (f_array_length_t j = 0; j < source.used; ++j) { + for (f_number_unsigned_t j = 0; j < source.used; ++j) { - for (f_array_length_t i = 0; i < source.array[j].used; ++i) { + for (f_number_unsigned_t i = 0; i < source.array[j].used; ++i) { free((void *) source.array[j].array[i].content.array); free((void *) source.array[j].array[i].delimits.array); @@ -123,9 +123,9 @@ void test__f_iki_datass_append_all__works(void **state) { free((void *) source.array[j].array); } // for - for (f_array_length_t j = 0; j < destination.used; ++j) { + for (f_number_unsigned_t j = 0; j < destination.used; ++j) { - for (f_array_length_t i = 0; i < destination.array[j].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[j].used; ++i) { free((void *) destination.array[j].array[i].content.array); free((void *) destination.array[j].array[i].delimits.array); diff --git a/level_0/f_iki/tests/unit/c/test-iki-read.c b/level_0/f_iki/tests/unit/c/test-iki-read.c index e1f689b..22d5d88 100644 --- a/level_0/f_iki/tests/unit/c/test-iki-read.c +++ b/level_0/f_iki/tests/unit/c/test-iki-read.c @@ -112,7 +112,7 @@ void test__f_iki_read__works(void **state) { macro_f_string_static_t_initialize_1("url:\"https://localhost/fake-0.7.0.tar.gz?query=xx¶meter=yyy%20\" end.", 0, 72), }; - const f_array_length_t matches[] = { + const f_number_unsigned_t matches[] = { 0, 0, 1, diff --git a/level_0/f_limit/c/limit/private-set.c b/level_0/f_limit/c/limit/private-set.c index 4f755be..8f056e2 100644 --- a/level_0/f_limit/c/limit/private-set.c +++ b/level_0/f_limit/c/limit/private-set.c @@ -7,7 +7,7 @@ extern "C" { #endif #if !defined(_di_f_limit_sets_adjust_) || !defined(_di_f_limit_sets_decimate_by_) - f_status_t private_f_limit_sets_adjust(const f_array_length_t length, f_limit_sets_t *sets) { + f_status_t private_f_limit_sets_adjust(const f_number_unsigned_t length, f_limit_sets_t *sets) { const f_status_t status = f_memory_adjust(sets->size, length, sizeof(f_limit_set_t), (void **) & sets->array); if (F_status_is_error(status)) return status; @@ -44,7 +44,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { destination->array[destination->used++] = source.array[i]; } // for @@ -53,7 +53,7 @@ extern "C" { #endif // !defined(_di_f_limit_sets_append_) || !defined(_di_f_limit_sets_append_all_) || !defined(_di_f_limit_setss_append_all_) #if !defined(_di_f_limit_sets_resize_) || !defined(_di_f_limit_sets_append_) || !defined(_di_f_limit_sets_decimate_by_) || !defined(_di_f_limit_setss_append_) - f_status_t private_f_limit_sets_resize(const f_array_length_t length, f_limit_sets_t *sets) { + f_status_t private_f_limit_sets_resize(const f_number_unsigned_t length, f_limit_sets_t *sets) { const f_status_t status = f_memory_resize(sets->size, length, sizeof(f_limit_set_t), (void **) & sets->array); if (F_status_is_error(status)) return status; @@ -69,11 +69,11 @@ extern "C" { #endif // !defined(_di_f_limit_sets_resize_) || !defined(_di_f_limit_sets_append_) || !defined(_di_f_limit_sets_decimate_by_) || !defined(_di_f_limit_setss_append_) #if !defined(_di_f_limit_setss_adjust_) || !defined(_di_f_limit_setss_decimate_by_) - f_status_t private_f_limit_setss_adjust(const f_array_length_t length, f_limit_setss_t *setss) { + f_status_t private_f_limit_setss_adjust(const f_number_unsigned_t length, f_limit_setss_t *setss) { f_status_t status = F_none; - for (f_array_length_t i = length; i < setss->size; ++i) { + for (f_number_unsigned_t i = length; i < setss->size; ++i) { status = f_memory_destroy(setss->array[i].size, sizeof(f_limit_sets_t), (void **) & setss->array[i].array); if (F_status_is_error(status)) return status; @@ -96,11 +96,11 @@ extern "C" { #endif // !defined(_di_f_limit_setss_adjust_) || !defined(_di_f_limit_setss_decimate_by_) #if !defined(_di_f_limit_setss_decrease_by_) || !defined(_di_f_limit_setss_increase_) || !defined(_di_f_limit_setss_increase_by_) || !defined(_di_f_limit_setss_resize_) - f_status_t private_f_limit_setss_resize(const f_array_length_t length, f_limit_setss_t *setss) { + f_status_t private_f_limit_setss_resize(const f_number_unsigned_t length, f_limit_setss_t *setss) { f_status_t status = F_none; - for (f_array_length_t i = length; i < setss->size; ++i) { + for (f_number_unsigned_t i = length; i < setss->size; ++i) { status = f_memory_delete(setss->array[i].size, sizeof(f_limit_sets_t), (void **) & setss->array[i].array); if (F_status_is_error(status)) return status; diff --git a/level_0/f_limit/c/limit/private-set.h b/level_0/f_limit/c/limit/private-set.h index a78c881..75e2299 100644 --- a/level_0/f_limit/c/limit/private-set.h +++ b/level_0/f_limit/c/limit/private-set.h @@ -35,7 +35,7 @@ extern "C" { * @see f_limit_sets_decimate_by() */ #if !defined(_di_f_limit_sets_adjust_) || !defined(_di_f_limit_sets_decimate_by_) - extern f_status_t private_f_limit_sets_adjust(const f_array_length_t length, f_limit_sets_t *sets) F_attribute_visibility_internal_d; + extern f_status_t private_f_limit_sets_adjust(const f_number_unsigned_t length, f_limit_sets_t *sets) F_attribute_visibility_internal_d; #endif // !defined(_di_f_limit_sets_adjust_) || !defined(_di_f_limit_sets_decimate_by_) /** @@ -107,7 +107,7 @@ extern "C" { * @see f_limit_setss_append() */ #if !defined(_di_f_limit_sets_resize_) || !defined(_di_f_limit_sets_append_) || !defined(_di_f_limit_sets_decimate_by_) || !defined(_di_f_limit_setss_append_) - extern f_status_t private_f_limit_sets_resize(const f_array_length_t length, f_limit_sets_t *sets) F_attribute_visibility_internal_d; + extern f_status_t private_f_limit_sets_resize(const f_number_unsigned_t length, f_limit_sets_t *sets) F_attribute_visibility_internal_d; #endif // !defined(_di_f_limit_sets_resize_) || !defined(_di_f_limit_sets_append_) || !defined(_di_f_limit_sets_decimate_by_) || !defined(_di_f_limit_setss_append_) /** @@ -135,7 +135,7 @@ extern "C" { * @see f_limit_setss_decimate_by() */ #if !defined(_di_f_limit_setss_adjust_) || !defined(_di_f_limit_setss_decimate_by_) - extern f_status_t private_f_limit_setss_adjust(const f_array_length_t length, f_limit_setss_t *setss) F_attribute_visibility_internal_d; + extern f_status_t private_f_limit_setss_adjust(const f_number_unsigned_t length, f_limit_setss_t *setss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_limit_setss_adjust_) || !defined(_di_f_limit_setss_decimate_by_) /** @@ -165,7 +165,7 @@ extern "C" { * @see f_limit_setss_resize() */ #if !defined(_di_f_limit_setss_decrease_by_) || !defined(_di_f_limit_setss_increase_) || !defined(_di_f_limit_setss_increase_by_) || !defined(_di_f_limit_setss_resize_) - extern f_status_t private_f_limit_setss_resize(const f_array_length_t length, f_limit_setss_t *setss) F_attribute_visibility_internal_d; + extern f_status_t private_f_limit_setss_resize(const f_number_unsigned_t length, f_limit_setss_t *setss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_limit_setss_decrease_by_) || !defined(_di_f_limit_setss_increase_) || !defined(_di_f_limit_setss_increase_by_) || !defined(_di_f_limit_setss_resize_) #ifdef __cplusplus diff --git a/level_0/f_limit/c/limit/private-value.c b/level_0/f_limit/c/limit/private-value.c index 2bb400a..be69994 100644 --- a/level_0/f_limit/c/limit/private-value.c +++ b/level_0/f_limit/c/limit/private-value.c @@ -7,7 +7,7 @@ extern "C" { #endif #if !defined(_di_f_limit_values_adjust_) || !defined(_di_f_limit_values_decimate_by_) - f_status_t private_f_limit_values_adjust(const f_array_length_t length, f_limit_values_t *values) { + f_status_t private_f_limit_values_adjust(const f_number_unsigned_t length, f_limit_values_t *values) { const f_status_t status = f_memory_adjust(values->size, length, sizeof(f_limit_value_t), (void **) & values->array); if (F_status_is_error(status)) return status; @@ -44,7 +44,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { destination->array[destination->used++] = source.array[i]; } // for @@ -53,7 +53,7 @@ extern "C" { #endif // !defined(_di_f_limit_values_append_) || !defined(_di_f_limit_values_append_all_) || !defined(_di_f_limit_valuess_append_all_) #if !defined(_di_f_limit_values_resize_) || !defined(_di_f_limit_values_append_) || !defined(_di_f_limit_values_decimate_by_) || !defined(_di_f_limit_valuess_append_) - f_status_t private_f_limit_values_resize(const f_array_length_t length, f_limit_values_t *values) { + f_status_t private_f_limit_values_resize(const f_number_unsigned_t length, f_limit_values_t *values) { const f_status_t status = f_memory_resize(values->size, length, sizeof(f_limit_value_t), (void **) & values->array); if (F_status_is_error(status)) return status; @@ -69,11 +69,11 @@ extern "C" { #endif // !defined(_di_f_limit_values_resize_) || !defined(_di_f_limit_values_append_) || !defined(_di_f_limit_values_decimate_by_) || !defined(_di_f_limit_valuess_append_) #if !defined(_di_f_limit_valuess_adjust_) || !defined(_di_f_limit_valuess_decimate_by_) - f_status_t private_f_limit_valuess_adjust(const f_array_length_t length, f_limit_valuess_t *valuess) { + f_status_t private_f_limit_valuess_adjust(const f_number_unsigned_t length, f_limit_valuess_t *valuess) { f_status_t status = F_none; - for (f_array_length_t i = length; i < valuess->size; ++i) { + for (f_number_unsigned_t i = length; i < valuess->size; ++i) { status = f_memory_destroy(valuess->array[i].size, sizeof(f_limit_values_t), (void **) & valuess->array[i].array); if (F_status_is_error(status)) return status; @@ -96,11 +96,11 @@ extern "C" { #endif // !defined(_di_f_limit_valuess_adjust_) || !defined(_di_f_limit_valuess_decimate_by_) #if !defined(_di_f_limit_valuess_decrease_by_) || !defined(_di_f_limit_valuess_increase_) || !defined(_di_f_limit_valuess_increase_by_) || !defined(_di_f_limit_valuess_resize_) - f_status_t private_f_limit_valuess_resize(const f_array_length_t length, f_limit_valuess_t *valuess) { + f_status_t private_f_limit_valuess_resize(const f_number_unsigned_t length, f_limit_valuess_t *valuess) { f_status_t status = F_none; - for (f_array_length_t i = length; i < valuess->size; ++i) { + for (f_number_unsigned_t i = length; i < valuess->size; ++i) { status = f_memory_delete(valuess->array[i].size, sizeof(f_limit_values_t), (void **) & valuess->array[i].array); if (F_status_is_error(status)) return status; diff --git a/level_0/f_limit/c/limit/private-value.h b/level_0/f_limit/c/limit/private-value.h index 66992cf..57cca27 100644 --- a/level_0/f_limit/c/limit/private-value.h +++ b/level_0/f_limit/c/limit/private-value.h @@ -35,7 +35,7 @@ extern "C" { * @see f_limit_values_decimate_by() */ #if !defined(_di_f_limit_values_adjust_) || !defined(_di_f_limit_values_decimate_by_) - extern f_status_t private_f_limit_values_adjust(const f_array_length_t length, f_limit_values_t *values) F_attribute_visibility_internal_d; + extern f_status_t private_f_limit_values_adjust(const f_number_unsigned_t length, f_limit_values_t *values) F_attribute_visibility_internal_d; #endif // !defined(_di_f_limit_values_adjust_) || !defined(_di_f_limit_values_decimate_by_) /** @@ -107,7 +107,7 @@ extern "C" { * @see f_limit_valuess_append() */ #if !defined(_di_f_limit_values_resize_) || !defined(_di_f_limit_values_append_) || !defined(_di_f_limit_values_decimate_by_) || !defined(_di_f_limit_valuess_append_) - extern f_status_t private_f_limit_values_resize(const f_array_length_t length, f_limit_values_t *values) F_attribute_visibility_internal_d; + extern f_status_t private_f_limit_values_resize(const f_number_unsigned_t length, f_limit_values_t *values) F_attribute_visibility_internal_d; #endif // !defined(_di_f_limit_values_resize_) || !defined(_di_f_limit_values_append_) || !defined(_di_f_limit_values_decimate_by_) || !defined(_di_f_limit_valuess_append_) /** @@ -135,7 +135,7 @@ extern "C" { * @see f_limit_valuess_decimate_by() */ #if !defined(_di_f_limit_valuess_adjust_) || !defined(_di_f_limit_valuess_decimate_by_) - extern f_status_t private_f_limit_valuess_adjust(const f_array_length_t length, f_limit_valuess_t *valuess) F_attribute_visibility_internal_d; + extern f_status_t private_f_limit_valuess_adjust(const f_number_unsigned_t length, f_limit_valuess_t *valuess) F_attribute_visibility_internal_d; #endif // !defined(_di_f_limit_valuess_adjust_) || !defined(_di_f_limit_valuess_decimate_by_) /** @@ -165,7 +165,7 @@ extern "C" { * @see f_limit_valuess_resize() */ #if !defined(_di_f_limit_valuess_decrease_by_) || !defined(_di_f_limit_valuess_increase_) || !defined(_di_f_limit_valuess_increase_by_) || !defined(_di_f_limit_valuess_resize_) - extern f_status_t private_f_limit_valuess_resize(const f_array_length_t length, f_limit_valuess_t *valuess) F_attribute_visibility_internal_d; + extern f_status_t private_f_limit_valuess_resize(const f_number_unsigned_t length, f_limit_valuess_t *valuess) F_attribute_visibility_internal_d; #endif // !defined(_di_f_limit_valuess_decrease_by_) || !defined(_di_f_limit_valuess_increase_) || !defined(_di_f_limit_valuess_increase_by_) || !defined(_di_f_limit_valuess_resize_) #ifdef __cplusplus diff --git a/level_0/f_limit/c/limit/set.c b/level_0/f_limit/c/limit/set.c index 411273b..6b619c2 100644 --- a/level_0/f_limit/c/limit/set.c +++ b/level_0/f_limit/c/limit/set.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_limit_sets_adjust_ - f_status_t f_limit_sets_adjust(const f_array_length_t length, f_limit_sets_t *sets) { + f_status_t f_limit_sets_adjust(const f_number_unsigned_t length, 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_ @@ -39,7 +39,7 @@ extern "C" { #endif // _di_f_limit_sets_append_all_ #ifndef _di_f_limit_sets_decimate_by_ - f_status_t f_limit_sets_decimate_by(const f_array_length_t amount, f_limit_sets_t *sets) { + f_status_t f_limit_sets_decimate_by(const f_number_unsigned_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_ @@ -55,7 +55,7 @@ extern "C" { #endif // _di_f_limit_sets_decimate_by_ #ifndef _di_f_limit_sets_decrease_by_ - f_status_t f_limit_sets_decrease_by(const f_array_length_t amount, f_limit_sets_t *sets) { + f_status_t f_limit_sets_decrease_by(const f_number_unsigned_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_ @@ -71,20 +71,20 @@ extern "C" { #endif // _di_f_limit_sets_decrease_by_ #ifndef _di_f_limit_sets_increase_ - f_status_t f_limit_sets_increase(const f_array_length_t step, f_limit_sets_t *sets) { + f_status_t f_limit_sets_increase(const f_number_unsigned_t step, 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 (step && sets->used + 1 > sets->size) { - f_array_length_t size = sets->used + step; + f_number_unsigned_t size = sets->used + step; - if (size > F_array_length_t_size_d) { - if (sets->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (sets->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_limit_sets_resize(size, sets); @@ -95,7 +95,7 @@ extern "C" { #endif // _di_f_limit_sets_increase_ #ifndef _di_f_limit_sets_increase_by_ - f_status_t f_limit_sets_increase_by(const f_array_length_t amount, f_limit_sets_t *sets) { + f_status_t f_limit_sets_increase_by(const f_number_unsigned_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_ @@ -103,7 +103,7 @@ extern "C" { if (!amount) return F_data_not; if (sets->used + amount > sets->size) { - if (sets->used + amount > F_array_length_t_size_d) { + if (sets->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -115,7 +115,7 @@ extern "C" { #endif // _di_f_limit_sets_increase_by_ #ifndef _di_f_limit_sets_resize_ - f_status_t f_limit_sets_resize(const f_array_length_t length, f_limit_sets_t *sets) { + f_status_t f_limit_sets_resize(const f_number_unsigned_t length, 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_ @@ -125,7 +125,7 @@ extern "C" { #endif // _di_f_limit_sets_resize_ #ifndef _di_f_limit_setss_adjust_ - f_status_t f_limit_setss_adjust(const f_array_length_t length, f_limit_setss_t *setss) { + f_status_t f_limit_setss_adjust(const f_number_unsigned_t length, f_limit_setss_t *setss) { #ifndef _di_level_0_parameter_checking_ if (!setss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -173,7 +173,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].used = 0; @@ -188,7 +188,7 @@ extern "C" { #endif // _di_f_limit_setss_append_all_ #ifndef _di_f_limit_setss_decimate_by_ - f_status_t f_limit_setss_decimate_by(const f_array_length_t amount, f_limit_setss_t *setss) { + f_status_t f_limit_setss_decimate_by(const f_number_unsigned_t amount, f_limit_setss_t *setss) { #ifndef _di_level_0_parameter_checking_ if (!setss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -204,7 +204,7 @@ extern "C" { #endif // _di_f_limit_setss_decimate_by_ #ifndef _di_f_limit_setss_decrease_by_ - f_status_t f_limit_setss_decrease_by(const f_array_length_t amount, f_limit_setss_t *setss) { + f_status_t f_limit_setss_decrease_by(const f_number_unsigned_t amount, f_limit_setss_t *setss) { #ifndef _di_level_0_parameter_checking_ if (!setss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -220,20 +220,20 @@ extern "C" { #endif // _di_f_limit_setss_decrease_by_ #ifndef _di_f_limit_setss_increase_ - f_status_t f_limit_setss_increase(const f_array_length_t step, f_limit_setss_t *setss) { + f_status_t f_limit_setss_increase(const f_number_unsigned_t step, f_limit_setss_t *setss) { #ifndef _di_level_0_parameter_checking_ if (!setss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && setss->used + 1 > setss->size) { - f_array_length_t size = setss->used + step; + f_number_unsigned_t size = setss->used + step; - if (size > F_array_length_t_size_d) { - if (setss->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (setss->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_limit_setss_resize(size, setss); @@ -244,7 +244,7 @@ extern "C" { #endif // _di_f_limit_setss_increase_ #ifndef _di_f_limit_setss_increase_by_ - f_status_t f_limit_setss_increase_by(const f_array_length_t amount, f_limit_setss_t *setss) { + f_status_t f_limit_setss_increase_by(const f_number_unsigned_t amount, f_limit_setss_t *setss) { #ifndef _di_level_0_parameter_checking_ if (!setss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -252,7 +252,7 @@ extern "C" { if (!amount) return F_data_not; if (setss->used + amount > setss->size) { - if (setss->used + amount > F_array_length_t_size_d) { + if (setss->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -264,7 +264,7 @@ extern "C" { #endif // _di_f_limit_setss_increase_by_ #ifndef _di_f_limit_setss_resize_ - f_status_t f_limit_setss_resize(const f_array_length_t length, f_limit_setss_t *setss) { + f_status_t f_limit_setss_resize(const f_number_unsigned_t length, f_limit_setss_t *setss) { #ifndef _di_level_0_parameter_checking_ if (!setss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_limit/c/limit/set.h b/level_0/f_limit/c/limit/set.h index 19350a3..db08625 100644 --- a/level_0/f_limit/c/limit/set.h +++ b/level_0/f_limit/c/limit/set.h @@ -48,8 +48,8 @@ extern "C" { typedef struct { f_limit_set_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_limit_sets_t; #define f_limit_sets_t_initialize { 0, 0, 0 } @@ -82,8 +82,8 @@ extern "C" { typedef struct { f_limit_sets_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_limit_setss_t; #define f_limit_setss_t_initialize { 0, 0, 0 } @@ -121,7 +121,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_limit_sets_adjust_ - extern f_status_t f_limit_sets_adjust(const f_array_length_t length, f_limit_sets_t *sets); + extern f_status_t f_limit_sets_adjust(const f_number_unsigned_t length, f_limit_sets_t *sets); #endif // _di_f_limit_sets_adjust_ /** @@ -185,7 +185,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_limit_sets_decimate_by_ - extern f_status_t f_limit_sets_decimate_by(const f_array_length_t amount, f_limit_sets_t *sets); + extern f_status_t f_limit_sets_decimate_by(const f_number_unsigned_t amount, f_limit_sets_t *sets); #endif // _di_f_limit_sets_decimate_by_ /** @@ -208,13 +208,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_limit_sets_decrease_by_ - extern f_status_t f_limit_sets_decrease_by(const f_array_length_t amount, f_limit_sets_t *sets); + extern f_status_t f_limit_sets_decrease_by(const f_number_unsigned_t amount, f_limit_sets_t *sets); #endif // _di_f_limit_sets_decrease_by_ /** * Increase the size of the sets array, but only if necesary. * - * If the given length is too large for the buffer, then attempt to set max buffer size (F_array_length_t_size_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -233,14 +233,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_limit_sets_increase_ - extern f_status_t f_limit_sets_increase(const f_array_length_t step, f_limit_sets_t *sets); + extern f_status_t f_limit_sets_increase(const f_number_unsigned_t step, 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -258,7 +258,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_limit_sets_increase_by_ - extern f_status_t f_limit_sets_increase_by(const f_array_length_t amount, f_limit_sets_t *sets); + extern f_status_t f_limit_sets_increase_by(const f_number_unsigned_t amount, f_limit_sets_t *sets); #endif // _di_f_limit_sets_increase_by_ /** @@ -277,7 +277,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_limit_sets_resize_ - extern f_status_t f_limit_sets_resize(const f_array_length_t length, f_limit_sets_t *sets); + extern f_status_t f_limit_sets_resize(const f_number_unsigned_t length, f_limit_sets_t *sets); #endif // _di_f_limit_sets_resize_ /** @@ -297,7 +297,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_limit_setss_adjust_ - extern f_status_t f_limit_setss_adjust(const f_array_length_t length, f_limit_setss_t *setss); + extern f_status_t f_limit_setss_adjust(const f_number_unsigned_t length, f_limit_setss_t *setss); #endif // _di_f_limit_setss_adjust_ /** @@ -362,7 +362,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_limit_setss_decimate_by_ - extern f_status_t f_limit_setss_decimate_by(const f_array_length_t amount, f_limit_setss_t *setss); + extern f_status_t f_limit_setss_decimate_by(const f_number_unsigned_t amount, f_limit_setss_t *setss); #endif // _di_f_limit_setss_decimate_by_ /** @@ -386,13 +386,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_limit_setss_decrease_by_ - extern f_status_t f_limit_setss_decrease_by(const f_array_length_t amount, f_limit_setss_t *setss); + extern f_status_t f_limit_setss_decrease_by(const f_number_unsigned_t amount, f_limit_setss_t *setss); #endif // _di_f_limit_setss_decrease_by_ /** * Increase the size of the setss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -411,14 +411,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_limit_setss_increase_ - extern f_status_t f_limit_setss_increase(const f_array_length_t step, f_limit_setss_t *setss); + extern f_status_t f_limit_setss_increase(const f_number_unsigned_t step, f_limit_setss_t *setss); #endif // _di_f_limit_setss_increase_ /** * Resize the setss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -436,7 +436,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_limit_setss_increase_by_ - extern f_status_t f_limit_setss_increase_by(const f_array_length_t amount, f_limit_setss_t *setss); + extern f_status_t f_limit_setss_increase_by(const f_number_unsigned_t amount, f_limit_setss_t *setss); #endif // _di_f_limit_setss_increase_by_ /** @@ -456,7 +456,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_limit_setss_resize_ - extern f_status_t f_limit_setss_resize(const f_array_length_t length, f_limit_setss_t *setss); + extern f_status_t f_limit_setss_resize(const f_number_unsigned_t length, f_limit_setss_t *setss); #endif // _di_f_limit_setss_resize_ #ifdef __cplusplus diff --git a/level_0/f_limit/c/limit/value.c b/level_0/f_limit/c/limit/value.c index c8b0f49..173f702 100644 --- a/level_0/f_limit/c/limit/value.c +++ b/level_0/f_limit/c/limit/value.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_limit_values_adjust_ - f_status_t f_limit_values_adjust(const f_array_length_t length, f_limit_values_t *values) { + f_status_t f_limit_values_adjust(const f_number_unsigned_t length, 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_ @@ -39,7 +39,7 @@ extern "C" { #endif // _di_f_limit_values_append_all_ #ifndef _di_f_limit_values_decimate_by_ - f_status_t f_limit_values_decimate_by(const f_array_length_t amount, f_limit_values_t *values) { + f_status_t f_limit_values_decimate_by(const f_number_unsigned_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_ @@ -55,7 +55,7 @@ extern "C" { #endif // _di_f_limit_values_decimate_by_ #ifndef _di_f_limit_values_decrease_by_ - f_status_t f_limit_values_decrease_by(const f_array_length_t amount, f_limit_values_t *values) { + f_status_t f_limit_values_decrease_by(const f_number_unsigned_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_ @@ -71,20 +71,20 @@ extern "C" { #endif // _di_f_limit_values_decrease_by_ #ifndef _di_f_limit_values_increase_ - f_status_t f_limit_values_increase(const f_array_length_t step, f_limit_values_t *values) { + f_status_t f_limit_values_increase(const f_number_unsigned_t step, 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 (step && values->used + 1 > values->size) { - f_array_length_t size = values->used + step; + f_number_unsigned_t size = values->used + step; - if (size > F_array_length_t_size_d) { - if (values->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (values->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_limit_values_resize(size, values); @@ -95,7 +95,7 @@ extern "C" { #endif // _di_f_limit_values_increase_ #ifndef _di_f_limit_values_increase_by_ - f_status_t f_limit_values_increase_by(const f_array_length_t amount, f_limit_values_t *values) { + f_status_t f_limit_values_increase_by(const f_number_unsigned_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_ @@ -103,7 +103,7 @@ extern "C" { if (!amount) return F_data_not; if (values->used + amount > values->size) { - if (values->used + amount > F_array_length_t_size_d) { + if (values->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -115,7 +115,7 @@ extern "C" { #endif // _di_f_limit_values_increase_by_ #ifndef _di_f_limit_values_resize_ - f_status_t f_limit_values_resize(const f_array_length_t length, f_limit_values_t *values) { + f_status_t f_limit_values_resize(const f_number_unsigned_t length, 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_ @@ -125,7 +125,7 @@ extern "C" { #endif // _di_f_limit_values_resize_ #ifndef _di_f_limit_valuess_adjust_ - f_status_t f_limit_valuess_adjust(const f_array_length_t length, f_limit_valuess_t *valuess) { + f_status_t f_limit_valuess_adjust(const f_number_unsigned_t length, f_limit_valuess_t *valuess) { #ifndef _di_level_0_parameter_checking_ if (!valuess) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -173,7 +173,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].used = 0; @@ -188,7 +188,7 @@ extern "C" { #endif // _di_f_limit_valuess_append_all_ #ifndef _di_f_limit_valuess_decimate_by_ - f_status_t f_limit_valuess_decimate_by(const f_array_length_t amount, f_limit_valuess_t *valuess) { + f_status_t f_limit_valuess_decimate_by(const f_number_unsigned_t amount, f_limit_valuess_t *valuess) { #ifndef _di_level_0_parameter_checking_ if (!valuess) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -204,7 +204,7 @@ extern "C" { #endif // _di_f_limit_valuess_decimate_by_ #ifndef _di_f_limit_valuess_decrease_by_ - f_status_t f_limit_valuess_decrease_by(const f_array_length_t amount, f_limit_valuess_t *valuess) { + f_status_t f_limit_valuess_decrease_by(const f_number_unsigned_t amount, f_limit_valuess_t *valuess) { #ifndef _di_level_0_parameter_checking_ if (!valuess) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -220,20 +220,20 @@ extern "C" { #endif // _di_f_limit_valuess_decrease_by_ #ifndef _di_f_limit_valuess_increase_ - f_status_t f_limit_valuess_increase(const f_array_length_t step, f_limit_valuess_t *valuess) { + f_status_t f_limit_valuess_increase(const f_number_unsigned_t step, f_limit_valuess_t *valuess) { #ifndef _di_level_0_parameter_checking_ if (!valuess) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && valuess->used + 1 > valuess->size) { - f_array_length_t size = valuess->used + step; + f_number_unsigned_t size = valuess->used + step; - if (size > F_array_length_t_size_d) { - if (valuess->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (valuess->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_limit_valuess_resize(size, valuess); @@ -244,7 +244,7 @@ extern "C" { #endif // _di_f_limit_valuess_increase_ #ifndef _di_f_limit_valuess_increase_by_ - f_status_t f_limit_valuess_increase_by(const f_array_length_t amount, f_limit_valuess_t *valuess) { + f_status_t f_limit_valuess_increase_by(const f_number_unsigned_t amount, f_limit_valuess_t *valuess) { #ifndef _di_level_0_parameter_checking_ if (!valuess) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -252,7 +252,7 @@ extern "C" { if (!amount) return F_data_not; if (valuess->used + amount > valuess->size) { - if (valuess->used + amount > F_array_length_t_size_d) { + if (valuess->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -264,7 +264,7 @@ extern "C" { #endif // _di_f_limit_valuess_increase_by_ #ifndef _di_f_limit_valuess_resize_ - f_status_t f_limit_valuess_resize(const f_array_length_t length, f_limit_valuess_t *valuess) { + f_status_t f_limit_valuess_resize(const f_number_unsigned_t length, f_limit_valuess_t *valuess) { #ifndef _di_level_0_parameter_checking_ if (!valuess) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_limit/c/limit/value.h b/level_0/f_limit/c/limit/value.h index 071932a..577f093 100644 --- a/level_0/f_limit/c/limit/value.h +++ b/level_0/f_limit/c/limit/value.h @@ -45,8 +45,8 @@ extern "C" { typedef struct { f_limit_value_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_limit_values_t; #define f_limit_values_t_initialize { 0, 0, 0 } @@ -79,8 +79,8 @@ extern "C" { typedef struct { f_limit_values_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_limit_valuess_t; #define f_limit_valuess_t_initialize { 0, 0, 0 } @@ -118,7 +118,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_limit_values_adjust_ - extern f_status_t f_limit_values_adjust(const f_array_length_t length, f_limit_values_t *values); + extern f_status_t f_limit_values_adjust(const f_number_unsigned_t length, f_limit_values_t *values); #endif // _di_f_limit_values_adjust_ /** @@ -182,7 +182,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_limit_values_decimate_by_ - extern f_status_t f_limit_values_decimate_by(const f_array_length_t amount, f_limit_values_t *values); + extern f_status_t f_limit_values_decimate_by(const f_number_unsigned_t amount, f_limit_values_t *values); #endif // _di_f_limit_values_decimate_by_ /** @@ -205,13 +205,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_limit_values_decrease_by_ - extern f_status_t f_limit_values_decrease_by(const f_array_length_t amount, f_limit_values_t *values); + extern f_status_t f_limit_values_decrease_by(const f_number_unsigned_t amount, f_limit_values_t *values); #endif // _di_f_limit_values_decrease_by_ /** * Increase the size of the values array, but only if necesary. * - * If the given length is too large for the buffer, then attempt to set max buffer size (F_array_length_t_size_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -230,14 +230,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_limit_values_increase_ - extern f_status_t f_limit_values_increase(const f_array_length_t step, f_limit_values_t *values); + extern f_status_t f_limit_values_increase(const f_number_unsigned_t step, 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -255,7 +255,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_limit_values_increase_by_ - extern f_status_t f_limit_values_increase_by(const f_array_length_t amount, f_limit_values_t *values); + extern f_status_t f_limit_values_increase_by(const f_number_unsigned_t amount, f_limit_values_t *values); #endif // _di_f_limit_values_increase_by_ /** @@ -274,7 +274,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_limit_values_resize_ - extern f_status_t f_limit_values_resize(const f_array_length_t length, f_limit_values_t *values); + extern f_status_t f_limit_values_resize(const f_number_unsigned_t length, f_limit_values_t *values); #endif // _di_f_limit_values_resize_ /** @@ -294,7 +294,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_limit_valuess_adjust_ - extern f_status_t f_limit_valuess_adjust(const f_array_length_t length, f_limit_valuess_t *valuess); + extern f_status_t f_limit_valuess_adjust(const f_number_unsigned_t length, f_limit_valuess_t *valuess); #endif // _di_f_limit_valuess_adjust_ /** @@ -359,7 +359,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_limit_valuess_decimate_by_ - extern f_status_t f_limit_valuess_decimate_by(const f_array_length_t amount, f_limit_valuess_t *valuess); + extern f_status_t f_limit_valuess_decimate_by(const f_number_unsigned_t amount, f_limit_valuess_t *valuess); #endif // _di_f_limit_valuess_decimate_by_ /** @@ -383,13 +383,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_limit_valuess_decrease_by_ - extern f_status_t f_limit_valuess_decrease_by(const f_array_length_t amount, f_limit_valuess_t *valuess); + extern f_status_t f_limit_valuess_decrease_by(const f_number_unsigned_t amount, f_limit_valuess_t *valuess); #endif // _di_f_limit_valuess_decrease_by_ /** * Increase the size of the valuess 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -408,14 +408,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_limit_valuess_increase_ - extern f_status_t f_limit_valuess_increase(const f_array_length_t step, f_limit_valuess_t *valuess); + extern f_status_t f_limit_valuess_increase(const f_number_unsigned_t step, f_limit_valuess_t *valuess); #endif // _di_f_limit_valuess_increase_ /** * Resize the valuess 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -433,7 +433,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_limit_valuess_increase_by_ - extern f_status_t f_limit_valuess_increase_by(const f_array_length_t amount, f_limit_valuess_t *valuess); + extern f_status_t f_limit_valuess_increase_by(const f_number_unsigned_t amount, f_limit_valuess_t *valuess); #endif // _di_f_limit_valuess_increase_by_ /** @@ -453,7 +453,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_limit_valuess_resize_ - extern f_status_t f_limit_valuess_resize(const f_array_length_t length, f_limit_valuess_t *valuess); + extern f_status_t f_limit_valuess_resize(const f_number_unsigned_t length, f_limit_valuess_t *valuess); #endif // _di_f_limit_valuess_resize_ #ifdef __cplusplus diff --git a/level_0/f_limit/tests/unit/c/test-limit-sets_append_all.c b/level_0/f_limit/tests/unit/c/test-limit-sets_append_all.c index b696b70..7d35e58 100644 --- a/level_0/f_limit/tests/unit/c/test-limit-sets_append_all.c +++ b/level_0/f_limit/tests/unit/c/test-limit-sets_append_all.c @@ -70,7 +70,7 @@ void test__f_limit_sets_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.array[i].type, i + 1); assert_int_equal(destination.array[i].value.rlim_cur, i + 2); diff --git a/level_0/f_limit/tests/unit/c/test-limit-setss_append.c b/level_0/f_limit/tests/unit/c/test-limit-setss_append.c index 43612e4..31dd6a3 100644 --- a/level_0/f_limit/tests/unit/c/test-limit-setss_append.c +++ b/level_0/f_limit/tests/unit/c/test-limit-setss_append.c @@ -71,7 +71,7 @@ void test__f_limit_setss_append__works(void **state) { assert_int_equal(destination.array[0].used, source.used); assert_int_equal(destination.array[0].size, source.used); - for (f_array_length_t i = 0; i < destination.array[0].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[0].used; ++i) { assert_int_equal(destination.array[0].array[i].type, i + 1); assert_int_equal(destination.array[0].array[i].value.rlim_cur, i + 2); @@ -79,7 +79,7 @@ void test__f_limit_setss_append__works(void **state) { } // for } - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_limit/tests/unit/c/test-limit-setss_append_all.c b/level_0/f_limit/tests/unit/c/test-limit-setss_append_all.c index 4b81ac7..8ce38c3 100644 --- a/level_0/f_limit/tests/unit/c/test-limit-setss_append_all.c +++ b/level_0/f_limit/tests/unit/c/test-limit-setss_append_all.c @@ -64,7 +64,7 @@ void test__f_limit_setss_append_all__works(void **state) { assert_int_equal(status, F_none); - for (f_array_length_t i = 0; i < length_inner; ++i) { + for (f_number_unsigned_t i = 0; i < length_inner; ++i) { source.array[source.used].array[i].type = i + 1; source.array[source.used].array[i].value.rlim_cur = i + 2; @@ -82,12 +82,12 @@ void test__f_limit_setss_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { assert_int_equal(destination.array[i].used, length_inner); assert_int_equal(destination.array[i].size, length_inner); - for (f_array_length_t j = 0; j < length_inner; ++j) { + for (f_number_unsigned_t j = 0; j < length_inner; ++j) { assert_int_equal(destination.array[i].array[j].type, j + 1); assert_int_equal(destination.array[i].array[j].value.rlim_cur, j + 2); @@ -96,11 +96,11 @@ void test__f_limit_setss_append_all__works(void **state) { } // for } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { free((void *) source.array[i].array); } // for - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_limit/tests/unit/c/test-limit-values_append_all.c b/level_0/f_limit/tests/unit/c/test-limit-values_append_all.c index c4b5ec5..ef20953 100644 --- a/level_0/f_limit/tests/unit/c/test-limit-values_append_all.c +++ b/level_0/f_limit/tests/unit/c/test-limit-values_append_all.c @@ -69,7 +69,7 @@ void test__f_limit_values_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.array[i].rlim_cur, i + 1); assert_int_equal(destination.array[i].rlim_max, i + 2); diff --git a/level_0/f_limit/tests/unit/c/test-limit-valuess_append.c b/level_0/f_limit/tests/unit/c/test-limit-valuess_append.c index a13c358..1370d3e 100644 --- a/level_0/f_limit/tests/unit/c/test-limit-valuess_append.c +++ b/level_0/f_limit/tests/unit/c/test-limit-valuess_append.c @@ -70,14 +70,14 @@ void test__f_limit_valuess_append__works(void **state) { assert_int_equal(destination.array[0].used, source.used); assert_int_equal(destination.array[0].size, source.used); - for (f_array_length_t i = 0; i < destination.array[0].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[0].used; ++i) { assert_int_equal(destination.array[0].array[i].rlim_cur, i + 1); assert_int_equal(destination.array[0].array[i].rlim_max, i + 2); } // for } - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_limit/tests/unit/c/test-limit-valuess_append_all.c b/level_0/f_limit/tests/unit/c/test-limit-valuess_append_all.c index 33a580c..e4be78a 100644 --- a/level_0/f_limit/tests/unit/c/test-limit-valuess_append_all.c +++ b/level_0/f_limit/tests/unit/c/test-limit-valuess_append_all.c @@ -64,7 +64,7 @@ void test__f_limit_valuess_append_all__works(void **state) { assert_int_equal(status, F_none); - for (f_array_length_t i = 0; i < length_inner; ++i) { + for (f_number_unsigned_t i = 0; i < length_inner; ++i) { source.array[source.used].array[i].rlim_cur = i + 1; source.array[source.used].array[i].rlim_max = i + 2; @@ -81,12 +81,12 @@ void test__f_limit_valuess_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { assert_int_equal(destination.array[i].used, length_inner); assert_int_equal(destination.array[i].size, length_inner); - for (f_array_length_t j = 0; j < length_inner; ++j) { + for (f_number_unsigned_t j = 0; j < length_inner; ++j) { assert_int_equal(destination.array[i].array[j].rlim_cur, j + 1); assert_int_equal(destination.array[i].array[j].rlim_max, j + 2); @@ -94,11 +94,11 @@ void test__f_limit_valuess_append_all__works(void **state) { } // for } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { free((void *) source.array[i].array); } // for - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_memory/c/memory/common.h b/level_0/f_memory/c/memory/common.h index 5f1c580..2d4c661 100644 --- a/level_0/f_memory/c/memory/common.h +++ b/level_0/f_memory/c/memory/common.h @@ -377,8 +377,8 @@ extern "C" { * 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_d, then attempt to increment by step. - * If step exceeds F_array_length_t_size_d, set status to error_too_large. + * If step_default exceeds F_number_t_size_unsigned_d, then attempt to increment by step. + * If step exceeds F_number_t_size_unsigned_d, set status to error_too_large. * * Be sure to check size for error after calling this. * @@ -387,13 +387,13 @@ extern "C" { * 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, length). - * error_too_large: The error status to return when F_array_length_t_size_d would be exceeded. + * error_too_large: The error status to return when F_number_t_size_unsigned_d would be exceeded. */ #ifndef _di_macro_f_memory_structure_increment_ #define macro_f_memory_structure_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_d) { \ - if (structure.used + step > F_array_length_t_size_d) { \ + if (structure.used + step_default > F_number_t_size_unsigned_d) { \ + if (structure.used + step > F_number_t_size_unsigned_d) { \ status = F_status_set_error(error_too_large); \ } \ else { \ diff --git a/level_0/f_memory/c/memory/structure.c b/level_0/f_memory/c/memory/structure.c index 2a73b44..0e5b228 100644 --- a/level_0/f_memory/c/memory/structure.c +++ b/level_0/f_memory/c/memory/structure.c @@ -6,7 +6,7 @@ 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 ** const structure, f_array_length_t * const used, f_array_length_t * const size) { + f_status_t f_memory_structure_adjust(const size_t length_new, const size_t type_size, void ** const structure, f_number_unsigned_t * const used, f_number_unsigned_t * const 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); @@ -22,7 +22,7 @@ extern "C" { #endif // _di_f_memory_structure_adjust_ #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 ** const structure, f_array_length_t * const used, f_array_length_t * const size) { + f_status_t f_memory_structure_decimate_by(const f_number_unsigned_t amount, const size_t type_size, void ** const structure, f_number_unsigned_t * const used, f_number_unsigned_t * const 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); @@ -39,7 +39,7 @@ extern "C" { #endif // _di_f_memory_structure_decimate_by_ #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 ** const structure, f_array_length_t * const used, f_array_length_t * const size) { + f_status_t f_memory_structure_decrease_by(const f_number_unsigned_t amount, const size_t type_size, void ** const structure, f_number_unsigned_t * const used, f_number_unsigned_t * const 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); @@ -56,7 +56,7 @@ extern "C" { #endif // _di_f_memory_structure_decrease_by_ #ifndef _di_f_memory_structure_increase_ - f_status_t f_memory_structure_increase(const f_array_length_t step, const size_t type_size, void ** const structure, f_array_length_t * const used, f_array_length_t * const size) { + f_status_t f_memory_structure_increase(const f_number_unsigned_t step, const size_t type_size, void ** const structure, f_number_unsigned_t * const used, f_number_unsigned_t * const size) { #ifndef _di_level_0_parameter_checking_ if (!step) return F_status_set_error(F_parameter); if (!type_size) return F_status_set_error(F_parameter); @@ -66,14 +66,14 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (*used + 1 > *size) { - f_array_length_t length_new = *used + step; + f_number_unsigned_t length_new = *used + step; - if (length_new > F_array_length_t_size_d) { - if (*used + 1 > F_array_length_t_size_d) { + if (length_new > F_number_t_size_unsigned_d) { + if (*used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - length_new = F_array_length_t_size_d; + length_new = F_number_t_size_unsigned_d; } return private_f_memory_structure_resize(length_new, type_size, structure, used, size); @@ -84,7 +84,7 @@ extern "C" { #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 ** const structure, f_array_length_t * const used, f_array_length_t * const size) { + f_status_t f_memory_structure_increase_by(const f_number_unsigned_t amount, const size_t type_size, void ** const structure, f_number_unsigned_t * const used, f_number_unsigned_t * const 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); @@ -93,7 +93,7 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (amount && *used + amount > *size) { - if (*used + amount > F_array_length_t_size_d) { + if (*used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -105,7 +105,7 @@ extern "C" { #endif // _di_f_memory_structure_increase_by_ #ifndef _di_f_memory_structure_resize_ - f_status_t f_memory_structure_resize(const size_t length_new, const size_t type_size, void ** const structure, f_array_length_t * const used, f_array_length_t * const size) { + f_status_t f_memory_structure_resize(const size_t length_new, const size_t type_size, void ** const structure, f_number_unsigned_t * const used, f_number_unsigned_t * const 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); diff --git a/level_0/f_memory/c/memory/structure.h b/level_0/f_memory/c/memory/structure.h index 996323f..e4468ee 100644 --- a/level_0/f_memory/c/memory/structure.h +++ b/level_0/f_memory/c/memory/structure.h @@ -44,7 +44,7 @@ extern "C" { * @see memset() */ #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 ** const structure, f_array_length_t * const used, f_array_length_t * const size); + extern f_status_t f_memory_structure_adjust(const size_t length_new, const size_t type_size, void ** const structure, f_number_unsigned_t * const used, f_number_unsigned_t * const size); #endif // _di_f_memory_structure_adjust_ /** @@ -76,7 +76,7 @@ extern "C" { * @see memset() */ #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 ** const structure, f_array_length_t * const used, f_array_length_t * const size); + extern f_status_t f_memory_structure_decimate_by(const f_number_unsigned_t amount, const size_t type_size, void ** const structure, f_number_unsigned_t * const used, f_number_unsigned_t * const size); #endif // _di_f_memory_structure_decimate_by_ /** @@ -108,13 +108,13 @@ extern "C" { * @see memset() */ #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 ** const structure, f_array_length_t * const used, f_array_length_t * const size); + extern f_status_t f_memory_structure_decrease_by(const f_number_unsigned_t amount, const size_t type_size, void ** const structure, f_number_unsigned_t * const used, f_number_unsigned_t * const size); #endif // _di_f_memory_structure_decrease_by_ /** * 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -142,14 +142,14 @@ extern "C" { * @see memset() */ #ifndef _di_f_memory_structure_increase_ - extern f_status_t f_memory_structure_increase(const f_array_length_t step, const size_t type_size, void ** const structure, f_array_length_t * const used, f_array_length_t * const size); + extern f_status_t f_memory_structure_increase(const f_number_unsigned_t step, const size_t type_size, void ** const structure, f_number_unsigned_t * const used, f_number_unsigned_t * const size); #endif // _di_f_memory_structure_increase_ /** * 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -176,7 +176,7 @@ extern "C" { * @see memset() */ #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 ** const structure, f_array_length_t * const used, f_array_length_t * const size); + extern f_status_t f_memory_structure_increase_by(const f_number_unsigned_t amount, const size_t type_size, void ** const structure, f_number_unsigned_t * const used, f_number_unsigned_t * const size); #endif // _di_f_memory_structure_increase_by_ /** @@ -206,7 +206,7 @@ extern "C" { * @see memset() */ #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 ** const structure, f_array_length_t * const used, f_array_length_t * const size); + extern f_status_t f_memory_structure_resize(const size_t length_new, const size_t type_size, void ** const structure, f_number_unsigned_t * const used, f_number_unsigned_t * const size); #endif // _di_f_memory_structure_resize_ #ifdef __cplusplus diff --git a/level_0/f_memory/c/private-memory.c b/level_0/f_memory/c/private-memory.c index 11c1d48..aed97c1 100644 --- a/level_0/f_memory/c/private-memory.c +++ b/level_0/f_memory/c/private-memory.c @@ -107,7 +107,7 @@ extern "C" { #endif // !defined(_di_f_memory_resize_) || !defined(_di_memory_structure_decrease_by_) || !defined(_di_memory_structure_increase_) || !defined(_di_memory_structure_increase_by_) || !defined(_di_f_memory_structure_resize_) #if !defined(_di_f_memory_structure_adjust_) || !defined(_di_f_memory_structure_decimate_by_) - f_status_t private_f_memory_structure_adjust(const size_t length_new, const size_t type_size, void ** const structure, f_array_length_t * const used, f_array_length_t * const size) { + f_status_t private_f_memory_structure_adjust(const size_t length_new, const size_t type_size, void ** const structure, f_number_unsigned_t * const used, f_number_unsigned_t * const size) { const f_status_t status = private_f_memory_adjust(*size, length_new, type_size, structure); @@ -124,7 +124,7 @@ extern "C" { #endif // !defined(_di_f_memory_structure_adjust_) || !defined(_di_f_memory_structure_decimate_by_) #if !defined(_di_memory_structure_decrease_by_) || !defined(_di_memory_structure_increase_) || !defined(_di_memory_structure_increase_by_) || !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 ** const structure, f_array_length_t * const used, f_array_length_t * const size) { + f_status_t private_f_memory_structure_resize(const size_t length_new, const size_t type_size, void ** const structure, f_number_unsigned_t * const used, f_number_unsigned_t * const size) { const f_status_t status = private_f_memory_resize(*size, length_new, type_size, structure); diff --git a/level_0/f_memory/c/private-memory.h b/level_0/f_memory/c/private-memory.h index 7a55770..e523810 100644 --- a/level_0/f_memory/c/private-memory.h +++ b/level_0/f_memory/c/private-memory.h @@ -115,7 +115,7 @@ extern "C" { * @see private_f_memory_adjust() */ #if !defined(_di_f_memory_structure_adjust_) || !defined(_di_f_memory_structure_decimate_by_) - extern f_status_t private_f_memory_structure_adjust(const size_t length_new, const size_t type_size, void ** const structure, f_array_length_t * const used, f_array_length_t * const size) F_attribute_visibility_internal_d; + extern f_status_t private_f_memory_structure_adjust(const size_t length_new, const size_t type_size, void ** const structure, f_number_unsigned_t * const used, f_number_unsigned_t * const size) F_attribute_visibility_internal_d; #endif // !defined(_di_f_memory_structure_adjust_) || !defined(_di_f_memory_structure_decimate_by_) /** @@ -148,7 +148,7 @@ extern "C" { * @see private_f_memory_resize() */ #if !defined(_di_memory_structure_decrease_by_) || !defined(_di_memory_structure_increase_) || !defined(_di_memory_structure_increase_by_) || !defined(_di_f_memory_structure_resize_) - extern f_status_t private_f_memory_structure_resize(const size_t length_new, const size_t type_size, void ** const structure, f_array_length_t * const used, f_array_length_t * const size) F_attribute_visibility_internal_d; + extern f_status_t private_f_memory_structure_resize(const size_t length_new, const size_t type_size, void ** const structure, f_number_unsigned_t * const used, f_number_unsigned_t * const size) F_attribute_visibility_internal_d; #endif // !defined(_di_memory_structure_decrease_by_) || !defined(_di_memory_structure_increase_) || !defined(_di_memory_structure_increase_by_) || !defined(_di_f_memory_structure_resize_) #ifdef __cplusplus diff --git a/level_0/f_parse/c/parse.c b/level_0/f_parse/c/parse.c index dd6b81c..9c62409 100644 --- a/level_0/f_parse/c/parse.c +++ b/level_0/f_parse/c/parse.c @@ -19,7 +19,7 @@ extern "C" { f_status_t status = F_none; unsigned short width = 0; - f_array_length_t width_max = 0; + f_number_unsigned_t width_max = 0; while (range->start <= range->stop && range->start < buffer.used) { @@ -72,7 +72,7 @@ extern "C" { f_status_t status = F_none; unsigned short width = 0; - f_array_length_t width_max = (range->stop - range->start) + 1; + f_number_unsigned_t width_max = (range->stop - range->start) + 1; while (buffer.string[range->start] == placeholder || (status = f_utf_is_graph(buffer.string + range->start, width_max)) == F_false) { @@ -121,7 +121,7 @@ extern "C" { f_status_t status = F_none; unsigned short width = 0; - f_array_length_t width_max = (range->stop - range->start) + 1; + f_number_unsigned_t width_max = (range->stop - range->start) + 1; while (buffer.string[range->start] == placeholder || (status = f_utf_is_whitespace(buffer.string + range->start, width_max, F_false)) == F_false) { @@ -174,7 +174,7 @@ extern "C" { unsigned short width = 0; - f_array_length_t width_max = 0; + f_number_unsigned_t width_max = 0; while (range->start <= range->stop && range->start < buffer.used) { @@ -302,7 +302,7 @@ extern "C" { return F_found_not; } - f_array_length_t i = range->start; + f_number_unsigned_t i = range->start; for (; range->start <= range->stop && range->start < buffer.used; ) { @@ -340,7 +340,7 @@ extern "C" { } { - f_array_length_t j = 0; + f_number_unsigned_t j = 0; f_char_t number[5] = { 0, 0, 0, 0, 0 }; for (++range->start; range->start <= range->stop && range->start < buffer.used && j < 4; ++range->start, ++j) { @@ -448,7 +448,7 @@ extern "C" { } if (id) { - for (f_array_length_t j = i, i = 0; j <= range->stop && j < buffer.used; ++j) { + for (f_number_unsigned_t j = i, i = 0; j <= range->stop && j < buffer.used; ++j) { if (!buffer.string[j]) continue; if (buffer.string[j] == f_string_ascii_minus_s.string[0]) break; @@ -480,7 +480,7 @@ extern "C" { f_status_t status = F_none; unsigned short width = 0; - f_array_length_t width_max = (range->stop - range->start) + 1; + f_number_unsigned_t width_max = (range->stop - range->start) + 1; for (; range->start <= range->stop; range->start += width) { @@ -526,7 +526,7 @@ extern "C" { f_status_t status = F_none; unsigned short width = 0; - f_array_length_t width_max = (range->stop - range->start) + 1; + f_number_unsigned_t width_max = (range->stop - range->start) + 1; while (string[range->start] == placeholder || (status = f_utf_is_graph(string + range->start, width_max)) == F_false) { @@ -571,7 +571,7 @@ extern "C" { f_status_t status = F_none; unsigned short width = 0; - f_array_length_t width_max = (range->stop - range->start) + 1; + f_number_unsigned_t width_max = (range->stop - range->start) + 1; while (string[range->start] == placeholder || (status = f_utf_is_whitespace(string + range->start, width_max, F_false)) == F_false) { @@ -619,7 +619,7 @@ extern "C" { f_status_t status = F_none; unsigned short width = 0; - f_array_length_t width_max = 0; + f_number_unsigned_t width_max = 0; for (; range->start <= range->stop; range->start += width) { diff --git a/level_0/f_path/c/path.c b/level_0/f_path/c/path.c index fe1994a..c321e11 100644 --- a/level_0/f_path/c/path.c +++ b/level_0/f_path/c/path.c @@ -73,7 +73,7 @@ extern "C" { return private_f_path_real(buffer, path); } - const f_array_length_t length = strnlen(buffer, F_path_length_max_d); + const f_number_unsigned_t length = strnlen(buffer, F_path_length_max_d); { path->used = 0; @@ -113,8 +113,8 @@ extern "C" { if (F_status_is_error(status)) return status; } - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; while (i < argument.used) { @@ -157,7 +157,7 @@ extern "C" { return F_data_not; } - for (f_array_length_t i = 0; i < path.used; ++i) { + for (f_number_unsigned_t i = 0; i < path.used; ++i) { if (path.string[i] == f_path_separator_s.string[0]) return true; } // for @@ -172,7 +172,7 @@ extern "C" { return F_data_not; } - f_array_length_t i = 0; + f_number_unsigned_t i = 0; for (; i < path.used; ++i) { if (path.string[i]) break; @@ -192,7 +192,7 @@ extern "C" { return F_data_not; } - f_array_length_t i = 0; + f_number_unsigned_t i = 0; for (; i < path.used; ++i) { if (path.string[i]) break; @@ -212,7 +212,7 @@ extern "C" { return F_data_not; } - f_array_length_t i = 0; + f_number_unsigned_t i = 0; for (; i < path.used; ++i) { if (path.string[i]) break; diff --git a/level_0/f_path/c/private-path.c b/level_0/f_path/c/private-path.c index 8ef4fed..44f1353 100644 --- a/level_0/f_path/c/private-path.c +++ b/level_0/f_path/c/private-path.c @@ -28,7 +28,7 @@ extern "C" { return F_status_set_error(F_failure); } - const f_array_length_t length = strnlen(buffer, F_path_length_max_d); + const f_number_unsigned_t length = strnlen(buffer, F_path_length_max_d); { real->used = 0; diff --git a/level_0/f_path/tests/unit/c/test-path-directory_cleanup.c b/level_0/f_path/tests/unit/c/test-path-directory_cleanup.c index 9e32bac..ff63585 100644 --- a/level_0/f_path/tests/unit/c/test-path-directory_cleanup.c +++ b/level_0/f_path/tests/unit/c/test-path-directory_cleanup.c @@ -54,7 +54,7 @@ void test__f_path_directory_cleanup__works(void **state) { f_string_dynamic_t destination = f_string_dynamic_t_initialize; - for (f_array_length_t i = 0; i < 14; ++i, destination.used = 0) { + for (f_number_unsigned_t i = 0; i < 14; ++i, destination.used = 0) { const f_status_t status = f_path_directory_cleanup(paths[i], &destination); diff --git a/level_0/f_print/c/print.c b/level_0/f_print/c/print.c index b510f9d..70ba200 100644 --- a/level_0/f_print/c/print.c +++ b/level_0/f_print/c/print.c @@ -19,9 +19,9 @@ extern "C" { * @see ferror_unlocked() */ #if !defined(_di_f_print_character_) && !defined(_di_f_print_character_safely_) - static inline f_status_t private_inline_f_print_write_unlocked(const f_string_t string, const f_array_length_t total, const f_file_t file) { + static inline f_status_t private_inline_f_print_write_unlocked(const f_string_t string, const f_number_unsigned_t total, const f_file_t file) { - f_array_length_t count = 0; + f_number_unsigned_t count = 0; do { count += fwrite_unlocked(string, sizeof(f_char_t), total - count, file.stream); @@ -34,7 +34,7 @@ extern "C" { #endif // !defined(_di_f_print_character_) && !defined(_di_f_print_character_safely_) #ifndef _di_f_print_ - f_status_t f_print(const f_string_t string, const f_array_length_t length, const f_file_t file) { + f_status_t f_print(const f_string_t string, const f_number_unsigned_t length, const f_file_t file) { if (!file.stream) return F_stream_not; if (!length || !string) return F_data_not; @@ -107,7 +107,7 @@ extern "C" { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -123,7 +123,7 @@ extern "C" { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -139,7 +139,7 @@ extern "C" { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -155,7 +155,7 @@ extern "C" { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -196,7 +196,7 @@ extern "C" { #endif // _di_f_print_dynamic_safely_ #ifndef _di_f_print_except_ - f_status_t f_print_except(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except, const f_file_t file) { + f_status_t f_print_except(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except, const f_file_t file) { if (!file.stream) return F_stream_not; if (!length || !string) return F_data_not; @@ -206,7 +206,7 @@ extern "C" { #endif // _di_f_print_except_ #ifndef _di_f_print_except_dynamic_ - f_status_t f_print_except_dynamic(const f_string_static_t buffer, const f_array_lengths_t except, const f_file_t file) { + f_status_t f_print_except_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || !buffer.string) return F_data_not; @@ -216,12 +216,12 @@ extern "C" { #endif // _di_f_print_except_dynamic_ #ifndef _di_f_print_except_dynamic_partial_ - f_status_t f_print_except_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, const f_file_t file) { + f_status_t f_print_except_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -232,12 +232,12 @@ extern "C" { #endif // _di_f_print_except_dynamic_partial_ #ifndef _di_f_print_except_dynamic_partial_raw_ - f_status_t f_print_except_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, const f_file_t file) { + f_status_t f_print_except_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -248,12 +248,12 @@ extern "C" { #endif // _di_f_print_except_dynamic_partial_raw_ #ifndef _di_f_print_except_dynamic_partial_raw_safely_ - f_status_t f_print_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, const f_file_t file) { + f_status_t f_print_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -264,12 +264,12 @@ extern "C" { #endif // _di_f_print_except_dynamic_partial_raw_safely_ #ifndef _di_f_print_except_dynamic_partial_safely_ - f_status_t f_print_except_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, const f_file_t file) { + f_status_t f_print_except_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -280,7 +280,7 @@ extern "C" { #endif // _di_f_print_except_dynamic_partial_safely_ #ifndef _di_f_print_except_dynamic_raw_ - f_status_t f_print_except_dynamic_raw(const f_string_static_t buffer, const f_array_lengths_t except, const f_file_t file) { + f_status_t f_print_except_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || !buffer.string) return F_data_not; @@ -290,7 +290,7 @@ extern "C" { #endif // _di_f_print_except_dynamic_raw_ #ifndef _di_f_print_except_dynamic_raw_safely_ - f_status_t f_print_except_dynamic_raw_safely(const f_string_static_t buffer, const f_array_lengths_t except, const f_file_t file) { + f_status_t f_print_except_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || !buffer.string) return F_data_not; @@ -300,7 +300,7 @@ extern "C" { #endif // _di_f_print_except_dynamic_raw_safely_ #ifndef _di_f_print_except_dynamic_safely_ - f_status_t f_print_except_dynamic_safely(const f_string_static_t buffer, const f_array_lengths_t except, const f_file_t file) { + f_status_t f_print_except_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || !buffer.string) return F_data_not; @@ -310,7 +310,7 @@ extern "C" { #endif // _di_f_print_except_dynamic_safely_ #ifndef _di_f_print_except_in_ - f_status_t f_print_except_in(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!length || !string) return F_data_not; @@ -320,7 +320,7 @@ extern "C" { #endif // _di_f_print_except_in_ #ifndef _di_f_print_except_in_dynamic_ - f_status_t f_print_except_in_dynamic(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_except_in_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || !buffer.string) return F_data_not; @@ -330,12 +330,12 @@ extern "C" { #endif // _di_f_print_except_in_dynamic_ #ifndef _di_f_print_except_in_dynamic_partial_ - f_status_t f_print_except_in_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_except_in_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -346,12 +346,12 @@ extern "C" { #endif // _di_f_print_except_in_dynamic_partial_ #ifndef _di_f_print_except_in_dynamic_partial_raw_ - f_status_t f_print_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -362,12 +362,12 @@ extern "C" { #endif // _di_f_print_except_in_dynamic_partial_raw_ #ifndef _di_f_print_except_in_dynamic_partial_raw_safely_ - f_status_t f_print_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -378,12 +378,12 @@ extern "C" { #endif // _di_f_print_except_in_dynamic_partial_raw_safely_ #ifndef _di_f_print_except_in_dynamic_partial_safely_ - f_status_t f_print_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -394,7 +394,7 @@ extern "C" { #endif // _di_f_print_except_in_dynamic_partial_safely_ #ifndef _di_f_print_except_in_dynamic_raw_ - f_status_t f_print_except_in_dynamic_raw(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_except_in_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || !buffer.string) return F_data_not; @@ -404,7 +404,7 @@ extern "C" { #endif // _di_f_print_except_in_dynamic_raw_ #ifndef _di_f_print_except_in_dynamic_raw_safely_ - f_status_t f_print_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || !buffer.string) return F_data_not; @@ -414,7 +414,7 @@ extern "C" { #endif // _di_f_print_except_in_dynamic_raw_safely_ #ifndef _di_f_print_except_in_dynamic_safely_ - f_status_t f_print_except_in_dynamic_safely(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_except_in_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || !buffer.string) return F_data_not; @@ -424,7 +424,7 @@ extern "C" { #endif // _di_f_print_except_in_dynamic_safely_ #ifndef _di_f_print_except_in_raw_ - f_status_t f_print_except_in_raw(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!length || !string) return F_data_not; @@ -434,7 +434,7 @@ extern "C" { #endif // _di_f_print_except_in_raw_ #ifndef _di_f_print_except_in_raw_safely_ - f_status_t f_print_except_in_raw_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!length || !string) return F_data_not; @@ -444,7 +444,7 @@ extern "C" { #endif // _di_f_print_except_in_raw_safely_ #ifndef _di_f_print_except_in_safely_ - f_status_t f_print_except_in_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!length || !string) return F_data_not; @@ -454,7 +454,7 @@ extern "C" { #endif // _di_f_print_except_in_safely_ #ifndef _di_f_print_except_raw_ - f_status_t f_print_except_raw(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except, const f_file_t file) { + f_status_t f_print_except_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except, const f_file_t file) { if (!file.stream) return F_stream_not; if (!length || !string) return F_data_not; @@ -464,7 +464,7 @@ extern "C" { #endif // _di_f_print_except_raw_ #ifndef _di_f_print_except_raw_safely_ - f_status_t f_print_except_raw_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except, const f_file_t file) { + f_status_t f_print_except_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except, const f_file_t file) { if (!file.stream) return F_stream_not; if (!length || !string) return F_data_not; @@ -474,7 +474,7 @@ extern "C" { #endif // _di_f_print_except_raw_safely_ #ifndef _di_f_print_except_safely_ - f_status_t f_print_except_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except, const f_file_t file) { + f_status_t f_print_except_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except, const f_file_t file) { if (!file.stream) return F_stream_not; if (!length || !string) return F_data_not; @@ -484,7 +484,7 @@ extern "C" { #endif // _di_f_print_except_safely_ #ifndef _di_f_print_raw_ - f_status_t f_print_raw(const f_string_t string, const f_array_length_t length, const f_file_t file) { + f_status_t f_print_raw(const f_string_t string, const f_number_unsigned_t length, const f_file_t file) { if (!file.stream) return F_stream_not; if (!length || !string) return F_data_not; @@ -494,7 +494,7 @@ extern "C" { #endif // _di_f_print_raw_ #ifndef _di_f_print_raw_safely_ - f_status_t f_print_raw_safely(const f_string_t string, const f_array_length_t length, const f_file_t file) { + f_status_t f_print_raw_safely(const f_string_t string, const f_number_unsigned_t length, const f_file_t file) { if (!file.stream) return F_stream_not; if (!length || !string) return F_data_not; @@ -515,7 +515,7 @@ extern "C" { #endif // _di_f_print_raw_terminated_ #ifndef _di_f_print_safely_ - f_status_t f_print_safely(const f_string_t string, const f_array_length_t length, const f_file_t file) { + f_status_t f_print_safely(const f_string_t string, const f_number_unsigned_t length, const f_file_t file) { if (!file.stream) return F_stream_not; if (!length || !string) return F_data_not; @@ -525,7 +525,7 @@ extern "C" { #endif // _di_f_print_safely_ #ifndef _di_f_print_safely_get_ - const f_string_static_t f_print_safely_get(const f_string_t character, const f_array_length_t width_max) { + const f_string_static_t f_print_safely_get(const f_string_t character, const f_number_unsigned_t width_max) { return private_f_print_safely_get(character, width_max); } @@ -537,9 +537,9 @@ extern "C" { if (!file.stream) return F_stream_not; if (!string) return F_data_not; - f_array_length_t start = 0; - f_array_length_t total = 0; - f_array_length_t count = 0; + f_number_unsigned_t start = 0; + f_number_unsigned_t total = 0; + f_number_unsigned_t count = 0; f_string_static_t safe = f_string_empty_s; @@ -547,7 +547,7 @@ extern "C" { clearerr_unlocked(file.stream); - for (register f_array_length_t i = 0; string[i]; ) { + for (register f_number_unsigned_t i = 0; string[i]; ) { safe.used = 0; width = macro_f_utf_byte_width(string[i]); diff --git a/level_0/f_print/c/print.h b/level_0/f_print/c/print.h index c9f71c9..6a1f3fe 100644 --- a/level_0/f_print/c/print.h +++ b/level_0/f_print/c/print.h @@ -67,7 +67,7 @@ extern "C" { * @see fwrite_unlocked() */ #ifndef _di_f_print_ - extern f_status_t f_print(const f_string_t string, const f_array_length_t length, const f_file_t file); + extern f_status_t f_print(const f_string_t string, const f_number_unsigned_t length, const f_file_t file); #endif // _di_f_print_ /** @@ -482,7 +482,7 @@ extern "C" { * @see fwrite_unlocked() */ #ifndef _di_f_print_except_ - extern f_status_t f_print_except(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except, const f_file_t file); + extern f_status_t f_print_except(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_f_print_except_ /** @@ -517,7 +517,7 @@ extern "C" { * @see fwrite_unlocked() */ #ifndef _di_f_print_except_dynamic_ - extern f_status_t f_print_except_dynamic(const f_string_static_t buffer, const f_array_lengths_t except, const f_file_t file); + extern f_status_t f_print_except_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_f_print_except_dynamic_ /** @@ -554,7 +554,7 @@ extern "C" { * @see fwrite_unlocked() */ #ifndef _di_f_print_except_dynamic_partial_ - extern f_status_t f_print_except_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, const f_file_t file); + extern f_status_t f_print_except_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_f_print_except_dynamic_partial_ /** @@ -593,7 +593,7 @@ extern "C" { * @see fwrite_unlocked() */ #ifndef _di_f_print_except_dynamic_partial_raw_ - extern f_status_t f_print_except_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, const f_file_t file); + extern f_status_t f_print_except_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_f_print_except_dynamic_partial_raw_ /** @@ -637,7 +637,7 @@ extern "C" { * @see f_utf_is_valid() */ #ifndef _di_f_print_except_dynamic_partial_raw_safely_ - extern f_status_t f_print_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, const f_file_t file); + extern f_status_t f_print_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_f_print_except_dynamic_partial_raw_safely_ /** @@ -679,7 +679,7 @@ extern "C" { * @see f_utf_is_valid() */ #ifndef _di_f_print_except_dynamic_partial_safely_ - extern f_status_t f_print_except_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, const f_file_t file); + extern f_status_t f_print_except_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_f_print_except_dynamic_partial_safely_ /** @@ -716,7 +716,7 @@ extern "C" { * @see fwrite_unlocked() */ #ifndef _di_f_print_except_dynamic_raw_ - extern f_status_t f_print_except_dynamic_raw(const f_string_static_t buffer, const f_array_lengths_t except, const f_file_t file); + extern f_status_t f_print_except_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_f_print_except_dynamic_raw_ /** @@ -758,7 +758,7 @@ extern "C" { * @see f_utf_is_valid() */ #ifndef _di_f_print_except_dynamic_raw_safely_ - extern f_status_t f_print_except_dynamic_raw_safely(const f_string_static_t buffer, const f_array_lengths_t except, const f_file_t file); + extern f_status_t f_print_except_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_f_print_except_dynamic_raw_safely_ /** @@ -798,7 +798,7 @@ extern "C" { * @see f_utf_is_valid() */ #ifndef _di_f_print_except_dynamic_safely_ - extern f_status_t f_print_except_dynamic_safely(const f_string_static_t buffer, const f_array_lengths_t except, const f_file_t file); + extern f_status_t f_print_except_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_f_print_except_dynamic_safely_ /** @@ -843,7 +843,7 @@ extern "C" { * @see fwrite_unlocked() */ #ifndef _di_f_print_except_in_ - extern f_status_t f_print_except_in(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_f_print_except_in_ /** @@ -882,7 +882,7 @@ extern "C" { * @see fwrite_unlocked() */ #ifndef _di_f_print_except_in_dynamic_ - extern f_status_t f_print_except_in_dynamic(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_except_in_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_f_print_except_in_dynamic_ /** @@ -923,7 +923,7 @@ extern "C" { * @see fwrite_unlocked() */ #ifndef _di_f_print_except_in_dynamic_partial_ - extern f_status_t f_print_except_in_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_except_in_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_f_print_except_in_dynamic_partial_ /** @@ -966,7 +966,7 @@ extern "C" { * @see fwrite_unlocked() */ #ifndef _di_f_print_except_in_dynamic_partial_raw_ - extern f_status_t f_print_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_f_print_except_in_dynamic_partial_raw_ /** @@ -1011,7 +1011,7 @@ extern "C" { * @see f_utf_is_valid() */ #ifndef _di_f_print_except_in_dynamic_partial_raw_safely_ - extern f_status_t f_print_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_f_print_except_in_dynamic_partial_raw_safely_ /** @@ -1054,7 +1054,7 @@ extern "C" { * @see f_utf_is_valid() */ #ifndef _di_f_print_except_in_dynamic_partial_safely_ - extern f_status_t f_print_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_f_print_except_in_dynamic_partial_safely_ /** @@ -1095,7 +1095,7 @@ extern "C" { * @see fwrite_unlocked() */ #ifndef _di_f_print_except_in_dynamic_raw_ - extern f_status_t f_print_except_in_dynamic_raw(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_except_in_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_f_print_except_in_dynamic_raw_ /** @@ -1141,7 +1141,7 @@ extern "C" { * @see f_utf_is_valid() */ #ifndef _di_f_print_except_in_dynamic_raw_safely_ - extern f_status_t f_print_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_f_print_except_in_dynamic_raw_safely_ /** @@ -1184,7 +1184,7 @@ extern "C" { * @see f_utf_is_valid() */ #ifndef _di_f_print_except_in_dynamic_safely_ - extern f_status_t f_print_except_in_dynamic_safely(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_except_in_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_f_print_except_in_dynamic_safely_ /** @@ -1231,7 +1231,7 @@ extern "C" { * @see fwrite_unlocked() */ #ifndef _di_f_print_except_in_raw_ - extern f_status_t f_print_except_in_raw(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_f_print_except_in_raw_ /** @@ -1283,7 +1283,7 @@ extern "C" { * @see f_utf_is_valid() */ #ifndef _di_f_print_except_in_raw_safely_ - extern f_status_t f_print_except_in_raw_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_f_print_except_in_raw_safely_ /** @@ -1333,7 +1333,7 @@ extern "C" { * @see f_utf_is_valid() */ #ifndef _di_f_print_except_in_safely_ - extern f_status_t f_print_except_in_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_f_print_except_in_safely_ /** @@ -1376,7 +1376,7 @@ extern "C" { * @see fwrite_unlocked() */ #ifndef _di_f_print_except_raw_ - extern f_status_t f_print_except_raw(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except, const f_file_t file); + extern f_status_t f_print_except_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_f_print_except_raw_ /** @@ -1422,7 +1422,7 @@ extern "C" { * @see f_utf_is_valid() */ #ifndef _di_f_print_except_raw_safely_ - extern f_status_t f_print_except_raw_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except, const f_file_t file); + extern f_status_t f_print_except_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_f_print_except_raw_safely_ /** @@ -1466,7 +1466,7 @@ extern "C" { * @see f_utf_is_valid() */ #ifndef _di_f_print_except_safely_ - extern f_status_t f_print_except_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except, const f_file_t file); + extern f_status_t f_print_except_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_f_print_except_safely_ /** @@ -1501,7 +1501,7 @@ extern "C" { * @see fwrite_unlocked() */ #ifndef _di_f_print_raw_ - extern f_status_t f_print_raw(const f_string_t string, const f_array_length_t length, const f_file_t file); + extern f_status_t f_print_raw(const f_string_t string, const f_number_unsigned_t length, const f_file_t file); #endif // _di_f_print_raw_ /** @@ -1541,7 +1541,7 @@ extern "C" { * @see f_utf_is_valid() */ #ifndef _di_f_print_raw_safely_ - extern f_status_t f_print_raw_safely(const f_string_t string, const f_array_length_t length, const f_file_t file); + extern f_status_t f_print_raw_safely(const f_string_t string, const f_number_unsigned_t length, const f_file_t file); #endif // _di_f_print_raw_safely_ /** @@ -1610,7 +1610,7 @@ extern "C" { * @see f_utf_is_valid() */ #ifndef _di_f_print_safely_ - extern f_status_t f_print_safely(const f_string_t string, const f_array_length_t length, const f_file_t file); + extern f_status_t f_print_safely(const f_string_t string, const f_number_unsigned_t length, const f_file_t file); #endif // _di_f_print_safely_ /** @@ -1637,7 +1637,7 @@ extern "C" { * A string with a non-zero used length is returned are NULL terminated (after the used length). */ #ifndef _di_f_print_safely_get_ - extern const f_string_static_t f_print_safely_get(const f_string_t character, const f_array_length_t width_max); + extern const f_string_static_t f_print_safely_get(const f_string_t character, const f_number_unsigned_t width_max); #endif // _di_f_print_safely_get_ /** diff --git a/level_0/f_print/c/print/common.h b/level_0/f_print/c/print/common.h index d84329b..5cbb668 100644 --- a/level_0/f_print/c/print/common.h +++ b/level_0/f_print/c/print/common.h @@ -283,7 +283,7 @@ extern "C" { * - exponent: Use exponent rather than decimal for printing double values. * - exponent_either: Use either exponent or decimila for printing double values. * - exponent_upper: When using exponent, display the exponent 'e' as uppercase 'E'. - * - ignore_index: ";", Ignore characters in the given positions from a f_array_length_t (only applies to static/dynamic string arguments but not character arguments). + * - ignore_index: ";", Ignore characters in the given positions from a f_number_unsigned_t (only applies to static/dynamic string arguments but not character arguments). * - ignore_range: ":", Ignore characters in the given ranges from a f_string_range_t (only applies to static/dynamic string arguments but not character arguments). * - precision: ".*", Designates that a precision is in use. * - precision_value: Designates that a precision is specified in the function value (parameter). @@ -346,7 +346,7 @@ extern "C" { * - unsigned_32: "u", "U", Type is a uint32_t digit. * - unsigned_64: "ul", "UL", Type is a uint64_t digit. * - unsigned_128: "ull", "ULL", Type is a f_uint128_t digit. - * - unsigned_number: "un", "UN", Type is a f_number_unsigned_t digit (which by default is what f_array_length_t is a type of). + * - unsigned_number: "un", "UN", Type is a f_number_unsigned_t digit (which by default is what f_number_unsigned_t is a type of). * * @see fprintf() */ diff --git a/level_0/f_print/c/print/private-to.c b/level_0/f_print/c/print/private-to.c index 0e902b7..68088f9 100644 --- a/level_0/f_print/c/print/private-to.c +++ b/level_0/f_print/c/print/private-to.c @@ -33,11 +33,11 @@ static inline f_status_t private_inline_f_print_to_error(void) { } #if !defined(_di_f_print_to_) || !defined(_di_f_print_dynamic_to_) || !defined(_di_f_print_dynamic_partial_to_) - f_status_t private_f_print_to(const f_string_t string, const f_array_length_t length, const int id) { + f_status_t private_f_print_to(const f_string_t string, const f_number_unsigned_t length, const int id) { - f_array_length_t total = 0; + f_number_unsigned_t total = 0; - for (register f_array_length_t i = 0; i < length; ) { + for (register f_number_unsigned_t i = 0; i < length; ) { total = strnlen((string + i), length - i); @@ -97,12 +97,12 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // !defined(_di_f_print_to_character_safely_) || !defined(_di_f_print_to_safely_) || !defined(_di_f_print_to_safely_dynamic_) || !defined(_di_f_print_to_safely_dynamic_partial_) || !defined(_di_f_print_to_safely_terminated_) || !defined(_di_f_print_to_except_safely_) || !defined(_di_f_print_to_except_dynamic_safely_) || !defined(_di_f_print_to_except_dynamic_partial_safely_) || !defined(_di_f_print_to_except_in_safely_) || !defined(_di_f_print_to_except_in_dynamic_safely_) || !defined(_di_f_print_to_except_in_dynamic_partial_safely_) #if !defined(_di_f_print_to_except_) || !defined(_di_f_print_to_except_dynamic_) || !defined(_di_f_print_to_except_dynamic_partial_) - f_status_t private_f_print_to_except(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except, const int id) { + f_status_t private_f_print_to_except(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except, const int id) { - f_array_length_t i = offset; - f_array_length_t j = 0; - f_array_length_t start = offset; - f_array_length_t total = 0; + f_number_unsigned_t i = offset; + f_number_unsigned_t j = 0; + f_number_unsigned_t start = offset; + f_number_unsigned_t total = 0; while (i < stop) { @@ -146,12 +146,12 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // !defined(_di_f_print_to_except_) || !defined(_di_f_print_to_except_dynamic_) || !defined(_di_f_print_to_except_dynamic_partial_) #if !defined(_di_f_print_to_except_raw_) || !defined(_di_f_print_to_except_dynamic_raw_) || !defined(_di_f_print_to_except_dynamic_partial_raw_) - f_status_t private_f_print_to_except_raw(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except, const int id) { + f_status_t private_f_print_to_except_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except, const int id) { - f_array_length_t i = offset; - f_array_length_t j = 0; - f_array_length_t start = offset; - f_array_length_t total = 0; + f_number_unsigned_t i = offset; + f_number_unsigned_t j = 0; + f_number_unsigned_t start = offset; + f_number_unsigned_t total = 0; while (i < stop) { @@ -195,12 +195,12 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // !defined(_di_f_print_to_except_raw_) || !defined(_di_f_print_to_except_dynamic_raw_) || !defined(_di_f_print_to_except_dynamic_partial_raw_) #if !defined(_di_f_print_to_except_dynamic_raw_safely_) || !defined(_di_f_print_to_except_dynamic_partial_raw_safely_) || !defined(_di_f_print_to_except_raw_safely_) - f_status_t private_f_print_to_except_raw_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except, const int id) { + f_status_t private_f_print_to_except_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except, const int id) { - f_array_length_t i = offset; - f_array_length_t j = 0; - f_array_length_t start = offset; - f_array_length_t total = 0; + f_number_unsigned_t i = offset; + f_number_unsigned_t j = 0; + f_number_unsigned_t start = offset; + f_number_unsigned_t total = 0; f_string_static_t safe = f_string_empty_s; @@ -270,12 +270,12 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // !defined(_di_f_print_to_except_dynamic_raw_safely_) || !defined(_di_f_print_to_except_dynamic_partial_raw_safely_) || !defined(_di_f_print_to_except_raw_safely_) #if !defined(_di_f_print_to_except_dynamic_safely_) || !defined(_di_f_print_to_except_dynamic_partial_safely_) || !defined(_di_f_print_to_except_safely_) - f_status_t private_f_print_to_except_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except, const int id) { + f_status_t private_f_print_to_except_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except, const int id) { - f_array_length_t i = offset; - f_array_length_t j = 0; - f_array_length_t start = offset; - f_array_length_t total = 0; + f_number_unsigned_t i = offset; + f_number_unsigned_t j = 0; + f_number_unsigned_t start = offset; + f_number_unsigned_t total = 0; f_string_static_t safe = f_string_empty_s; @@ -354,13 +354,13 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // !defined(_di_f_print_to_except_dynamic_safely_) || !defined(_di_f_print_to_except_dynamic_partial_safely_) || !defined(_di_f_print_to_except_safely_) #if !defined(_di_f_print_to_except_in_) || !defined(_di_f_print_to_except_in_dynamic_) || !defined(_di_f_print_to_except_in_dynamic_partial_) - f_status_t private_f_print_to_except_in(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const int id) { + f_status_t private_f_print_to_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const int id) { - f_array_length_t i = offset; - f_array_length_t at = 0; - f_array_length_t in = 0; - f_array_length_t start = i; - f_array_length_t total = 0; + f_number_unsigned_t i = offset; + f_number_unsigned_t at = 0; + f_number_unsigned_t in = 0; + f_number_unsigned_t start = i; + f_number_unsigned_t total = 0; while (i < stop) { @@ -434,13 +434,13 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // !defined(_di_f_print_to_except_in_) || !defined(_di_f_print_to_except_in_dynamic_) || !defined(_di_f_print_to_except_in_dynamic_partial_) #if !defined(_di_f_print_to_except_in_raw_) || !defined(_di_f_print_to_except_in_dynamic_raw_) || !defined(_di_f_print_to_except_in_dynamic_partial_raw_) - f_status_t private_f_print_to_except_in_raw(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const int id) { + f_status_t private_f_print_to_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const int id) { - f_array_length_t i = offset; - f_array_length_t at = 0; - f_array_length_t in = 0; - f_array_length_t start = i; - f_array_length_t total = 0; + f_number_unsigned_t i = offset; + f_number_unsigned_t at = 0; + f_number_unsigned_t in = 0; + f_number_unsigned_t start = i; + f_number_unsigned_t total = 0; while (i < stop) { @@ -512,13 +512,13 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // !defined(_di_f_print_to_except_in_raw_) || !defined(_di_f_print_to_except_in_dynamic_raw_) || !defined(_di_f_print_to_except_in_dynamic_partial_raw_) #if !defined(_di_f_print_to_except_in_raw_safely_) || !defined(_di_f_print_to_except_in_dynamic_raw_safely_) || !defined(_di_f_print_to_except_in_dynamic_partial_raw_safely_) - f_status_t private_f_print_to_except_in_raw_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const int id) { + f_status_t private_f_print_to_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const int id) { - f_array_length_t i = offset; - f_array_length_t at = 0; - f_array_length_t in = 0; - f_array_length_t start = i; - f_array_length_t total = 0; + f_number_unsigned_t i = offset; + f_number_unsigned_t at = 0; + f_number_unsigned_t in = 0; + f_number_unsigned_t start = i; + f_number_unsigned_t total = 0; f_string_static_t safe = f_string_empty_s; @@ -617,13 +617,13 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // !defined(_di_f_print_to_except_in_raw_safely_) || !defined(_di_f_print_to_except_in_dynamic_raw_safely_) || !defined(_di_f_print_to_except_in_dynamic_partial_raw_safely_) #if !defined(_di_f_print_to_except_in_safely_) || !defined(_di_f_print_to_except_in_dynamic_safely_) || !defined(_di_f_print_to_except_in_dynamic_partial_safely_) - f_status_t private_f_print_to_except_in_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const int id) { + f_status_t private_f_print_to_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const int id) { - f_array_length_t i = offset; - f_array_length_t at = 0; - f_array_length_t in = 0; - f_array_length_t start = i; - f_array_length_t total = 0; + f_number_unsigned_t i = offset; + f_number_unsigned_t at = 0; + f_number_unsigned_t in = 0; + f_number_unsigned_t start = i; + f_number_unsigned_t total = 0; f_string_static_t safe = f_string_empty_s; @@ -731,12 +731,12 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // !defined(_di_f_print_to_except_in_safely_) || !defined(_di_f_print_to_except_in_dynamic_safely_) || !defined(_di_f_print_to_except_in_dynamic_partial_safely_) #if !defined(_di_f_print_to_raw_) || !defined(_di_f_print_dynamic_to_raw_) || !defined(_di_f_print_dynamic_partial_to_raw_) - f_status_t private_f_print_to_raw(const f_string_t string, const f_array_length_t length, const int id) { + f_status_t private_f_print_to_raw(const f_string_t string, const f_number_unsigned_t length, const int id) { - f_array_length_t start = 0; - f_array_length_t total = 0; + f_number_unsigned_t start = 0; + f_number_unsigned_t total = 0; - for (register f_array_length_t i = 0; i < length; ) { + for (register f_number_unsigned_t i = 0; i < length; ) { total = strnlen((string + i), length - i); @@ -774,11 +774,11 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // !defined(_di_f_print_to_raw_) || !defined(_di_f_print_dynamic_to_raw_) || !defined(_di_f_print_dynamic_partial_to_raw_) #if !defined(_di_f_print_to_dynamic_raw_safely_) || !defined(_di_f_print_to_dynamic_partial_raw_safely_) || !defined(_di_f_print_to_raw_safely_) - f_status_t private_f_print_to_raw_safely(const f_string_t string, const f_array_length_t length, const int id) { + f_status_t private_f_print_to_raw_safely(const f_string_t string, const f_number_unsigned_t length, const int id) { - register f_array_length_t i = 0; - f_array_length_t start = 0; - f_array_length_t total = 0; + register f_number_unsigned_t i = 0; + f_number_unsigned_t start = 0; + f_number_unsigned_t total = 0; f_string_static_t safe = f_string_empty_s; @@ -839,11 +839,11 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // !defined(_di_f_print_to_dynamic_raw_safely_) || !defined(_di_f_print_dynamic_partial_to_raw_safely_) || !defined(_di_f_print_to_raw_safely_) #if !defined(_di_f_print_to_dynamic_safely_) || !defined(_di_f_print_to_dynamic_partial_safely_) || !defined(_di_f_print_to_safely_) - f_status_t private_f_print_to_safely(const f_string_t string, const f_array_length_t length, const int id) { + f_status_t private_f_print_to_safely(const f_string_t string, const f_number_unsigned_t length, const int id) { - register f_array_length_t i = 0; - f_array_length_t start = 0; - f_array_length_t total = 0; + register f_number_unsigned_t i = 0; + f_number_unsigned_t start = 0; + f_number_unsigned_t total = 0; f_string_static_t safe = f_string_empty_s; diff --git a/level_0/f_print/c/print/private-to.h b/level_0/f_print/c/print/private-to.h index bd86422..5d01084 100644 --- a/level_0/f_print/c/print/private-to.h +++ b/level_0/f_print/c/print/private-to.h @@ -54,7 +54,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_status_t private_f_print_to(const f_string_t string, const f_array_length_t length, const int id) F_attribute_visibility_internal_d; + extern f_status_t private_f_print_to(const f_string_t string, const f_number_unsigned_t length, const int id) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_to_) || !defined(_di_f_print_to_dynamic_) || !defined(_di_f_print_to_dynamic_partial_) /** @@ -150,7 +150,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_status_t private_f_print_to_except(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except, const int id) F_attribute_visibility_internal_d; + extern f_status_t private_f_print_to_except(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except, const int id) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_to_except_) || !defined(_di_f_print_to_except_dynamic_) || !defined(_di_f_print_to_except_dynamic_partial_) /** * Private implementation of f_print_to_except_in(). @@ -186,7 +186,7 @@ extern "C" { * @see f_print_to_except_in_dynamic_partial() */ #if !defined(_di_f_print_to_except_in_) || !defined(_di_f_print_to_except_dynamic_in_) || !defined(_di_f_print_to_except_in_dynamic_partial_) - extern f_status_t private_f_print_to_except_in(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except_at, f_string_ranges_t except_in, const int id) F_attribute_visibility_internal_d; + extern f_status_t private_f_print_to_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, f_string_ranges_t except_in, const int id) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_to_except_in_) || !defined(_di_f_print_to_except_dynamic_in_) || !defined(_di_f_print_to_except_in_dynamic_partial_) /** @@ -223,7 +223,7 @@ extern "C" { * @see f_print_to_except_in_dynamic_partial_raw() */ #if !defined(_di_f_print_to_except_in_raw_) || !defined(_di_f_print_to_except_dynamic_in_raw_) || !defined(_di_f_print_to_except_in_dynamic_partial_raw_) - extern f_status_t private_f_print_to_except_in_raw(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except_at, f_string_ranges_t except_in, const int id) F_attribute_visibility_internal_d; + extern f_status_t private_f_print_to_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, f_string_ranges_t except_in, const int id) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_to_except_in_raw_) || !defined(_di_f_print_to_except_dynamic_in_raw_) || !defined(_di_f_print_to_except_in_dynamic_partial_raw_) /** @@ -261,7 +261,7 @@ extern "C" { * @see f_utf_is_valid() */ #if !defined(_di_f_print_to_except_in_raw_safely_) || !defined(_di_f_print_to_except_dynamic_in_raw_safely_) || !defined(_di_f_print_to_except_in_dynamic_partial_raw_safely_) - extern f_status_t private_f_print_to_except_in_raw_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except_at, f_string_ranges_t except_in, const int id) F_attribute_visibility_internal_d; + extern f_status_t private_f_print_to_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, f_string_ranges_t except_in, const int id) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_to_except_in_raw_safely_) || !defined(_di_f_print_to_except_dynamic_in_raw_safely_) || !defined(_di_f_print_to_except_in_dynamic_partial_raw_safely_) /** @@ -299,7 +299,7 @@ extern "C" { * @see f_utf_is_valid() */ #if !defined(_di_f_print_to_except_in_safely_) || !defined(_di_f_print_to_except_dynamic_in_safely_) || !defined(_di_f_print_to_except_in_dynamic_partial_safely_) - extern f_status_t private_f_print_to_except_in_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except_at, f_string_ranges_t except_in, const int id) F_attribute_visibility_internal_d; + extern f_status_t private_f_print_to_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, f_string_ranges_t except_in, const int id) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_to_except_in_safely_) || !defined(_di_f_print_to_except_dynamic_in_safely_) || !defined(_di_f_print_to_except_in_dynamic_partial_safely_) /** @@ -346,7 +346,7 @@ extern "C" { * @see f_print_to_except_dynamic_partial_raw() */ #if !defined(_di_f_print_to_except_raw_) || !defined(_di_f_print_to_except_dynamic_raw_) || !defined(_di_f_print_to_except_dynamic_partial_raw_) - extern f_status_t private_f_print_to_except_raw(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except, const int id) F_attribute_visibility_internal_d; + extern f_status_t private_f_print_to_except_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except, const int id) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_to_except_raw_) || !defined(_di_f_print_to_except_dynamic_raw_) || !defined(_di_f_print_to_except_dynamic_partial_raw_) /** @@ -394,7 +394,7 @@ extern "C" { * @see f_utf_is_valid() */ #if !defined(_di_f_print_to_except_raw_safely_) || !defined(_di_f_print_to_except_dynamic_raw_safely_) || !defined(_di_f_print_to_except_dynamic_partial_raw_safely_) - extern f_status_t private_f_print_to_except_raw_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except, const int id) F_attribute_visibility_internal_d; + extern f_status_t private_f_print_to_except_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except, const int id) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_to_except_raw_safely_) || !defined(_di_f_print_to_except_dynamic_raw_safely_) || !defined(_di_f_print_to_except_dynamic_partial_raw_safely_) /** @@ -442,7 +442,7 @@ extern "C" { * @see f_utf_is_valid() */ #if !defined(_di_f_print_to_except_safely_) || !defined(_di_f_print_to_except_dynamic_safely_) || !defined(_di_f_print_to_except_dynamic_partial_safely_) - extern f_status_t private_f_print_to_except_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except, const int id) F_attribute_visibility_internal_d; + extern f_status_t private_f_print_to_except_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except, const int id) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_to_except_safely_) || !defined(_di_f_print_to_except_dynamic_safely_) || !defined(_di_f_print_to_except_dynamic_partial_safely_) /** @@ -484,7 +484,7 @@ extern "C" { * @see f_print_to_dynamic_partial_raw() */ #if !defined(_di_f_print_to_raw_) || !defined(_di_f_print_to_dynamic_raw_) || !defined(_di_f_print_to_dynamic_partial_raw_) - extern f_status_t private_f_print_to_raw(const f_string_t string, const f_array_length_t length, const int id) F_attribute_visibility_internal_d; + extern f_status_t private_f_print_to_raw(const f_string_t string, const f_number_unsigned_t length, const int id) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_to_raw_) || !defined(_di_f_print_to_dynamic_raw_) || !defined(_di_f_print_to_dynamic_partial_raw_ /** @@ -527,7 +527,7 @@ extern "C" { * @see f_utf_is_valid() */ #if !defined(_di_f_print_to_raw_safely_) || !defined(_di_f_print_to_dynamic_raw_safely_) || !defined(_di_f_print_to_dynamic_partial_raw_safely_) - extern f_status_t private_f_print_to_raw_safely(const f_string_t string, const f_array_length_t length, const int id) F_attribute_visibility_internal_d; + extern f_status_t private_f_print_to_raw_safely(const f_string_t string, const f_number_unsigned_t length, const int id) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_to_raw_safely_) || !defined(_di_f_print_to_dynamic_raw_safely_) || !defined(_di_f_print_to_dynamic_partial_raw_safely_) /** @@ -570,7 +570,7 @@ extern "C" { * @see f_utf_is_valid() */ #if !defined(_di_f_print_to_safely_) || !defined(_di_f_print_to_dynamic_safely_) || !defined(_di_f_print_to_dynamic_partial_safely_) - extern f_status_t private_f_print_to_safely(const f_string_t string, const f_array_length_t length, const int id) F_attribute_visibility_internal_d; + extern f_status_t private_f_print_to_safely(const f_string_t string, const f_number_unsigned_t length, const int id) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_to_safely_) || !defined(_di_f_print_to_dynamic_safely_) || !defined(_di_f_print_to_dynamic_partial_safely_) /** diff --git a/level_0/f_print/c/print/to.c b/level_0/f_print/c/print/to.c index b242f55..084b1a1 100644 --- a/level_0/f_print/c/print/to.c +++ b/level_0/f_print/c/print/to.c @@ -33,7 +33,7 @@ static inline f_status_t private_inline_f_print_to_error(void) { } #ifndef _di_f_print_to_ - f_status_t f_print_to(const f_string_t string, const f_array_length_t length, const f_file_t file) { + f_status_t f_print_to(const f_string_t string, const f_number_unsigned_t length, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!length || !string) return F_data_not; @@ -80,7 +80,7 @@ static inline f_status_t private_inline_f_print_to_error(void) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -96,7 +96,7 @@ static inline f_status_t private_inline_f_print_to_error(void) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -112,7 +112,7 @@ static inline f_status_t private_inline_f_print_to_error(void) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -128,7 +128,7 @@ static inline f_status_t private_inline_f_print_to_error(void) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -169,7 +169,7 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // _di_f_print_to_dynamic_safely_ #ifndef _di_f_print_to_except_ - f_status_t f_print_to_except(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except, const f_file_t file) { + f_status_t f_print_to_except(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!length || !string) return F_data_not; @@ -179,7 +179,7 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // _di_f_print_to_except_ #ifndef _di_f_print_to_except_dynamic_ - f_status_t f_print_to_except_dynamic(const f_string_static_t buffer, const f_array_lengths_t except, const f_file_t file) { + f_status_t f_print_to_except_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || !buffer.string) return F_data_not; @@ -189,14 +189,14 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // _di_f_print_to_except_dynamic_ #ifndef _di_f_print_to_except_dynamic_partial_ - f_status_t f_print_to_except_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, const f_file_t file) { + f_status_t f_print_to_except_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) { return F_data_not; } - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -207,14 +207,14 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // _di_f_print_to_except_dynamic_partial_ #ifndef _di_f_print_to_except_dynamic_partial_raw_ - f_status_t f_print_to_except_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, const f_file_t file) { + f_status_t f_print_to_except_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) { return F_data_not; } - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -225,14 +225,14 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // _di_f_print_to_except_dynamic_partial_raw_ #ifndef _di_f_print_to_except_dynamic_partial_raw_safely_ - f_status_t f_print_to_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, const f_file_t file) { + f_status_t f_print_to_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) { return F_data_not; } - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -243,14 +243,14 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // _di_f_print_to_except_dynamic_partial_raw_safely_ #ifndef _di_f_print_to_except_dynamic_partial_safely_ - f_status_t f_print_to_except_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, const f_file_t file) { + f_status_t f_print_to_except_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) { return F_data_not; } - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -261,7 +261,7 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // _di_f_print_to_except_dynamic_partial_safely_ #ifndef _di_f_print_to_except_dynamic_raw_ - f_status_t f_print_to_except_dynamic_raw(const f_string_static_t buffer, const f_array_lengths_t except, const f_file_t file) { + f_status_t f_print_to_except_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || !buffer.string) return F_data_not; @@ -271,7 +271,7 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // _di_f_print_to_except_dynamic_raw_ #ifndef _di_f_print_to_except_dynamic_raw_safely_ - f_status_t f_print_to_except_dynamic_raw_safely(const f_string_static_t buffer, const f_array_lengths_t except, const f_file_t file) { + f_status_t f_print_to_except_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || !buffer.string) return F_data_not; @@ -281,7 +281,7 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // _di_f_print_to_except_dynamic_raw_safely_ #ifndef _di_f_print_to_except_dynamic_safely_ - f_status_t f_print_to_except_dynamic_safely(const f_string_static_t buffer, const f_array_lengths_t except, const f_file_t file) { + f_status_t f_print_to_except_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || !buffer.string) return F_data_not; @@ -291,7 +291,7 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // _di_f_print_to_except_dynamic_safely_ #ifndef _di_f_print_to_except_in_ - f_status_t f_print_to_except_in(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_to_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!length || !string) return F_data_not; @@ -301,7 +301,7 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // _di_f_print_to_except_in_ #ifndef _di_f_print_to_except_in_dynamic_ - f_status_t f_print_to_except_in_dynamic(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_to_except_in_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.string || !buffer.used) return F_data_not; @@ -311,14 +311,14 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // _di_f_print_to_except_in_dynamic_ #ifndef _di_f_print_to_except_in_dynamic_partial_ - f_status_t f_print_to_except_in_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_to_except_in_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) { return F_data_not; } - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -329,14 +329,14 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // _di_f_print_to_except_in_dynamic_partial_ #ifndef _di_f_print_to_except_in_dynamic_partial_raw_ - f_status_t f_print_to_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_to_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) { return F_data_not; } - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -347,12 +347,12 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // _di_f_print_to_except_in_dynamic_partial_raw_ #ifndef _di_f_print_to_except_in_dynamic_partial_raw_safely_ - f_status_t f_print_to_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_to_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -363,12 +363,12 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // _di_f_print_to_except_in_dynamic_partial_raw_safely_ #ifndef _di_f_print_to_except_in_dynamic_partial_safely_ - f_status_t f_print_to_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_to_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used || !buffer.string) return F_data_not; - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -379,7 +379,7 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // _di_f_print_to_except_in_dynamic_partial_safely_ #ifndef _di_f_print_to_except_in_dynamic_raw_ - f_status_t f_print_to_except_in_dynamic_raw(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_to_except_in_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || !buffer.string) return F_data_not; @@ -389,7 +389,7 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // _di_f_print_to_except_in_dynamic_raw_ #ifndef _di_f_print_to_except_in_dynamic_raw_safely_ - f_status_t f_print_to_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_to_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || !buffer.string) return F_data_not; @@ -399,7 +399,7 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // _di_f_print_to_except_in_dynamic_raw_safely_ #ifndef _di_f_print_to_except_in_dynamic_safely_ - f_status_t f_print_to_except_in_dynamic_safely(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_to_except_in_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!buffer.used || !buffer.string) return F_data_not; @@ -409,7 +409,7 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // _di_f_print_to_except_in_dynamic_safely_ #ifndef _di_f_print_to_except_in_raw_ - f_status_t f_print_to_except_in_raw(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_to_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!length || !string) return F_data_not; @@ -419,7 +419,7 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // _di_f_print_to_except_in_raw_ #ifndef _di_f_print_to_except_in_raw_safely_ - f_status_t f_print_to_except_in_raw_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_to_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!length || !string) return F_data_not; @@ -429,7 +429,7 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // _di_f_print_to_except_in_raw_safely_ #ifndef _di_f_print_to_except_in_safely_ - f_status_t f_print_to_except_in_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t f_print_to_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!length || !string) return F_data_not; @@ -439,7 +439,7 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // _di_f_print_to_except_in_safely_ #ifndef _di_f_print_to_except_raw_ - f_status_t f_print_to_except_raw(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except, const f_file_t file) { + f_status_t f_print_to_except_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!length || !string) return F_data_not; @@ -449,7 +449,7 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // _di_f_print_to_except_raw_ #ifndef _di_f_print_to_except_raw_safely_ - f_status_t f_print_to_except_raw_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except, const f_file_t file) { + f_status_t f_print_to_except_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!length || !string) return F_data_not; @@ -459,7 +459,7 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // _di_f_print_to_except_raw_safely_ #ifndef _di_f_print_to_except_safely_ - f_status_t f_print_to_except_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except, const f_file_t file) { + f_status_t f_print_to_except_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!length || !string) return F_data_not; @@ -469,7 +469,7 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // _di_f_print_to_except_safely_ #ifndef _di_f_print_to_raw_ - f_status_t f_print_to_raw(const f_string_t string, const f_array_length_t length, const f_file_t file) { + f_status_t f_print_to_raw(const f_string_t string, const f_number_unsigned_t length, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!length || !string) return F_data_not; @@ -479,7 +479,7 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // _di_f_print_to_raw_ #ifndef _di_f_print_to_raw_safely_ - f_status_t f_print_to_raw_safely(const f_string_t string, const f_array_length_t length, const f_file_t file) { + f_status_t f_print_to_raw_safely(const f_string_t string, const f_number_unsigned_t length, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!length || !string) return F_data_not; @@ -500,7 +500,7 @@ static inline f_status_t private_inline_f_print_to_error(void) { #endif // _di_f_print_raw_terminated_ #ifndef _di_f_print_to_safely_ - f_status_t f_print_to_safely(const f_string_t string, const f_array_length_t length, const f_file_t file) { + f_status_t f_print_to_safely(const f_string_t string, const f_number_unsigned_t length, const f_file_t file) { if (file.id == -1) return F_file_descriptor_not; if (!length || !string) return F_data_not; @@ -515,14 +515,14 @@ static inline f_status_t private_inline_f_print_to_error(void) { if (file.id == -1) return F_file_descriptor_not; if (!string) return F_data_not; - f_array_length_t start = 0; - f_array_length_t total = 0; + f_number_unsigned_t start = 0; + f_number_unsigned_t total = 0; f_string_static_t safe = f_string_empty_s; uint8_t width = 0; - for (register f_array_length_t i = 0; string[i]; ) { + for (register f_number_unsigned_t i = 0; string[i]; ) { safe = f_string_empty_s; width = macro_f_utf_byte_width(string[i]); diff --git a/level_0/f_print/c/print/to.h b/level_0/f_print/c/print/to.h index 949c36c..649a9d1 100644 --- a/level_0/f_print/c/print/to.h +++ b/level_0/f_print/c/print/to.h @@ -56,7 +56,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_ - extern f_status_t f_print_to(const f_string_t string, const f_array_length_t length, const f_file_t file); + extern f_status_t f_print_to(const f_string_t string, const f_number_unsigned_t length, const f_file_t file); #endif // _di_f_print_to_ /** @@ -525,7 +525,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_ - extern f_status_t f_print_to_except(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except, const f_file_t file); + extern f_status_t f_print_to_except(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_f_print_to_except_ /** @@ -568,7 +568,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_dynamic_ - extern f_status_t f_print_to_except_dynamic(const f_string_static_t buffer, const f_array_lengths_t except, const f_file_t file); + extern f_status_t f_print_to_except_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_f_print_to_except_dynamic_ /** @@ -613,7 +613,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_dynamic_partial_ - extern f_status_t f_print_to_except_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, const f_file_t file); + extern f_status_t f_print_to_except_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_f_print_to_except_dynamic_partial_ /** @@ -660,7 +660,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_dynamic_partial_raw_ - extern f_status_t f_print_to_except_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, const f_file_t file); + extern f_status_t f_print_to_except_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_f_print_to_except_dynamic_partial_raw_ /** @@ -712,7 +712,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_dynamic_partial_raw_safely_ - extern f_status_t f_print_to_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, const f_file_t file); + extern f_status_t f_print_to_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_f_print_to_except_dynamic_partial_raw_safely_ /** @@ -760,7 +760,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_dynamic_partial_safely_ - extern f_status_t f_print_to_except_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, const f_file_t file); + extern f_status_t f_print_to_except_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_f_print_to_except_dynamic_partial_safely_ /** @@ -805,7 +805,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_dynamic_raw_ - extern f_status_t f_print_to_except_dynamic_raw(const f_string_static_t buffer, const f_array_lengths_t except, const f_file_t file); + extern f_status_t f_print_to_except_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_f_print_to_except_dynamic_raw_ /** @@ -855,7 +855,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_dynamic_raw_safely_ - extern f_status_t f_print_to_except_dynamic_raw_safely(const f_string_static_t buffer, const f_array_lengths_t except, const f_file_t file); + extern f_status_t f_print_to_except_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_f_print_to_except_dynamic_raw_safely_ /** @@ -901,7 +901,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_dynamic_safely_ - extern f_status_t f_print_to_except_dynamic_safely(const f_string_static_t buffer, const f_array_lengths_t except, const f_file_t file); + extern f_status_t f_print_to_except_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_f_print_to_except_dynamic_safely_ /** @@ -956,7 +956,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_in_ - extern f_status_t f_print_to_except_in(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_to_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_f_print_to_except_in_ /** @@ -1005,7 +1005,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_in_dynamic_ - extern f_status_t f_print_to_except_in_dynamic(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_to_except_in_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_f_print_to_except_in_dynamic_ /** @@ -1056,7 +1056,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_in_dynamic_partial_ - extern f_status_t f_print_to_except_in_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_to_except_in_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_f_print_to_except_in_dynamic_partial_ /** @@ -1109,7 +1109,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_in_dynamic_partial_raw_ - extern f_status_t f_print_to_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_to_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_f_print_to_except_in_dynamic_partial_raw_ /** @@ -1162,7 +1162,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_in_dynamic_partial_raw_safely_ - extern f_status_t f_print_to_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_to_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_f_print_to_except_in_dynamic_partial_raw_safely_ /** @@ -1215,7 +1215,7 @@ extern "C" { * @see f_utf_is_valid() */ #ifndef _di_f_print_to_except_in_dynamic_partial_safely_ - extern f_status_t f_print_to_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_to_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_f_print_to_except_in_dynamic_partial_safely_ /** @@ -1266,7 +1266,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_in_dynamic_raw_ - extern f_status_t f_print_to_except_in_dynamic_raw(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_to_except_in_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_f_print_to_except_in_dynamic_raw_ /** @@ -1320,7 +1320,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_in_dynamic_raw_safely_ - extern f_status_t f_print_to_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_to_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_f_print_to_except_in_dynamic_raw_safely_ /** @@ -1374,7 +1374,7 @@ extern "C" { * @see f_utf_is_valid() */ #ifndef _di_f_print_to_except_in_dynamic_safely_ - extern f_status_t f_print_to_except_in_dynamic_safely(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_to_except_in_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_f_print_to_except_in_dynamic_safely_ /** @@ -1431,7 +1431,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_in_raw_ - extern f_status_t f_print_to_except_in_raw(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_to_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_f_print_to_except_in_raw_ /** @@ -1491,7 +1491,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_in_raw_safely_ - extern f_status_t f_print_to_except_in_raw_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_to_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_f_print_to_except_in_raw_safely_ /** @@ -1551,7 +1551,7 @@ extern "C" { * @see f_utf_is_valid() */ #ifndef _di_f_print_to_except_in_safely_ - extern f_status_t f_print_to_except_in_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t f_print_to_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_f_print_to_except_in_safely_ /** @@ -1600,7 +1600,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_raw_ - extern f_status_t f_print_to_except_raw(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except, const f_file_t file); + extern f_status_t f_print_to_except_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_f_print_to_except_raw_ /** @@ -1654,7 +1654,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_raw_safely_ - extern f_status_t f_print_to_except_raw_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except, const f_file_t file); + extern f_status_t f_print_to_except_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_f_print_to_except_raw_safely_ /** @@ -1704,7 +1704,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_safely_ - extern f_status_t f_print_to_except_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except, const f_file_t file); + extern f_status_t f_print_to_except_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_f_print_to_except_safely_ /** @@ -1747,7 +1747,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_raw_ - extern f_status_t f_print_to_raw(const f_string_t string, const f_array_length_t length, const f_file_t file); + extern f_status_t f_print_to_raw(const f_string_t string, const f_number_unsigned_t length, const f_file_t file); #endif // _di_f_print_to_raw_ /** @@ -1795,7 +1795,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_raw_safely_ - extern f_status_t f_print_to_raw_safely(const f_string_t string, const f_array_length_t length, const f_file_t file); + extern f_status_t f_print_to_raw_safely(const f_string_t string, const f_number_unsigned_t length, const f_file_t file); #endif // _di_f_print_to_raw_safely_ /** @@ -1880,7 +1880,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_safely_ - extern f_status_t f_print_to_safely(const f_string_t string, const f_array_length_t length, const f_file_t file); + extern f_status_t f_print_to_safely(const f_string_t string, const f_number_unsigned_t length, const f_file_t file); #endif // _di_f_print_to_safely_ /** diff --git a/level_0/f_print/c/private-print.c b/level_0/f_print/c/private-print.c index 38c5cc0..356d370 100644 --- a/level_0/f_print/c/private-print.c +++ b/level_0/f_print/c/private-print.c @@ -6,14 +6,14 @@ extern "C" { #endif #if !defined(_di_f_print_) || !defined(_di_f_print_dynamic_) || !defined(_di_f_print_dynamic_partial_) - f_status_t private_f_print(const f_string_t string, const f_array_length_t length, const f_file_t file) { + f_status_t private_f_print(const f_string_t string, const f_number_unsigned_t length, const f_file_t file) { - f_array_length_t total = 0; - f_array_length_t count = 0; + f_number_unsigned_t total = 0; + f_number_unsigned_t count = 0; clearerr_unlocked(file.stream); - for (register f_array_length_t i = 0; i < length; ) { + for (register f_number_unsigned_t i = 0; i < length; ) { total = strnlen((string + i), length - i); @@ -65,13 +65,13 @@ extern "C" { #endif // !defined(_di_f_print_character_safely_get_) || !defined(_di_f_print_dynamic_partial_safely_) || !defined(_di_f_print_dynamic_safely_) || !defined(_di_f_print_except_dynamic_partial_safely_) || !defined(_di_f_print_except_dynamic_safely_) || !defined(_di_f_print_except_in_dynamic_safely_) || !defined(_di_f_print_except_in_dynamic_partial_safely_) || !defined(_di_f_print_except_in_safely_) || !defined(_di_f_print_except_safely_) || !defined(_di_f_print_safely_) || !defined(_di_f_print_safely_terminated_) || !defined(_di_f_print_to_dynamic_partial_safely_) || !defined(_di_f_print_to_dynamic_safely_) || !defined(_di_f_print_to_except_dynamic_partial_safely_) || !defined(_di_f_print_to_except_dynamic_safely_) || !defined(_di_f_print_to_except_in_dynamic_safely_) || !defined(_di_f_print_to_except_in_dynamic_partial_safely_) || !defined(_di_f_print_to_except_in_safely_) || !defined(_di_f_print_to_except_safely_) || !defined(_di_f_print_to_safely_) #if !defined(_di_f_print_except_) || !defined(_di_f_print_except_dynamic_) || !defined(_di_f_print_except_dynamic_partial_) - f_status_t private_f_print_except(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except, const f_file_t file) { + f_status_t private_f_print_except(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except, const f_file_t file) { - register f_array_length_t i = offset; - f_array_length_t j = 0; - f_array_length_t start = i; - f_array_length_t total = 0; - f_array_length_t count = 0; + register f_number_unsigned_t i = offset; + f_number_unsigned_t j = 0; + f_number_unsigned_t start = i; + f_number_unsigned_t total = 0; + f_number_unsigned_t count = 0; clearerr_unlocked(file.stream); @@ -128,14 +128,14 @@ 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_except_in_) || !defined(_di_f_print_except_in_dynamic_) || !defined(_di_f_print_except_in_dynamic_partial_) - f_status_t private_f_print_except_in(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t private_f_print_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { - f_array_length_t i = offset; - f_array_length_t at = 0; - f_array_length_t in = 0; - f_array_length_t start = i; - f_array_length_t total = 0; - f_array_length_t count = 0; + f_number_unsigned_t i = offset; + f_number_unsigned_t at = 0; + f_number_unsigned_t in = 0; + f_number_unsigned_t start = i; + f_number_unsigned_t total = 0; + f_number_unsigned_t count = 0; clearerr_unlocked(file.stream); @@ -217,14 +217,14 @@ extern "C" { #endif // !defined(_di_f_print_except_in_) || !defined(_di_f_print_except_in_dynamic_) || !defined(_di_f_print_except_in_dynamic_partial_) #if !defined(_di_f_print_except_in_raw_) || !defined(_di_f_print_except_in_dynamic_raw_) || !defined(_di_f_print_except_in_dynamic_partial_raw_) - f_status_t private_f_print_except_in_raw(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t private_f_print_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { - f_array_length_t i = offset; - f_array_length_t at = 0; - f_array_length_t in = 0; - f_array_length_t start = i; - f_array_length_t total = 0; - f_array_length_t count = 0; + f_number_unsigned_t i = offset; + f_number_unsigned_t at = 0; + f_number_unsigned_t in = 0; + f_number_unsigned_t start = i; + f_number_unsigned_t total = 0; + f_number_unsigned_t count = 0; clearerr_unlocked(file.stream); @@ -304,14 +304,14 @@ extern "C" { #endif // !defined(_di_f_print_except_in_raw_) || !defined(_di_f_print_except_in_dynamic_raw_) || !defined(_di_f_print_except_in_dynamic_partial_raw_) #if !defined(_di_f_print_except_in_raw_safely_) || !defined(_di_f_print_except_in_dynamic_raw_safely_) || !defined(_di_f_print_except_in_dynamic_partial_raw_safely_) - f_status_t private_f_print_except_in_raw_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t private_f_print_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { - f_array_length_t i = offset; - f_array_length_t at = 0; - f_array_length_t in = 0; - f_array_length_t start = i; - f_array_length_t total = 0; - f_array_length_t count = 0; + f_number_unsigned_t i = offset; + f_number_unsigned_t at = 0; + f_number_unsigned_t in = 0; + f_number_unsigned_t start = i; + f_number_unsigned_t total = 0; + f_number_unsigned_t count = 0; f_string_static_t safe = f_string_static_t_initialize; @@ -436,14 +436,14 @@ extern "C" { #endif // !defined(_di_f_print_except_in_raw_safely_) || !defined(_di_f_print_except_in_dynamic_raw_safely_) || !defined(_di_f_print_except_in_dynamic_partial_raw_safely_) #if !defined(_di_f_print_except_in_safely_) || !defined(_di_f_print_except_in_dynamic_safely_) || !defined(_di_f_print_except_in_dynamic_partial_safely_) - f_status_t private_f_print_except_in_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t private_f_print_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { - f_array_length_t i = offset; - f_array_length_t at = 0; - f_array_length_t in = 0; - f_array_length_t start = i; - f_array_length_t total = 0; - f_array_length_t count = 0; + f_number_unsigned_t i = offset; + f_number_unsigned_t at = 0; + f_number_unsigned_t in = 0; + f_number_unsigned_t start = i; + f_number_unsigned_t total = 0; + f_number_unsigned_t count = 0; f_string_static_t safe = f_string_static_t_initialize; @@ -581,13 +581,13 @@ extern "C" { #endif // !defined(_di_f_print_except_in_safely_) || !defined(_di_f_print_except_in_dynamic_safely_) || !defined(_di_f_print_except_in_dynamic_partial_safely_) #if !defined(_di_f_print_except_raw_) || !defined(_di_f_print_except_dynamic_raw_) || !defined(_di_f_print_except_dynamic_partial_raw_) - f_status_t private_f_print_except_raw(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except, const f_file_t file) { + f_status_t private_f_print_except_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except, const f_file_t file) { - register f_array_length_t i = offset; - f_array_length_t j = 0; - f_array_length_t start = i; - f_array_length_t total = 0; - f_array_length_t count = 0; + register f_number_unsigned_t i = offset; + f_number_unsigned_t j = 0; + f_number_unsigned_t start = i; + f_number_unsigned_t total = 0; + f_number_unsigned_t count = 0; clearerr_unlocked(file.stream); @@ -652,13 +652,13 @@ extern "C" { #endif // !defined(_di_f_print_except_raw_) || !defined(_di_f_print_except_dynamic_raw_) || !defined(_di_f_print_except_dynamic_partial_raw_) #if !defined(_di_f_print_except_raw_safely_) || !defined(_di_f_print_except_dynamic_raw_) || !defined(_di_f_print_except_dynamic_partial_raw_) - f_status_t private_f_print_except_raw_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except, const f_file_t file) { + f_status_t private_f_print_except_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except, const f_file_t file) { - f_array_length_t i = offset; - f_array_length_t j = 0; - f_array_length_t start = i; - f_array_length_t total = 0; - f_array_length_t count = 0; + f_number_unsigned_t i = offset; + f_number_unsigned_t j = 0; + f_number_unsigned_t start = i; + f_number_unsigned_t total = 0; + f_number_unsigned_t count = 0; f_string_static_t safe = f_string_static_t_initialize; @@ -758,13 +758,13 @@ extern "C" { #endif // !defined(_di_f_print_except_raw_safely_) || !defined(_di_f_print_except_dynamic_raw_) || !defined(_di_f_print_except_dynamic_partial_raw_) #if !defined(_di_f_print_except_safely_) || !defined(_di_f_print_except_dynamic_safely_) || !defined(_di_f_print_except_dynamic_partial_safely_) - f_status_t private_f_print_except_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except, const f_file_t file) { + f_status_t private_f_print_except_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except, const f_file_t file) { - f_array_length_t i = offset; - f_array_length_t j = 0; - f_array_length_t start = i; - f_array_length_t total = 0; - f_array_length_t count = 0; + f_number_unsigned_t i = offset; + f_number_unsigned_t j = 0; + f_number_unsigned_t start = i; + f_number_unsigned_t total = 0; + f_number_unsigned_t count = 0; f_string_static_t safe = f_string_static_t_initialize; @@ -877,9 +877,9 @@ extern "C" { #endif // !defined(_di_f_print_except_safely_) || !defined(_di_f_print_except_dynamic_safely_) || !defined(_di_f_print_except_dynamic_partial_safely_) #if !defined(_di_f_print_dynamic_partial_raw_) || !defined(_di_f_print_dynamic_partial_raw_safely_) || !defined(_di_f_print_dynamic_raw_) || !defined(_di_f_print_dynamic_raw_safely_) || !defined(_di_f_print_raw_) || !defined(_di_f_print_raw_safely_) - f_status_t private_f_print_raw(const f_string_t string, const f_array_length_t length, const f_file_t file) { + f_status_t private_f_print_raw(const f_string_t string, const f_number_unsigned_t length, const f_file_t file) { - f_array_length_t count = 0; + f_number_unsigned_t count = 0; clearerr_unlocked(file.stream); @@ -893,7 +893,7 @@ extern "C" { } while (count < length); } else { - for (f_array_length_t total = 0; ; total += F_print_write_max_d) { + for (f_number_unsigned_t total = 0; ; total += F_print_write_max_d) { if (length - total > F_print_write_max_d) { count = 0; @@ -923,12 +923,12 @@ extern "C" { #endif // !defined(_di_f_print_dynamic_partial_raw_) || !defined(_di_f_print_dynamic_partial_raw_safely_) || !defined(_di_f_print_dynamic_raw_) || !defined(_di_f_print_dynamic_raw_safely_) || !defined(_di_f_print_raw_) || !defined(_di_f_print_raw_safely_) #if !defined(_di_f_print_dynamic_partial_raw_safely_) || !defined(_di_f_print_dynamic_raw_safely_) || !defined(_di_f_print_raw_safely_) - f_status_t private_f_print_raw_safely(const f_string_t string, const f_array_length_t length, const f_file_t file) { + f_status_t private_f_print_raw_safely(const f_string_t string, const f_number_unsigned_t length, const f_file_t file) { - register f_array_length_t i = 0; - f_array_length_t start = 0; - f_array_length_t total = 0; - f_array_length_t count = 0; + register f_number_unsigned_t i = 0; + f_number_unsigned_t start = 0; + f_number_unsigned_t total = 0; + f_number_unsigned_t count = 0; f_string_static_t safe = f_string_static_t_initialize; @@ -1006,12 +1006,12 @@ extern "C" { #endif // !defined(_di_f_print_dynamic_partial_raw_safely_) || !defined(_di_f_print_dynamic_raw_safely_) || !defined(_di_f_print_raw_safely_) #if !defined(_di_f_print_dynamic_partial_safely_) || !defined(_di_f_print_dynamic_safely_) || !defined(_di_f_print_safely_) - f_status_t private_f_print_safely(const f_string_t string, const f_array_length_t length, const f_file_t file) { + f_status_t private_f_print_safely(const f_string_t string, const f_number_unsigned_t length, const f_file_t file) { - register f_array_length_t i = 0; - f_array_length_t start = 0; - f_array_length_t total = 0; - f_array_length_t count = 0; + register f_number_unsigned_t i = 0; + f_number_unsigned_t start = 0; + f_number_unsigned_t total = 0; + f_number_unsigned_t count = 0; f_string_static_t safe = f_string_static_t_initialize; @@ -1102,7 +1102,7 @@ extern "C" { #endif // !defined(_di_f_print_dynamic_partial_safely_) || !defined(_di_f_print_dynamic_safely_) || !defined(_di_f_print_safely_) #if !defined(_di_f_print_character_safely_get_) || !defined(_di_f_print_dynamic_partial_safely_) || !defined(_di_f_print_dynamic_safely_) || !defined(_di_f_print_except_dynamic_partial_safely_) || !defined(_di_f_print_except_dynamic_safely_) || !defined(_di_f_print_except_in_dynamic_safely_) || !defined(_di_f_print_except_in_dynamic_partial_safely_) || !defined(_di_f_print_except_in_safely_) || !defined(_di_f_print_except_safely_) || !defined(_di_f_print_raw_safely_) || !defined(_di_f_print_safely_) || !defined(_di_f_print_safely_terminated_) || !defined(_di_f_print_to_dynamic_partial_safely_) || !defined(_di_f_print_to_dynamic_safely_) || !defined(_di_f_print_to_except_dynamic_partial_safely_) || !defined(_di_f_print_to_except_dynamic_safely_) || !defined(_di_f_print_to_except_in_dynamic_safely_) || !defined(_di_f_print_to_except_in_dynamic_partial_safely_) || !defined(_di_f_print_to_except_in_safely_) || !defined(_di_f_print_to_except_safely_) || !defined(_di_f_print_to_safely_) - const f_string_static_t private_f_print_safely_get(const f_string_t character, const f_array_length_t width_max) { + const f_string_static_t private_f_print_safely_get(const f_string_t character, const f_number_unsigned_t width_max) { if (character[0] == 0x7f) return f_print_sequence_delete_s; @@ -1124,7 +1124,7 @@ extern "C" { f_status_t private_f_print_terminated(const f_string_t string, const f_file_t file) { const size_t length = strlen(string); - f_array_length_t count = 0; + f_number_unsigned_t count = 0; clearerr_unlocked(file.stream); @@ -1139,7 +1139,7 @@ extern "C" { #endif // !defined(_di_f_print_terminated_) || !defined(_di_f_print_raw_terminated_) #if !defined(_di_f_print_dynamic_partial_raw_safely_) || !defined(_di_f_print_dynamic_partial_safely_) || !defined(_di_f_print_dynamic_raw_safely_) || !defined(_di_f_print_dynamic_safely_) || !defined(_di_f_print_except_dynamic_partial_raw_) || !defined(_di_f_print_except_dynamic_partial_safely_) || !defined(_di_f_print_except_dynamic_raw_) || !defined(_di_f_print_except_dynamic_safely_) || !defined(_di_f_print_except_in_dynamic_partial_raw_safely_) || !defined(_di_f_print_except_in_dynamic_partial_safely_) || !defined(_di_f_print_except_in_dynamic_raw_safely_) || !defined(_di_f_print_except_in_dynamic_safely_) || !defined(_di_f_print_except_in_raw_safely_) || !defined(_di_f_print_except_in_safely_) || !defined(_di_f_print_except_raw_safely_) || !defined(_di_f_print_except_safely_) || !defined(_di_f_print_raw_safely_) || !defined(_di_f_print_safely_) - uint8_t private_f_print_width_max(const f_string_t string, const f_array_length_t at) { + uint8_t private_f_print_width_max(const f_string_t string, const f_number_unsigned_t at) { const uint8_t width = macro_f_utf_byte_width(string[at]); diff --git a/level_0/f_print/c/private-print.h b/level_0/f_print/c/private-print.h index b75e7be..326e93a 100644 --- a/level_0/f_print/c/private-print.h +++ b/level_0/f_print/c/private-print.h @@ -41,7 +41,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_status_t private_f_print(const f_string_t string, const f_array_length_t length, const f_file_t file) F_attribute_visibility_internal_d; + extern f_status_t private_f_print(const f_string_t string, const f_number_unsigned_t length, const f_file_t file) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_) || !defined(_di_f_print_dynamic_) || !defined(_di_f_print_dynamic_partial_) /** @@ -147,7 +147,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_status_t private_f_print_except(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except, const f_file_t file) F_attribute_visibility_internal_d; + extern f_status_t private_f_print_except(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except, const f_file_t file) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_except_) || !defined(_di_f_print_except_dynamic_) || !defined(_di_f_print_except_dynamic_partial_) /** @@ -184,7 +184,7 @@ extern "C" { * @see f_print_except_in_dynamic_partial() */ #if !defined(_di_f_print_except_in_) || !defined(_di_f_print_except_in_dynamic_) || !defined(_di_f_print_except_in_dynamic_partial_) - extern f_status_t private_f_print_except_in(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except_at, f_string_ranges_t except_in, const f_file_t file) F_attribute_visibility_internal_d; + extern f_status_t private_f_print_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, f_string_ranges_t except_in, const f_file_t file) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_except_in_) || !defined(_di_f_print_except_in_dynamic_) || !defined(_di_f_print_except_in_dynamic_partial_) /** @@ -221,7 +221,7 @@ extern "C" { * @see f_print_except_in_dynamic_partial_raw() */ #if !defined(_di_f_print_except_in_raw_) || !defined(_di_f_print_except_in_dynamic_raw_) || !defined(_di_f_print_except_in_dynamic_partial_raw_) - extern f_status_t private_f_print_except_in_raw(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except_at, f_string_ranges_t except_in, const f_file_t file) F_attribute_visibility_internal_d; + extern f_status_t private_f_print_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, f_string_ranges_t except_in, const f_file_t file) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_except_in_raw_) || !defined(_di_f_print_except_in_dynamic_raw_) || !defined(_di_f_print_except_in_dynamic_partial_raw_) /** @@ -258,7 +258,7 @@ extern "C" { * @see f_print_except_in_dynamic_partial_raw_safely() */ #if !defined(_di_f_print_except_in_raw_safely_) || !defined(_di_f_print_except_in_dynamic_raw_safely_) || !defined(_di_f_print_except_in_dynamic_partial_raw_safely_) - extern f_status_t private_f_print_except_in_raw_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except_at, f_string_ranges_t except_in, const f_file_t file) F_attribute_visibility_internal_d; + extern f_status_t private_f_print_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, f_string_ranges_t except_in, const f_file_t file) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_except_in_raw_safely_) || !defined(_di_f_print_except_in_dynamic_raw_safely_) || !defined(_di_f_print_except_in_dynamic_partial_raw_safely_) /** @@ -295,7 +295,7 @@ extern "C" { * @see f_print_except_in_dynamic_partial_safely() */ #if !defined(_di_f_print_except_in_safely_) || !defined(_di_f_print_except_dynamic_in_safely_) || !defined(_di_f_print_except_in_dynamic_partial_safely_) - extern f_status_t private_f_print_except_in_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except_at, f_string_ranges_t except_in, const f_file_t file) F_attribute_visibility_internal_d; + extern f_status_t private_f_print_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, f_string_ranges_t except_in, const f_file_t file) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_except_in_safely_) || !defined(_di_f_print_except_dynamic_in_safely_) || !defined(_di_f_print_except_in_dynamic_partial_safely_) /** @@ -329,7 +329,7 @@ extern "C" { * @see f_print_except_dynamic_partial_raw() */ #if !defined(_di_f_print_except_raw_) || !defined(_di_f_print_except_dynamic_raw_) || !defined(_di_f_print_except_dynamic_partial_raw_) - extern f_status_t private_f_print_except_raw(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except, const f_file_t file) F_attribute_visibility_internal_d; + extern f_status_t private_f_print_except_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except, const f_file_t file) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_except_raw_) || !defined(_di_f_print_except_dynamic_raw_) || !defined(_di_f_print_except_dynamic_partial_raw_) /** @@ -363,7 +363,7 @@ extern "C" { * @see f_print_except_dynamic_partial_raw_safely() */ #if !defined(_di_f_print_except_raw_safely_) || !defined(_di_f_print_except_dynamic_raw_safely_) || !defined(_di_f_print_except_dynamic_partial_raw_safely_) - extern f_status_t private_f_print_except_raw_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except, const f_file_t file) F_attribute_visibility_internal_d; + extern f_status_t private_f_print_except_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except, const f_file_t file) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_except_raw_safely_) || !defined(_di_f_print_except_dynamic_raw_safely_) || !defined(_di_f_print_except_dynamic_partial_raw_safely_) /** @@ -397,7 +397,7 @@ extern "C" { * @see f_print_except_dynamic_partial_safely() */ #if !defined(_di_f_print_except_safely_) || !defined(_di_f_print_except_dynamic_safely_) || !defined(_di_f_print_except_dynamic_partial_safely_) - extern f_status_t private_f_print_except_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except, const f_file_t file) F_attribute_visibility_internal_d; + extern f_status_t private_f_print_except_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except, const f_file_t file) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_except_safely_) || !defined(_di_f_print_except_dynamic_safely_) || !defined(_di_f_print_except_dynamic_partial_safely_) /** @@ -429,7 +429,7 @@ extern "C" { * @see f_print_raw_safely()) */ #if !defined(_di_f_print_dynamic_partial_raw_) || !defined(_di_f_print_dynamic_partial_raw_safely_) || !defined(_di_f_print_dynamic_raw_) || !defined(_di_f_print_dynamic_raw_safely_) || !defined(_di_f_print_raw_) || !defined(_di_f_print_raw_safely_) - extern f_status_t private_f_print_raw(const f_string_t string, const f_array_length_t length, const f_file_t file) F_attribute_visibility_internal_d; + extern f_status_t private_f_print_raw(const f_string_t string, const f_number_unsigned_t length, const f_file_t file) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_dynamic_partial_raw_) || !defined(_di_f_print_dynamic_partial_raw_safely_) || !defined(_di_f_print_dynamic_raw_) || !defined(_di_f_print_dynamic_raw_safely_) || !defined(_di_f_print_raw_) || !defined(_di_f_print_raw_safely_) /** @@ -458,7 +458,7 @@ extern "C" { * @see f_print_raw_safely() */ #if !defined(_di_f_print_dynamic_partial_raw_safely_) || !defined(_di_f_print_dynamic_raw_safely_) || !defined(_di_f_print_raw_safely_) - extern f_status_t private_f_print_raw_safely(const f_string_t string, const f_array_length_t length, const f_file_t file) F_attribute_visibility_internal_d; + extern f_status_t private_f_print_raw_safely(const f_string_t string, const f_number_unsigned_t length, const f_file_t file) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_dynamic_partial_raw_safely_) || !defined(_di_f_print_dynamic_raw_safely_) || !defined(_di_f_print_raw_safely_) /** @@ -487,7 +487,7 @@ extern "C" { * @see f_print_safely() */ #if !defined(_di_f_print_dynamic_partial_safely_) || !defined(_di_f_print_dynamic_safely_) || !defined(_di_f_print_safely_) - extern f_status_t private_f_print_safely(const f_string_t string, const f_array_length_t length, const f_file_t file) F_attribute_visibility_internal_d; + extern f_status_t private_f_print_safely(const f_string_t string, const f_number_unsigned_t length, const f_file_t file) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_dynamic_partial_safely_) || !defined(_di_f_print_dynamic_safely_) || !defined(_di_f_print_safely_) /** @@ -530,7 +530,7 @@ extern "C" { * @see f_print_to_safely() */ #if !defined(_di_f_print_character_safely_get_) || !defined(_di_f_print_dynamic_partial_safely_) || !defined(_di_f_print_dynamic_safely_) || !defined(_di_f_print_except_dynamic_partial_safely_) || !defined(_di_f_print_except_dynamic_safely_) || !defined(_di_f_print_except_in_dynamic_safely_) || !defined(_di_f_print_except_in_dynamic_partial_safely_) || !defined(_di_f_print_except_in_safely_) || !defined(_di_f_print_except_safely_) || !defined(_di_f_print_raw_safely_) || !defined(_di_f_print_safely_) || !defined(_di_f_print_safely_terminated_) || !defined(_di_f_print_to_dynamic_partial_safely_) || !defined(_di_f_print_to_dynamic_safely_) || !defined(_di_f_print_to_except_dynamic_partial_safely_) || !defined(_di_f_print_to_except_dynamic_safely_) || !defined(_di_f_print_to_except_in_dynamic_safely_) || !defined(_di_f_print_to_except_in_dynamic_partial_safely_) || !defined(_di_f_print_to_except_in_safely_) || !defined(_di_f_print_to_except_safely_) || !defined(_di_f_print_to_safely_) - extern const f_string_static_t private_f_print_safely_get(const f_string_t character, const f_array_length_t width_max) F_attribute_visibility_internal_d; + extern const f_string_static_t private_f_print_safely_get(const f_string_t character, const f_number_unsigned_t width_max) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_character_safely_get_) || !defined(_di_f_print_dynamic_partial_safely_) || !defined(_di_f_print_dynamic_safely_) || !defined(_di_f_print_except_dynamic_partial_safely_) || !defined(_di_f_print_except_dynamic_safely_) || !defined(_di_f_print_except_in_dynamic_safely_) || !defined(_di_f_print_except_in_dynamic_partial_safely_) || !defined(_di_f_print_except_in_safely_) || !defined(_di_f_print_except_safely_) || !defined(_di_f_print_raw_safely_) || !defined(_di_f_print_safely_) || !defined(_di_f_print_safely_terminated_) || !defined(_di_f_print_to_dynamic_partial_safely_) || !defined(_di_f_print_to_dynamic_safely_) || !defined(_di_f_print_to_except_dynamic_partial_safely_) || !defined(_di_f_print_to_except_dynamic_safely_) || !defined(_di_f_print_to_except_in_dynamic_safely_) || !defined(_di_f_print_to_except_in_dynamic_partial_safely_) || !defined(_di_f_print_to_except_in_safely_) || !defined(_di_f_print_to_except_safely_) || !defined(_di_f_print_to_safely_) /** @@ -590,7 +590,7 @@ extern "C" { * @see f_print_safely */ #if !defined(_di_f_print_dynamic_partial_raw_safely_) || !defined(_di_f_print_dynamic_partial_safely_) || !defined(_di_f_print_dynamic_raw_safely_) || !defined(_di_f_print_dynamic_safely_) || !defined(_di_f_print_except_dynamic_partial_raw_) || !defined(_di_f_print_except_dynamic_partial_safely_) || !defined(_di_f_print_except_dynamic_raw_) || !defined(_di_f_print_except_dynamic_safely_) || !defined(_di_f_print_except_in_dynamic_partial_raw_safely_) || !defined(_di_f_print_except_in_dynamic_partial_safely_) || !defined(_di_f_print_except_in_dynamic_raw_safely_) || !defined(_di_f_print_except_in_dynamic_safely_) || !defined(_di_f_print_except_in_raw_safely_) || !defined(_di_f_print_except_in_safely_) || !defined(_di_f_print_except_raw_safely_) || !defined(_di_f_print_except_safely_) || !defined(_di_f_print_raw_safely_) || !defined(_di_f_print_safely_) - extern uint8_t private_f_print_width_max(const f_string_t string, const f_array_length_t at) F_attribute_visibility_internal_d; + extern uint8_t private_f_print_width_max(const f_string_t string, const f_number_unsigned_t at) F_attribute_visibility_internal_d; #endif // #if !defined(_di_f_print_dynamic_partial_raw_safely_) || !defined(_di_f_print_dynamic_partial_safely_) || !defined(_di_f_print_dynamic_raw_safely_) || !defined(_di_f_print_dynamic_safely_) || !defined(_di_f_print_except_dynamic_partial_raw_) || !defined(_di_f_print_except_dynamic_partial_safely_) || !defined(_di_f_print_except_dynamic_raw_) || !defined(_di_f_print_except_dynamic_safely_) || !defined(_di_f_print_except_in_dynamic_partial_raw_safely_) || !defined(_di_f_print_except_in_dynamic_partial_safely_) || !defined(_di_f_print_except_in_dynamic_raw_safely_) || !defined(_di_f_print_except_in_dynamic_safely_) || !defined(_di_f_print_except_in_raw_safely_) || !defined(_di_f_print_except_in_safely_) || !defined(_di_f_print_except_raw_safely_) || !defined(_di_f_print_except_safely_) || !defined(_di_f_print_raw_safely_) || !defined(_di_f_print_safely_) #ifdef __cplusplus diff --git a/level_0/f_print/tests/unit/c/test-print-except.c b/level_0/f_print/tests/unit/c/test-print-except.c index 40dc08c..3febdfb 100644 --- a/level_0/f_print/tests/unit/c/test-print-except.c +++ b/level_0/f_print/tests/unit/c/test-print-except.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_except__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -25,7 +25,7 @@ void test__f_print_except__fails(void **state) { void test__f_print_except__returns_data_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -50,7 +50,7 @@ void test__f_print_except__returns_data_not(void **state) { void test__f_print_except__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -66,7 +66,7 @@ void test__f_print_except__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used); @@ -78,7 +78,7 @@ void test__f_print_except__works(void **state) { } { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used); @@ -90,8 +90,8 @@ void test__f_print_except__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + f_number_unsigned_t lengths[] = { 3 }; + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used - 1); diff --git a/level_0/f_print/tests/unit/c/test-print-except_dynamic.c b/level_0/f_print/tests/unit/c/test-print-except_dynamic.c index bf33789..2ecf997 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_dynamic.c +++ b/level_0/f_print/tests/unit/c/test-print-except_dynamic.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_except_dynamic__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -24,7 +24,7 @@ void test__f_print_except_dynamic__fails(void **state) { void test__f_print_except_dynamic__returns_data_not(void **state) { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -37,7 +37,7 @@ void test__f_print_except_dynamic__returns_data_not(void **state) { void test__f_print_except_dynamic__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -53,7 +53,7 @@ void test__f_print_except_dynamic__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used); @@ -65,8 +65,8 @@ void test__f_print_except_dynamic__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + f_number_unsigned_t lengths[] = { 3 }; + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used - 1); diff --git a/level_0/f_print/tests/unit/c/test-print-except_dynamic_partial.c b/level_0/f_print/tests/unit/c/test-print-except_dynamic_partial.c index f2e2dd3..ad28037 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_dynamic_partial.c +++ b/level_0/f_print/tests/unit/c/test-print-except_dynamic_partial.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_except_dynamic_partial__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -25,7 +25,7 @@ void test__f_print_except_dynamic_partial__fails(void **state) { void test__f_print_except_dynamic_partial__returns_data_not(void **state) { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -39,7 +39,7 @@ void test__f_print_except_dynamic_partial__returns_data_not(void **state) { void test__f_print_except_dynamic_partial__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); @@ -57,7 +57,7 @@ void test__f_print_except_dynamic_partial__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used); @@ -69,8 +69,8 @@ void test__f_print_except_dynamic_partial__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + f_number_unsigned_t lengths[] = { 3 }; + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used - 1); diff --git a/level_0/f_print/tests/unit/c/test-print-except_dynamic_partial_raw.c b/level_0/f_print/tests/unit/c/test-print-except_dynamic_partial_raw.c index 90a34ff..f27ee2a 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_dynamic_partial_raw.c +++ b/level_0/f_print/tests/unit/c/test-print-except_dynamic_partial_raw.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_except_dynamic_partial_raw__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -25,7 +25,7 @@ void test__f_print_except_dynamic_partial_raw__fails(void **state) { void test__f_print_except_dynamic_partial_raw__returns_data_not(void **state) { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -39,7 +39,7 @@ void test__f_print_except_dynamic_partial_raw__returns_data_not(void **state) { void test__f_print_except_dynamic_partial_raw__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); @@ -57,7 +57,7 @@ void test__f_print_except_dynamic_partial_raw__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used); @@ -69,8 +69,8 @@ void test__f_print_except_dynamic_partial_raw__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + f_number_unsigned_t lengths[] = { 3 }; + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used - 1); diff --git a/level_0/f_print/tests/unit/c/test-print-except_dynamic_partial_raw_safely.c b/level_0/f_print/tests/unit/c/test-print-except_dynamic_partial_raw_safely.c index a1f0ad6..213755c 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_dynamic_partial_raw_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-except_dynamic_partial_raw_safely.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_except_dynamic_partial_raw_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -25,7 +25,7 @@ void test__f_print_except_dynamic_partial_raw_safely__fails(void **state) { void test__f_print_except_dynamic_partial_raw_safely__returns_data_not(void **state) { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -39,7 +39,7 @@ void test__f_print_except_dynamic_partial_raw_safely__returns_data_not(void **st void test__f_print_except_dynamic_partial_raw_safely__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); @@ -57,7 +57,7 @@ void test__f_print_except_dynamic_partial_raw_safely__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used); @@ -69,8 +69,8 @@ void test__f_print_except_dynamic_partial_raw_safely__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + f_number_unsigned_t lengths[] = { 3 }; + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used - 1); diff --git a/level_0/f_print/tests/unit/c/test-print-except_dynamic_partial_safely.c b/level_0/f_print/tests/unit/c/test-print-except_dynamic_partial_safely.c index f111767..b76f1af 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_dynamic_partial_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-except_dynamic_partial_safely.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_except_dynamic_partial_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -25,7 +25,7 @@ void test__f_print_except_dynamic_partial_safely__fails(void **state) { void test__f_print_except_dynamic_partial_safely__returns_data_not(void **state) { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -39,7 +39,7 @@ void test__f_print_except_dynamic_partial_safely__returns_data_not(void **state) void test__f_print_except_dynamic_partial_safely__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); @@ -57,7 +57,7 @@ void test__f_print_except_dynamic_partial_safely__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used); @@ -69,8 +69,8 @@ void test__f_print_except_dynamic_partial_safely__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + f_number_unsigned_t lengths[] = { 3 }; + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used - 1); diff --git a/level_0/f_print/tests/unit/c/test-print-except_dynamic_raw.c b/level_0/f_print/tests/unit/c/test-print-except_dynamic_raw.c index 117f522..0e45682 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_dynamic_raw.c +++ b/level_0/f_print/tests/unit/c/test-print-except_dynamic_raw.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_except_dynamic_raw__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -24,7 +24,7 @@ void test__f_print_except_dynamic_raw__fails(void **state) { void test__f_print_except_dynamic_raw__returns_data_not(void **state) { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -37,7 +37,7 @@ void test__f_print_except_dynamic_raw__returns_data_not(void **state) { void test__f_print_except_dynamic_raw__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -53,7 +53,7 @@ void test__f_print_except_dynamic_raw__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used); @@ -65,8 +65,8 @@ void test__f_print_except_dynamic_raw__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + f_number_unsigned_t lengths[] = { 3 }; + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used - 1); diff --git a/level_0/f_print/tests/unit/c/test-print-except_dynamic_raw_safely.c b/level_0/f_print/tests/unit/c/test-print-except_dynamic_raw_safely.c index 151fc3f..419b371 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_dynamic_raw_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-except_dynamic_raw_safely.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_except_dynamic_raw_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -24,7 +24,7 @@ void test__f_print_except_dynamic_raw_safely__fails(void **state) { void test__f_print_except_dynamic_raw_safely__returns_data_not(void **state) { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -37,7 +37,7 @@ void test__f_print_except_dynamic_raw_safely__returns_data_not(void **state) { void test__f_print_except_dynamic_raw_safely__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -53,7 +53,7 @@ void test__f_print_except_dynamic_raw_safely__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used); @@ -65,8 +65,8 @@ void test__f_print_except_dynamic_raw_safely__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + f_number_unsigned_t lengths[] = { 3 }; + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used - 1); diff --git a/level_0/f_print/tests/unit/c/test-print-except_dynamic_safely.c b/level_0/f_print/tests/unit/c/test-print-except_dynamic_safely.c index c428708..b6dd617 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_dynamic_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-except_dynamic_safely.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_except_dynamic_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -24,7 +24,7 @@ void test__f_print_except_dynamic_safely__fails(void **state) { void test__f_print_except_dynamic_safely__returns_data_not(void **state) { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -37,7 +37,7 @@ void test__f_print_except_dynamic_safely__returns_data_not(void **state) { void test__f_print_except_dynamic_safely__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -53,7 +53,7 @@ void test__f_print_except_dynamic_safely__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used); @@ -65,8 +65,8 @@ void test__f_print_except_dynamic_safely__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + f_number_unsigned_t lengths[] = { 3 }; + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used - 1); diff --git a/level_0/f_print/tests/unit/c/test-print-except_in.c b/level_0/f_print/tests/unit/c/test-print-except_in.c index 9436b2a..799b54a 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_in.c +++ b/level_0/f_print/tests/unit/c/test-print-except_in.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_except_in__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -26,7 +26,7 @@ void test__f_print_except_in__fails(void **state) { void test__f_print_except_in__returns_data_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -52,7 +52,7 @@ void test__f_print_except_in__returns_data_not(void **state) { void test__f_print_except_in__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); @@ -69,7 +69,7 @@ void test__f_print_except_in__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; will_return(__wrap_fwrite_unlocked, false); @@ -82,7 +82,7 @@ void test__f_print_except_in__works(void **state) { } { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; will_return(__wrap_fwrite_unlocked, false); @@ -95,11 +95,11 @@ void test__f_print_except_in__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; + f_number_unsigned_t lengths[] = { 3 }; f_string_range_t ranges[] = { macro_f_string_range_t_initialize_1(0, 1), }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_fwrite_unlocked, false); diff --git a/level_0/f_print/tests/unit/c/test-print-except_in_dynamic.c b/level_0/f_print/tests/unit/c/test-print-except_in_dynamic.c index 8caf777..dd8f50d 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_in_dynamic.c +++ b/level_0/f_print/tests/unit/c/test-print-except_in_dynamic.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_except_in_dynamic__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -25,7 +25,7 @@ void test__f_print_except_in_dynamic__fails(void **state) { void test__f_print_except_in_dynamic__returns_data_not(void **state) { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -39,7 +39,7 @@ void test__f_print_except_in_dynamic__returns_data_not(void **state) { void test__f_print_except_in_dynamic__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); @@ -56,7 +56,7 @@ void test__f_print_except_in_dynamic__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; will_return(__wrap_fwrite_unlocked, false); @@ -69,11 +69,11 @@ void test__f_print_except_in_dynamic__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; + f_number_unsigned_t lengths[] = { 3 }; f_string_range_t ranges[] = { macro_f_string_range_t_initialize_1(0, 1), }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_fwrite_unlocked, false); diff --git a/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_partial.c b/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_partial.c index de601b2..7ed093d 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_partial.c +++ b/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_partial.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_except_in_dynamic_partial__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -26,7 +26,7 @@ void test__f_print_except_in_dynamic_partial__fails(void **state) { void test__f_print_except_in_dynamic_partial__returns_data_not(void **state) { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -41,7 +41,7 @@ void test__f_print_except_in_dynamic_partial__returns_data_not(void **state) { void test__f_print_except_in_dynamic_partial__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); @@ -60,7 +60,7 @@ void test__f_print_except_in_dynamic_partial__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; will_return(__wrap_fwrite_unlocked, false); @@ -73,11 +73,11 @@ void test__f_print_except_in_dynamic_partial__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; + f_number_unsigned_t lengths[] = { 3 }; f_string_range_t ranges[] = { macro_f_string_range_t_initialize_1(0, 1), }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_fwrite_unlocked, false); diff --git a/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_partial_raw.c b/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_partial_raw.c index 99f16ae..318ee74 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_partial_raw.c +++ b/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_partial_raw.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_except_in_dynamic_partial_raw__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -26,7 +26,7 @@ void test__f_print_except_in_dynamic_partial_raw__fails(void **state) { void test__f_print_except_in_dynamic_partial_raw__returns_data_not(void **state) { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -41,7 +41,7 @@ void test__f_print_except_in_dynamic_partial_raw__returns_data_not(void **state) void test__f_print_except_in_dynamic_partial_raw__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); @@ -60,7 +60,7 @@ void test__f_print_except_in_dynamic_partial_raw__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; will_return(__wrap_fwrite_unlocked, false); @@ -73,11 +73,11 @@ void test__f_print_except_in_dynamic_partial_raw__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; + f_number_unsigned_t lengths[] = { 3 }; f_string_range_t ranges[] = { macro_f_string_range_t_initialize_1(0, 1), }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_fwrite_unlocked, false); diff --git a/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_partial_raw_safely.c b/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_partial_raw_safely.c index 9fda3bf..a380258 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_partial_raw_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_partial_raw_safely.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_except_in_dynamic_partial_raw_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -26,7 +26,7 @@ void test__f_print_except_in_dynamic_partial_raw_safely__fails(void **state) { void test__f_print_except_in_dynamic_partial_raw_safely__returns_data_not(void **state) { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -41,7 +41,7 @@ void test__f_print_except_in_dynamic_partial_raw_safely__returns_data_not(void * void test__f_print_except_in_dynamic_partial_raw_safely__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); @@ -60,7 +60,7 @@ void test__f_print_except_in_dynamic_partial_raw_safely__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; will_return(__wrap_fwrite_unlocked, false); @@ -73,11 +73,11 @@ void test__f_print_except_in_dynamic_partial_raw_safely__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; + f_number_unsigned_t lengths[] = { 3 }; f_string_range_t ranges[] = { macro_f_string_range_t_initialize_1(0, 1), }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_fwrite_unlocked, false); diff --git a/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_partial_safely.c b/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_partial_safely.c index 8b88b2f..ab4e248 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_partial_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_partial_safely.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_except_in_dynamic_partial_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -26,7 +26,7 @@ void test__f_print_except_in_dynamic_partial_safely__fails(void **state) { void test__f_print_except_in_dynamic_partial_safely__returns_data_not(void **state) { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -41,7 +41,7 @@ void test__f_print_except_in_dynamic_partial_safely__returns_data_not(void **sta void test__f_print_except_in_dynamic_partial_safely__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); @@ -60,7 +60,7 @@ void test__f_print_except_in_dynamic_partial_safely__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; will_return(__wrap_fwrite_unlocked, false); @@ -73,11 +73,11 @@ void test__f_print_except_in_dynamic_partial_safely__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; + f_number_unsigned_t lengths[] = { 3 }; f_string_range_t ranges[] = { macro_f_string_range_t_initialize_1(0, 1), }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_fwrite_unlocked, false); diff --git a/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_raw.c b/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_raw.c index c3164bf..e64fc68 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_raw.c +++ b/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_raw.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_except_in_dynamic_raw__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -25,7 +25,7 @@ void test__f_print_except_in_dynamic_raw__fails(void **state) { void test__f_print_except_in_dynamic_raw__returns_data_not(void **state) { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -39,7 +39,7 @@ void test__f_print_except_in_dynamic_raw__returns_data_not(void **state) { void test__f_print_except_in_dynamic_raw__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); @@ -56,7 +56,7 @@ void test__f_print_except_in_dynamic_raw__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; will_return(__wrap_fwrite_unlocked, false); @@ -69,11 +69,11 @@ void test__f_print_except_in_dynamic_raw__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; + f_number_unsigned_t lengths[] = { 3 }; f_string_range_t ranges[] = { macro_f_string_range_t_initialize_1(0, 1), }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_fwrite_unlocked, false); diff --git a/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_raw_safely.c b/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_raw_safely.c index f894625..1d6f1f7 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_raw_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_raw_safely.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_except_in_dynamic_raw_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -25,7 +25,7 @@ void test__f_print_except_in_dynamic_raw_safely__fails(void **state) { void test__f_print_except_in_dynamic_raw_safely__returns_data_not(void **state) { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -39,7 +39,7 @@ void test__f_print_except_in_dynamic_raw_safely__returns_data_not(void **state) void test__f_print_except_in_dynamic_raw_safely__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); @@ -56,7 +56,7 @@ void test__f_print_except_in_dynamic_raw_safely__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; will_return(__wrap_fwrite_unlocked, false); @@ -69,11 +69,11 @@ void test__f_print_except_in_dynamic_raw_safely__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; + f_number_unsigned_t lengths[] = { 3 }; f_string_range_t ranges[] = { macro_f_string_range_t_initialize_1(0, 1), }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_fwrite_unlocked, false); diff --git a/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_safely.c b/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_safely.c index c646559..cccf0d6 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-except_in_dynamic_safely.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_except_in_dynamic_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -25,7 +25,7 @@ void test__f_print_except_in_dynamic_safely__fails(void **state) { void test__f_print_except_in_dynamic_safely__returns_data_not(void **state) { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -39,7 +39,7 @@ void test__f_print_except_in_dynamic_safely__returns_data_not(void **state) { void test__f_print_except_in_dynamic_safely__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); @@ -56,7 +56,7 @@ void test__f_print_except_in_dynamic_safely__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; will_return(__wrap_fwrite_unlocked, false); @@ -69,11 +69,11 @@ void test__f_print_except_in_dynamic_safely__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; + f_number_unsigned_t lengths[] = { 3 }; f_string_range_t ranges[] = { macro_f_string_range_t_initialize_1(0, 1), }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_fwrite_unlocked, false); diff --git a/level_0/f_print/tests/unit/c/test-print-except_in_raw.c b/level_0/f_print/tests/unit/c/test-print-except_in_raw.c index a26e8f1..aea8165 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_in_raw.c +++ b/level_0/f_print/tests/unit/c/test-print-except_in_raw.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_except_in_raw__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -26,7 +26,7 @@ void test__f_print_except_in_raw__fails(void **state) { void test__f_print_except_in_raw__returns_data_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -52,7 +52,7 @@ void test__f_print_except_in_raw__returns_data_not(void **state) { void test__f_print_except_in_raw__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); @@ -69,7 +69,7 @@ void test__f_print_except_in_raw__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; will_return(__wrap_fwrite_unlocked, false); @@ -82,7 +82,7 @@ void test__f_print_except_in_raw__works(void **state) { } { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; will_return(__wrap_fwrite_unlocked, false); @@ -95,11 +95,11 @@ void test__f_print_except_in_raw__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; + f_number_unsigned_t lengths[] = { 3 }; f_string_range_t ranges[] = { macro_f_string_range_t_initialize_1(0, 1), }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_fwrite_unlocked, false); diff --git a/level_0/f_print/tests/unit/c/test-print-except_in_raw_safely.c b/level_0/f_print/tests/unit/c/test-print-except_in_raw_safely.c index 1ab9b97..28f5c55 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_in_raw_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-except_in_raw_safely.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_except_in_raw_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -26,7 +26,7 @@ void test__f_print_except_in_raw_safely__fails(void **state) { void test__f_print_except_in_raw_safely__returns_data_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -52,7 +52,7 @@ void test__f_print_except_in_raw_safely__returns_data_not(void **state) { void test__f_print_except_in_raw_safely__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); @@ -69,7 +69,7 @@ void test__f_print_except_in_raw_safely__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; will_return(__wrap_fwrite_unlocked, false); @@ -82,7 +82,7 @@ void test__f_print_except_in_raw_safely__works(void **state) { } { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; will_return(__wrap_fwrite_unlocked, false); @@ -95,11 +95,11 @@ void test__f_print_except_in_raw_safely__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; + f_number_unsigned_t lengths[] = { 3 }; f_string_range_t ranges[] = { macro_f_string_range_t_initialize_1(0, 1), }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_fwrite_unlocked, false); diff --git a/level_0/f_print/tests/unit/c/test-print-except_in_safely.c b/level_0/f_print/tests/unit/c/test-print-except_in_safely.c index b55a635..fef241a 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_in_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-except_in_safely.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_except_in_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -26,7 +26,7 @@ void test__f_print_except_in_safely__fails(void **state) { void test__f_print_except_in_safely__returns_data_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -52,7 +52,7 @@ void test__f_print_except_in_safely__returns_data_not(void **state) { void test__f_print_except_in_safely__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); @@ -69,7 +69,7 @@ void test__f_print_except_in_safely__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; will_return(__wrap_fwrite_unlocked, false); @@ -82,7 +82,7 @@ void test__f_print_except_in_safely__works(void **state) { } { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; will_return(__wrap_fwrite_unlocked, false); @@ -95,11 +95,11 @@ void test__f_print_except_in_safely__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; + f_number_unsigned_t lengths[] = { 3 }; f_string_range_t ranges[] = { macro_f_string_range_t_initialize_1(0, 1), }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_fwrite_unlocked, false); diff --git a/level_0/f_print/tests/unit/c/test-print-except_raw.c b/level_0/f_print/tests/unit/c/test-print-except_raw.c index 77cab6d..a4972ca 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_raw.c +++ b/level_0/f_print/tests/unit/c/test-print-except_raw.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_except_raw__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -25,7 +25,7 @@ void test__f_print_except_raw__fails(void **state) { void test__f_print_except_raw__returns_data_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -50,7 +50,7 @@ void test__f_print_except_raw__returns_data_not(void **state) { void test__f_print_except_raw__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -66,7 +66,7 @@ void test__f_print_except_raw__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used); @@ -78,7 +78,7 @@ void test__f_print_except_raw__works(void **state) { } { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used); @@ -90,8 +90,8 @@ void test__f_print_except_raw__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + f_number_unsigned_t lengths[] = { 3 }; + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used - 1); diff --git a/level_0/f_print/tests/unit/c/test-print-except_raw_safely.c b/level_0/f_print/tests/unit/c/test-print-except_raw_safely.c index b3682fc..d2480aa 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_raw_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-except_raw_safely.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_except_raw_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -25,7 +25,7 @@ void test__f_print_except_raw_safely__fails(void **state) { void test__f_print_except_raw_safely__returns_data_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -50,7 +50,7 @@ void test__f_print_except_raw_safely__returns_data_not(void **state) { void test__f_print_except_raw_safely__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -66,7 +66,7 @@ void test__f_print_except_raw_safely__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used); @@ -78,7 +78,7 @@ void test__f_print_except_raw_safely__works(void **state) { } { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used); @@ -90,8 +90,8 @@ void test__f_print_except_raw_safely__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + f_number_unsigned_t lengths[] = { 3 }; + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used - 1); diff --git a/level_0/f_print/tests/unit/c/test-print-except_safely.c b/level_0/f_print/tests/unit/c/test-print-except_safely.c index 6059102..2b400cc 100644 --- a/level_0/f_print/tests/unit/c/test-print-except_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-except_safely.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_except_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -25,7 +25,7 @@ void test__f_print_except_safely__fails(void **state) { void test__f_print_except_safely__returns_data_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -50,7 +50,7 @@ void test__f_print_except_safely__returns_data_not(void **state) { void test__f_print_except_safely__returns_stream_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -66,7 +66,7 @@ void test__f_print_except_safely__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used); @@ -78,7 +78,7 @@ void test__f_print_except_safely__works(void **state) { } { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used); @@ -90,8 +90,8 @@ void test__f_print_except_safely__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + f_number_unsigned_t lengths[] = { 3 }; + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); will_return(__wrap_fwrite_unlocked, false); will_return(__wrap_fwrite_unlocked, test.used - 1); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except.c b/level_0/f_print/tests/unit/c/test-print-to_except.c index 9db50f1..fd4e76e 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_to_except__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); int errnos[] = { @@ -59,7 +59,7 @@ void test__f_print_to_except__fails(void **state) { void test__f_print_to_except__returns_data_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -84,7 +84,7 @@ void test__f_print_to_except__returns_data_not(void **state) { void test__f_print_to_except__returns_file_descriptor_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -100,7 +100,7 @@ void test__f_print_to_except__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; will_return(__wrap_write, false); will_return(__wrap_write, test.used); @@ -111,7 +111,7 @@ void test__f_print_to_except__works(void **state) { } { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; will_return(__wrap_write, false); will_return(__wrap_write, test.used); @@ -122,8 +122,8 @@ void test__f_print_to_except__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + f_number_unsigned_t lengths[] = { 3 }; + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); will_return(__wrap_write, false); will_return(__wrap_write, test.used); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_dynamic.c b/level_0/f_print/tests/unit/c/test-print-to_except_dynamic.c index 6072769..54b8963 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_dynamic.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_dynamic.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_to_except_dynamic__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); int errnos[] = { @@ -58,7 +58,7 @@ void test__f_print_to_except_dynamic__fails(void **state) { void test__f_print_to_except_dynamic__returns_data_not(void **state) { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -71,7 +71,7 @@ void test__f_print_to_except_dynamic__returns_data_not(void **state) { void test__f_print_to_except_dynamic__returns_file_descriptor_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -87,7 +87,7 @@ void test__f_print_to_except_dynamic__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; will_return(__wrap_write, false); will_return(__wrap_write, test.used); @@ -98,8 +98,8 @@ void test__f_print_to_except_dynamic__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + f_number_unsigned_t lengths[] = { 3 }; + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); will_return(__wrap_write, false); will_return(__wrap_write, test.used); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_partial.c b/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_partial.c index 735655f..18152d3 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_partial.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_partial.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_to_except_dynamic_partial__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -59,7 +59,7 @@ void test__f_print_to_except_dynamic_partial__fails(void **state) { void test__f_print_to_except_dynamic_partial__returns_data_not(void **state) { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -73,7 +73,7 @@ void test__f_print_to_except_dynamic_partial__returns_data_not(void **state) { void test__f_print_to_except_dynamic_partial__returns_file_descriptor_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); @@ -91,7 +91,7 @@ void test__f_print_to_except_dynamic_partial__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; will_return(__wrap_write, false); will_return(__wrap_write, test.used); @@ -102,8 +102,8 @@ void test__f_print_to_except_dynamic_partial__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + f_number_unsigned_t lengths[] = { 3 }; + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); will_return(__wrap_write, false); will_return(__wrap_write, test.used); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_partial_raw.c b/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_partial_raw.c index 6d678c8..27a054d 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_partial_raw.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_partial_raw.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_to_except_dynamic_partial_raw__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -59,7 +59,7 @@ void test__f_print_to_except_dynamic_partial_raw__fails(void **state) { void test__f_print_to_except_dynamic_partial_raw__returns_data_not(void **state) { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -73,7 +73,7 @@ void test__f_print_to_except_dynamic_partial_raw__returns_data_not(void **state) void test__f_print_to_except_dynamic_partial_raw__returns_file_descriptor_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); @@ -91,7 +91,7 @@ void test__f_print_to_except_dynamic_partial_raw__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; will_return(__wrap_write, false); will_return(__wrap_write, test.used); @@ -102,8 +102,8 @@ void test__f_print_to_except_dynamic_partial_raw__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + f_number_unsigned_t lengths[] = { 3 }; + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); will_return(__wrap_write, false); will_return(__wrap_write, test.used); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_partial_raw_safely.c b/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_partial_raw_safely.c index 0d340c5..e2f17f1 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_partial_raw_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_partial_raw_safely.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_to_except_dynamic_partial_raw_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -59,7 +59,7 @@ void test__f_print_to_except_dynamic_partial_raw_safely__fails(void **state) { void test__f_print_to_except_dynamic_partial_raw_safely__returns_data_not(void **state) { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -73,7 +73,7 @@ void test__f_print_to_except_dynamic_partial_raw_safely__returns_data_not(void * void test__f_print_to_except_dynamic_partial_raw_safely__returns_file_descriptor_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); @@ -91,7 +91,7 @@ void test__f_print_to_except_dynamic_partial_raw_safely__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; will_return(__wrap_write, false); will_return(__wrap_write, test.used); @@ -102,8 +102,8 @@ void test__f_print_to_except_dynamic_partial_raw_safely__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + f_number_unsigned_t lengths[] = { 3 }; + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); will_return(__wrap_write, false); will_return(__wrap_write, test.used); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_partial_safely.c b/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_partial_safely.c index 34502b0..604ed97 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_partial_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_partial_safely.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_to_except_dynamic_partial_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -59,7 +59,7 @@ void test__f_print_to_except_dynamic_partial_safely__fails(void **state) { void test__f_print_to_except_dynamic_partial_safely__returns_data_not(void **state) { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -73,7 +73,7 @@ void test__f_print_to_except_dynamic_partial_safely__returns_data_not(void **sta void test__f_print_to_except_dynamic_partial_safely__returns_file_descriptor_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); @@ -91,7 +91,7 @@ void test__f_print_to_except_dynamic_partial_safely__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; will_return(__wrap_write, false); will_return(__wrap_write, test.used); @@ -102,8 +102,8 @@ void test__f_print_to_except_dynamic_partial_safely__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + f_number_unsigned_t lengths[] = { 3 }; + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); will_return(__wrap_write, false); will_return(__wrap_write, test.used); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_raw.c b/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_raw.c index 76205c9..7d98b20 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_raw.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_raw.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_to_except_dynamic_raw__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); int errnos[] = { @@ -58,7 +58,7 @@ void test__f_print_to_except_dynamic_raw__fails(void **state) { void test__f_print_to_except_dynamic_raw__returns_data_not(void **state) { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -71,7 +71,7 @@ void test__f_print_to_except_dynamic_raw__returns_data_not(void **state) { void test__f_print_to_except_dynamic_raw__returns_file_descriptor_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -87,7 +87,7 @@ void test__f_print_to_except_dynamic_raw__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; will_return(__wrap_write, false); will_return(__wrap_write, test.used); @@ -98,8 +98,8 @@ void test__f_print_to_except_dynamic_raw__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + f_number_unsigned_t lengths[] = { 3 }; + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); will_return(__wrap_write, false); will_return(__wrap_write, test.used); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_raw_safely.c b/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_raw_safely.c index 759272e..0da1d7f 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_raw_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_raw_safely.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_to_except_dynamic_raw_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); int errnos[] = { @@ -58,7 +58,7 @@ void test__f_print_to_except_dynamic_raw_safely__fails(void **state) { void test__f_print_to_except_dynamic_raw_safely__returns_data_not(void **state) { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -71,7 +71,7 @@ void test__f_print_to_except_dynamic_raw_safely__returns_data_not(void **state) void test__f_print_to_except_dynamic_raw_safely__returns_file_descriptor_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -87,7 +87,7 @@ void test__f_print_to_except_dynamic_raw_safely__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; will_return(__wrap_write, false); will_return(__wrap_write, test.used); @@ -98,8 +98,8 @@ void test__f_print_to_except_dynamic_raw_safely__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + f_number_unsigned_t lengths[] = { 3 }; + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); will_return(__wrap_write, false); will_return(__wrap_write, test.used); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_safely.c b/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_safely.c index 0ceb48f..9146f6c 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_dynamic_safely.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_to_except_dynamic_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); int errnos[] = { @@ -58,7 +58,7 @@ void test__f_print_to_except_dynamic_safely__fails(void **state) { void test__f_print_to_except_dynamic_safely__returns_data_not(void **state) { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -71,7 +71,7 @@ void test__f_print_to_except_dynamic_safely__returns_data_not(void **state) { void test__f_print_to_except_dynamic_safely__returns_file_descriptor_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -87,7 +87,7 @@ void test__f_print_to_except_dynamic_safely__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; will_return(__wrap_write, false); will_return(__wrap_write, test.used); @@ -98,8 +98,8 @@ void test__f_print_to_except_dynamic_safely__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + f_number_unsigned_t lengths[] = { 3 }; + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); will_return(__wrap_write, false); will_return(__wrap_write, test.used); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_in.c b/level_0/f_print/tests/unit/c/test-print-to_except_in.c index a04975d..89a3b7c 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_in.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_in.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_to_except_in__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -60,7 +60,7 @@ void test__f_print_to_except_in__fails(void **state) { void test__f_print_to_except_in__returns_data_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -86,7 +86,7 @@ void test__f_print_to_except_in__returns_data_not(void **state) { void test__f_print_to_except_in__returns_file_descriptor_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); @@ -103,7 +103,7 @@ void test__f_print_to_except_in__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; will_return(__wrap_write, false); @@ -115,7 +115,7 @@ void test__f_print_to_except_in__works(void **state) { } { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; will_return(__wrap_write, false); @@ -127,11 +127,11 @@ void test__f_print_to_except_in__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; + f_number_unsigned_t lengths[] = { 3 }; f_string_range_t ranges[] = { macro_f_string_range_t_initialize_1(0, 1), }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_write, false); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic.c b/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic.c index c472fbb..e06d15a 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_to_except_in_dynamic__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -59,7 +59,7 @@ void test__f_print_to_except_in_dynamic__fails(void **state) { void test__f_print_to_except_in_dynamic__returns_data_not(void **state) { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -73,7 +73,7 @@ void test__f_print_to_except_in_dynamic__returns_data_not(void **state) { void test__f_print_to_except_in_dynamic__returns_file_descriptor_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); @@ -90,7 +90,7 @@ void test__f_print_to_except_in_dynamic__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; will_return(__wrap_write, false); @@ -102,11 +102,11 @@ void test__f_print_to_except_in_dynamic__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; + f_number_unsigned_t lengths[] = { 3 }; f_string_range_t ranges[] = { macro_f_string_range_t_initialize_1(0, 1), }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_write, false); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_partial.c b/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_partial.c index cfede54..4cb8dad 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_partial.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_partial.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_to_except_in_dynamic_partial__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -60,7 +60,7 @@ void test__f_print_to_except_in_dynamic_partial__fails(void **state) { void test__f_print_to_except_in_dynamic_partial__returns_data_not(void **state) { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -75,7 +75,7 @@ void test__f_print_to_except_in_dynamic_partial__returns_data_not(void **state) void test__f_print_to_except_in_dynamic_partial__returns_file_descriptor_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); @@ -94,7 +94,7 @@ void test__f_print_to_except_in_dynamic_partial__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; will_return(__wrap_write, false); @@ -106,11 +106,11 @@ void test__f_print_to_except_in_dynamic_partial__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; + f_number_unsigned_t lengths[] = { 3 }; f_string_range_t ranges[] = { macro_f_string_range_t_initialize_1(0, 1), }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_write, false); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_partial_raw.c b/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_partial_raw.c index 5a623a7..786e6fd 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_partial_raw.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_partial_raw.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_to_except_in_dynamic_partial_raw__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -60,7 +60,7 @@ void test__f_print_to_except_in_dynamic_partial_raw__fails(void **state) { void test__f_print_to_except_in_dynamic_partial_raw__returns_data_not(void **state) { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -75,7 +75,7 @@ void test__f_print_to_except_in_dynamic_partial_raw__returns_data_not(void **sta void test__f_print_to_except_in_dynamic_partial_raw__returns_file_descriptor_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); @@ -94,7 +94,7 @@ void test__f_print_to_except_in_dynamic_partial_raw__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; will_return(__wrap_write, false); @@ -106,11 +106,11 @@ void test__f_print_to_except_in_dynamic_partial_raw__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; + f_number_unsigned_t lengths[] = { 3 }; f_string_range_t ranges[] = { macro_f_string_range_t_initialize_1(0, 1), }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_write, false); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_partial_raw_safely.c b/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_partial_raw_safely.c index 60e1fdb..8aa5744 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_partial_raw_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_partial_raw_safely.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_to_except_in_dynamic_partial_raw_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -60,7 +60,7 @@ void test__f_print_to_except_in_dynamic_partial_raw_safely__fails(void **state) void test__f_print_to_except_in_dynamic_partial_raw_safely__returns_data_not(void **state) { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -75,7 +75,7 @@ void test__f_print_to_except_in_dynamic_partial_raw_safely__returns_data_not(voi void test__f_print_to_except_in_dynamic_partial_raw_safely__returns_file_descriptor_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); @@ -94,7 +94,7 @@ void test__f_print_to_except_in_dynamic_partial_raw_safely__works(void **state) const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; will_return(__wrap_write, false); @@ -106,11 +106,11 @@ void test__f_print_to_except_in_dynamic_partial_raw_safely__works(void **state) } { - f_array_length_t lengths[] = { 3 }; + f_number_unsigned_t lengths[] = { 3 }; f_string_range_t ranges[] = { macro_f_string_range_t_initialize_1(0, 1), }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_partial_safely.c b/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_partial_safely.c index 965db9e..4477f20 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_partial_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_partial_safely.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_to_except_in_dynamic_partial_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -60,7 +60,7 @@ void test__f_print_to_except_in_dynamic_partial_safely__fails(void **state) { void test__f_print_to_except_in_dynamic_partial_safely__returns_data_not(void **state) { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -75,7 +75,7 @@ void test__f_print_to_except_in_dynamic_partial_safely__returns_data_not(void ** void test__f_print_to_except_in_dynamic_partial_safely__returns_file_descriptor_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_string_range_t partial = macro_f_string_range_t_initialize_1(0, 2); const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); @@ -94,7 +94,7 @@ void test__f_print_to_except_in_dynamic_partial_safely__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; will_return(__wrap_write, false); @@ -106,11 +106,11 @@ void test__f_print_to_except_in_dynamic_partial_safely__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; + f_number_unsigned_t lengths[] = { 3 }; f_string_range_t ranges[] = { macro_f_string_range_t_initialize_1(0, 1), }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_write, false); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_raw.c b/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_raw.c index 0b187a2..f24c6b1 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_raw.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_raw.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_to_except_in_dynamic_raw__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -59,7 +59,7 @@ void test__f_print_to_except_in_dynamic_raw__fails(void **state) { void test__f_print_to_except_in_dynamic_raw__returns_data_not(void **state) { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -73,7 +73,7 @@ void test__f_print_to_except_in_dynamic_raw__returns_data_not(void **state) { void test__f_print_to_except_in_dynamic_raw__returns_file_descriptor_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); @@ -90,7 +90,7 @@ void test__f_print_to_except_in_dynamic_raw__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; will_return(__wrap_write, false); @@ -102,11 +102,11 @@ void test__f_print_to_except_in_dynamic_raw__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; + f_number_unsigned_t lengths[] = { 3 }; f_string_range_t ranges[] = { macro_f_string_range_t_initialize_1(0, 1), }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_write, false); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_raw_safely.c b/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_raw_safely.c index 4e09319..8184f47 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_raw_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_raw_safely.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_to_except_in_dynamic_raw_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -59,7 +59,7 @@ void test__f_print_to_except_in_dynamic_raw_safely__fails(void **state) { void test__f_print_to_except_in_dynamic_raw_safely__returns_data_not(void **state) { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -73,7 +73,7 @@ void test__f_print_to_except_in_dynamic_raw_safely__returns_data_not(void **stat void test__f_print_to_except_in_dynamic_raw_safely__returns_file_descriptor_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); @@ -90,7 +90,7 @@ void test__f_print_to_except_in_dynamic_raw_safely__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; will_return(__wrap_write, false); @@ -102,11 +102,11 @@ void test__f_print_to_except_in_dynamic_raw_safely__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; + f_number_unsigned_t lengths[] = { 3 }; f_string_range_t ranges[] = { macro_f_string_range_t_initialize_1(0, 1), }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_write, false); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_safely.c b/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_safely.c index 8e143db..4ceef49 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_in_dynamic_safely.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_to_except_in_dynamic_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -59,7 +59,7 @@ void test__f_print_to_except_in_dynamic_safely__fails(void **state) { void test__f_print_to_except_in_dynamic_safely__returns_data_not(void **state) { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -73,7 +73,7 @@ void test__f_print_to_except_in_dynamic_safely__returns_data_not(void **state) { void test__f_print_to_except_in_dynamic_safely__returns_file_descriptor_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); @@ -90,7 +90,7 @@ void test__f_print_to_except_in_dynamic_safely__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; will_return(__wrap_write, false); @@ -102,11 +102,11 @@ void test__f_print_to_except_in_dynamic_safely__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; + f_number_unsigned_t lengths[] = { 3 }; f_string_range_t ranges[] = { macro_f_string_range_t_initialize_1(0, 1), }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_write, false); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_in_raw.c b/level_0/f_print/tests/unit/c/test-print-to_except_in_raw.c index a0950af..fce3f3f 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_in_raw.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_in_raw.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_to_except_in_raw__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -60,7 +60,7 @@ void test__f_print_to_except_in_raw__fails(void **state) { void test__f_print_to_except_in_raw__returns_data_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -86,7 +86,7 @@ void test__f_print_to_except_in_raw__returns_data_not(void **state) { void test__f_print_to_except_in_raw__returns_file_descriptor_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); @@ -103,7 +103,7 @@ void test__f_print_to_except_in_raw__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; will_return(__wrap_write, false); @@ -115,7 +115,7 @@ void test__f_print_to_except_in_raw__works(void **state) { } { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; will_return(__wrap_write, false); @@ -127,11 +127,11 @@ void test__f_print_to_except_in_raw__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; + f_number_unsigned_t lengths[] = { 3 }; f_string_range_t ranges[] = { macro_f_string_range_t_initialize_1(0, 1), }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_write, false); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_in_raw_safely.c b/level_0/f_print/tests/unit/c/test-print-to_except_in_raw_safely.c index 7de60ac..581a4fa 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_in_raw_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_in_raw_safely.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_to_except_in_raw_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -60,7 +60,7 @@ void test__f_print_to_except_in_raw_safely__fails(void **state) { void test__f_print_to_except_in_raw_safely__returns_data_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -86,7 +86,7 @@ void test__f_print_to_except_in_raw_safely__returns_data_not(void **state) { void test__f_print_to_except_in_raw_safely__returns_file_descriptor_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); @@ -103,7 +103,7 @@ void test__f_print_to_except_in_raw_safely__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; will_return(__wrap_write, false); @@ -115,7 +115,7 @@ void test__f_print_to_except_in_raw_safely__works(void **state) { } { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; will_return(__wrap_write, false); @@ -127,11 +127,11 @@ void test__f_print_to_except_in_raw_safely__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; + f_number_unsigned_t lengths[] = { 3 }; f_string_range_t ranges[] = { macro_f_string_range_t_initialize_1(0, 1), }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_write, false); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_in_safely.c b/level_0/f_print/tests/unit/c/test-print-to_except_in_safely.c index c1d052f..0ffe9fa 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_in_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_in_safely.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_to_except_in_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -60,7 +60,7 @@ void test__f_print_to_except_in_safely__fails(void **state) { void test__f_print_to_except_in_safely__returns_data_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); @@ -86,7 +86,7 @@ void test__f_print_to_except_in_safely__returns_data_not(void **state) { void test__f_print_to_except_in_safely__returns_file_descriptor_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); @@ -103,7 +103,7 @@ void test__f_print_to_except_in_safely__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; will_return(__wrap_write, false); @@ -115,7 +115,7 @@ void test__f_print_to_except_in_safely__works(void **state) { } { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_string_ranges_t range = f_string_ranges_t_initialize; will_return(__wrap_write, false); @@ -127,11 +127,11 @@ void test__f_print_to_except_in_safely__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; + f_number_unsigned_t lengths[] = { 3 }; f_string_range_t ranges[] = { macro_f_string_range_t_initialize_1(0, 1), }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); const f_string_ranges_t range = macro_f_string_ranges_t_initialize_1(ranges, 0, 1); will_return(__wrap_write, false); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_raw.c b/level_0/f_print/tests/unit/c/test-print-to_except_raw.c index dfa3ba7..6133e00 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_raw.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_raw.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_to_except_raw__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); int errnos[] = { @@ -59,7 +59,7 @@ void test__f_print_to_except_raw__fails(void **state) { void test__f_print_to_except_raw__returns_data_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -84,7 +84,7 @@ void test__f_print_to_except_raw__returns_data_not(void **state) { void test__f_print_to_except_raw__returns_file_descriptor_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -100,7 +100,7 @@ void test__f_print_to_except_raw__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; will_return(__wrap_write, false); will_return(__wrap_write, test.used); @@ -111,7 +111,7 @@ void test__f_print_to_except_raw__works(void **state) { } { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; will_return(__wrap_write, false); will_return(__wrap_write, test.used); @@ -122,8 +122,8 @@ void test__f_print_to_except_raw__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + f_number_unsigned_t lengths[] = { 3 }; + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); will_return(__wrap_write, false); will_return(__wrap_write, test.used); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_raw_safely.c b/level_0/f_print/tests/unit/c/test-print-to_except_raw_safely.c index 258d3ac..80ce62c 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_raw_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_raw_safely.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_to_except_raw_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); int errnos[] = { @@ -59,7 +59,7 @@ void test__f_print_to_except_raw_safely__fails(void **state) { void test__f_print_to_except_raw_safely__returns_data_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -84,7 +84,7 @@ void test__f_print_to_except_raw_safely__returns_data_not(void **state) { void test__f_print_to_except_raw_safely__returns_file_descriptor_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -100,7 +100,7 @@ void test__f_print_to_except_raw_safely__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; will_return(__wrap_write, false); will_return(__wrap_write, test.used); @@ -111,7 +111,7 @@ void test__f_print_to_except_raw_safely__works(void **state) { } { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; will_return(__wrap_write, false); will_return(__wrap_write, test.used); @@ -122,8 +122,8 @@ void test__f_print_to_except_raw_safely__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + f_number_unsigned_t lengths[] = { 3 }; + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); will_return(__wrap_write, false); will_return(__wrap_write, test.used); diff --git a/level_0/f_print/tests/unit/c/test-print-to_except_safely.c b/level_0/f_print/tests/unit/c/test-print-to_except_safely.c index d890d8c..444b78a 100644 --- a/level_0/f_print/tests/unit/c/test-print-to_except_safely.c +++ b/level_0/f_print/tests/unit/c/test-print-to_except_safely.c @@ -8,7 +8,7 @@ extern "C" { void test__f_print_to_except_safely__fails(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); int errnos[] = { @@ -59,7 +59,7 @@ void test__f_print_to_except_safely__fails(void **state) { void test__f_print_to_except_safely__returns_data_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { @@ -84,7 +84,7 @@ void test__f_print_to_except_safely__returns_data_not(void **state) { void test__f_print_to_except_safely__returns_file_descriptor_not(void **state) { const f_string_static_t test = macro_f_string_static_t_initialize_1("test", 0, 4); - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; const f_file_t output = macro_f_file_t_initialize_2(0, -1, F_file_flag_write_only_d); { @@ -100,7 +100,7 @@ void test__f_print_to_except_safely__works(void **state) { const f_file_t output = macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d); { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; will_return(__wrap_write, false); will_return(__wrap_write, test.used); @@ -111,7 +111,7 @@ void test__f_print_to_except_safely__works(void **state) { } { - const f_array_lengths_t except = f_array_lengths_t_initialize; + const f_number_unsigneds_t except = f_number_unsigneds_t_initialize; will_return(__wrap_write, false); will_return(__wrap_write, test.used); @@ -122,8 +122,8 @@ void test__f_print_to_except_safely__works(void **state) { } { - f_array_length_t lengths[] = { 3 }; - const f_array_lengths_t except = macro_f_array_lengths_t_initialize_1(lengths, 0, 1); + f_number_unsigned_t lengths[] = { 3 }; + const f_number_unsigneds_t except = macro_f_number_unsigneds_t_initialize_1(lengths, 0, 1); will_return(__wrap_write, false); will_return(__wrap_write, test.used); diff --git a/level_0/f_rip/c/private-rip.c b/level_0/f_rip/c/private-rip.c index b3c0e1f..7141e7a 100644 --- a/level_0/f_rip/c/private-rip.c +++ b/level_0/f_rip/c/private-rip.c @@ -6,10 +6,10 @@ extern "C" { #endif #if !defined(_di_f_rip_dynamic_partial_) || !defined(_di_f_rip_dynamic_partial_nulless_) || !defined(_di_f_rip_dynamic_) || !defined(_di_f_rip_) || !defined(_di_f_rip_nulless_) - f_status_t private_f_rip_find_range(const f_string_t string, f_array_length_t * const start, f_array_length_t * const stop) { + f_status_t private_f_rip_find_range(const f_string_t string, f_number_unsigned_t * const start, f_number_unsigned_t * const stop) { - const f_array_length_t stop_original = *stop; - f_array_length_t previous = 0; + const f_number_unsigned_t stop_original = *stop; + f_number_unsigned_t previous = 0; f_status_t status = F_none; // Skip past leading whitespace. diff --git a/level_0/f_rip/c/private-rip.h b/level_0/f_rip/c/private-rip.h index e19d3cb..f882c03 100644 --- a/level_0/f_rip/c/private-rip.h +++ b/level_0/f_rip/c/private-rip.h @@ -48,7 +48,7 @@ extern "C" { * @see f_rip_nulless() */ #if !defined(_di_f_rip_dynamic_partial_) || !defined(_di_f_rip_dynamic_partial_nulless_) || !defined(_di_f_rip_dynamic_) || !defined(_di_f_rip_) || !defined(_di_f_rip_nulless_) - extern f_status_t private_f_rip_find_range(const f_string_t string, f_array_length_t * const start, f_array_length_t * const stop) F_attribute_visibility_internal_d; + extern f_status_t private_f_rip_find_range(const f_string_t string, f_number_unsigned_t * const start, f_number_unsigned_t * const stop) F_attribute_visibility_internal_d; #endif // !defined(_di_f_rip_dynamic_partial_) || !defined(_di_f_rip_dynamic_partial_nulless_) || !defined(_di_f_rip_dynamic_) || !defined(_di_f_rip_) || !defined(_di_f_rip_nulless_) #ifdef __cplusplus diff --git a/level_0/f_rip/c/rip.c b/level_0/f_rip/c/rip.c index 6ea24cb..9725c35 100644 --- a/level_0/f_rip/c/rip.c +++ b/level_0/f_rip/c/rip.c @@ -6,15 +6,15 @@ extern "C" { #endif #ifndef _di_f_rip_ - f_status_t f_rip(const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination) { + f_status_t f_rip(const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (!length) return F_data_not_eos; - f_array_length_t begin = 0; - f_array_length_t end = length - 1; + f_number_unsigned_t begin = 0; + f_number_unsigned_t end = length - 1; { const f_status_t status = private_f_rip_find_range(source, &begin, &end); @@ -34,8 +34,8 @@ extern "C" { if (!source.used) return F_data_not_eos; - f_array_length_t begin = 0; - f_array_length_t end = source.used - 1; + f_number_unsigned_t begin = 0; + f_number_unsigned_t end = source.used - 1; { const f_status_t status = private_f_rip_find_range(source.string, &begin, &end); @@ -57,8 +57,8 @@ extern "C" { if (!source.used) return F_data_not_eos; - f_array_length_t begin = 0; - f_array_length_t end = source.used - 1; + f_number_unsigned_t begin = 0; + f_number_unsigned_t end = source.used - 1; { const f_status_t status = private_f_rip_find_range(source.string, &begin, &end); @@ -73,15 +73,15 @@ extern "C" { #endif // _di_f_rip_dynamic_nulless_ #ifndef _di_f_rip_nulless_ - f_status_t f_rip_nulless(const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination) { + f_status_t f_rip_nulless(const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (!length) return F_data_not_eos; - f_array_length_t begin = 0; - f_array_length_t end = length - 1; + f_number_unsigned_t begin = 0; + f_number_unsigned_t end = length - 1; { const f_status_t status = private_f_rip_find_range(source, &begin, &end); @@ -102,8 +102,8 @@ extern "C" { if (!source.used) return F_data_not_eos; if (range.start > range.stop) return F_data_not_stop; - f_array_length_t begin = range.start; - f_array_length_t end = range.stop; + f_number_unsigned_t begin = range.start; + f_number_unsigned_t end = range.stop; { const f_status_t status = private_f_rip_find_range(source.string, &begin, &end); @@ -126,8 +126,8 @@ extern "C" { if (!source.used) return F_data_not_eos; if (range.start > range.stop) return F_data_not_stop; - f_array_length_t begin = range.start; - f_array_length_t end = range.stop; + f_number_unsigned_t begin = range.start; + f_number_unsigned_t end = range.stop; { const f_status_t status = private_f_rip_find_range(source.string, &begin, &end); diff --git a/level_0/f_rip/c/rip.h b/level_0/f_rip/c/rip.h index 8a88e27..23ac555 100644 --- a/level_0/f_rip/c/rip.h +++ b/level_0/f_rip/c/rip.h @@ -57,7 +57,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_f_rip_ - extern f_status_t f_rip(const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination); + extern f_status_t f_rip(const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination); #endif // _di_f_rip_ /** @@ -159,7 +159,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_f_rip_nulless_ - extern f_status_t f_rip_nulless(const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination); + extern f_status_t f_rip_nulless(const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination); #endif // _di_f_rip_nulless_ /** diff --git a/level_0/f_rip/c/rip/private-utf.c b/level_0/f_rip/c/rip/private-utf.c index 8826b8f..6d29229 100644 --- a/level_0/f_rip/c/rip/private-utf.c +++ b/level_0/f_rip/c/rip/private-utf.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_f_rip_utf_) || !defined(_di_f_rip_utf_dynamic_) || !defined(_di_f_rip_utf_nulless_) || !defined(_di_f_rip_utf_dynamic_nulless_) - f_status_t private_f_rip_utf_find_range(const f_utf_string_t source, f_array_length_t *start, f_array_length_t *stop) { + f_status_t private_f_rip_utf_find_range(const f_utf_string_t source, f_number_unsigned_t *start, f_number_unsigned_t *stop) { f_status_t status = F_none; diff --git a/level_0/f_rip/c/rip/private-utf.h b/level_0/f_rip/c/rip/private-utf.h index 96b5b01..3b48543 100644 --- a/level_0/f_rip/c/rip/private-utf.h +++ b/level_0/f_rip/c/rip/private-utf.h @@ -42,7 +42,7 @@ extern "C" { * @see f_rip_utf() */ #if !defined(_di_f_rip_utf_) || !defined(_di_f_rip_utf_dynamic_) || !defined(_di_f_rip_utf_nulless_) || !defined(_di_f_rip_utf_dynamic_nulless_) - extern f_status_t private_f_rip_utf_find_range(const f_utf_string_t source, f_array_length_t *start, f_array_length_t *stop) F_attribute_visibility_internal_d; + extern f_status_t private_f_rip_utf_find_range(const f_utf_string_t source, f_number_unsigned_t *start, f_number_unsigned_t *stop) F_attribute_visibility_internal_d; #endif // !defined(_di_f_rip_utf_) || !defined(_di_f_rip_utf_dynamic_) || !defined(_di_f_rip_utf_nulless_) || !defined(_di_f_rip_utf_dynamic_nulless_) #ifdef __cplusplus diff --git a/level_0/f_rip/c/rip/utf.c b/level_0/f_rip/c/rip/utf.c index 1c39fe8..c3f266d 100644 --- a/level_0/f_rip/c/rip/utf.c +++ b/level_0/f_rip/c/rip/utf.c @@ -6,15 +6,15 @@ extern "C" { #endif #ifndef _di_f_rip_utf_ - f_status_t f_rip_utf(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_rip_utf(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ if (!length) return F_data_not; - f_array_length_t begin = 0; - f_array_length_t end = length - 1; + f_number_unsigned_t begin = 0; + f_number_unsigned_t end = length - 1; f_status_t status = private_f_rip_utf_find_range(source, &begin, &end); @@ -61,15 +61,15 @@ extern "C" { #endif // _di_f_rip_utf_dynamic_nulless_ #ifndef _di_f_rip_utf_nulless_ - f_status_t f_rip_utf_nulless(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_rip_utf_nulless(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ if (!length) return F_data_not; - f_array_length_t begin = 0; - f_array_length_t end = length - 1; + f_number_unsigned_t begin = 0; + f_number_unsigned_t end = length - 1; f_status_t status = private_f_rip_utf_find_range(source, &begin, &end); diff --git a/level_0/f_rip/c/rip/utf.h b/level_0/f_rip/c/rip/utf.h index cbe2fc7..96c6ee3 100644 --- a/level_0/f_rip/c/rip/utf.h +++ b/level_0/f_rip/c/rip/utf.h @@ -39,7 +39,7 @@ extern "C" { * @see f_utf_character_is_whitespace() */ #ifndef _di_f_rip_utf_ - extern f_status_t f_rip_utf(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_rip_utf(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_rip_utf_ /** @@ -127,7 +127,7 @@ extern "C" { * @see f_utf_character_is_whitespace() */ #ifndef _di_f_rip_utf_nulless_ - extern f_status_t f_rip_utf_nulless(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_rip_utf_nulless(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_rip_utf_nulless_ #ifdef __cplusplus diff --git a/level_0/f_serialize/c/private-serialize.c b/level_0/f_serialize/c/private-serialize.c index 9c83501..db549f3 100644 --- a/level_0/f_serialize/c/private-serialize.c +++ b/level_0/f_serialize/c/private-serialize.c @@ -6,14 +6,14 @@ extern "C" { #endif #if !defined(_di_f_serialize_from_simple_get_) || !defined(_di_f_serialize_from_simple_select_) - f_status_t private_f_serialize_from_simple_select(const f_string_static_t source, const f_array_length_t index, f_string_range_t * const range) { + f_status_t private_f_serialize_from_simple_select(const f_string_static_t source, const f_number_unsigned_t index, f_string_range_t * const range) { - f_array_length_t start = 0; - f_array_length_t current = 0; + f_number_unsigned_t start = 0; + f_number_unsigned_t current = 0; unsigned short width = 0; - for (f_array_length_t i = 0; i < source.used; i += width) { + for (f_number_unsigned_t i = 0; i < source.used; i += width) { width = macro_f_utf_byte_width(source.string[i]); diff --git a/level_0/f_serialize/c/private-serialize.h b/level_0/f_serialize/c/private-serialize.h index b294f8a..1e73790 100644 --- a/level_0/f_serialize/c/private-serialize.h +++ b/level_0/f_serialize/c/private-serialize.h @@ -36,7 +36,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #if !defined(_di_f_serialize_from_simple_get_) || !defined(_di_f_serialize_from_simple_select_) - extern f_status_t private_f_serialize_from_simple_select(const f_string_static_t source, const f_array_length_t index, f_string_range_t * const range) F_attribute_visibility_internal_d; + extern f_status_t private_f_serialize_from_simple_select(const f_string_static_t source, const f_number_unsigned_t index, f_string_range_t * const range) F_attribute_visibility_internal_d; #endif // !defined(_di_f_serialize_from_simple_get_) || !defined(_di_f_serialize_from_simple_select_) #ifdef __cplusplus diff --git a/level_0/f_serialize/c/serialize.c b/level_0/f_serialize/c/serialize.c index 8cee1b6..04bcf26 100644 --- a/level_0/f_serialize/c/serialize.c +++ b/level_0/f_serialize/c/serialize.c @@ -14,9 +14,9 @@ extern "C" { if (!source.used) return F_data_not; f_status_t status = F_none; - f_array_length_t i = 0; - f_array_length_t start = 0; - f_array_length_t total = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t start = 0; + f_number_unsigned_t total = 0; uint8_t width = 0; do { @@ -84,7 +84,7 @@ extern "C" { #endif // _di_f_serialize_from_simple_ #ifndef _di_f_serialize_from_simple_get_ - f_status_t f_serialize_from_simple_get(const f_string_static_t source, const f_array_length_t index, f_string_dynamic_t * const destination) { + f_status_t f_serialize_from_simple_get(const f_string_static_t source, const f_number_unsigned_t index, f_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -100,7 +100,7 @@ extern "C" { return status; } - const f_array_length_t total = (range.stop - range.start) + 1; + const f_number_unsigned_t total = (range.stop - range.start) + 1; if (range.start <= range.stop) { const f_status_t status_allocation = f_string_append(source.string + range.start, total, destination); @@ -120,9 +120,9 @@ extern "C" { if (!source.used) return F_data_not; f_status_t status = F_none; - f_array_length_t i = 0; - f_array_length_t start = 0; - f_array_length_t total = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t start = 0; + f_number_unsigned_t total = 0; uint8_t width = 0; do { @@ -198,7 +198,7 @@ extern "C" { #endif // _di_f_serialize_from_simple_range_ #ifndef _di_f_serialize_from_simple_select_ - f_status_t f_serialize_from_simple_select(const f_string_static_t source, const f_array_length_t index, f_string_range_t * const range) { + f_status_t f_serialize_from_simple_select(const f_string_static_t source, const f_number_unsigned_t index, f_string_range_t * const 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_serialize/c/serialize.h b/level_0/f_serialize/c/serialize.h index b97b49e..564aea4 100644 --- a/level_0/f_serialize/c/serialize.h +++ b/level_0/f_serialize/c/serialize.h @@ -95,7 +95,7 @@ extern "C" { * @see f_string_append() */ #ifndef _di_f_serialize_from_simple_get_ - extern f_status_t f_serialize_from_simple_get(const f_string_static_t source, const f_array_length_t index, f_string_dynamic_t * const destination); + extern f_status_t f_serialize_from_simple_get(const f_string_static_t source, const f_number_unsigned_t index, f_string_dynamic_t * const destination); #endif // _di_f_serialize_from_simple_get_ /** @@ -156,7 +156,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_serialize_from_simple_select_ - extern f_status_t f_serialize_from_simple_select(const f_string_static_t source, const f_array_length_t index, f_string_range_t * const range); + extern f_status_t f_serialize_from_simple_select(const f_string_static_t source, const f_number_unsigned_t index, f_string_range_t * const range); #endif // _di_f_serialize_from_simple_select_ /** diff --git a/level_0/f_string/c/private-string.c b/level_0/f_string/c/private-string.c index 66ff931..ea4572e 100644 --- a/level_0/f_string/c/private-string.c +++ b/level_0/f_string/c/private-string.c @@ -7,7 +7,7 @@ extern "C" { #endif #if !defined(_di_f_string_append_) || !defined(_di_f_string_append_assure_) || !defined(_di_f_string_dynamic_append_) || !defined(_di_f_string_dynamic_append_assure_) || !defined(_di_f_string_dynamic_mash_) || !defined(_di_f_string_dynamic_partial_append_) || !defined(_di_f_string_dynamic_partial_append_assure_) || !defined(_di_f_string_dynamic_partial_mash_) || !defined(_di_f_string_dynamic_partial_mash_nulless_) || !defined(_di_f_string_dynamic_partial_mish_) || !defined(_di_f_string_dynamic_partial_mish_nulless_) || !defined(_di_f_string_dynamic_partial_prepend_) || !defined(_di_f_string_dynamics_append_) || !defined(_di_f_string_map_multis_append_) || !defined(_di_f_string_mash_) || !defined(_di_f_string_maps_append_) || !defined(_di_f_string_triples_append_) - f_status_t private_f_string_append(const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination) { + f_status_t private_f_string_append(const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination) { if (destination->used + length + 1 > destination->size) { const f_status_t status = private_f_string_dynamic_increase_by(length + 1, destination); @@ -23,12 +23,12 @@ extern "C" { #endif // !defined(_di_f_string_append_) || !defined(_di_f_string_append_assure_) || !defined(_di_f_string_dynamic_append_) || !defined(_di_f_string_dynamic_append_assure_) || !defined(_di_f_string_dynamic_mash_) || !defined(_di_f_string_dynamic_partial_append_) || !defined(_di_f_string_dynamic_partial_append_assure_) || !defined(_di_f_string_dynamic_partial_mash_) || !defined(_di_f_string_dynamic_partial_mash_nulless_) || !defined(_di_f_string_dynamic_partial_mish_) || !defined(_di_f_string_dynamic_partial_mish_nulless_) || !defined(_di_f_string_dynamic_partial_prepend_) || !defined(_di_f_string_dynamics_append_) || !defined(_di_f_string_map_multis_append_) || !defined(_di_f_string_mash_) || !defined(_di_f_string_maps_append_) || !defined(_di_f_string_triples_append_) #if !defined(_di_f_string_append_assure_nulless_) || !defined(_di_f_string_append_nulless_) || !defined(_di_f_string_dynamic_append_assure_nulless_) || !defined(_di_f_string_dynamic_append_nulless_) || !defined(_di_f_string_dynamic_mash_nulless_) || !defined(_di_f_string_dynamic_partial_append_assure_nulless_) || !defined(_di_f_string_dynamic_partial_append_nulless_) || !defined(_di_f_string_dynamic_partial_mash_nulless_) || !defined(_di_f_string_mash_nulless_) - f_status_t private_f_string_append_nulless(const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination) { + f_status_t private_f_string_append_nulless(const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination) { f_status_t status = F_none; - f_array_length_t i = 0; - f_array_length_t size = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t size = 0; // Count all of the NULLs and subtract them from the total size. for (; i < length; ++i) { @@ -40,7 +40,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - f_array_length_t first = 0; + f_number_unsigned_t first = 0; for (i = 0, size = 0; i < length; ++i) { @@ -74,7 +74,7 @@ extern "C" { #endif // !defined(_di_f_string_append_assure_nulless_) || !defined(_di_f_string_append_nulless_) || !defined(_di_f_string_dynamic_append_assure_nulless_) || !defined(_di_f_string_dynamic_append_nulless_) || !defined(_di_f_string_dynamic_mash_nulless_) || !defined(_di_f_string_dynamic_partial_append_assure_nulless_) || !defined(_di_f_string_dynamic_partial_append_nulless_) || !defined(_di_f_string_dynamic_partial_mash_nulless_) || !defined(_di_f_string_mash_nulless_) #if !defined(_di_f_string_dynamic_mish_) || !defined(_di_f_string_dynamic_partial_mish_) || !defined(_di_f_string_dynamic_partial_prepend_assure_) || !defined(_di_f_string_dynamic_partial_prepend_) || !defined(_di_f_string_dynamic_prepend_assure_) || !defined(_di_f_string_dynamic_prepend_) || !defined(_di_f_string_mish_) || !defined(_di_f_string_prepend_assure_) || !defined(_di_f_string_prepend_) - f_status_t private_f_string_prepend(const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination) { + f_status_t private_f_string_prepend(const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination) { if (destination->used + length > F_string_t_size_d) { return F_status_set_error(F_string_too_large); @@ -100,7 +100,7 @@ extern "C" { #endif // !defined(_di_f_string_dynamic_mish_) || !defined(_di_f_string_dynamic_partial_mish_) || !defined(_di_f_string_dynamic_partial_prepend_assure_) || !defined(_di_f_string_dynamic_partial_prepend_) || !defined(_di_f_string_dynamic_prepend_assure_) || !defined(_di_f_string_dynamic_prepend_) || !defined(_di_f_string_mish_) || !defined(_di_f_string_prepend_assure_) || !defined(_di_f_string_prepend_) #if !defined(_di_f_string_dynamic_mish_nulless_) || !defined(_di_f_string_dynamic_partial_mish_nulless_) || !defined(_di_f_string_dynamic_partial_prepend_assure_nulless_) || !defined(_di_f_string_dynamic_partial_prepend_nulless_) || !defined(_di_f_string_dynamic_prepend_assure_nulless_) || !defined(_di_f_string_dynamic_prepend_nulless_) || !defined(_di_f_string_mish_nulless_) || !defined(_di_f_string_prepend_assure_nulless_) || !defined(_di_f_string_prepend_nulless_) - f_status_t private_f_string_prepend_nulless(const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination) { + f_status_t private_f_string_prepend_nulless(const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination) { if (destination->used + length > F_string_t_size_d) { return F_status_set_error(F_string_too_large); @@ -108,12 +108,12 @@ extern "C" { f_status_t status = F_none; - f_array_length_t first = 0; - f_array_length_t offset = 0; + f_number_unsigned_t first = 0; + f_number_unsigned_t offset = 0; - f_array_length_t size = 0; + f_number_unsigned_t size = 0; - for (f_array_length_t i = 0; i <= length; ++i) { + for (f_number_unsigned_t i = 0; i <= length; ++i) { if (i == length) { if (i > first) { diff --git a/level_0/f_string/c/private-string.h b/level_0/f_string/c/private-string.h index 22ce72d..e99b04b 100644 --- a/level_0/f_string/c/private-string.h +++ b/level_0/f_string/c/private-string.h @@ -55,7 +55,7 @@ extern "C" { * @see f_string_triples_append() */ #if !defined(_di_f_string_append_) || !defined(_di_f_string_append_assure_) || !defined(_di_f_string_dynamic_append_) || !defined(_di_f_string_dynamic_append_assure_) || !defined(_di_f_string_dynamic_mash_) || !defined(_di_f_string_dynamic_partial_append_) || !defined(_di_f_string_dynamic_partial_append_assure_) || !defined(_di_f_string_dynamic_partial_mash_) || !defined(_di_f_string_dynamic_partial_mash_nulless_) || !defined(_di_f_string_dynamic_partial_mish_) || !defined(_di_f_string_dynamic_partial_mish_nulless_) || !defined(_di_f_string_dynamic_partial_prepend_) || !defined(_di_f_string_dynamics_append_) || !defined(_di_f_string_map_multis_append_) || !defined(_di_f_string_mash_) || !defined(_di_f_string_maps_append_) || !defined(_di_f_string_triples_append_) - extern f_status_t private_f_string_append(const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_append(const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_append_) || !defined(_di_f_string_append_assure_) || !defined(_di_f_string_dynamic_append_) || !defined(_di_f_string_dynamic_append_assure_) || !defined(_di_f_string_dynamic_mash_) || !defined(_di_f_string_dynamic_partial_append_) || !defined(_di_f_string_dynamic_partial_append_assure_) || !defined(_di_f_string_dynamic_partial_mash_) || !defined(_di_f_string_dynamic_partial_mash_nulless_) || !defined(_di_f_string_dynamic_partial_mish_) || !defined(_di_f_string_dynamic_partial_mish_nulless_) || !defined(_di_f_string_dynamic_partial_prepend_) || !defined(_di_f_string_dynamics_append_) || !defined(_di_f_string_map_multis_append_) || !defined(_di_f_string_mash_) || !defined(_di_f_string_maps_append_) || !defined(_di_f_string_triples_append_) /** @@ -88,7 +88,7 @@ extern "C" { * @see f_string_mash_nulless() */ #if !defined(_di_f_string_append_assure_nulless_) || !defined(_di_f_string_append_nulless_) || !defined(_di_f_string_dynamic_append_assure_nulless_) || !defined(_di_f_string_dynamic_append_nulless_) || !defined(_di_f_string_dynamic_mash_nulless_) || !defined(_di_f_string_dynamic_partial_append_assure_nulless_) || !defined(_di_f_string_dynamic_partial_append_nulless_) || !defined(_di_f_string_dynamic_partial_mash_nulless_) || !defined(_di_f_string_mash_nulless_) - extern f_status_t private_f_string_append_nulless(const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_append_nulless(const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_append_assure_nulless_) || !defined(_di_f_string_append_nulless_) || !defined(_di_f_string_dynamic_append_assure_nulless_) || !defined(_di_f_string_dynamic_append_nulless_) || !defined(_di_f_string_dynamic_mash_nulless_) || !defined(_di_f_string_dynamic_partial_append_assure_nulless_) || !defined(_di_f_string_dynamic_partial_append_nulless_) || !defined(_di_f_string_dynamic_partial_mash_nulless_) || !defined(_di_f_string_mash_nulless_) /** @@ -124,7 +124,7 @@ extern "C" { * @see f_string_prepend() */ #if !defined(_di_f_string_dynamic_mish_) || !defined(_di_f_string_dynamic_partial_mish_) || !defined(_di_f_string_dynamic_partial_prepend_assure_) || !defined(_di_f_string_dynamic_partial_prepend_) || !defined(_di_f_string_dynamic_prepend_assure_) || !defined(_di_f_string_dynamic_prepend_) || !defined(_di_f_string_mish_) || !defined(_di_f_string_prepend_assure_) || !defined(_di_f_string_prepend_) - extern f_status_t private_f_string_prepend(const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_prepend(const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_dynamic_mish_) || !defined(_di_f_string_dynamic_partial_mish_) || !defined(_di_f_string_dynamic_partial_prepend_assure_) || !defined(_di_f_string_dynamic_partial_prepend_) || !defined(_di_f_string_dynamic_prepend_assure_) || !defined(_di_f_string_dynamic_prepend_) || !defined(_di_f_string_mish_) || !defined(_di_f_string_prepend_assure_) || !defined(_di_f_string_prepend_) /** @@ -160,7 +160,7 @@ extern "C" { * @see f_string_prepend_nulless() */ #if !defined(_di_f_string_dynamic_mish_nulless_) || !defined(_di_f_string_dynamic_partial_mish_nulless_) || !defined(_di_f_string_dynamic_partial_prepend_assure_nulless_) || !defined(_di_f_string_dynamic_partial_prepend_nulless_) || !defined(_di_f_string_dynamic_prepend_assure_nulless_) || !defined(_di_f_string_dynamic_prepend_nulless_) || !defined(_di_f_string_mish_nulless_) || !defined(_di_f_string_prepend_assure_nulless_) || !defined(_di_f_string_prepend_nulless_) - extern f_status_t private_f_string_prepend_nulless(const f_string_t source, f_array_length_t length, f_string_dynamic_t * const destination) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_prepend_nulless(const f_string_t source, f_number_unsigned_t length, f_string_dynamic_t * const destination) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_dynamic_mish_nulless_) || !defined(_di_f_string_dynamic_partial_mish_nulless_) || !defined(_di_f_string_dynamic_partial_prepend_assure_nulless_) || !defined(_di_f_string_dynamic_partial_prepend_nulless_) || !defined(_di_f_string_dynamic_prepend_assure_nulless_) || !defined(_di_f_string_dynamic_prepend_nulless_) || !defined(_di_f_string_mish_nulless_) || !defined(_di_f_string_prepend_assure_nulless_) || !defined(_di_f_string_prepend_nulless_) #ifdef __cplusplus diff --git a/level_0/f_string/c/string.c b/level_0/f_string/c/string.c index 0e81725..8115e9c 100644 --- a/level_0/f_string/c/string.c +++ b/level_0/f_string/c/string.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_f_string_append_ - f_status_t f_string_append(const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination) { + f_status_t f_string_append(const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -18,7 +18,7 @@ extern "C" { #endif // _di_f_string_append_ #ifndef _di_f_string_append_assure_ - f_status_t f_string_append_assure(const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination) { + f_status_t f_string_append_assure(const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -29,8 +29,8 @@ extern "C" { return private_f_string_append(source, length, destination); } - f_array_length_t i = 1; - f_array_length_t j = 1; + f_number_unsigned_t i = 1; + f_number_unsigned_t j = 1; while (i <= length && j <= destination->used) { @@ -59,7 +59,7 @@ extern "C" { #endif // _di_f_string_append_assure_ #ifndef _di_f_string_append_assure_nulless_ - f_status_t f_string_append_assure_nulless(const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination) { + f_status_t f_string_append_assure_nulless(const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -70,8 +70,8 @@ extern "C" { return private_f_string_append_nulless(source, length, destination); } - f_array_length_t i = 1; - f_array_length_t j = 1; + f_number_unsigned_t i = 1; + f_number_unsigned_t j = 1; while (i <= length && j <= destination->used) { @@ -100,7 +100,7 @@ extern "C" { #endif // _di_f_string_append_assure_nulless_ #ifndef _di_f_string_append_nulless_ - f_status_t f_string_append_nulless(const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination) { + f_status_t f_string_append_nulless(const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -112,7 +112,7 @@ extern "C" { #endif // _di_f_string_append_nulless_ #ifndef _di_f_string_mash_ - f_status_t f_string_mash(const f_string_t glue, const f_array_length_t glue_length, const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination) { + f_status_t f_string_mash(const f_string_t glue, const f_number_unsigned_t glue_length, const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -129,7 +129,7 @@ extern "C" { #endif // _di_f_string_mash_ #ifndef _di_f_string_mash_nulless_ - f_status_t f_string_mash_nulless(const f_string_t glue, const f_array_length_t glue_length, const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination) { + f_status_t f_string_mash_nulless(const f_string_t glue, const f_number_unsigned_t glue_length, const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -146,7 +146,7 @@ extern "C" { #endif // _di_f_string_mash_nulless_ #ifndef _di_f_string_mish_ - f_status_t f_string_mish(const f_string_t glue, const f_array_length_t glue_length, const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination) { + f_status_t f_string_mish(const f_string_t glue, const f_number_unsigned_t glue_length, const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -163,7 +163,7 @@ extern "C" { #endif // _di_f_string_mish_ #ifndef _di_f_string_mish_nulless_ - f_status_t f_string_mish_nulless(const f_string_t glue, const f_array_length_t glue_length, const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination) { + f_status_t f_string_mish_nulless(const f_string_t glue, const f_number_unsigned_t glue_length, const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -180,7 +180,7 @@ extern "C" { #endif // _di_f_string_mish_nulless_ #ifndef _di_f_string_prepend_ - f_status_t f_string_prepend(const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination) { + f_status_t f_string_prepend(const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -192,7 +192,7 @@ extern "C" { #endif // _di_f_string_prepend_ #ifndef _di_f_string_prepend_assure_ - f_status_t f_string_prepend_assure(const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination) { + f_status_t f_string_prepend_assure(const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -203,8 +203,8 @@ extern "C" { return private_f_string_prepend(source, length, destination); } - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; while (i < length && j < destination->used) { @@ -233,7 +233,7 @@ extern "C" { #endif // _di_f_string_prepend_assure_ #ifndef _di_f_string_prepend_assure_nulless_ - f_status_t f_string_prepend_assure_nulless(const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination) { + f_status_t f_string_prepend_assure_nulless(const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -244,8 +244,8 @@ extern "C" { return private_f_string_prepend_nulless(source, length, destination); } - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; while (i < length && j < destination->used) { @@ -274,7 +274,7 @@ extern "C" { #endif // _di_f_string_prepend_assure_nulless_ #ifndef _di_f_string_prepend_nulless_ - f_status_t f_string_prepend_nulless(const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination) { + f_status_t f_string_prepend_nulless(const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_string/c/string.h b/level_0/f_string/c/string.h index 5291350..e9b0cb2 100644 --- a/level_0/f_string/c/string.h +++ b/level_0/f_string/c/string.h @@ -7,8 +7,8 @@ * * Provides string capabilities. * - * It is highly recommended that all string arrays are set to a max size of F_array_length_t_size_d. - * Any calculations against the length (aka: string.used) can always perform (A < B) operators such that the B is F_array_length_t_size_d + 1 without integer overflow. + * It is highly recommended that all string arrays are set to a max size of F_number_t_size_unsigned_d. + * Any calculations against the length (aka: string.used) can always perform (A < B) operators such that the B is F_number_t_size_unsigned_d + 1 without integer overflow. */ #ifndef _F_string_h #define _F_string_h @@ -71,7 +71,7 @@ extern "C" { * @see f_memory_resize() */ #ifndef _di_f_string_append_ - extern f_status_t f_string_append(const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination); + extern f_status_t f_string_append(const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination); #endif // _di_f_string_append_ /** @@ -98,7 +98,7 @@ extern "C" { * @see f_memory_resize() */ #ifndef _di_f_string_append_assure_ - extern f_status_t f_string_append_assure(const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination); + extern f_status_t f_string_append_assure(const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination); #endif // _di_f_string_append_assure_ /** @@ -126,7 +126,7 @@ extern "C" { * @see f_memory_resize() */ #ifndef _di_f_string_append_assure_nulless_ - extern f_status_t f_string_append_assure_nulless(const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination); + extern f_status_t f_string_append_assure_nulless(const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination); #endif // _di_f_string_append_assure_nulless_ /** @@ -153,7 +153,7 @@ extern "C" { * @see f_memory_resize() */ #ifndef _di_f_string_append_nulless_ - extern f_status_t f_string_append_nulless(const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination); + extern f_status_t f_string_append_nulless(const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination); #endif // _di_f_string_append_nulless_ /** @@ -184,7 +184,7 @@ extern "C" { * @see f_memory_resize() */ #ifndef _di_f_string_mash_ - extern f_status_t f_string_mash(const f_string_t glue, const f_array_length_t glue_length, const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination); + extern f_status_t f_string_mash(const f_string_t glue, const f_number_unsigned_t glue_length, const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination); #endif // _di_f_string_mash_ /** @@ -217,7 +217,7 @@ extern "C" { * @see f_memory_resize() */ #ifndef _di_f_string_mash_nulless_ - extern f_status_t f_string_mash_nulless(const f_string_t glue, const f_array_length_t glue_length, const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination); + extern f_status_t f_string_mash_nulless(const f_string_t glue, const f_number_unsigned_t glue_length, const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination); #endif // _di_f_string_mash_nulless_ /** @@ -248,7 +248,7 @@ extern "C" { * @see f_memory_resize() */ #ifndef _di_f_string_mish_ - extern f_status_t f_string_mish(const f_string_t glue, const f_array_length_t glue_length, const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination); + extern f_status_t f_string_mish(const f_string_t glue, const f_number_unsigned_t glue_length, const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination); #endif // _di_f_string_mish_ /** @@ -281,7 +281,7 @@ extern "C" { * @see f_memory_resize() */ #ifndef _di_f_string_mish_nulless_ - extern f_status_t f_string_mish_nulless(const f_string_t glue, const f_array_length_t glue_length, const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination); + extern f_status_t f_string_mish_nulless(const f_string_t glue, const f_number_unsigned_t glue_length, const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination); #endif // _di_f_string_mish_nulless_ /** @@ -308,7 +308,7 @@ extern "C" { * @see f_memory_resize() */ #ifndef _di_f_string_prepend_ - extern f_status_t f_string_prepend(const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination); + extern f_status_t f_string_prepend(const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination); #endif // _di_f_string_prepend_ /** @@ -337,7 +337,7 @@ extern "C" { * @see f_memory_resize() */ #ifndef _di_f_string_prepend_assure_ - extern f_status_t f_string_prepend_assure(const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination); + extern f_status_t f_string_prepend_assure(const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination); #endif // _di_f_string_prepend_assure_ /** @@ -367,7 +367,7 @@ extern "C" { * @see f_memory_resize() */ #ifndef _di_f_string_prepend_assure_nulless_ - extern f_status_t f_string_prepend_assure_nulless(const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination); + extern f_status_t f_string_prepend_assure_nulless(const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination); #endif // _di_f_string_prepend_assure_nulless_ /** @@ -397,7 +397,7 @@ extern "C" { * @see f_memory_resize() */ #ifndef _di_f_string_prepend_nulless_ - extern f_status_t f_string_prepend_nulless(const f_string_t source, const f_array_length_t length, f_string_dynamic_t * const destination); + extern f_status_t f_string_prepend_nulless(const f_string_t source, const f_number_unsigned_t length, f_string_dynamic_t * const destination); #endif // _di_f_string_prepend_nulless_ /** diff --git a/level_0/f_string/c/string/common.h b/level_0/f_string/c/string/common.h index 8cc079d..0eb0ccc 100644 --- a/level_0/f_string/c/string/common.h +++ b/level_0/f_string/c/string/common.h @@ -42,9 +42,9 @@ extern "C" { * * Dynamic allocation macros are provided, but it is recommended to utilize the f_string_dynamic_t for dynamic allocation. * - * is provided as a way t have a string max for systems that do not support max string length in 64-bits (when f_array_length_t is set to uint64_t). + * is provided as a way t have a string max for systems that do not support max string length in 64-bits (when f_number_unsigned_t is set to uint64_t). * - * The ideal length for a string is F_array_length_t_size_d, which generally defaults to 2^64 (unsigned). + * The ideal length for a string is F_number_t_size_unsigned_d, which generally defaults to 2^64 (unsigned). * However, the libc/POSIX appears to limit this to 2^63 (signed). * * F_string_t_size_d is provided to help safely navigate this. diff --git a/level_0/f_string/c/string/dynamic.c b/level_0/f_string/c/string/dynamic.c index 3ba742b..a5670a3 100644 --- a/level_0/f_string/c/string/dynamic.c +++ b/level_0/f_string/c/string/dynamic.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_string_dynamic_adjust_ - f_status_t f_string_dynamic_adjust(const f_array_length_t length, f_string_dynamic_t * const dynamic) { + f_status_t f_string_dynamic_adjust(const f_number_unsigned_t length, f_string_dynamic_t * const dynamic) { #ifndef _di_level_0_parameter_checking_ if (!dynamic) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -40,8 +40,8 @@ extern "C" { return private_f_string_append(source.string, source.used, destination); } - f_array_length_t i = 1; - f_array_length_t j = 1; + f_number_unsigned_t i = 1; + f_number_unsigned_t j = 1; while (i <= source.used && j <= destination->used) { @@ -69,8 +69,8 @@ extern "C" { return private_f_string_append_nulless(source.string, source.used, destination); } - f_array_length_t i = 1; - f_array_length_t j = 1; + f_number_unsigned_t i = 1; + f_number_unsigned_t j = 1; while (i <= source.used && j <= destination->used) { @@ -111,7 +111,7 @@ extern "C" { #endif // _di_f_string_dynamic_append_nulless_ #ifndef _di_f_string_dynamic_decimate_by_ - f_status_t f_string_dynamic_decimate_by(const f_array_length_t amount, f_string_dynamic_t * const dynamic) { + f_status_t f_string_dynamic_decimate_by(const f_number_unsigned_t amount, f_string_dynamic_t * const dynamic) { #ifndef _di_level_0_parameter_checking_ if (!dynamic) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -127,7 +127,7 @@ extern "C" { #endif // _di_f_string_dynamic_decimate_by_ #ifndef _di_f_string_dynamic_decrease_by_ - f_status_t f_string_dynamic_decrease_by(const f_array_length_t amount, f_string_dynamic_t * const dynamic) { + f_status_t f_string_dynamic_decrease_by(const f_number_unsigned_t amount, f_string_dynamic_t * const dynamic) { #ifndef _di_level_0_parameter_checking_ if (!dynamic) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -143,13 +143,13 @@ extern "C" { #endif // _di_f_string_dynamic_decrease_by_ #ifndef _di_f_string_dynamic_increase_ - f_status_t f_string_dynamic_increase(const f_array_length_t step, f_string_dynamic_t * const dynamic) { + f_status_t f_string_dynamic_increase(const f_number_unsigned_t step, f_string_dynamic_t * const dynamic) { #ifndef _di_level_0_parameter_checking_ if (!dynamic) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && dynamic->used + 1 > dynamic->size) { - f_array_length_t size = dynamic->used + step; + f_number_unsigned_t size = dynamic->used + step; if (size > F_string_t_size_d) { if (dynamic->used + 1 > F_string_t_size_d) { @@ -167,7 +167,7 @@ extern "C" { #endif // _di_f_string_dynamic_increase_ #ifndef _di_f_string_dynamic_increase_by_ - f_status_t f_string_dynamic_increase_by(const f_array_length_t amount, f_string_dynamic_t * const dynamic) { + f_status_t f_string_dynamic_increase_by(const f_number_unsigned_t amount, f_string_dynamic_t * const dynamic) { #ifndef _di_level_0_parameter_checking_ if (!dynamic) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -274,15 +274,15 @@ extern "C" { if (range.start > range.stop) return F_data_not_stop; if (range.start >= source.used) return F_data_not_eos; - const f_array_length_t length = range.stop >= source.used ? source.used - range.start : (range.stop - range.start) + 1; + const f_number_unsigned_t length = range.stop >= source.used ? source.used - range.start : (range.stop - range.start) + 1; if (destination->used < length) { return private_f_string_append(source.string + range.start, length, destination); } - const f_array_length_t stop = range.stop >= source.used ? source.used : range.stop + 1; - f_array_length_t i = 1; - f_array_length_t j = 1; + const f_number_unsigned_t stop = range.stop >= source.used ? source.used : range.stop + 1; + f_number_unsigned_t i = 1; + f_number_unsigned_t j = 1; while (i <= length && j <= destination->used) { @@ -308,15 +308,15 @@ extern "C" { if (range.start > range.stop) return F_data_not_stop; if (range.start >= source.used) return F_data_not_eos; - const f_array_length_t length = range.stop >= source.used ? source.used - range.start : (range.stop - range.start) + 1; + const f_number_unsigned_t length = range.stop >= source.used ? source.used - range.start : (range.stop - range.start) + 1; if (!destination->used) { return private_f_string_append_nulless(source.string + range.start, length, destination); } - const f_array_length_t stop = range.stop >= source.used ? source.used : range.stop + 1; - f_array_length_t i = 1; - f_array_length_t j = 1; + const f_number_unsigned_t stop = range.stop >= source.used ? source.used : range.stop + 1; + f_number_unsigned_t i = 1; + f_number_unsigned_t j = 1; while (i <= length && j <= destination->used) { @@ -482,14 +482,14 @@ extern "C" { if (range.start > range.stop) return F_data_not_stop; if (range.start >= source.used) return F_data_not_eos; - const f_array_length_t length = range.stop >= source.used ? source.used - range.start : (range.stop - range.start) + 1; + const f_number_unsigned_t length = range.stop >= source.used ? source.used - range.start : (range.stop - range.start) + 1; if (destination->used < length) { return private_f_string_prepend(source.string + range.start, length, destination); } - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; while (i < length && j < destination->used) { @@ -515,14 +515,14 @@ extern "C" { if (range.start > range.stop) return F_data_not_stop; if (range.start >= source.used) return F_data_not_eos; - const f_array_length_t length = range.stop >= source.used ? source.used - range.start : (range.stop - range.start) + 1; + const f_number_unsigned_t length = range.stop >= source.used ? source.used - range.start : (range.stop - range.start) + 1; if (!destination->used) { return private_f_string_prepend_nulless(source.string + range.start, length, destination); } - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; while (i < length && j < destination->used) { @@ -588,8 +588,8 @@ extern "C" { return private_f_string_prepend(source.string, source.used, destination); } - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; while (i < source.used && j < destination->used) { @@ -617,8 +617,8 @@ extern "C" { return private_f_string_prepend_nulless(source.string, source.used, destination); } - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; while (i < source.used && j < destination->used) { @@ -659,7 +659,7 @@ extern "C" { #endif // _di_f_string_dynamic_prepend_nulless_ #ifndef _di_f_string_dynamic_resize_ - f_status_t f_string_dynamic_resize(const f_array_length_t length, f_string_dynamic_t * const buffer) { + f_status_t f_string_dynamic_resize(const f_number_unsigned_t length, f_string_dynamic_t * const buffer) { #ifndef _di_level_0_parameter_checking_ if (!buffer) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_string/c/string/dynamic.h b/level_0/f_string/c/string/dynamic.h index 45e9be2..f2026c5 100644 --- a/level_0/f_string/c/string/dynamic.h +++ b/level_0/f_string/c/string/dynamic.h @@ -67,7 +67,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_string_dynamic_adjust_ - extern f_status_t f_string_dynamic_adjust(const f_array_length_t length, f_string_dynamic_t * const dynamic); + extern f_status_t f_string_dynamic_adjust(const f_number_unsigned_t length, f_string_dynamic_t * const dynamic); #endif // _di_f_string_dynamic_adjust_ /** @@ -180,7 +180,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamic_decimate_by_ - extern f_status_t f_string_dynamic_decimate_by(const f_array_length_t amount, f_string_dynamic_t * const dynamic); + extern f_status_t f_string_dynamic_decimate_by(const f_number_unsigned_t amount, f_string_dynamic_t * const dynamic); #endif // _di_f_string_dynamic_decimate_by_ /** @@ -205,14 +205,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamic_decrease_by_ - extern f_status_t f_string_dynamic_decrease_by(const f_array_length_t amount, f_string_dynamic_t * const dynamic); + extern f_status_t f_string_dynamic_decrease_by(const f_number_unsigned_t amount, f_string_dynamic_t * const dynamic); #endif // _di_f_string_dynamic_decrease_by_ /** * Resize the dynamic string 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -231,14 +231,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamic_increase_ - extern f_status_t f_string_dynamic_increase(const f_array_length_t step, f_string_dynamic_t * const dynamic); + extern f_status_t f_string_dynamic_increase(const f_number_unsigned_t step, f_string_dynamic_t * const dynamic); #endif // _di_f_string_dynamic_increase_ /** * Resize the dynamic string 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -256,7 +256,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamic_increase_by_ - extern f_status_t f_string_dynamic_increase_by(const f_array_length_t amount, f_string_dynamic_t * const dynamic); + extern f_status_t f_string_dynamic_increase_by(const f_number_unsigned_t amount, f_string_dynamic_t * const dynamic); #endif // _di_f_string_dynamic_increase_by_ /** @@ -811,7 +811,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamic_resize_ - extern f_status_t f_string_dynamic_resize(const f_array_length_t length, f_string_dynamic_t * const buffer); + extern f_status_t f_string_dynamic_resize(const f_number_unsigned_t length, f_string_dynamic_t * const buffer); #endif // _di_f_string_dynamic_resize_ /** diff --git a/level_0/f_string/c/string/dynamics.c b/level_0/f_string/c/string/dynamics.c index 7af991a..a06e2b4 100644 --- a/level_0/f_string/c/string/dynamics.c +++ b/level_0/f_string/c/string/dynamics.c @@ -8,7 +8,7 @@ extern "C" { #endif #ifndef _di_f_string_dynamics_adjust_ - f_status_t f_string_dynamics_adjust(const f_array_length_t length, f_string_dynamics_t * const dynamics) { + f_status_t f_string_dynamics_adjust(const f_number_unsigned_t length, f_string_dynamics_t * const dynamics) { #ifndef _di_level_0_parameter_checking_ if (!dynamics) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -42,7 +42,7 @@ extern "C" { #endif // _di_f_string_dynamics_append_all_ #ifndef _di_f_string_dynamics_decimate_by_ - f_status_t f_string_dynamics_decimate_by(const f_array_length_t amount, f_string_dynamics_t * const dynamics) { + f_status_t f_string_dynamics_decimate_by(const f_number_unsigned_t amount, f_string_dynamics_t * const dynamics) { #ifndef _di_level_0_parameter_checking_ if (!dynamics) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -58,7 +58,7 @@ extern "C" { #endif // _di_f_string_dynamics_decimate_by_ #ifndef _di_f_string_dynamics_decrease_by_ - f_status_t f_string_dynamics_decrease_by(const f_array_length_t amount, f_string_dynamics_t * const dynamics) { + f_status_t f_string_dynamics_decrease_by(const f_number_unsigned_t amount, f_string_dynamics_t * const dynamics) { #ifndef _di_level_0_parameter_checking_ if (!dynamics) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -74,7 +74,7 @@ extern "C" { #endif // _di_f_string_dynamics_decrease_by_ #ifndef _di_f_string_dynamics_increase_ - f_status_t f_string_dynamics_increase(const f_array_length_t step, f_string_dynamics_t * const dynamics) { + f_status_t f_string_dynamics_increase(const f_number_unsigned_t step, f_string_dynamics_t * const dynamics) { #ifndef _di_level_0_parameter_checking_ if (!dynamics) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -82,14 +82,14 @@ extern "C" { if (!step) return F_data_not; if (dynamics->used + 1 > dynamics->size) { - f_array_length_t size = dynamics->used + step; + f_number_unsigned_t size = dynamics->used + step; - if (size > F_array_length_t_size_d) { - if (dynamics->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (dynamics->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_string_dynamics_resize(size, dynamics); @@ -100,13 +100,13 @@ extern "C" { #endif // _di_f_string_dynamics_increase_ #ifndef _di_f_string_dynamics_increase_by_ - f_status_t f_string_dynamics_increase_by(const f_array_length_t amount, f_string_dynamics_t * const dynamics) { + f_status_t f_string_dynamics_increase_by(const f_number_unsigned_t amount, f_string_dynamics_t * const dynamics) { #ifndef _di_level_0_parameter_checking_ if (!dynamics) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (dynamics->used + amount > dynamics->size) { - if (dynamics->used + amount > F_array_length_t_size_d) { + if (dynamics->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -118,7 +118,7 @@ extern "C" { #endif // _di_f_string_dynamics_increase_by_ #ifndef _di_f_string_dynamics_resize_ - f_status_t f_string_dynamics_resize(const f_array_length_t length, f_string_dynamics_t * const dynamics) { + f_status_t f_string_dynamics_resize(const f_number_unsigned_t length, f_string_dynamics_t * const dynamics) { #ifndef _di_level_0_parameter_checking_ if (!dynamics) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_string/c/string/dynamics.h b/level_0/f_string/c/string/dynamics.h index 8c154f4..a1b5c09 100644 --- a/level_0/f_string/c/string/dynamics.h +++ b/level_0/f_string/c/string/dynamics.h @@ -61,7 +61,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_string_dynamics_adjust_ - extern f_status_t f_string_dynamics_adjust(const f_array_length_t length, f_string_dynamics_t * const dynamics); + extern f_status_t f_string_dynamics_adjust(const f_number_unsigned_t length, f_string_dynamics_t * const dynamics); #endif // _di_f_string_dynamics_adjust_ /** @@ -127,7 +127,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamics_decimate_by_ - extern f_status_t f_string_dynamics_decimate_by(const f_array_length_t amount, f_string_dynamics_t * const dynamics); + extern f_status_t f_string_dynamics_decimate_by(const f_number_unsigned_t amount, f_string_dynamics_t * const dynamics); #endif // _di_f_string_dynamics_decimate_by_ /** @@ -151,13 +151,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamics_decrease_by_ - extern f_status_t f_string_dynamics_decrease_by(const f_array_length_t amount, f_string_dynamics_t * const dynamics); + extern f_status_t f_string_dynamics_decrease_by(const f_number_unsigned_t amount, f_string_dynamics_t * const dynamics); #endif // _di_f_string_dynamics_decrease_by_ /** * Increase the size of the dynamic string array, but only if necessary. * - * If the given length is too large for the buffer, then attempt to set max buffer size (F_array_length_t_size_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -176,14 +176,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamics_increase_ - extern f_status_t f_string_dynamics_increase(const f_array_length_t step, f_string_dynamics_t * const dynamics); + extern f_status_t f_string_dynamics_increase(const f_number_unsigned_t step, f_string_dynamics_t * const dynamics); #endif // _di_f_string_dynamics_increase_ /** * Resize the dynamic string 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -201,7 +201,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamics_increase_by_ - extern f_status_t f_string_dynamics_increase_by(const f_array_length_t amount, f_string_dynamics_t * const dynamics); + extern f_status_t f_string_dynamics_increase_by(const f_number_unsigned_t amount, f_string_dynamics_t * const dynamics); #endif // _di_f_string_dynamics_increase_by_ /** @@ -220,7 +220,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamics_resize_ - extern f_status_t f_string_dynamics_resize(const f_array_length_t length, f_string_dynamics_t * const dynamics); + extern f_status_t f_string_dynamics_resize(const f_number_unsigned_t length, f_string_dynamics_t * const dynamics); #endif // _di_f_string_dynamics_resize_ #ifdef __cplusplus diff --git a/level_0/f_string/c/string/dynamicss.c b/level_0/f_string/c/string/dynamicss.c index df3733b..4b881f6 100644 --- a/level_0/f_string/c/string/dynamicss.c +++ b/level_0/f_string/c/string/dynamicss.c @@ -9,7 +9,7 @@ extern "C" { #endif #ifndef _di_f_string_dynamicss_adjust_ - f_status_t f_string_dynamicss_adjust(const f_array_length_t length, f_string_dynamicss_t * const dynamicss) { + f_status_t f_string_dynamicss_adjust(const f_number_unsigned_t length, f_string_dynamicss_t * const dynamicss) { #ifndef _di_level_0_parameter_checking_ if (!dynamicss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -61,7 +61,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].used = 0; @@ -76,7 +76,7 @@ extern "C" { #endif // _di_f_string_dynamicss_append_all_ #ifndef _di_f_string_dynamicss_decimate_by_ - f_status_t f_string_dynamicss_decimate_by(const f_array_length_t amount, f_string_dynamicss_t * const dynamicss) { + f_status_t f_string_dynamicss_decimate_by(const f_number_unsigned_t amount, f_string_dynamicss_t * const dynamicss) { #ifndef _di_level_0_parameter_checking_ if (!dynamicss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -92,7 +92,7 @@ extern "C" { #endif // _di_f_string_dynamicss_decimate_by_ #ifndef _di_f_string_dynamicss_decrease_by_ - f_status_t f_string_dynamicss_decrease_by(const f_array_length_t amount, f_string_dynamicss_t * const dynamicss) { + f_status_t f_string_dynamicss_decrease_by(const f_number_unsigned_t amount, f_string_dynamicss_t * const dynamicss) { #ifndef _di_level_0_parameter_checking_ if (!dynamicss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -108,7 +108,7 @@ extern "C" { #endif // _di_f_string_dynamicss_decrease_by_ #ifndef _di_f_string_dynamicss_increase_ - f_status_t f_string_dynamicss_increase(const f_array_length_t step, f_string_dynamicss_t * const dynamicss) { + f_status_t f_string_dynamicss_increase(const f_number_unsigned_t step, f_string_dynamicss_t * const dynamicss) { #ifndef _di_level_0_parameter_checking_ if (!dynamicss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -116,14 +116,14 @@ extern "C" { if (!step) return F_data_not; if (dynamicss->used + 1 > dynamicss->size) { - f_array_length_t size = dynamicss->used + step; + f_number_unsigned_t size = dynamicss->used + step; - if (size > F_array_length_t_size_d) { - if (dynamicss->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (dynamicss->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_string_dynamicss_resize(size, dynamicss); @@ -134,7 +134,7 @@ extern "C" { #endif // _di_f_string_dynamicss_increase_ #ifndef _di_f_string_dynamicss_increase_by_ - f_status_t f_string_dynamicss_increase_by(const f_array_length_t amount, f_string_dynamicss_t * const dynamicss) { + f_status_t f_string_dynamicss_increase_by(const f_number_unsigned_t amount, f_string_dynamicss_t * const dynamicss) { #ifndef _di_level_0_parameter_checking_ if (!dynamicss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -142,7 +142,7 @@ extern "C" { if (!amount) return F_data_not; if (dynamicss->used + amount > dynamicss->size) { - if (dynamicss->used + amount > F_array_length_t_size_d) { + if (dynamicss->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -154,7 +154,7 @@ extern "C" { #endif // _di_f_string_dynamicss_increase_by_ #ifndef _di_f_string_dynamicss_resize_ - f_status_t f_string_dynamicss_resize(const f_array_length_t length, f_string_dynamicss_t * const dynamicss) { + f_status_t f_string_dynamicss_resize(const f_number_unsigned_t length, f_string_dynamicss_t * const dynamicss) { #ifndef _di_level_0_parameter_checking_ if (!dynamicss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_string/c/string/dynamicss.h b/level_0/f_string/c/string/dynamicss.h index 3c66ddc..5a3755c 100644 --- a/level_0/f_string/c/string/dynamicss.h +++ b/level_0/f_string/c/string/dynamicss.h @@ -61,7 +61,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_string_dynamicss_adjust_ - extern f_status_t f_string_dynamicss_adjust(const f_array_length_t length, f_string_dynamicss_t * const dynamicss); + extern f_status_t f_string_dynamicss_adjust(const f_number_unsigned_t length, f_string_dynamicss_t * const dynamicss); #endif // _di_f_string_dynamicss_adjust_ /** @@ -127,7 +127,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamicss_decimate_by_ - extern f_status_t f_string_dynamicss_decimate_by(const f_array_length_t amount, f_string_dynamicss_t * const dynamicss); + extern f_status_t f_string_dynamicss_decimate_by(const f_number_unsigned_t amount, f_string_dynamicss_t * const dynamicss); #endif // _di_f_string_dynamicss_decimate_by_ /** @@ -151,13 +151,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamicss_decrease_by_ - extern f_status_t f_string_dynamicss_decrease_by(const f_array_length_t amount, f_string_dynamicss_t * const dynamicss); + extern f_status_t f_string_dynamicss_decrease_by(const f_number_unsigned_t amount, f_string_dynamicss_t * const dynamicss); #endif // _di_f_string_dynamicss_decrease_by_ /** * Increase the size of the dynamics string array, but only if necessary. * - * If the given length is too large for the buffer, then attempt to set max buffer size (F_array_length_t_size_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -176,14 +176,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamicss_increase_ - extern f_status_t f_string_dynamicss_increase(const f_array_length_t step, f_string_dynamicss_t * const dynamicss); + extern f_status_t f_string_dynamicss_increase(const f_number_unsigned_t step, f_string_dynamicss_t * const dynamicss); #endif // _di_f_string_dynamicss_increase_ /** * Resize the dynamics string 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -201,7 +201,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamicss_increase_by_ - extern f_status_t f_string_dynamicss_increase_by(const f_array_length_t amount, f_string_dynamicss_t * const dynamicss); + extern f_status_t f_string_dynamicss_increase_by(const f_number_unsigned_t amount, f_string_dynamicss_t * const dynamicss); #endif // _di_f_string_dynamicss_increase_by_ /** @@ -220,7 +220,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamicss_resize_ - extern f_status_t f_string_dynamicss_resize(const f_array_length_t length, f_string_dynamicss_t * const dynamicss); + extern f_status_t f_string_dynamicss_resize(const f_number_unsigned_t length, f_string_dynamicss_t * const dynamicss); #endif // _di_f_string_dynamicss_resize_ #ifdef __cplusplus diff --git a/level_0/f_string/c/string/map_multis.c b/level_0/f_string/c/string/map_multis.c index 8144836..2f3a4dd 100644 --- a/level_0/f_string/c/string/map_multis.c +++ b/level_0/f_string/c/string/map_multis.c @@ -9,7 +9,7 @@ extern "C" { #endif #ifndef _di_f_string_map_multis_adjust_ - f_status_t f_string_map_multis_adjust(const f_array_length_t length, f_string_map_multis_t * const map_multis) { + f_status_t f_string_map_multis_adjust(const f_number_unsigned_t length, f_string_map_multis_t * const map_multis) { #ifndef _di_level_0_parameter_checking_ if (!map_multis) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -63,7 +63,7 @@ extern "C" { #endif // _di_f_string_map_multis_append_all_ #ifndef _di_f_string_map_multis_decimate_by_ - f_status_t f_string_map_multis_decimate_by(const f_array_length_t amount, f_string_map_multis_t * const map_multis) { + f_status_t f_string_map_multis_decimate_by(const f_number_unsigned_t amount, f_string_map_multis_t * const map_multis) { #ifndef _di_level_0_parameter_checking_ if (!map_multis) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -79,7 +79,7 @@ extern "C" { #endif // _di_f_string_map_multis_decimate_by_ #ifndef _di_f_string_map_multis_decrease_by_ - f_status_t f_string_map_multis_decrease_by(const f_array_length_t amount, f_string_map_multis_t * const map_multis) { + f_status_t f_string_map_multis_decrease_by(const f_number_unsigned_t amount, f_string_map_multis_t * const map_multis) { #ifndef _di_level_0_parameter_checking_ if (!map_multis) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -95,20 +95,20 @@ extern "C" { #endif // _di_f_string_map_multis_decrease_by_ #ifndef _di_f_string_map_multis_increase_ - f_status_t f_string_map_multis_increase(const f_array_length_t step, f_string_map_multis_t * const map_multis) { + f_status_t f_string_map_multis_increase(const f_number_unsigned_t step, f_string_map_multis_t * const map_multis) { #ifndef _di_level_0_parameter_checking_ if (!map_multis) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && map_multis->used + 1 > map_multis->size) { - f_array_length_t size = map_multis->used + step; + f_number_unsigned_t size = map_multis->used + step; - if (size > F_array_length_t_size_d) { - if (map_multis->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (map_multis->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_string_map_multis_resize(size, map_multis); @@ -119,7 +119,7 @@ extern "C" { #endif // _di_f_string_map_multis_increase_ #ifndef _di_f_string_map_multis_increase_by_ - f_status_t f_string_map_multis_increase_by(const f_array_length_t amount, f_string_map_multis_t * const map_multis) { + f_status_t f_string_map_multis_increase_by(const f_number_unsigned_t amount, f_string_map_multis_t * const map_multis) { #ifndef _di_level_0_parameter_checking_ if (!map_multis) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -127,7 +127,7 @@ extern "C" { if (!amount) return F_data_not; if (map_multis->used + amount > map_multis->size) { - if (map_multis->used + amount > F_array_length_t_size_d) { + if (map_multis->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -139,7 +139,7 @@ extern "C" { #endif // _di_f_string_map_multis_increase_by_ #ifndef _di_f_string_map_multis_resize_ - f_status_t f_string_map_multis_resize(const f_array_length_t length, f_string_map_multis_t * const map_multis) { + f_status_t f_string_map_multis_resize(const f_number_unsigned_t length, f_string_map_multis_t * const map_multis) { #ifndef _di_level_0_parameter_checking_ if (!map_multis) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_string/c/string/map_multis.h b/level_0/f_string/c/string/map_multis.h index 693cc81..1a1decc 100644 --- a/level_0/f_string/c/string/map_multis.h +++ b/level_0/f_string/c/string/map_multis.h @@ -27,8 +27,8 @@ extern "C" { typedef struct { f_string_map_multi_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_string_map_multis_t; #define f_string_map_multis_t_initialize f_string_statics_t_initialize @@ -66,7 +66,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_map_multis_adjust_ - extern f_status_t f_string_map_multis_adjust(const f_array_length_t length, f_string_map_multis_t * const map_multis); + extern f_status_t f_string_map_multis_adjust(const f_number_unsigned_t length, f_string_map_multis_t * const map_multis); #endif // _di_f_string_map_multis_adjust_ /** @@ -131,7 +131,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_map_multis_decimate_by_ - extern f_status_t f_string_map_multis_decimate_by(const f_array_length_t amount, f_string_map_multis_t * const map_multis); + extern f_status_t f_string_map_multis_decimate_by(const f_number_unsigned_t amount, f_string_map_multis_t * const map_multis); #endif // _di_f_string_map_multis_decimate_by_ /** @@ -154,13 +154,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_map_multis_decrease_by_ - extern f_status_t f_string_map_multis_decrease_by(const f_array_length_t amount, f_string_map_multis_t * const map_multis); + extern f_status_t f_string_map_multis_decrease_by(const f_number_unsigned_t amount, f_string_map_multis_t * const map_multis); #endif // _di_f_string_map_multis_decrease_by_ /** * Increase the size of the map_multis 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -179,14 +179,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_map_multis_increase_ - extern f_status_t f_string_map_multis_increase(const f_array_length_t step, f_string_map_multis_t * const map_multis); + extern f_status_t f_string_map_multis_increase(const f_number_unsigned_t step, f_string_map_multis_t * const map_multis); #endif // _di_f_string_map_multis_increase_ /** * Resize the map_multis 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -204,7 +204,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_map_multis_increase_by_ - extern f_status_t f_string_map_multis_increase_by(const f_array_length_t amount, f_string_map_multis_t * const map_multis); + extern f_status_t f_string_map_multis_increase_by(const f_number_unsigned_t amount, f_string_map_multis_t * const map_multis); #endif // _di_f_string_map_multis_increase_by_ /** @@ -223,7 +223,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_map_multis_resize_ - extern f_status_t f_string_map_multis_resize(const f_array_length_t length, f_string_map_multis_t * const map_multis); + extern f_status_t f_string_map_multis_resize(const f_number_unsigned_t length, f_string_map_multis_t * const map_multis); #endif // _di_f_string_map_multis_resize_ #ifdef __cplusplus diff --git a/level_0/f_string/c/string/map_multiss.c b/level_0/f_string/c/string/map_multiss.c index 6aff10d..2297175 100644 --- a/level_0/f_string/c/string/map_multiss.c +++ b/level_0/f_string/c/string/map_multiss.c @@ -10,7 +10,7 @@ extern "C" { #endif #ifndef _di_f_string_map_multiss_adjust_ - f_status_t f_string_map_multiss_adjust(const f_array_length_t length, f_string_map_multiss_t * const map_multiss) { + f_status_t f_string_map_multiss_adjust(const f_number_unsigned_t length, f_string_map_multiss_t * const map_multiss) { #ifndef _di_level_0_parameter_checking_ if (!map_multiss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -62,7 +62,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].used = 0; @@ -77,7 +77,7 @@ extern "C" { #endif // _di_f_string_map_multiss_append_all_ #ifndef _di_f_string_map_multiss_decimate_by_ - f_status_t f_string_map_multiss_decimate_by(const f_array_length_t amount, f_string_map_multiss_t * const map_multiss) { + f_status_t f_string_map_multiss_decimate_by(const f_number_unsigned_t amount, f_string_map_multiss_t * const map_multiss) { #ifndef _di_level_0_parameter_checking_ if (!map_multiss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -93,7 +93,7 @@ extern "C" { #endif // _di_f_string_map_multiss_decimate_by_ #ifndef _di_f_string_map_multiss_decrease_by_ - f_status_t f_string_map_multiss_decrease_by(const f_array_length_t amount, f_string_map_multiss_t * const map_multiss) { + f_status_t f_string_map_multiss_decrease_by(const f_number_unsigned_t amount, f_string_map_multiss_t * const map_multiss) { #ifndef _di_level_0_parameter_checking_ if (!map_multiss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -109,20 +109,20 @@ extern "C" { #endif // _di_f_string_map_multiss_decrease_by_ #ifndef _di_f_string_map_multiss_increase_ - f_status_t f_string_map_multiss_increase(const f_array_length_t step, f_string_map_multiss_t * const map_multiss) { + f_status_t f_string_map_multiss_increase(const f_number_unsigned_t step, f_string_map_multiss_t * const map_multiss) { #ifndef _di_level_0_parameter_checking_ if (!map_multiss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && map_multiss->used + 1 > map_multiss->size) { - f_array_length_t size = map_multiss->used + step; + f_number_unsigned_t size = map_multiss->used + step; - if (size > F_array_length_t_size_d) { - if (map_multiss->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (map_multiss->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_string_map_multiss_resize(size, map_multiss); @@ -133,7 +133,7 @@ extern "C" { #endif // _di_f_string_map_multiss_increase_ #ifndef _di_f_string_map_multiss_increase_by_ - f_status_t f_string_map_multiss_increase_by(const f_array_length_t amount, f_string_map_multiss_t * const map_multiss) { + f_status_t f_string_map_multiss_increase_by(const f_number_unsigned_t amount, f_string_map_multiss_t * const map_multiss) { #ifndef _di_level_0_parameter_checking_ if (!map_multiss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -141,7 +141,7 @@ extern "C" { if (!amount) return F_data_not; if (map_multiss->used + amount > map_multiss->size) { - if (map_multiss->used + amount > F_array_length_t_size_d) { + if (map_multiss->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -153,7 +153,7 @@ extern "C" { #endif // _di_f_string_map_multiss_increase_by_ #ifndef _di_f_string_map_multiss_resize_ - f_status_t f_string_map_multiss_resize(const f_array_length_t length, f_string_map_multiss_t * const map_multiss) { + f_status_t f_string_map_multiss_resize(const f_number_unsigned_t length, f_string_map_multiss_t * const map_multiss) { #ifndef _di_level_0_parameter_checking_ if (!map_multiss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_string/c/string/map_multiss.h b/level_0/f_string/c/string/map_multiss.h index d0e0747..4ae297f 100644 --- a/level_0/f_string/c/string/map_multiss.h +++ b/level_0/f_string/c/string/map_multiss.h @@ -27,8 +27,8 @@ extern "C" { typedef struct { f_string_map_multis_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_string_map_multiss_t; #define f_string_map_multiss_t_initialize f_string_statics_t_initialize @@ -66,7 +66,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_map_multiss_adjust_ - extern f_status_t f_string_map_multiss_adjust(const f_array_length_t length, f_string_map_multiss_t * const map_multiss); + extern f_status_t f_string_map_multiss_adjust(const f_number_unsigned_t length, f_string_map_multiss_t * const map_multiss); #endif // _di_f_string_map_multiss_adjust_ /** @@ -131,7 +131,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_map_multiss_decimate_by_ - extern f_status_t f_string_map_multiss_decimate_by(const f_array_length_t amount, f_string_map_multiss_t * const map_multiss); + extern f_status_t f_string_map_multiss_decimate_by(const f_number_unsigned_t amount, f_string_map_multiss_t * const map_multiss); #endif // _di_f_string_map_multiss_decimate_by_ /** @@ -154,13 +154,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_map_multiss_decrease_by_ - extern f_status_t f_string_map_multiss_decrease_by(const f_array_length_t amount, f_string_map_multiss_t * const map_multiss); + extern f_status_t f_string_map_multiss_decrease_by(const f_number_unsigned_t amount, f_string_map_multiss_t * const map_multiss); #endif // _di_f_string_map_multiss_decrease_by_ /** * Increase the size of the map_multiss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -179,14 +179,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_map_multiss_increase_ - extern f_status_t f_string_map_multiss_increase(const f_array_length_t step, f_string_map_multiss_t * const map_multiss); + extern f_status_t f_string_map_multiss_increase(const f_number_unsigned_t step, f_string_map_multiss_t * const map_multiss); #endif // _di_f_string_map_multiss_increase_ /** * Resize the map_multiss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -204,7 +204,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_map_multiss_increase_by_ - extern f_status_t f_string_map_multiss_increase_by(const f_array_length_t amount, f_string_map_multiss_t * const map_multiss); + extern f_status_t f_string_map_multiss_increase_by(const f_number_unsigned_t amount, f_string_map_multiss_t * const map_multiss); #endif // _di_f_string_map_multiss_increase_by_ /** @@ -223,7 +223,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_map_multiss_resize_ - extern f_status_t f_string_map_multiss_resize(const f_array_length_t length, f_string_map_multiss_t * const map_multiss); + extern f_status_t f_string_map_multiss_resize(const f_number_unsigned_t length, f_string_map_multiss_t * const map_multiss); #endif // _di_f_string_map_multiss_resize_ #ifdef __cplusplus diff --git a/level_0/f_string/c/string/maps.c b/level_0/f_string/c/string/maps.c index 268f1ef..dac763d 100644 --- a/level_0/f_string/c/string/maps.c +++ b/level_0/f_string/c/string/maps.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_string_maps_adjust_ - f_status_t f_string_maps_adjust(const f_array_length_t length, f_string_maps_t * const maps) { + f_status_t f_string_maps_adjust(const f_number_unsigned_t length, f_string_maps_t * const maps) { #ifndef _di_level_0_parameter_checking_ if (!maps) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -61,7 +61,7 @@ extern "C" { #endif // _di_f_string_maps_append_all_ #ifndef _di_f_string_maps_decimate_by_ - f_status_t f_string_maps_decimate_by(const f_array_length_t amount, f_string_maps_t * const maps) { + f_status_t f_string_maps_decimate_by(const f_number_unsigned_t amount, f_string_maps_t * const maps) { #ifndef _di_level_0_parameter_checking_ if (!maps) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -77,7 +77,7 @@ extern "C" { #endif // _di_f_string_maps_decimate_by_ #ifndef _di_f_string_maps_decrease_by_ - f_status_t f_string_maps_decrease_by(const f_array_length_t amount, f_string_maps_t * const maps) { + f_status_t f_string_maps_decrease_by(const f_number_unsigned_t amount, f_string_maps_t * const maps) { #ifndef _di_level_0_parameter_checking_ if (!maps) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -93,20 +93,20 @@ extern "C" { #endif // _di_f_string_maps_decrease_by_ #ifndef _di_f_string_maps_increase_ - f_status_t f_string_maps_increase(const f_array_length_t step, f_string_maps_t * const maps) { + f_status_t f_string_maps_increase(const f_number_unsigned_t step, f_string_maps_t * const maps) { #ifndef _di_level_0_parameter_checking_ if (!maps) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && maps->used + 1 > maps->size) { - f_array_length_t size = maps->used + step; + f_number_unsigned_t size = maps->used + step; - if (size > F_array_length_t_size_d) { - if (maps->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (maps->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_string_maps_resize(size, maps); @@ -117,7 +117,7 @@ extern "C" { #endif // _di_f_string_maps_increase_ #ifndef _di_f_string_maps_increase_by_ - f_status_t f_string_maps_increase_by(const f_array_length_t amount, f_string_maps_t * const maps) { + f_status_t f_string_maps_increase_by(const f_number_unsigned_t amount, f_string_maps_t * const maps) { #ifndef _di_level_0_parameter_checking_ if (!maps) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -125,7 +125,7 @@ extern "C" { if (!amount) return F_data_not; if (maps->used + amount > maps->size) { - if (maps->used + amount > F_array_length_t_size_d) { + if (maps->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -137,7 +137,7 @@ extern "C" { #endif // _di_f_string_maps_increase_by_ #ifndef _di_f_string_maps_resize_ - f_status_t f_string_maps_resize(const f_array_length_t length, f_string_maps_t * const maps) { + f_status_t f_string_maps_resize(const f_number_unsigned_t length, f_string_maps_t * const maps) { #ifndef _di_level_0_parameter_checking_ if (!maps) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_string/c/string/maps.h b/level_0/f_string/c/string/maps.h index f2f9b2a..0609b7c 100644 --- a/level_0/f_string/c/string/maps.h +++ b/level_0/f_string/c/string/maps.h @@ -27,8 +27,8 @@ extern "C" { typedef struct { f_string_map_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_string_maps_t; #define f_string_maps_t_initialize f_string_statics_t_initialize @@ -66,7 +66,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_maps_adjust_ - extern f_status_t f_string_maps_adjust(const f_array_length_t length, f_string_maps_t * const maps); + extern f_status_t f_string_maps_adjust(const f_number_unsigned_t length, f_string_maps_t * const maps); #endif // _di_f_string_maps_adjust_ /** @@ -131,7 +131,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_maps_decimate_by_ - extern f_status_t f_string_maps_decimate_by(const f_array_length_t amount, f_string_maps_t * const maps); + extern f_status_t f_string_maps_decimate_by(const f_number_unsigned_t amount, f_string_maps_t * const maps); #endif // _di_f_string_maps_decimate_by_ /** @@ -154,13 +154,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_maps_decrease_by_ - extern f_status_t f_string_maps_decrease_by(const f_array_length_t amount, f_string_maps_t * const maps); + extern f_status_t f_string_maps_decrease_by(const f_number_unsigned_t amount, f_string_maps_t * const maps); #endif // _di_f_string_maps_decrease_by_ /** * Increase the size of the string maps array, but only if necessary. * - * If the given length is too large for the buffer, then attempt to set max buffer size (F_array_length_t_size_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -179,14 +179,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_maps_increase_ - extern f_status_t f_string_maps_increase(const f_array_length_t step, f_string_maps_t * const maps); + extern f_status_t f_string_maps_increase(const f_number_unsigned_t step, f_string_maps_t * const maps); #endif // _di_f_string_maps_increase_ /** * Resize the string maps 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -204,7 +204,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_maps_increase_by_ - extern f_status_t f_string_maps_increase_by(const f_array_length_t amount, f_string_maps_t * const maps); + extern f_status_t f_string_maps_increase_by(const f_number_unsigned_t amount, f_string_maps_t * const maps); #endif // _di_f_string_maps_increase_by_ /** @@ -223,7 +223,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_maps_resize_ - extern f_status_t f_string_maps_resize(const f_array_length_t length, f_string_maps_t * const maps); + extern f_status_t f_string_maps_resize(const f_number_unsigned_t length, f_string_maps_t * const maps); #endif // _di_f_string_maps_resize_ #ifdef __cplusplus diff --git a/level_0/f_string/c/string/mapss.c b/level_0/f_string/c/string/mapss.c index 9d6b89d..ae3d40f 100644 --- a/level_0/f_string/c/string/mapss.c +++ b/level_0/f_string/c/string/mapss.c @@ -8,7 +8,7 @@ extern "C" { #endif #ifndef _di_f_string_mapss_adjust_ - f_status_t f_string_mapss_adjust(const f_array_length_t length, f_string_mapss_t * const mapss) { + f_status_t f_string_mapss_adjust(const f_number_unsigned_t length, f_string_mapss_t * const mapss) { #ifndef _di_level_0_parameter_checking_ if (!mapss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -60,7 +60,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].used = 0; @@ -75,7 +75,7 @@ extern "C" { #endif // _di_f_string_mapss_append_all_ #ifndef _di_f_string_mapss_decimate_by_ - f_status_t f_string_mapss_decimate_by(const f_array_length_t amount, f_string_mapss_t * const mapss) { + f_status_t f_string_mapss_decimate_by(const f_number_unsigned_t amount, f_string_mapss_t * const mapss) { #ifndef _di_level_0_parameter_checking_ if (!mapss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -91,7 +91,7 @@ extern "C" { #endif // _di_f_string_mapss_decimate_by_ #ifndef _di_f_string_mapss_decrease_by_ - f_status_t f_string_mapss_decrease_by(const f_array_length_t amount, f_string_mapss_t * const mapss) { + f_status_t f_string_mapss_decrease_by(const f_number_unsigned_t amount, f_string_mapss_t * const mapss) { #ifndef _di_level_0_parameter_checking_ if (!mapss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -107,20 +107,20 @@ extern "C" { #endif // _di_f_string_mapss_decrease_by_ #ifndef _di_f_string_mapss_increase_ - f_status_t f_string_mapss_increase(const f_array_length_t step, f_string_mapss_t * const mapss) { + f_status_t f_string_mapss_increase(const f_number_unsigned_t step, f_string_mapss_t * const mapss) { #ifndef _di_level_0_parameter_checking_ if (!mapss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && mapss->used + 1 > mapss->size) { - f_array_length_t size = mapss->used + step; + f_number_unsigned_t size = mapss->used + step; - if (size > F_array_length_t_size_d) { - if (mapss->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (mapss->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_string_mapss_resize(size, mapss); @@ -131,7 +131,7 @@ extern "C" { #endif // _di_f_string_mapss_increase_ #ifndef _di_f_string_mapss_increase_by_ - f_status_t f_string_mapss_increase_by(const f_array_length_t amount, f_string_mapss_t * const mapss) { + f_status_t f_string_mapss_increase_by(const f_number_unsigned_t amount, f_string_mapss_t * const mapss) { #ifndef _di_level_0_parameter_checking_ if (!mapss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -139,7 +139,7 @@ extern "C" { if (!amount) return F_data_not; if (mapss->used + amount > mapss->size) { - if (mapss->used + amount > F_array_length_t_size_d) { + if (mapss->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -151,7 +151,7 @@ extern "C" { #endif // _di_f_string_mapss_increase_by_ #ifndef _di_f_string_mapss_resize_ - f_status_t f_string_mapss_resize(const f_array_length_t length, f_string_mapss_t * const mapss) { + f_status_t f_string_mapss_resize(const f_number_unsigned_t length, f_string_mapss_t * const mapss) { #ifndef _di_level_0_parameter_checking_ if (!mapss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_string/c/string/mapss.h b/level_0/f_string/c/string/mapss.h index 3732850..3b84554 100644 --- a/level_0/f_string/c/string/mapss.h +++ b/level_0/f_string/c/string/mapss.h @@ -27,8 +27,8 @@ extern "C" { typedef struct { f_string_maps_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_string_mapss_t; #define f_string_mapss_t_initialize f_string_statics_t_initialize @@ -66,7 +66,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_mapss_adjust_ - extern f_status_t f_string_mapss_adjust(const f_array_length_t length, f_string_mapss_t * const mapss); + extern f_status_t f_string_mapss_adjust(const f_number_unsigned_t length, f_string_mapss_t * const mapss); #endif // _di_f_string_mapss_adjust_ /** @@ -131,7 +131,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_mapss_decimate_by_ - extern f_status_t f_string_mapss_decimate_by(const f_array_length_t amount, f_string_mapss_t * const mapss); + extern f_status_t f_string_mapss_decimate_by(const f_number_unsigned_t amount, f_string_mapss_t * const mapss); #endif // _di_f_string_mapss_decimate_by_ /** @@ -155,13 +155,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_mapss_decrease_by_ - extern f_status_t f_string_mapss_decrease_by(const f_array_length_t amount, f_string_mapss_t * const mapss); + extern f_status_t f_string_mapss_decrease_by(const f_number_unsigned_t amount, f_string_mapss_t * const mapss); #endif // _di_f_string_mapss_decrease_by_ /** * Increase the size of the string mapss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -180,14 +180,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_mapss_increase_ - extern f_status_t f_string_mapss_increase(const f_array_length_t step, f_string_mapss_t * const mapss); + extern f_status_t f_string_mapss_increase(const f_number_unsigned_t step, f_string_mapss_t * const mapss); #endif // _di_f_string_mapss_increase_ /** * Resize the string mapss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -205,7 +205,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_mapss_increase_by_ - extern f_status_t f_string_mapss_increase_by(const f_array_length_t amount, f_string_mapss_t * const mapss); + extern f_status_t f_string_mapss_increase_by(const f_number_unsigned_t amount, f_string_mapss_t * const mapss); #endif // _di_f_string_mapss_increase_by_ /** @@ -224,7 +224,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_mapss_resize_ - extern f_status_t f_string_mapss_resize(const f_array_length_t length, f_string_mapss_t * const mapss); + extern f_status_t f_string_mapss_resize(const f_number_unsigned_t length, f_string_mapss_t * const mapss); #endif // _di_f_string_mapss_resize_ #ifdef __cplusplus diff --git a/level_0/f_string/c/string/private-dynamic.c b/level_0/f_string/c/string/private-dynamic.c index e3da0a0..f2542fd 100644 --- a/level_0/f_string/c/string/private-dynamic.c +++ b/level_0/f_string/c/string/private-dynamic.c @@ -7,7 +7,7 @@ extern "C" { #endif #if !defined(_di_f_string_dynamic_adjust_) || !defined(_di_f_string_dynamic_decimate_by_) || !defined(_di_f_string_dynamics_adjust_) || !defined(_di_f_string_dynamics_append_) || !defined(_di_f_string_dynamics_decimate_by_) || !defined(_di_f_string_map_multis_adjust_) || !defined(_di_f_string_map_multis_append_) || !defined(_di_f_string_triples_adjust_) || !defined(_di_f_string_triples_decimate_by_) - f_status_t private_f_string_dynamic_adjust(const f_array_length_t length, f_string_dynamic_t * const dynamic) { + f_status_t private_f_string_dynamic_adjust(const f_number_unsigned_t length, f_string_dynamic_t * const dynamic) { const f_status_t status = f_memory_adjust(dynamic->size, length, sizeof(f_char_t), (void **) & dynamic->string); if (F_status_is_error(status)) return status; @@ -23,7 +23,7 @@ extern "C" { #endif // !defined(_di_f_string_dynamic_adjust_) || !defined(_di_f_string_dynamic_decimate_by_) || !defined(_di_f_string_dynamics_adjust_) || !defined(_di_f_string_dynamics_append_) || !defined(_di_f_string_dynamics_decimate_by_) || !defined(_di_f_string_map_multis_adjust_) || !defined(_di_f_string_map_multis_append_) || !defined(_di_f_string_triples_adjust_) || !defined(_di_f_string_triples_decimate_by_) #if !defined(_di_f_string_append_) || !defined(_di_f_string_append_assure_) || !defined(_di_f_string_append_mash_) || !defined(_di_f_string_append_nulless_) || !defined(_di_f_string_dynamic_append_) || !defined(_di_f_string_dynamic_append_assure_) || !defined(_di_f_string_dynamic_append_nulless_) || !defined(_di_f_string_dynamic_increase_by_) || !defined(_di_f_string_dynamic_mash_) || !defined(_di_f_string_dynamic_mash_nulless_) || !defined(_di_f_string_dynamic_partial_append_) || !defined(_di_f_string_dynamic_partial_append_assure_) || !defined(_di_f_string_dynamic_partial_mash_) || !defined(_di_f_string_dynamic_prepend_) || !defined(_di_f_string_dynamic_prepend_nulless_) || !defined(_di_f_string_dynamics_append_) || !defined(_di_f_string_map_multis_append_) || !defined(_di_f_string_mash_) || !defined(_di_f_string_mash_nulless_) || !defined(_di_f_string_maps_append_) || !defined(_di_f_string_prepend_) || !defined(_di_f_string_prepend_nulless_) || !defined(_di_f_string_triples_append_) - f_status_t private_f_string_dynamic_increase_by(const f_array_length_t amount, f_string_dynamic_t * const dynamic) { + f_status_t private_f_string_dynamic_increase_by(const f_number_unsigned_t amount, f_string_dynamic_t * const dynamic) { if (dynamic->used + amount > dynamic->size) { if (dynamic->used + amount > F_string_t_size_d) { @@ -38,7 +38,7 @@ extern "C" { #endif // !defined(_di_f_string_append_) || !defined(_di_f_string_append_assure_) || !defined(_di_f_string_append_mash_) || !defined(_di_f_string_append_nulless_) || !defined(_di_f_string_dynamic_append_) || !defined(_di_f_string_dynamic_append_assure_) || !defined(_di_f_string_dynamic_append_nulless_) || !defined(_di_f_string_dynamic_increase_by_) || !defined(_di_f_string_dynamic_mash_) || !defined(_di_f_string_dynamic_mash_nulless_) || !defined(_di_f_string_dynamic_partial_append_) || !defined(_di_f_string_dynamic_partial_append_assure_) || !defined(_di_f_string_dynamic_partial_mash_) || !defined(_di_f_string_dynamic_prepend_) || !defined(_di_f_string_dynamic_prepend_nulless_) || !defined(_di_f_string_dynamics_append_) || !defined(_di_f_string_map_multis_append_) || !defined(_di_f_string_mash_) || !defined(_di_f_string_mash_nulless_) || !defined(_di_f_string_maps_append_) || !defined(_di_f_string_prepend_) || !defined(_di_f_string_prepend_nulless_) || !defined(_di_f_string_triples_append_) #if !defined(_di_f_string_append_) || !defined(_di_f_string_append_assure_) || !defined(_di_f_string_append_mash_) || !defined(_di_f_string_append_nulless_) || !defined(_di_f_string_dynamic_append_) || !defined(_di_f_string_dynamic_append_assure_) || !defined(_di_f_string_dynamic_append_nulless_) || !defined(_di_f_string_dynamic_decrease_by_) || !defined(_di_f_string_dynamic_increase_) || !defined(_di_f_string_dynamic_increase_by_) || !defined(_di_f_string_dynamic_mash_) || !defined(_di_f_string_dynamic_mash_nulless_) || !defined(f_string_dynamic_partial_append) || !defined(_di_f_string_dynamic_partial_append_assure_) || !defined(_di_f_string_dynamic_partial_mash_) || !defined(_di_f_string_dynamic_prepend_) || !defined(_di_f_string_dynamic_prepend_nulless_) || !defined(_di_f_string_dynamic_terminate_) || !defined(_di_f_string_dynamic_terminate_after_) || !defined(_di_f_string_dynamics_append_) || !defined(_di_f_string_map_multis_append_) || !defined(_di_f_string_mash_nulless_) || !defined(_di_f_string_mash_) || !defined(_di_f_string_maps_append_) || !defined(_di_f_string_prepend_) || !defined(_di_f_string_prepend_nulless_) || !defined(_di_f_string_triples_append_) - f_status_t private_f_string_dynamic_resize(const f_array_length_t length, f_string_dynamic_t * const dynamic) { + f_status_t private_f_string_dynamic_resize(const f_number_unsigned_t length, f_string_dynamic_t * const dynamic) { const f_status_t status = f_memory_resize(dynamic->size, length, sizeof(f_char_t), (void **) & dynamic->string); if (F_status_is_error(status)) return status; diff --git a/level_0/f_string/c/string/private-dynamic.h b/level_0/f_string/c/string/private-dynamic.h index 44a2dec..504366a 100644 --- a/level_0/f_string/c/string/private-dynamic.h +++ b/level_0/f_string/c/string/private-dynamic.h @@ -42,7 +42,7 @@ extern "C" { * @see f_string_triples_decimate_by() */ #if !defined(_di_f_string_dynamic_adjust_) || !defined(_di_f_string_dynamic_decimate_by_) || !defined(_di_f_string_dynamics_adjust_) || !defined(_di_f_string_dynamics_append_) || !defined(_di_f_string_dynamics_decimate_by_) || !defined(_di_f_string_map_multis_adjust_) || !defined(_di_f_string_map_multis_append_) || !defined(_di_f_string_triples_adjust_) || !defined(_di_f_string_triples_decimate_by_) - extern f_status_t private_f_string_dynamic_adjust(const f_array_length_t length, f_string_dynamic_t * const dynamic) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_dynamic_adjust(const f_number_unsigned_t length, f_string_dynamic_t * const dynamic) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_dynamic_adjust_) || !defined(_di_f_string_dynamic_decimate_by_) || !defined(_di_f_string_dynamics_adjust_) || !defined(_di_f_string_dynamics_append_) || !defined(_di_f_string_dynamics_decimate_by_) || !defined(_di_f_string_map_multis_adjust_) || !defined(_di_f_string_map_multis_append_) || !defined(_di_f_string_triples_adjust_) || !defined(_di_f_string_triples_decimate_by_) /** @@ -90,7 +90,7 @@ extern "C" { * @see f_string_triples_append() */ #if !defined(_di_f_string_append_) || !defined(_di_f_string_append_assure_) || !defined(_di_f_string_append_mash_) || !defined(_di_f_string_append_nulless_) || !defined(_di_f_string_dynamic_append_) || !defined(_di_f_string_dynamic_append_assure_) || !defined(_di_f_string_dynamic_append_nulless_) || !defined(_di_f_string_dynamic_increase_by_) || !defined(_di_f_string_dynamic_mash_) || !defined(_di_f_string_dynamic_mash_nulless_) || !defined(_di_f_string_dynamic_partial_append_) || !defined(_di_f_string_dynamic_partial_append_assure_) || !defined(_di_f_string_dynamic_partial_mash_) || !defined(_di_f_string_dynamic_prepend_) || !defined(_di_f_string_dynamic_prepend_nulless_) || !defined(_di_f_string_dynamics_append_) || !defined(_di_f_string_map_multis_append_) || !defined(_di_f_string_mash_) || !defined(_di_f_string_mash_nulless_) || !defined(_di_f_string_maps_append_) || !defined(_di_f_string_prepend_) || !defined(_di_f_string_prepend_nulless_) || !defined(_di_f_string_triples_append_) - extern f_status_t private_f_string_dynamic_increase_by(const f_array_length_t amount, f_string_dynamic_t * const dynamic) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_dynamic_increase_by(const f_number_unsigned_t amount, f_string_dynamic_t * const dynamic) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_append_) || !defined(_di_f_string_append_assure_) || !defined(_di_f_string_append_mash_) || !defined(_di_f_string_append_nulless_) || !defined(_di_f_string_dynamic_append_) || !defined(_di_f_string_dynamic_append_assure_) || !defined(_di_f_string_dynamic_append_nulless_) || !defined(_di_f_string_dynamic_increase_by_) || !defined(_di_f_string_dynamic_mash_) || !defined(_di_f_string_dynamic_mash_nulless_) || !defined(_di_f_string_dynamic_partial_append_) || !defined(_di_f_string_dynamic_partial_append_assure_) || !defined(_di_f_string_dynamic_partial_mash_) || !defined(_di_f_string_dynamic_prepend_) || !defined(_di_f_string_dynamic_prepend_nulless_) || !defined(_di_f_string_dynamics_append_) || !defined(_di_f_string_map_multis_append_) || !defined(_di_f_string_mash_) || !defined(_di_f_string_mash_nulless_) || !defined(_di_f_string_maps_append_) || !defined(_di_f_string_prepend_) || !defined(_di_f_string_prepend_nulless_) || !defined(_di_f_string_triples_append_) /** @@ -138,7 +138,7 @@ extern "C" { * @see f_string_triples_append() */ #if !defined(_di_f_string_append_) || !defined(_di_f_string_append_assure_) || !defined(_di_f_string_append_mash_) || !defined(_di_f_string_append_nulless_) || !defined(_di_f_string_dynamic_append_) || !defined(_di_f_string_dynamic_append_assure_) || !defined(_di_f_string_dynamic_append_nulless_) || !defined(_di_f_string_dynamic_decrease_by_) || !defined(_di_f_string_dynamic_increase_) || !defined(_di_f_string_dynamic_increase_by_) || !defined(_di_f_string_dynamic_mash_) || !defined(_di_f_string_dynamic_mash_nulless_) || !defined(f_string_dynamic_partial_append) || !defined(_di_f_string_dynamic_partial_append_assure_) || !defined(_di_f_string_dynamic_partial_mash_) || !defined(_di_f_string_dynamic_prepend_) || !defined(_di_f_string_dynamic_prepend_nulless_) || !defined(_di_f_string_dynamic_terminate_) || !defined(_di_f_string_dynamic_terminate_after_) || !defined(_di_f_string_dynamics_append_) || !defined(_di_f_string_map_multis_append_) || !defined(_di_f_string_mash_nulless_) || !defined(_di_f_string_mash_) || !defined(_di_f_string_maps_append_) || !defined(_di_f_string_prepend_) || !defined(_di_f_string_prepend_nulless_) || !defined(_di_f_string_triples_append_) - extern f_status_t private_f_string_dynamic_resize(const f_array_length_t length, f_string_dynamic_t * const dynamic) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_dynamic_resize(const f_number_unsigned_t length, f_string_dynamic_t * const dynamic) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_append_) || !defined(_di_f_string_append_assure_) || !defined(_di_f_string_append_mash_) || !defined(_di_f_string_append_nulless_) || !defined(_di_f_string_dynamic_append_) || !defined(_di_f_string_dynamic_append_assure_) || !defined(_di_f_string_dynamic_append_nulless_) || !defined(_di_f_string_dynamic_decrease_by_) || !defined(_di_f_string_dynamic_increase_) || !defined(_di_f_string_dynamic_increase_by_) || !defined(_di_f_string_dynamic_mash_) || !defined(_di_f_string_dynamic_mash_nulless_) || !defined(f_string_dynamic_partial_append) || !defined(_di_f_string_dynamic_partial_append_assure_) || !defined(_di_f_string_dynamic_partial_mash_) || !defined(_di_f_string_dynamic_prepend_) || !defined(_di_f_string_dynamic_prepend_nulless_) || !defined(_di_f_string_dynamic_terminate_) || !defined(_di_f_string_dynamic_terminate_after_) || !defined(_di_f_string_dynamics_append_) || !defined(_di_f_string_map_multis_append_) || !defined(_di_f_string_mash_nulless_) || !defined(_di_f_string_mash_) || !defined(_di_f_string_maps_append_) || !defined(_di_f_string_prepend_) || !defined(_di_f_string_prepend_nulless_) || !defined(_di_f_string_triples_append_) #ifdef __cplusplus diff --git a/level_0/f_string/c/string/private-dynamics.c b/level_0/f_string/c/string/private-dynamics.c index 91e0540..26552fc 100644 --- a/level_0/f_string/c/string/private-dynamics.c +++ b/level_0/f_string/c/string/private-dynamics.c @@ -8,13 +8,13 @@ extern "C" { #endif #if !defined(_di_f_string_dynamics_adjust_) || !defined(_di_f_string_dynamics_append_) || !defined(_di_f_string_dynamics_decimate_by_) || !defined(_di_f_string_map_multis_adjust_) || !defined(_di_f_string_map_multis_append_) - f_status_t private_f_string_dynamics_adjust(const f_array_length_t length, f_string_dynamics_t * const dynamics) { + f_status_t private_f_string_dynamics_adjust(const f_number_unsigned_t length, f_string_dynamics_t * const dynamics) { - if (dynamics->used + length > F_array_length_t_size_d) return F_status_set_error(F_array_too_large); + if (dynamics->used + length > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large); f_status_t status = F_none; - for (f_array_length_t i = length; i < dynamics->size; ++i) { + for (f_number_unsigned_t i = length; i < dynamics->size; ++i) { status = private_f_string_dynamic_adjust(0, &dynamics->array[i]); if (F_status_is_error(status)) return status; @@ -66,7 +66,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].used = 0; @@ -81,13 +81,13 @@ extern "C" { #endif // !defined(_di_f_string_dynamics_append_all_) || !defined(_di_f_string_map_multis_append_) || !defined(_di_f_string_map_multis_append_all_) #if !defined(_di_f_string_dynamics_decrease_by_) || !defined(_di_f_string_dynamics_increase_) || !defined(_di_f_string_dynamics_increase_by_) || !defined(f_string_dynamics_resize) || !defined(_di_f_string_map_multis_append_) || !defined(_di_f_string_map_multis_append_all_) || !defined(_di_f_string_map_multis_decrease_by_) || !defined(_di_f_string_map_multis_increase_) || !defined(_di_f_string_map_multis_increase_by_) || !defined(_di_f_string_map_multis_resize_) || !defined(_di_f_string_map_multiss_append_) || !defined(_di_f_string_map_multiss_append_all_) || !defined(_di_f_string_map_multiss_decrease_by_) || !defined(_di_f_string_map_multiss_increase_) || !defined(_di_f_string_map_multiss_increase_by_) - f_status_t private_f_string_dynamics_resize(const f_array_length_t length, f_string_dynamics_t * const dynamics) { + f_status_t private_f_string_dynamics_resize(const f_number_unsigned_t length, f_string_dynamics_t * const dynamics) { - if (dynamics->used + length > F_array_length_t_size_d) return F_status_set_error(F_array_too_large); + if (dynamics->used + length > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large); f_status_t status = F_none; - for (f_array_length_t i = length; i < dynamics->size; ++i) { + for (f_number_unsigned_t i = length; i < dynamics->size; ++i) { status = private_f_string_dynamic_resize(0, &dynamics->array[i]); if (F_status_is_error(status)) return status; diff --git a/level_0/f_string/c/string/private-dynamics.h b/level_0/f_string/c/string/private-dynamics.h index 382b72e..7508fee 100644 --- a/level_0/f_string/c/string/private-dynamics.h +++ b/level_0/f_string/c/string/private-dynamics.h @@ -41,7 +41,7 @@ extern "C" { * @see f_string_map_multis_append() */ #if !defined(_di_f_string_dynamics_adjust_) || !defined(_di_f_string_dynamics_append_) || !defined(_di_f_string_dynamics_decimate_by_) || !defined(_di_f_string_map_multis_adjust_) || !defined(_di_f_string_map_multis_append_) - extern f_status_t private_f_string_dynamics_adjust(const f_array_length_t length, f_string_dynamics_t * const dynamics) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_dynamics_adjust(const f_number_unsigned_t length, f_string_dynamics_t * const dynamics) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_dynamics_adjust_) || !defined(_di_f_string_dynamics_append_) || !defined(_di_f_string_dynamics_decimate_by_) || !defined(_di_f_string_map_multis_adjust_) || !defined(_di_f_string_map_multis_append_) /** @@ -134,7 +134,7 @@ extern "C" { * @see f_string_map_multiss_increase_by() */ #if !defined(_di_f_string_dynamics_decrease_by_) || !defined(_di_f_string_dynamics_increase_) || !defined(_di_f_string_dynamics_increase_by_) || !defined(f_string_dynamics_resize) || !defined(_di_f_string_map_multis_append_) || !defined(_di_f_string_map_multis_append_all_) || !defined(_di_f_string_map_multis_decrease_by_) || !defined(_di_f_string_map_multis_increase_) || !defined(_di_f_string_map_multis_increase_by_) || !defined(_di_f_string_map_multis_resize_) || !defined(_di_f_string_map_multiss_append_) || !defined(_di_f_string_map_multiss_append_all_) || !defined(_di_f_string_map_multiss_decrease_by_) || !defined(_di_f_string_map_multiss_increase_) || !defined(_di_f_string_map_multiss_increase_by_) - extern f_status_t private_f_string_dynamics_resize(const f_array_length_t length, f_string_dynamics_t * const dynamics) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_dynamics_resize(const f_number_unsigned_t length, f_string_dynamics_t * const dynamics) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_dynamics_decrease_by_) || !defined(_di_f_string_dynamics_increase_) || !defined(_di_f_string_dynamics_increase_by_) || !defined(f_string_dynamics_resize) || !defined(_di_f_string_map_multis_append_) || !defined(_di_f_string_map_multis_append_all_) || !defined(_di_f_string_map_multis_decrease_by_) || !defined(_di_f_string_map_multis_increase_) || !defined(_di_f_string_map_multis_increase_by_) || !defined(_di_f_string_map_multis_resize_) || !defined(_di_f_string_map_multiss_append_) || !defined(_di_f_string_map_multiss_append_all_) || !defined(_di_f_string_map_multiss_decrease_by_) || !defined(_di_f_string_map_multiss_increase_) || !defined(_di_f_string_map_multiss_increase_by_) #ifdef __cplusplus diff --git a/level_0/f_string/c/string/private-dynamicss.c b/level_0/f_string/c/string/private-dynamicss.c index 09a69fb..e36b7bb 100644 --- a/level_0/f_string/c/string/private-dynamicss.c +++ b/level_0/f_string/c/string/private-dynamicss.c @@ -9,13 +9,13 @@ extern "C" { #endif #if !defined(_di_f_string_dynamicss_adjust_) || !defined(_di_f_string_dynamicss_append_) || !defined(_di_f_string_dynamicss_decimate_by_) || !defined(_di_f_string_map_multis_adjust_) || !defined(_di_f_string_map_multis_append_) - f_status_t private_f_string_dynamicss_adjust(const f_array_length_t length, f_string_dynamicss_t * const dynamicss) { + f_status_t private_f_string_dynamicss_adjust(const f_number_unsigned_t length, f_string_dynamicss_t * const dynamicss) { - if (dynamicss->used + length > F_array_length_t_size_d) return F_status_set_error(F_array_too_large); + if (dynamicss->used + length > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large); f_status_t status = F_none; - for (f_array_length_t i = length; i < dynamicss->size; ++i) { + for (f_number_unsigned_t i = length; i < dynamicss->size; ++i) { status = private_f_string_dynamics_adjust(0, &dynamicss->array[i]); if (F_status_is_error(status)) return status; @@ -35,13 +35,13 @@ extern "C" { #endif // !defined(_di_f_string_dynamicss_adjust_) || !defined(_di_f_string_dynamicss_append_) || !defined(_di_f_string_dynamicss_decimate_by_) || !defined(_di_f_string_map_multis_adjust_) || !defined(_di_f_string_map_multis_append_) #if !defined(_di_f_string_dynamicss_decrease_by_) || !defined(_di_f_string_dynamicss_increase_) || !defined(_di_f_string_dynamicss_increase_by_) || !defined(_di_f_string_dynamicss_append_all_) || !defined(_di_f_string_map_multis_append_all_) - f_status_t private_f_string_dynamicss_resize(const f_array_length_t length, f_string_dynamicss_t * const dynamicss) { + f_status_t private_f_string_dynamicss_resize(const f_number_unsigned_t length, f_string_dynamicss_t * const dynamicss) { - if (dynamicss->used + length > F_array_length_t_size_d) return F_status_set_error(F_array_too_large); + if (dynamicss->used + length > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large); f_status_t status = F_none; - for (f_array_length_t i = length; i < dynamicss->size; ++i) { + for (f_number_unsigned_t i = length; i < dynamicss->size; ++i) { status = private_f_string_dynamics_resize(0, &dynamicss->array[i]); if (F_status_is_error(status)) return status; diff --git a/level_0/f_string/c/string/private-dynamicss.h b/level_0/f_string/c/string/private-dynamicss.h index f80c85a..1a4a796 100644 --- a/level_0/f_string/c/string/private-dynamicss.h +++ b/level_0/f_string/c/string/private-dynamicss.h @@ -41,7 +41,7 @@ extern "C" { * @see f_string_map_multis_append() */ #if !defined(_di_f_string_dynamicss_adjust_) || !defined(_di_f_string_dynamicss_append_) || !defined(_di_f_string_dynamicss_decimate_by_) || !defined(_di_f_string_map_multis_adjust_) || !defined(_di_f_string_map_multis_append_) - extern f_status_t private_f_string_dynamicss_adjust(const f_array_length_t length, f_string_dynamicss_t * const dynamicss) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_dynamicss_adjust(const f_number_unsigned_t length, f_string_dynamicss_t * const dynamicss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_dynamicss_adjust_) || !defined(_di_f_string_dynamicss_append_) || !defined(_di_f_string_dynamicss_decimate_by_) || !defined(_di_f_string_map_multis_adjust_) || !defined(_di_f_string_map_multis_append_) /** @@ -70,7 +70,7 @@ extern "C" { * @see f_string_map_multis_append_all() */ #if !defined(_di_f_string_dynamicss_decrease_by_) || !defined(_di_f_string_dynamicss_increase_) || !defined(_di_f_string_dynamicss_increase_by_) || !defined(_di_f_string_dynamicss_append_all_) || !defined(_di_f_string_map_multis_append_all_) - extern f_status_t private_f_string_dynamicss_resize(const f_array_length_t length, f_string_dynamicss_t * const dynamicss) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_dynamicss_resize(const f_number_unsigned_t length, f_string_dynamicss_t * const dynamicss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_dynamicss_decrease_by_) || !defined(_di_f_string_dynamicss_increase_) || !defined(_di_f_string_dynamicss_increase_by_) || !defined(_di_f_string_dynamicss_append_all_) || !defined(_di_f_string_map_multis_append_all_) #ifdef __cplusplus diff --git a/level_0/f_string/c/string/private-map_multis.c b/level_0/f_string/c/string/private-map_multis.c index e43a8a8..fcbdb86 100644 --- a/level_0/f_string/c/string/private-map_multis.c +++ b/level_0/f_string/c/string/private-map_multis.c @@ -9,15 +9,15 @@ extern "C" { #endif #if !defined(_di_f_string_map_multis_adjust_) || !defined(_di_f_string_map_multis_decimate_by_) - f_status_t private_f_string_map_multis_adjust(const f_array_length_t length, f_string_map_multis_t * const map_multis) { + f_status_t private_f_string_map_multis_adjust(const f_number_unsigned_t length, f_string_map_multis_t * const map_multis) { - if (map_multis->used + length > F_array_length_t_size_d) { + if (map_multis->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < map_multis->size; ++i) { + for (f_number_unsigned_t i = length; i < map_multis->size; ++i) { status = private_f_string_dynamic_adjust(0, &map_multis->array[i].name); if (F_status_is_error(status)) return status; @@ -49,7 +49,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].name.used = 0; destination->array[destination->used].value.used = 0; @@ -70,15 +70,15 @@ extern "C" { #endif // !defined(_di_f_string_map_multis_append_all_) || !defined(_di_f_string_map_multiss_append_) || !defined(_di_f_string_map_multiss_append_all_) #if !defined(_di_f_string_map_multis_append_) || !defined(_di_f_string_map_multis_append_all_) || !defined(_di_f_string_map_multis_decrease_by_) || !defined(_di_f_string_map_multis_increase_) || !defined(_di_f_string_map_multis_increase_by_) || !defined(_di_f_string_map_multis_resize_) || !defined(_di_f_string_map_multiss_append_) || !defined(_di_f_string_map_multiss_append_all_) || !defined(_di_f_string_map_multiss_decrease_by_) || !defined(_di_f_string_map_multiss_increase_) || !defined(_di_f_string_map_multiss_increase_by_) - f_status_t private_f_string_map_multis_resize(const f_array_length_t length, f_string_map_multis_t * const map_multis) { + f_status_t private_f_string_map_multis_resize(const f_number_unsigned_t length, f_string_map_multis_t * const map_multis) { - if (map_multis->used + length > F_array_length_t_size_d) { + if (map_multis->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < map_multis->size; ++i) { + for (f_number_unsigned_t i = length; i < map_multis->size; ++i) { status = private_f_string_dynamic_resize(0, &map_multis->array[i].name); if (F_status_is_error(status)) return status; diff --git a/level_0/f_string/c/string/private-map_multis.h b/level_0/f_string/c/string/private-map_multis.h index 23342b0..a823653 100644 --- a/level_0/f_string/c/string/private-map_multis.h +++ b/level_0/f_string/c/string/private-map_multis.h @@ -37,7 +37,7 @@ extern "C" { * @see f_string_map_multis_adjust() */ #if !defined(_di_f_string_map_multis_adjust_) || !defined(_di_f_string_map_multis_decimate_by_) - extern f_status_t private_f_string_map_multis_adjust(const f_array_length_t length, f_string_map_multis_t * const map_multis) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_map_multis_adjust(const f_number_unsigned_t length, f_string_map_multis_t * const map_multis) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_map_multis_adjust_) || !defined(_di_f_string_map_multis_decimate_by_) /** @@ -99,7 +99,7 @@ extern "C" { * @see f_string_map_multiss_increase_by() */ #if !defined(_di_f_string_map_multis_append_) || !defined(_di_f_string_map_multis_append_all_) || !defined(_di_f_string_map_multis_decrease_by_) || !defined(_di_f_string_map_multis_increase_) || !defined(_di_f_string_map_multis_increase_by_) || !defined(_di_f_string_map_multis_resize_) || !defined(_di_f_string_map_multiss_append_) || !defined(_di_f_string_map_multiss_append_all_) || !defined(_di_f_string_map_multiss_decrease_by_) || !defined(_di_f_string_map_multiss_increase_) || !defined(_di_f_string_map_multiss_increase_by_) - extern f_status_t private_f_string_map_multis_resize(const f_array_length_t length, f_string_map_multis_t * const map_multis) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_map_multis_resize(const f_number_unsigned_t length, f_string_map_multis_t * const map_multis) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_map_multis_append_) || !defined(_di_f_string_map_multis_append_all_) || !defined(_di_f_string_map_multis_decrease_by_) || !defined(_di_f_string_map_multis_increase_) || !defined(_di_f_string_map_multis_increase_by_) || !defined(_di_f_string_map_multis_resize_) || !defined(_di_f_string_map_multiss_append_) || !defined(_di_f_string_map_multiss_append_all_) || !defined(_di_f_string_map_multiss_decrease_by_) || !defined(_di_f_string_map_multiss_increase_) || !defined(_di_f_string_map_multiss_increase_by_) #ifdef __cplusplus diff --git a/level_0/f_string/c/string/private-map_multiss.c b/level_0/f_string/c/string/private-map_multiss.c index e3d83cd..f25b375 100644 --- a/level_0/f_string/c/string/private-map_multiss.c +++ b/level_0/f_string/c/string/private-map_multiss.c @@ -10,15 +10,15 @@ extern "C" { #endif #if !defined(_di_f_string_map_multiss_adjust_) || !defined(_di_f_string_map_multiss_decimate_by_) - f_status_t private_f_string_map_multiss_adjust(const f_array_length_t length, f_string_map_multiss_t * const map_multiss) { + f_status_t private_f_string_map_multiss_adjust(const f_number_unsigned_t length, f_string_map_multiss_t * const map_multiss) { - if (map_multiss->used + length > F_array_length_t_size_d) { + if (map_multiss->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < map_multiss->size; ++i) { + for (f_number_unsigned_t i = length; i < map_multiss->size; ++i) { status = private_f_string_map_multis_adjust(0, &map_multiss->array[i]); if (F_status_is_error(status)) return status; @@ -38,15 +38,15 @@ extern "C" { #endif // !defined(_di_f_string_map_multiss_adjust_) || !defined(_di_f_string_map_multiss_decimate_by_) #if !defined(_di_f_string_map_multiss_decrease_by_) || !defined(_di_f_string_map_multiss_increase_) || !defined(_di_f_string_map_multiss_increase_by_) - f_status_t private_f_string_map_multiss_resize(const f_array_length_t length, f_string_map_multiss_t * const map_multiss) { + f_status_t private_f_string_map_multiss_resize(const f_number_unsigned_t length, f_string_map_multiss_t * const map_multiss) { - if (map_multiss->used + length > F_array_length_t_size_d) { + if (map_multiss->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < map_multiss->size; ++i) { + for (f_number_unsigned_t i = length; i < map_multiss->size; ++i) { status = private_f_string_map_multis_resize(0, &map_multiss->array[i]); if (F_status_is_error(status)) return status; diff --git a/level_0/f_string/c/string/private-map_multiss.h b/level_0/f_string/c/string/private-map_multiss.h index 4d6df41..2cacd1b 100644 --- a/level_0/f_string/c/string/private-map_multiss.h +++ b/level_0/f_string/c/string/private-map_multiss.h @@ -37,7 +37,7 @@ extern "C" { * @see f_string_map_multiss_adjust() */ #if !defined(_di_f_string_map_multiss_adjust_) || !defined(_di_f_string_map_multiss_decimate_by_) - extern f_status_t private_f_string_map_multiss_adjust(const f_array_length_t length, f_string_map_multiss_t * const map_multiss) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_map_multiss_adjust(const f_number_unsigned_t length, f_string_map_multiss_t * const map_multiss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_map_multiss_adjust_) || !defined(_di_f_string_map_multiss_decimate_by_) /** @@ -64,7 +64,7 @@ extern "C" { * @see f_string_map_multiss_increase_by() */ #if !defined(_di_f_string_map_multiss_decrease_by_) || !defined(_di_f_string_map_multiss_increase_) || !defined(_di_f_string_map_multiss_increase_by_) - extern f_status_t private_f_string_map_multiss_resize(const f_array_length_t length, f_string_map_multiss_t * const map_multiss) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_map_multiss_resize(const f_number_unsigned_t length, f_string_map_multiss_t * const map_multiss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_map_multiss_decrease_by_) || !defined(_di_f_string_map_multiss_increase_) || !defined(_di_f_string_map_multiss_increase_by_) #ifdef __cplusplus diff --git a/level_0/f_string/c/string/private-maps.c b/level_0/f_string/c/string/private-maps.c index d800cb9..18588cd 100644 --- a/level_0/f_string/c/string/private-maps.c +++ b/level_0/f_string/c/string/private-maps.c @@ -8,15 +8,15 @@ extern "C" { #endif #if !defined(_di_f_string_maps_adjust_) || !defined(_di_f_string_maps_decimate_by_) - f_status_t private_f_string_maps_adjust(const f_array_length_t length, f_string_maps_t * const maps) { + f_status_t private_f_string_maps_adjust(const f_number_unsigned_t length, f_string_maps_t * const maps) { - if (maps->used + length > F_array_length_t_size_d) { + if (maps->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < maps->size; ++i) { + for (f_number_unsigned_t i = length; i < maps->size; ++i) { status = private_f_string_dynamic_adjust(0, &maps->array[i].name); if (F_status_is_error(status)) return status; @@ -48,7 +48,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].name.used = 0; destination->array[destination->used].value.used = 0; @@ -69,15 +69,15 @@ extern "C" { #endif // !defined(_di_f_string_maps_append_all_) || !defined(_di_f_string_mapss_append_) || !defined(_di_f_string_mapss_append_all_) #if !defined(_di_f_string_maps_append_) || !defined(_di_f_string_maps_append_all_) || !defined(_di_f_string_maps_decrease_by_) || !defined(_di_f_string_maps_increase_) || !defined(_di_f_string_maps_increase_by_) || !defined(_di_f_string_maps_resize_) || !defined(_di_f_string_mapss_append_) || !defined(_di_f_string_mapss_append_all_) || !defined(_di_f_string_mapss_decrease_by_) || !defined(_di_f_string_mapss_increase_) || !defined(_di_f_string_mapss_increase_by_) - f_status_t private_f_string_maps_resize(const f_array_length_t length, f_string_maps_t * const maps) { + f_status_t private_f_string_maps_resize(const f_number_unsigned_t length, f_string_maps_t * const maps) { - if (maps->used + length > F_array_length_t_size_d) { + if (maps->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < maps->size; ++i) { + for (f_number_unsigned_t i = length; i < maps->size; ++i) { status = private_f_string_dynamic_resize(0, &maps->array[i].name); if (F_status_is_error(status)) return status; diff --git a/level_0/f_string/c/string/private-maps.h b/level_0/f_string/c/string/private-maps.h index 6d8e693..59a867f 100644 --- a/level_0/f_string/c/string/private-maps.h +++ b/level_0/f_string/c/string/private-maps.h @@ -36,7 +36,7 @@ extern "C" { * @see f_string_maps_adjust() */ #if !defined(_di_f_string_maps_adjust_) || !defined(_di_f_string_maps_decimate_by_) - extern f_status_t private_f_string_maps_adjust(const f_array_length_t length, f_string_maps_t * const maps) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_maps_adjust(const f_number_unsigned_t length, f_string_maps_t * const maps) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_maps_adjust_) || !defined(_di_f_string_maps_decimate_by_) /** @@ -96,7 +96,7 @@ extern "C" { * @see f_string_mapss_increase_by() */ #if !defined(_di_f_string_maps_append_) || !defined(_di_f_string_maps_append_all_) || !defined(_di_f_string_maps_decrease_by_) || !defined(_di_f_string_maps_increase_) || !defined(_di_f_string_maps_increase_by_) || !defined(_di_f_string_maps_resize_) || !defined(_di_f_string_mapss_append_) || !defined(_di_f_string_mapss_append_all_) || !defined(_di_f_string_mapss_decrease_by_) || !defined(_di_f_string_mapss_increase_) || !defined(_di_f_string_mapss_increase_by_) - extern f_status_t private_f_string_maps_resize(const f_array_length_t length, f_string_maps_t * const maps) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_maps_resize(const f_number_unsigned_t length, f_string_maps_t * const maps) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_maps_append_) || !defined(_di_f_string_maps_append_all_) || !defined(_di_f_string_maps_decrease_by_) || !defined(_di_f_string_maps_increase_) || !defined(_di_f_string_maps_increase_by_) || !defined(_di_f_string_maps_resize_) || !defined(_di_f_string_mapss_append_) || !defined(_di_f_string_mapss_append_all_) || !defined(_di_f_string_mapss_decrease_by_) || !defined(_di_f_string_mapss_increase_) || !defined(_di_f_string_mapss_increase_by_) #ifdef __cplusplus diff --git a/level_0/f_string/c/string/private-mapss.c b/level_0/f_string/c/string/private-mapss.c index c1dc19f..c59cee8 100644 --- a/level_0/f_string/c/string/private-mapss.c +++ b/level_0/f_string/c/string/private-mapss.c @@ -9,15 +9,15 @@ extern "C" { #endif #if !defined(_di_f_string_mapss_adjust_) || !defined(_di_f_string_mapss_decimate_by_) - f_status_t private_f_string_mapss_adjust(const f_array_length_t length, f_string_mapss_t * const mapss) { + f_status_t private_f_string_mapss_adjust(const f_number_unsigned_t length, f_string_mapss_t * const mapss) { - if (mapss->used + length > F_array_length_t_size_d) { + if (mapss->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < mapss->size; ++i) { + for (f_number_unsigned_t i = length; i < mapss->size; ++i) { status = private_f_string_maps_adjust(0, &mapss->array[i]); if (F_status_is_error(status)) return status; @@ -37,15 +37,15 @@ extern "C" { #endif // !defined(_di_f_string_mapss_adjust_) || !defined(_di_f_string_mapss_decimate_by_) #if !defined(_di_f_string_mapss_decrease_by_) || !defined(_di_f_string_mapss_increase_) || !defined(_di_f_string_mapss_increase_by_) - f_status_t private_f_string_mapss_resize(const f_array_length_t length, f_string_mapss_t * const mapss) { + f_status_t private_f_string_mapss_resize(const f_number_unsigned_t length, f_string_mapss_t * const mapss) { - if (mapss->used + length > F_array_length_t_size_d) { + if (mapss->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < mapss->size; ++i) { + for (f_number_unsigned_t i = length; i < mapss->size; ++i) { status = private_f_string_maps_resize(0, &mapss->array[i]); if (F_status_is_error(status)) return status; diff --git a/level_0/f_string/c/string/private-mapss.h b/level_0/f_string/c/string/private-mapss.h index 5e92139..f4dfd9f 100644 --- a/level_0/f_string/c/string/private-mapss.h +++ b/level_0/f_string/c/string/private-mapss.h @@ -36,7 +36,7 @@ extern "C" { * @see f_string_mapss_adjust() */ #if !defined(_di_f_string_mapss_adjust_) || !defined(_di_f_string_mapss_decimate_by_) - extern f_status_t private_f_string_mapss_adjust(const f_array_length_t length, f_string_mapss_t * const mapss) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_mapss_adjust(const f_number_unsigned_t length, f_string_mapss_t * const mapss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_mapss_adjust_) || !defined(_di_f_string_mapss_decimate_by_) /** @@ -62,7 +62,7 @@ extern "C" { * @see f_string_mapss_increase_by() */ #if !defined(_di_f_string_mapss_decrease_by_) || !defined(_di_f_string_mapss_increase_) || !defined(_di_f_string_mapss_increase_by_) - extern f_status_t private_f_string_mapss_resize(const f_array_length_t length, f_string_mapss_t * const mapss) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_mapss_resize(const f_number_unsigned_t length, f_string_mapss_t * const mapss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_mapss_decrease_by_) || !defined(_di_f_string_mapss_increase_) || !defined(_di_f_string_mapss_increase_by_) #ifdef __cplusplus diff --git a/level_0/f_string/c/string/private-quantitys.c b/level_0/f_string/c/string/private-quantitys.c index 2a6ad2a..9db33a9 100644 --- a/level_0/f_string/c/string/private-quantitys.c +++ b/level_0/f_string/c/string/private-quantitys.c @@ -7,9 +7,9 @@ extern "C" { #endif #if !defined(_di_f_string_quantitys_adjust_) || !defined(_di_f_string_quantitys_decimate_by_) - f_status_t private_f_string_quantitys_adjust(const f_array_length_t length, f_string_quantitys_t * const quantitys) { + f_status_t private_f_string_quantitys_adjust(const f_number_unsigned_t length, f_string_quantitys_t * const quantitys) { - if (quantitys->used + length > F_array_length_t_size_d) { + if (quantitys->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -34,7 +34,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { destination->array[destination->used].start = source.array[i].start; destination->array[destination->used++].total = source.array[i].total; @@ -45,9 +45,9 @@ extern "C" { #endif // !defined(_di_f_string_quantitys_append_all_) || !defined(_di_f_string_quantityss_append_) || !defined(_di_f_string_quantityss_append_all_) #if !defined(_di_f_string_quantitys_decrease_) || !defined(_di_f_string_quantitys_decrease_by_) || !defined(_di_f_string_quantitys_increase_) || !defined(_di_f_string_quantitys_increase_by_) - f_status_t private_f_string_quantitys_resize(const f_array_length_t length, f_string_quantitys_t * const quantitys) { + f_status_t private_f_string_quantitys_resize(const f_number_unsigned_t length, f_string_quantitys_t * const quantitys) { - if (quantitys->used + length > F_array_length_t_size_d) { + if (quantitys->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } diff --git a/level_0/f_string/c/string/private-quantitys.h b/level_0/f_string/c/string/private-quantitys.h index 8ba5e9e..17ad18f 100644 --- a/level_0/f_string/c/string/private-quantitys.h +++ b/level_0/f_string/c/string/private-quantitys.h @@ -36,7 +36,7 @@ extern "C" { * @see f_string_quantitys_adjust() */ #if !defined(_di_f_string_quantitys_adjust_) || !defined(_di_f_string_quantitys_decimate_by_) - extern f_status_t private_f_string_quantitys_adjust(const f_array_length_t length, f_string_quantitys_t * const quantitys) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_quantitys_adjust(const f_number_unsigned_t length, f_string_quantitys_t * const quantitys) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_quantitys_adjust_) || !defined(_di_f_string_quantitys_decimate_by_) /** @@ -88,7 +88,7 @@ extern "C" { * @see f_string_quantitys_increase_by() */ #if !defined(_di_f_string_quantitys_decrease_by_) || !defined(_di_f_string_quantitys_increase_) || !defined(_di_f_string_quantitys_increase_by_) - extern f_status_t private_f_string_quantitys_resize(const f_array_length_t length, f_string_quantitys_t * const quantitys) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_quantitys_resize(const f_number_unsigned_t length, f_string_quantitys_t * const quantitys) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_quantitys_decrease_by_) || !defined(_di_f_string_quantitys_increase_) || !defined(_di_f_string_quantitys_increase_by_) #ifdef __cplusplus diff --git a/level_0/f_string/c/string/private-quantityss.c b/level_0/f_string/c/string/private-quantityss.c index c723070..39995b9 100644 --- a/level_0/f_string/c/string/private-quantityss.c +++ b/level_0/f_string/c/string/private-quantityss.c @@ -8,15 +8,15 @@ extern "C" { #endif #if !defined(_di_f_string_quantityss_adjust_) || !defined(_di_f_string_quantityss_decimate_by_) - f_status_t private_f_string_quantityss_adjust(const f_array_length_t length, f_string_quantityss_t * const quantityss) { + f_status_t private_f_string_quantityss_adjust(const f_number_unsigned_t length, f_string_quantityss_t * const quantityss) { - if (quantityss->used + length > F_array_length_t_size_d) { + if (quantityss->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < quantityss->size; ++i) { + for (f_number_unsigned_t i = length; i < quantityss->size; ++i) { status = private_f_string_quantitys_adjust(0, &quantityss->array[i]); if (F_status_is_error(status)) return status; @@ -36,15 +36,15 @@ extern "C" { #endif // !defined(_di_f_string_quantityss_adjust_) || !defined(_di_f_string_quantityss_decimate_by_) #if !defined(_di_f_string_quantityss_decrease_by_) || !defined(_di_f_string_quantityss_increase_) || !defined(_di_f_string_quantityss_increase_by_) - f_status_t private_f_string_quantityss_resize(const f_array_length_t length, f_string_quantityss_t * const quantityss) { + f_status_t private_f_string_quantityss_resize(const f_number_unsigned_t length, f_string_quantityss_t * const quantityss) { - if (quantityss->used + length > F_array_length_t_size_d) { + if (quantityss->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < quantityss->size; ++i) { + for (f_number_unsigned_t i = length; i < quantityss->size; ++i) { status = private_f_string_quantitys_resize(0, &quantityss->array[i]); if (F_status_is_error(status)) return status; diff --git a/level_0/f_string/c/string/private-quantityss.h b/level_0/f_string/c/string/private-quantityss.h index 0c3511c..ea0d1e3 100644 --- a/level_0/f_string/c/string/private-quantityss.h +++ b/level_0/f_string/c/string/private-quantityss.h @@ -36,7 +36,7 @@ extern "C" { * @see f_string_quantityss_adjust() */ #if !defined(_di_f_string_quantityss_adjust_) || !defined(_di_f_string_quantityss_decimate_by_) - extern f_status_t private_f_string_quantityss_adjust(const f_array_length_t length, f_string_quantityss_t * const quantityss) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_quantityss_adjust(const f_number_unsigned_t length, f_string_quantityss_t * const quantityss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_quantityss_adjust_) || !defined(_di_f_string_quantityss_decimate_by_) /** @@ -62,7 +62,7 @@ extern "C" { * @see f_string_quantityss_increase_by() */ #if !defined(_di_f_string_quantityss_decrease_by_) || !defined(_di_f_string_quantityss_increase_) || !defined(_di_f_string_quantityss_increase_by_) - extern f_status_t private_f_string_quantityss_resize(const f_array_length_t length, f_string_quantityss_t * const quantityss) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_quantityss_resize(const f_number_unsigned_t length, f_string_quantityss_t * const quantityss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_quantityss_decrease_by_) || !defined(_di_f_string_quantityss_increase_) || !defined(_di_f_string_quantityss_increase_by_) #ifdef __cplusplus diff --git a/level_0/f_string/c/string/private-ranges.c b/level_0/f_string/c/string/private-ranges.c index cfdfe44..248f491 100644 --- a/level_0/f_string/c/string/private-ranges.c +++ b/level_0/f_string/c/string/private-ranges.c @@ -7,9 +7,9 @@ extern "C" { #endif #if !defined(_di_f_string_ranges_adjust_) || !defined(_di_f_string_ranges_decimate_by_) - f_status_t private_f_string_ranges_adjust(const f_array_length_t length, f_string_ranges_t * const ranges) { + f_status_t private_f_string_ranges_adjust(const f_number_unsigned_t length, f_string_ranges_t * const ranges) { - if (ranges->used + length > F_array_length_t_size_d) { + if (ranges->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -34,7 +34,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { destination->array[destination->used].start = source.array[i].start; destination->array[destination->used++].stop = source.array[i].stop; @@ -45,9 +45,9 @@ extern "C" { #endif // !defined(_di_f_string_ranges_append_all_) || !defined(_di_f_string_rangess_append_) || !defined(_di_f_string_rangess_append_all_) #if !defined(_di_f_string_ranges_append_) || !defined(_di_f_string_ranges_append_all_) || !defined(_di_f_string_ranges_decrease_by_) || !defined(_di_f_string_ranges_increase_) || !defined(_di_f_string_ranges_increase_by_) || !defined(_di_f_string_ranges_resize_) || !defined(_di_f_string_rangess_append_) || !defined(_di_f_string_rangess_append_all_) || !defined(_di_f_string_rangess_decrease_by_) || !defined(_di_f_string_rangess_increase_) || !defined(_di_f_string_rangess_increase_by_) - f_status_t private_f_string_ranges_resize(const f_array_length_t length, f_string_ranges_t * const ranges) { + f_status_t private_f_string_ranges_resize(const f_number_unsigned_t length, f_string_ranges_t * const ranges) { - if (ranges->used + length > F_array_length_t_size_d) { + if (ranges->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } diff --git a/level_0/f_string/c/string/private-ranges.h b/level_0/f_string/c/string/private-ranges.h index 07b7b7a..d1d3962 100644 --- a/level_0/f_string/c/string/private-ranges.h +++ b/level_0/f_string/c/string/private-ranges.h @@ -36,7 +36,7 @@ extern "C" { * @see f_string_ranges_adjust() */ #if !defined(_di_f_string_ranges_adjust_) || !defined(_di_f_string_ranges_decimate_by_) - extern f_status_t private_f_string_ranges_adjust(const f_array_length_t length, f_string_ranges_t * const ranges) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_ranges_adjust(const f_number_unsigned_t length, f_string_ranges_t * const ranges) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_ranges_adjust_) || !defined(_di_f_string_ranges_decimate_by_) /** @@ -96,7 +96,7 @@ extern "C" { * @see f_string_rangess_increase_by() */ #if !defined(_di_f_string_ranges_append_) || !defined(_di_f_string_ranges_append_all_) || !defined(_di_f_string_ranges_decrease_by_) || !defined(_di_f_string_ranges_increase_) || !defined(_di_f_string_ranges_increase_by_) || !defined(_di_f_string_ranges_resize_) || !defined(_di_f_string_rangess_append_) || !defined(_di_f_string_rangess_append_all_) || !defined(_di_f_string_rangess_decrease_by_) || !defined(_di_f_string_rangess_increase_) || !defined(_di_f_string_rangess_increase_by_) - extern f_status_t private_f_string_ranges_resize(const f_array_length_t length, f_string_ranges_t * const ranges) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_ranges_resize(const f_number_unsigned_t length, f_string_ranges_t * const ranges) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_ranges_append_) || !defined(_di_f_string_ranges_append_all_) || !defined(_di_f_string_ranges_decrease_by_) || !defined(_di_f_string_ranges_increase_) || !defined(_di_f_string_ranges_increase_by_) || !defined(_di_f_string_ranges_resize_) || !defined(_di_f_string_rangess_append_) || !defined(_di_f_string_rangess_append_all_) || !defined(_di_f_string_rangess_decrease_by_) || !defined(_di_f_string_rangess_increase_) || !defined(_di_f_string_rangess_increase_by_) #ifdef __cplusplus diff --git a/level_0/f_string/c/string/private-rangess.c b/level_0/f_string/c/string/private-rangess.c index ab5fb88..b129caf 100644 --- a/level_0/f_string/c/string/private-rangess.c +++ b/level_0/f_string/c/string/private-rangess.c @@ -8,15 +8,15 @@ extern "C" { #endif #if !defined(_di_f_string_rangess_adjust_) || !defined(_di_f_string_rangess_decimate_by_) - f_status_t private_f_string_rangess_adjust(const f_array_length_t length, f_string_rangess_t * const rangess) { + f_status_t private_f_string_rangess_adjust(const f_number_unsigned_t length, f_string_rangess_t * const rangess) { - if (rangess->used + length > F_array_length_t_size_d) { + if (rangess->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < rangess->size; ++i) { + for (f_number_unsigned_t i = length; i < rangess->size; ++i) { status = private_f_string_ranges_adjust(0, &rangess->array[i]); if (F_status_is_error(status)) return status; @@ -36,15 +36,15 @@ extern "C" { #endif // !defined(_di_f_string_rangess_adjust_) || !defined(_di_f_string_rangess_decimate_by_) #if !defined(_di_f_string_ranges_append_) || !defined(_di_f_string_ranges_append_all_) || !defined(_di_f_string_ranges_decrease_by_) || !defined(_di_f_string_ranges_increase_) || !defined(_di_f_string_ranges_increase_by_) || !defined(_di_f_string_ranges_resize_) || !defined(_di_f_string_rangess_append_) || !defined(_di_f_string_rangess_append_all_) || !defined(_di_f_string_rangess_decrease_by_) || !defined(_di_f_string_rangess_increase_) || !defined(_di_f_string_rangess_increase_by_) - f_status_t private_f_string_rangess_resize(const f_array_length_t length, f_string_rangess_t * const rangess) { + f_status_t private_f_string_rangess_resize(const f_number_unsigned_t length, f_string_rangess_t * const rangess) { - if (rangess->used + length > F_array_length_t_size_d) { + if (rangess->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < rangess->size; ++i) { + for (f_number_unsigned_t i = length; i < rangess->size; ++i) { status = private_f_string_ranges_resize(0, &rangess->array[i]); if (F_status_is_error(status)) return status; diff --git a/level_0/f_string/c/string/private-rangess.h b/level_0/f_string/c/string/private-rangess.h index 4f585fa..a021035 100644 --- a/level_0/f_string/c/string/private-rangess.h +++ b/level_0/f_string/c/string/private-rangess.h @@ -36,7 +36,7 @@ extern "C" { * @see f_string_rangess_adjust() */ #if !defined(_di_f_string_rangess_adjust_) || !defined(_di_f_string_rangess_decimate_by_) - extern f_status_t private_f_string_rangess_adjust(const f_array_length_t length, f_string_rangess_t * const rangess) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_rangess_adjust(const f_number_unsigned_t length, f_string_rangess_t * const rangess) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_rangess_adjust_) || !defined(_di_f_string_rangess_decimate_by_) /** @@ -64,7 +64,7 @@ extern "C" { * @see f_string_rangess_increase_by() */ #if !defined(_di_f_string_ranges_append_) || !defined(_di_f_string_ranges_append_all_) || !defined(_di_f_string_ranges_decrease_by_) || !defined(_di_f_string_ranges_increase_) || !defined(_di_f_string_ranges_increase_by_) || !defined(_di_f_string_ranges_resize_) || !defined(_di_f_string_rangess_append_) || !defined(_di_f_string_rangess_append_all_) || !defined(_di_f_string_rangess_decrease_by_) || !defined(_di_f_string_rangess_increase_) || !defined(_di_f_string_rangess_increase_by_) - extern f_status_t private_f_string_rangess_resize(const f_array_length_t length, f_string_rangess_t * const rangess) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_rangess_resize(const f_number_unsigned_t length, f_string_rangess_t * const rangess) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_ranges_append_) || !defined(_di_f_string_ranges_append_all_) || !defined(_di_f_string_ranges_decrease_by_) || !defined(_di_f_string_ranges_increase_) || !defined(_di_f_string_ranges_increase_by_) || !defined(_di_f_string_ranges_resize_) || !defined(_di_f_string_rangess_append_) || !defined(_di_f_string_rangess_append_all_) || !defined(_di_f_string_rangess_decrease_by_) || !defined(_di_f_string_rangess_increase_) || !defined(_di_f_string_rangess_increase_by_) #ifdef __cplusplus diff --git a/level_0/f_string/c/string/private-triples.c b/level_0/f_string/c/string/private-triples.c index 35beeab..8da8f50 100644 --- a/level_0/f_string/c/string/private-triples.c +++ b/level_0/f_string/c/string/private-triples.c @@ -8,15 +8,15 @@ extern "C" { #endif #if !defined(_di_f_string_triples_adjust_) || !defined(_di_f_string_triples_decimate_by_) - f_status_t private_f_string_triples_adjust(const f_array_length_t length, f_string_triples_t * const triples) { + f_status_t private_f_string_triples_adjust(const f_number_unsigned_t length, f_string_triples_t * const triples) { - if (triples->used + length > F_array_length_t_size_d) { + if (triples->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < triples->size; ++i) { + for (f_number_unsigned_t i = length; i < triples->size; ++i) { status = private_f_string_dynamic_adjust(0, &triples->array[i].a); if (F_status_is_error(status)) return status; @@ -51,7 +51,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].a.used = 0; destination->array[destination->used].b.used = 0; @@ -78,15 +78,15 @@ extern "C" { #endif // !defined(_di_f_string_triples_append_all_) || !defined(_di_f_string_tripless_append_) || !defined(_di_f_string_tripless_append_all_) #if !defined(_di_f_string_triples_decrease_by_) || !defined(_di_f_string_triples_increase_) || !defined(_di_f_string_triples_increase_by_) - f_status_t private_f_string_triples_resize(const f_array_length_t length, f_string_triples_t * const triples) { + f_status_t private_f_string_triples_resize(const f_number_unsigned_t length, f_string_triples_t * const triples) { - if (triples->used + length > F_array_length_t_size_d) { + if (triples->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < triples->size; ++i) { + for (f_number_unsigned_t i = length; i < triples->size; ++i) { status = private_f_string_dynamic_resize(0, &triples->array[i].a); if (F_status_is_error(status)) return status; diff --git a/level_0/f_string/c/string/private-triples.h b/level_0/f_string/c/string/private-triples.h index 0ba573a..1140787 100644 --- a/level_0/f_string/c/string/private-triples.h +++ b/level_0/f_string/c/string/private-triples.h @@ -36,7 +36,7 @@ extern "C" { * @see f_string_triples_adjust() */ #if !defined(_di_f_string_triples_adjust_) || !defined(_di_f_string_triples_decimate_by_) - extern f_status_t private_f_string_triples_adjust(const f_array_length_t length, f_string_triples_t * const triples) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_triples_adjust(const f_number_unsigned_t length, f_string_triples_t * const triples) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_triples_adjust_) || !defined(_di_f_string_triples_decimate_by_) /** @@ -88,7 +88,7 @@ extern "C" { * @see f_string_triples_increase_by() */ #if !defined(_di_f_string_triples_decrease_by_) || !defined(_di_f_string_triples_increase_) || !defined(_di_f_string_triples_increase_by_) - extern f_status_t private_f_string_triples_resize(const f_array_length_t length, f_string_triples_t * const triples) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_triples_resize(const f_number_unsigned_t length, f_string_triples_t * const triples) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_triples_decrease_by_) || !defined(_di_f_string_triples_increase_) || !defined(_di_f_string_triples_increase_by_) /** @@ -112,7 +112,7 @@ extern "C" { * @see f_string_tripless_adjust() */ #if !defined(_di_f_string_tripless_adjust_) || !defined(_di_f_string_tripless_decimate_by_) - extern f_status_t private_f_string_tripless_adjust(const f_array_length_t length, f_string_tripless_t * const tripless) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_tripless_adjust(const f_number_unsigned_t length, f_string_tripless_t * const tripless) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_tripless_adjust_) || !defined(_di_f_string_tripless_decimate_by_) /** @@ -138,7 +138,7 @@ extern "C" { * @see f_string_tripless_increase_by() */ #if !defined(_di_f_string_tripless_decrease_by_) || !defined(_di_f_string_tripless_increase_) || !defined(_di_f_string_tripless_increase_by_) - extern f_status_t private_f_string_tripless_resize(const f_array_length_t length, f_string_tripless_t * const tripless) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_tripless_resize(const f_number_unsigned_t length, f_string_tripless_t * const tripless) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_tripless_decrease_by_) || !defined(_di_f_string_tripless_increase_) || !defined(_di_f_string_tripless_increase_by_) #ifdef __cplusplus diff --git a/level_0/f_string/c/string/private-tripless.c b/level_0/f_string/c/string/private-tripless.c index cc43eaa..7061fc6 100644 --- a/level_0/f_string/c/string/private-tripless.c +++ b/level_0/f_string/c/string/private-tripless.c @@ -9,15 +9,15 @@ extern "C" { #endif #if !defined(_di_f_string_tripless_adjust_) || !defined(_di_f_string_tripless_decimate_by_) - f_status_t private_f_string_tripless_adjust(const f_array_length_t length, f_string_tripless_t * const tripless) { + f_status_t private_f_string_tripless_adjust(const f_number_unsigned_t length, f_string_tripless_t * const tripless) { - if (tripless->used + length > F_array_length_t_size_d) { + if (tripless->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < tripless->size; ++i) { + for (f_number_unsigned_t i = length; i < tripless->size; ++i) { status = private_f_string_triples_adjust(0, &tripless->array[i]); if (F_status_is_error(status)) return status; @@ -37,15 +37,15 @@ extern "C" { #endif // !defined(_di_f_string_tripless_adjust_) || !defined(_di_f_string_tripless_decimate_by_) #if !defined(_di_f_string_tripless_decrease_by_) || !defined(_di_f_string_tripless_increase_) || !defined(_di_f_string_tripless_increase_by_) - f_status_t private_f_string_tripless_resize(const f_array_length_t length, f_string_tripless_t * const tripless) { + f_status_t private_f_string_tripless_resize(const f_number_unsigned_t length, f_string_tripless_t * const tripless) { - if (tripless->used + length > F_array_length_t_size_d) { + if (tripless->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < tripless->size; ++i) { + for (f_number_unsigned_t i = length; i < tripless->size; ++i) { status = private_f_string_triples_resize(0, &tripless->array[i]); if (F_status_is_error(status)) return status; diff --git a/level_0/f_string/c/string/private-tripless.h b/level_0/f_string/c/string/private-tripless.h index c4fb1b8..7b1a28b 100644 --- a/level_0/f_string/c/string/private-tripless.h +++ b/level_0/f_string/c/string/private-tripless.h @@ -36,7 +36,7 @@ extern "C" { * @see f_string_tripless_adjust() */ #if !defined(_di_f_string_tripless_adjust_) || !defined(_di_f_string_tripless_decimate_by_) - extern f_status_t private_f_string_tripless_adjust(const f_array_length_t length, f_string_tripless_t * const tripless) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_tripless_adjust(const f_number_unsigned_t length, f_string_tripless_t * const tripless) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_tripless_adjust_) || !defined(_di_f_string_tripless_decimate_by_) /** @@ -62,7 +62,7 @@ extern "C" { * @see f_string_tripless_increase_by() */ #if !defined(_di_f_string_tripless_decrease_by_) || !defined(_di_f_string_tripless_increase_) || !defined(_di_f_string_tripless_increase_by_) - extern f_status_t private_f_string_tripless_resize(const f_array_length_t length, f_string_tripless_t * const tripless) F_attribute_visibility_internal_d; + extern f_status_t private_f_string_tripless_resize(const f_number_unsigned_t length, f_string_tripless_t * const tripless) F_attribute_visibility_internal_d; #endif // !defined(_di_f_string_tripless_decrease_by_) || !defined(_di_f_string_tripless_increase_) || !defined(_di_f_string_tripless_increase_by_) #ifdef __cplusplus diff --git a/level_0/f_string/c/string/quantity.h b/level_0/f_string/c/string/quantity.h index b751172..5231c52 100644 --- a/level_0/f_string/c/string/quantity.h +++ b/level_0/f_string/c/string/quantity.h @@ -30,8 +30,8 @@ extern "C" { */ #ifndef _di_f_string_quantity_t_ typedef struct { - f_array_length_t start; - f_array_length_t total; + f_number_unsigned_t start; + f_number_unsigned_t total; } f_string_quantity_t; #define f_string_quantity_t_initialize { 0, 0 } diff --git a/level_0/f_string/c/string/quantitys.c b/level_0/f_string/c/string/quantitys.c index 64f3a58..a802050 100644 --- a/level_0/f_string/c/string/quantitys.c +++ b/level_0/f_string/c/string/quantitys.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_string_quantitys_adjust_ - f_status_t f_string_quantitys_adjust(const f_array_length_t length, f_string_quantitys_t * const quantitys) { + f_status_t f_string_quantitys_adjust(const f_number_unsigned_t length, f_string_quantitys_t * const quantitys) { #ifndef _di_level_0_parameter_checking_ if (!quantitys) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -47,7 +47,7 @@ extern "C" { #endif // _di_f_string_quantitys_append_all_ #ifndef _di_f_string_quantitys_decimate_by_ - f_status_t f_string_quantitys_decimate_by(const f_array_length_t amount, f_string_quantitys_t * const quantitys) { + f_status_t f_string_quantitys_decimate_by(const f_number_unsigned_t amount, f_string_quantitys_t * const quantitys) { #ifndef _di_level_0_parameter_checking_ if (!quantitys) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -63,7 +63,7 @@ extern "C" { #endif // _di_f_string_quantitys_decimate_by_ #ifndef _di_f_string_quantitys_decrease_by_ - f_status_t f_string_quantitys_decrease_by(const f_array_length_t amount, f_string_quantitys_t * const quantitys) { + f_status_t f_string_quantitys_decrease_by(const f_number_unsigned_t amount, f_string_quantitys_t * const quantitys) { #ifndef _di_level_0_parameter_checking_ if (!quantitys) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -79,20 +79,20 @@ extern "C" { #endif // _di_f_string_quantitys_decrease_by_ #ifndef _di_f_string_quantitys_increase_ - f_status_t f_string_quantitys_increase(const f_array_length_t step, f_string_quantitys_t * const quantitys) { + f_status_t f_string_quantitys_increase(const f_number_unsigned_t step, f_string_quantitys_t * const quantitys) { #ifndef _di_level_0_parameter_checking_ if (!quantitys) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && quantitys->used + 1 > quantitys->size) { - f_array_length_t size = quantitys->used + step; + f_number_unsigned_t size = quantitys->used + step; - if (size > F_array_length_t_size_d) { - if (quantitys->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (quantitys->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_string_quantitys_resize(size, quantitys); @@ -103,7 +103,7 @@ extern "C" { #endif // _di_f_string_quantitys_increase_ #ifndef _di_f_string_quantitys_increase_by_ - f_status_t f_string_quantitys_increase_by(const f_array_length_t amount, f_string_quantitys_t * const quantitys) { + f_status_t f_string_quantitys_increase_by(const f_number_unsigned_t amount, f_string_quantitys_t * const quantitys) { #ifndef _di_level_0_parameter_checking_ if (!quantitys) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -111,7 +111,7 @@ extern "C" { if (!amount) return F_data_not; if (quantitys->used + amount > quantitys->size) { - if (quantitys->used + amount > F_array_length_t_size_d) { + if (quantitys->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -123,7 +123,7 @@ extern "C" { #endif // _di_f_string_quantitys_increase_by_ #ifndef _di_f_string_quantitys_resize_ - f_status_t f_string_quantitys_resize(const f_array_length_t length, f_string_quantitys_t * const quantitys) { + f_status_t f_string_quantitys_resize(const f_number_unsigned_t length, f_string_quantitys_t * const quantitys) { #ifndef _di_level_0_parameter_checking_ if (!quantitys) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_string/c/string/quantitys.h b/level_0/f_string/c/string/quantitys.h index f17503f..379dc5e 100644 --- a/level_0/f_string/c/string/quantitys.h +++ b/level_0/f_string/c/string/quantitys.h @@ -27,8 +27,8 @@ extern "C" { typedef struct { f_string_quantity_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_string_quantitys_t; #define f_string_quantitys_t_initialize { 0, 0, 0 } @@ -66,7 +66,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_quantitys_adjust_ - extern f_status_t f_string_quantitys_adjust(const f_array_length_t length, f_string_quantitys_t * const quantitys); + extern f_status_t f_string_quantitys_adjust(const f_number_unsigned_t length, f_string_quantitys_t * const quantitys); #endif // _di_f_string_quantitys_adjust_ /** @@ -130,7 +130,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_quantitys_decimate_by_ - extern f_status_t f_string_quantitys_decimate_by(const f_array_length_t amount, f_string_quantitys_t * const quantitys); + extern f_status_t f_string_quantitys_decimate_by(const f_number_unsigned_t amount, f_string_quantitys_t * const quantitys); #endif // _di_f_string_quantitys_decimate_by_ /** @@ -153,13 +153,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_quantitys_decrease_by_ - extern f_status_t f_string_quantitys_decrease_by(const f_array_length_t amount, f_string_quantitys_t * const quantitys); + extern f_status_t f_string_quantitys_decrease_by(const f_number_unsigned_t amount, f_string_quantitys_t * const quantitys); #endif // _di_f_string_quantitys_decrease_by_ /** * Increase the size of the string quantitys 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -177,14 +177,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_quantitys_increase_ - extern f_status_t f_string_quantitys_increase(const f_array_length_t step, f_string_quantitys_t * const quantitys); + extern f_status_t f_string_quantitys_increase(const f_number_unsigned_t step, f_string_quantitys_t * const quantitys); #endif // _di_f_string_quantitys_increase_ /** * Resize the string quantitys 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -201,7 +201,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_quantitys_increase_by_ - extern f_status_t f_string_quantitys_increase_by(const f_array_length_t amount, f_string_quantitys_t * const quantitys); + extern f_status_t f_string_quantitys_increase_by(const f_number_unsigned_t amount, f_string_quantitys_t * const quantitys); #endif // _di_f_string_quantitys_increase_by_ /** @@ -220,7 +220,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_quantitys_resize_ - extern f_status_t f_string_quantitys_resize(const f_array_length_t length, f_string_quantitys_t * const quantitys); + extern f_status_t f_string_quantitys_resize(const f_number_unsigned_t length, f_string_quantitys_t * const quantitys); #endif // _di_f_string_quantitys_resize_ #ifdef __cplusplus diff --git a/level_0/f_string/c/string/quantityss.c b/level_0/f_string/c/string/quantityss.c index 7d09f4e..31137d5 100644 --- a/level_0/f_string/c/string/quantityss.c +++ b/level_0/f_string/c/string/quantityss.c @@ -8,7 +8,7 @@ extern "C" { #endif #ifndef _di_f_string_quantityss_adjust_ - f_status_t f_string_quantityss_adjust(const f_array_length_t length, f_string_quantityss_t * const quantityss) { + f_status_t f_string_quantityss_adjust(const f_number_unsigned_t length, f_string_quantityss_t * const quantityss) { #ifndef _di_level_0_parameter_checking_ if (!quantityss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -60,7 +60,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].used = 0; @@ -75,7 +75,7 @@ extern "C" { #endif // _di_f_string_quantityss_append_all_ #ifndef _di_f_string_quantityss_decimate_by_ - f_status_t f_string_quantityss_decimate_by(const f_array_length_t amount, f_string_quantityss_t * const quantityss) { + f_status_t f_string_quantityss_decimate_by(const f_number_unsigned_t amount, f_string_quantityss_t * const quantityss) { #ifndef _di_level_0_parameter_checking_ if (!quantityss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -91,7 +91,7 @@ extern "C" { #endif // _di_f_string_quantityss_decimate_by_ #ifndef _di_f_string_quantityss_decrease_by_ - f_status_t f_string_quantityss_decrease_by(const f_array_length_t amount, f_string_quantityss_t * const quantityss) { + f_status_t f_string_quantityss_decrease_by(const f_number_unsigned_t amount, f_string_quantityss_t * const quantityss) { #ifndef _di_level_0_parameter_checking_ if (!quantityss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -107,20 +107,20 @@ extern "C" { #endif // _di_f_string_quantityss_decrease_by_ #ifndef _di_f_string_quantityss_increase_ - f_status_t f_string_quantityss_increase(const f_array_length_t step, f_string_quantityss_t * const quantityss) { + f_status_t f_string_quantityss_increase(const f_number_unsigned_t step, f_string_quantityss_t * const quantityss) { #ifndef _di_level_0_parameter_checking_ if (!quantityss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && quantityss->used + 1 > quantityss->size) { - f_array_length_t size = quantityss->used + step; + f_number_unsigned_t size = quantityss->used + step; - if (size > F_array_length_t_size_d) { - if (quantityss->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (quantityss->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_string_quantityss_resize(size, quantityss); @@ -131,7 +131,7 @@ extern "C" { #endif // _di_f_string_quantityss_increase_ #ifndef _di_f_string_quantityss_increase_by_ - f_status_t f_string_quantityss_increase_by(const f_array_length_t amount, f_string_quantityss_t * const quantityss) { + f_status_t f_string_quantityss_increase_by(const f_number_unsigned_t amount, f_string_quantityss_t * const quantityss) { #ifndef _di_level_0_parameter_checking_ if (!quantityss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -139,7 +139,7 @@ extern "C" { if (!amount) return F_data_not; if (quantityss->used + amount > quantityss->size) { - if (quantityss->used + amount > F_array_length_t_size_d) { + if (quantityss->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -151,7 +151,7 @@ extern "C" { #endif // _di_f_string_quantityss_increase_by_ #ifndef _di_f_string_quantityss_resize_ - f_status_t f_string_quantityss_resize(const f_array_length_t length, f_string_quantityss_t * const quantityss) { + f_status_t f_string_quantityss_resize(const f_number_unsigned_t length, f_string_quantityss_t * const quantityss) { #ifndef _di_level_0_parameter_checking_ if (!quantityss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_string/c/string/quantityss.h b/level_0/f_string/c/string/quantityss.h index b92ed32..a8225cb 100644 --- a/level_0/f_string/c/string/quantityss.h +++ b/level_0/f_string/c/string/quantityss.h @@ -27,8 +27,8 @@ extern "C" { typedef struct { f_string_quantitys_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_string_quantityss_t; #define f_string_quantityss_t_initialize { 0, 0, 0 } @@ -66,7 +66,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_quantityss_adjust_ - extern f_status_t f_string_quantityss_adjust(const f_array_length_t length, f_string_quantityss_t * const quantityss); + extern f_status_t f_string_quantityss_adjust(const f_number_unsigned_t length, f_string_quantityss_t * const quantityss); #endif // _di_f_string_quantityss_adjust_ /** @@ -130,7 +130,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_quantityss_decimate_by_ - extern f_status_t f_string_quantityss_decimate_by(const f_array_length_t amount, f_string_quantityss_t * const quantityss); + extern f_status_t f_string_quantityss_decimate_by(const f_number_unsigned_t amount, f_string_quantityss_t * const quantityss); #endif // _di_f_string_quantityss_decimate_by_ /** @@ -153,13 +153,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_quantityss_decrease_by_ - extern f_status_t f_string_quantityss_decrease_by(const f_array_length_t amount, f_string_quantityss_t * const quantityss); + extern f_status_t f_string_quantityss_decrease_by(const f_number_unsigned_t amount, f_string_quantityss_t * const quantityss); #endif // _di_f_string_quantityss_decrease_by_ /** * Increase the size of the string quantityss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -178,14 +178,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_quantityss_increase_ - extern f_status_t f_string_quantityss_increase(const f_array_length_t step, f_string_quantityss_t * const quantityss); + extern f_status_t f_string_quantityss_increase(const f_number_unsigned_t step, f_string_quantityss_t * const quantityss); #endif // _di_f_string_quantityss_increase_ /** * Resize the string quantityss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -203,7 +203,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_quantityss_increase_by_ - extern f_status_t f_string_quantityss_increase_by(const f_array_length_t amount, f_string_quantityss_t * const quantityss); + extern f_status_t f_string_quantityss_increase_by(const f_number_unsigned_t amount, f_string_quantityss_t * const quantityss); #endif // _di_f_string_quantityss_increase_by_ /** @@ -222,7 +222,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_quantityss_resize_ - extern f_status_t f_string_quantityss_resize(const f_array_length_t length, f_string_quantityss_t * const quantityss); + extern f_status_t f_string_quantityss_resize(const f_number_unsigned_t length, f_string_quantityss_t * const quantityss); #endif // _di_f_string_quantityss_resize_ #ifdef __cplusplus diff --git a/level_0/f_string/c/string/range.h b/level_0/f_string/c/string/range.h index 8cefa3e..2f3ee5b 100644 --- a/level_0/f_string/c/string/range.h +++ b/level_0/f_string/c/string/range.h @@ -28,8 +28,8 @@ extern "C" { */ #ifndef _di_f_string_range_t_ typedef struct { - f_array_length_t start; - f_array_length_t stop; + f_number_unsigned_t start; + f_number_unsigned_t stop; } f_string_range_t; #define f_string_range_t_initialize { 1, 0 } diff --git a/level_0/f_string/c/string/ranges.c b/level_0/f_string/c/string/ranges.c index 2626760..37be263 100644 --- a/level_0/f_string/c/string/ranges.c +++ b/level_0/f_string/c/string/ranges.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_string_ranges_adjust_ - f_status_t f_string_ranges_adjust(const f_array_length_t length, f_string_ranges_t * const ranges) { + f_status_t f_string_ranges_adjust(const f_number_unsigned_t length, f_string_ranges_t * const ranges) { #ifndef _di_level_0_parameter_checking_ if (!ranges) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -47,7 +47,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { destination->array[destination->used].start = source.array[i].start; destination->array[destination->used++].stop = source.array[i].stop; @@ -58,7 +58,7 @@ extern "C" { #endif // _di_f_string_ranges_append_all_ #ifndef _di_f_string_ranges_decimate_by_ - f_status_t f_string_ranges_decimate_by(const f_array_length_t amount, f_string_ranges_t * const ranges) { + f_status_t f_string_ranges_decimate_by(const f_number_unsigned_t amount, f_string_ranges_t * const ranges) { #ifndef _di_level_0_parameter_checking_ if (!ranges) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -74,7 +74,7 @@ extern "C" { #endif // _di_f_string_ranges_decimate_by_ #ifndef _di_f_string_ranges_decrease_by_ - f_status_t f_string_ranges_decrease_by(const f_array_length_t amount, f_string_ranges_t * const ranges) { + f_status_t f_string_ranges_decrease_by(const f_number_unsigned_t amount, f_string_ranges_t * const ranges) { #ifndef _di_level_0_parameter_checking_ if (!ranges) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -90,20 +90,20 @@ extern "C" { #endif // _di_f_string_ranges_decrease_by_ #ifndef _di_f_string_ranges_increase_ - f_status_t f_string_ranges_increase(const f_array_length_t step, f_string_ranges_t * const ranges) { + f_status_t f_string_ranges_increase(const f_number_unsigned_t step, f_string_ranges_t * const ranges) { #ifndef _di_level_0_parameter_checking_ if (!ranges) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && ranges->used + 1 > ranges->size) { - f_array_length_t size = ranges->used + step; + f_number_unsigned_t size = ranges->used + step; - if (size > F_array_length_t_size_d) { - if (ranges->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (ranges->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_string_ranges_resize(size, ranges); @@ -114,7 +114,7 @@ extern "C" { #endif // _di_f_string_ranges_increase_ #ifndef _di_f_string_ranges_increase_by_ - f_status_t f_string_ranges_increase_by(const f_array_length_t amount, f_string_ranges_t * const ranges) { + f_status_t f_string_ranges_increase_by(const f_number_unsigned_t amount, f_string_ranges_t * const ranges) { #ifndef _di_level_0_parameter_checking_ if (!ranges) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -122,7 +122,7 @@ extern "C" { if (!amount) return F_data_not; if (ranges->used + amount > ranges->size) { - if (ranges->used + amount > F_array_length_t_size_d) { + if (ranges->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -134,7 +134,7 @@ extern "C" { #endif // _di_f_string_ranges_increase_by_ #ifndef _di_f_string_ranges_resize_ - f_status_t f_string_ranges_resize(const f_array_length_t length, f_string_ranges_t * const ranges) { + f_status_t f_string_ranges_resize(const f_number_unsigned_t length, f_string_ranges_t * const ranges) { #ifndef _di_level_0_parameter_checking_ if (!ranges) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_string/c/string/ranges.h b/level_0/f_string/c/string/ranges.h index c9e1d6a..c2886f5 100644 --- a/level_0/f_string/c/string/ranges.h +++ b/level_0/f_string/c/string/ranges.h @@ -27,8 +27,8 @@ extern "C" { typedef struct { f_string_range_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_string_ranges_t; #define f_string_ranges_t_initialize { 0, 0, 0 } @@ -65,7 +65,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_string_ranges_adjust_ - extern f_status_t f_string_ranges_adjust(const f_array_length_t length, f_string_ranges_t * const ranges); + extern f_status_t f_string_ranges_adjust(const f_number_unsigned_t length, f_string_ranges_t * const ranges); #endif // _di_f_string_ranges_adjust_ /** @@ -129,7 +129,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_ranges_decimate_by_ - extern f_status_t f_string_ranges_decimate_by(const f_array_length_t amount, f_string_ranges_t * const ranges); + extern f_status_t f_string_ranges_decimate_by(const f_number_unsigned_t amount, f_string_ranges_t * const ranges); #endif // _di_f_string_ranges_decimate_by_ /** @@ -153,13 +153,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_ranges_decrease_by_ - extern f_status_t f_string_ranges_decrease_by(const f_array_length_t amount, f_string_ranges_t * const ranges); + extern f_status_t f_string_ranges_decrease_by(const f_number_unsigned_t amount, f_string_ranges_t * const ranges); #endif // _di_f_string_ranges_decrease_by_ /** * Increase the size of the string ranges 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -178,14 +178,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_ranges_increase_ - extern f_status_t f_string_ranges_increase(const f_array_length_t step, f_string_ranges_t * const ranges); + extern f_status_t f_string_ranges_increase(const f_number_unsigned_t step, f_string_ranges_t * const ranges); #endif // _di_f_string_ranges_increase_ /** * Resize the string ranges 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -203,7 +203,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_ranges_increase_by_ - extern f_status_t f_string_ranges_increase_by(const f_array_length_t amount, f_string_ranges_t * const ranges); + extern f_status_t f_string_ranges_increase_by(const f_number_unsigned_t amount, f_string_ranges_t * const ranges); #endif // _di_f_string_ranges_increase_by_ /** @@ -222,7 +222,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_ranges_resize_ - extern f_status_t f_string_ranges_resize(const f_array_length_t length, f_string_ranges_t * const ranges); + extern f_status_t f_string_ranges_resize(const f_number_unsigned_t length, f_string_ranges_t * const ranges); #endif // _di_f_string_ranges_resize_ #ifdef __cplusplus diff --git a/level_0/f_string/c/string/rangess.c b/level_0/f_string/c/string/rangess.c index 94cc8f7..22c7762 100644 --- a/level_0/f_string/c/string/rangess.c +++ b/level_0/f_string/c/string/rangess.c @@ -8,7 +8,7 @@ extern "C" { #endif #ifndef _di_f_string_rangess_adjust_ - f_status_t f_string_rangess_adjust(const f_array_length_t length, f_string_rangess_t * const rangess) { + f_status_t f_string_rangess_adjust(const f_number_unsigned_t length, f_string_rangess_t * const rangess) { #ifndef _di_level_0_parameter_checking_ if (!rangess) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -60,7 +60,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].used = 0; @@ -75,7 +75,7 @@ extern "C" { #endif // _di_f_string_rangess_append_all_ #ifndef _di_f_string_rangess_decimate_by_ - f_status_t f_string_rangess_decimate_by(const f_array_length_t amount, f_string_rangess_t * const rangess) { + f_status_t f_string_rangess_decimate_by(const f_number_unsigned_t amount, f_string_rangess_t * const rangess) { #ifndef _di_level_0_parameter_checking_ if (!rangess) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -91,7 +91,7 @@ extern "C" { #endif // _di_f_string_rangess_decimate_by_ #ifndef _di_f_string_rangess_decrease_by_ - f_status_t f_string_rangess_decrease_by(const f_array_length_t amount, f_string_rangess_t * const rangess) { + f_status_t f_string_rangess_decrease_by(const f_number_unsigned_t amount, f_string_rangess_t * const rangess) { #ifndef _di_level_0_parameter_checking_ if (!rangess) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -107,20 +107,20 @@ extern "C" { #endif // _di_f_string_rangess_decrease_by_ #ifndef _di_f_string_rangess_increase_ - f_status_t f_string_rangess_increase(const f_array_length_t step, f_string_rangess_t * const rangess) { + f_status_t f_string_rangess_increase(const f_number_unsigned_t step, f_string_rangess_t * const rangess) { #ifndef _di_level_0_parameter_checking_ if (!rangess) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && rangess->used + 1 > rangess->size) { - f_array_length_t size = rangess->used + step; + f_number_unsigned_t size = rangess->used + step; - if (size > F_array_length_t_size_d) { - if (rangess->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (rangess->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_string_rangess_resize(size, rangess); @@ -131,7 +131,7 @@ extern "C" { #endif // _di_f_string_rangess_increase_ #ifndef _di_f_string_rangess_increase_by_ - f_status_t f_string_rangess_increase_by(const f_array_length_t amount, f_string_rangess_t * const rangess) { + f_status_t f_string_rangess_increase_by(const f_number_unsigned_t amount, f_string_rangess_t * const rangess) { #ifndef _di_level_0_parameter_checking_ if (!rangess) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -139,7 +139,7 @@ extern "C" { if (!amount) return F_data_not; if (rangess->used + amount > rangess->size) { - if (rangess->used + amount > F_array_length_t_size_d) { + if (rangess->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -151,7 +151,7 @@ extern "C" { #endif // _di_f_string_rangess_increase_by_ #ifndef _di_f_string_rangess_resize_ - f_status_t f_string_rangess_resize(const f_array_length_t length, f_string_rangess_t * const rangess) { + f_status_t f_string_rangess_resize(const f_number_unsigned_t length, f_string_rangess_t * const rangess) { #ifndef _di_level_0_parameter_checking_ if (!rangess) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_string/c/string/rangess.h b/level_0/f_string/c/string/rangess.h index dbf2338..68d6205 100644 --- a/level_0/f_string/c/string/rangess.h +++ b/level_0/f_string/c/string/rangess.h @@ -27,8 +27,8 @@ extern "C" { typedef struct { f_string_ranges_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_string_rangess_t; #define f_string_rangess_t_initialize { 0, 0, 0 } @@ -66,7 +66,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_rangess_adjust_ - extern f_status_t f_string_rangess_adjust(const f_array_length_t length, f_string_rangess_t * const rangess); + extern f_status_t f_string_rangess_adjust(const f_number_unsigned_t length, f_string_rangess_t * const rangess); #endif // _di_f_string_rangess_adjust_ /** @@ -130,7 +130,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_rangess_decimate_by_ - extern f_status_t f_string_rangess_decimate_by(const f_array_length_t amount, f_string_rangess_t * const rangess); + extern f_status_t f_string_rangess_decimate_by(const f_number_unsigned_t amount, f_string_rangess_t * const rangess); #endif // _di_f_string_rangess_decimate_by_ /** @@ -154,13 +154,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_rangess_decrease_by_ - extern f_status_t f_string_rangess_decrease_by(const f_array_length_t amount, f_string_rangess_t * const rangess); + extern f_status_t f_string_rangess_decrease_by(const f_number_unsigned_t amount, f_string_rangess_t * const rangess); #endif // _di_f_string_rangess_decrease_by_ /** * Increase the size of the string rangess 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -179,14 +179,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_rangess_increase_ - extern f_status_t f_string_rangess_increase(const f_array_length_t step, f_string_rangess_t * const rangess); + extern f_status_t f_string_rangess_increase(const f_number_unsigned_t step, f_string_rangess_t * const rangess); #endif // _di_f_string_rangess_increase_ /** * Resize the string rangess 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -204,7 +204,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_rangess_increase_by_ - extern f_status_t f_string_rangess_increase_by(const f_array_length_t amount, f_string_rangess_t * const rangess); + extern f_status_t f_string_rangess_increase_by(const f_number_unsigned_t amount, f_string_rangess_t * const rangess); #endif // _di_f_string_rangess_increase_by_ /** @@ -223,7 +223,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_rangess_resize_ - extern f_status_t f_string_rangess_resize(const f_array_length_t length, f_string_rangess_t * const rangess); + extern f_status_t f_string_rangess_resize(const f_number_unsigned_t length, f_string_rangess_t * const rangess); #endif // _di_f_string_rangess_resize_ #ifdef __cplusplus diff --git a/level_0/f_string/c/string/static.h b/level_0/f_string/c/string/static.h index cee40ce..7b1f720 100644 --- a/level_0/f_string/c/string/static.h +++ b/level_0/f_string/c/string/static.h @@ -35,8 +35,8 @@ extern "C" { typedef struct { f_string_t string; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_string_static_t; #define f_string_static_t_initialize { 0, 0, 0 } diff --git a/level_0/f_string/c/string/statics.h b/level_0/f_string/c/string/statics.h index bd52ac5..e80b6e9 100644 --- a/level_0/f_string/c/string/statics.h +++ b/level_0/f_string/c/string/statics.h @@ -27,8 +27,8 @@ extern "C" { typedef struct { f_string_static_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_string_statics_t; #define f_string_statics_t_initialize { 0, 0, 0 } diff --git a/level_0/f_string/c/string/staticss.h b/level_0/f_string/c/string/staticss.h index 6211074..1d92a22 100644 --- a/level_0/f_string/c/string/staticss.h +++ b/level_0/f_string/c/string/staticss.h @@ -27,8 +27,8 @@ extern "C" { typedef struct { f_string_statics_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_string_staticss_t; #define f_string_staticss_t_initialize { 0, 0, 0 } diff --git a/level_0/f_string/c/string/triples.c b/level_0/f_string/c/string/triples.c index bd87e8b..a63a20b 100644 --- a/level_0/f_string/c/string/triples.c +++ b/level_0/f_string/c/string/triples.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_string_triples_adjust_ - f_status_t f_string_triples_adjust(const f_array_length_t length, f_string_triples_t * const triples) { + f_status_t f_string_triples_adjust(const f_number_unsigned_t length, f_string_triples_t * const triples) { #ifndef _di_level_0_parameter_checking_ if (!triples) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -69,7 +69,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].a.used = 0; destination->array[destination->used].b.used = 0; @@ -96,7 +96,7 @@ extern "C" { #endif // _di_f_string_triples_append_all_ #ifndef _di_f_string_triples_decimate_by_ - f_status_t f_string_triples_decimate_by(const f_array_length_t amount, f_string_triples_t * const triples) { + f_status_t f_string_triples_decimate_by(const f_number_unsigned_t amount, f_string_triples_t * const triples) { #ifndef _di_level_0_parameter_checking_ if (!triples) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -110,7 +110,7 @@ extern "C" { #endif // _di_f_string_triples_decimate_by_ #ifndef _di_f_string_triples_decrease_by_ - f_status_t f_string_triples_decrease_by(const f_array_length_t amount, f_string_triples_t * const triples) { + f_status_t f_string_triples_decrease_by(const f_number_unsigned_t amount, f_string_triples_t * const triples) { #ifndef _di_level_0_parameter_checking_ if (!triples) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -126,20 +126,20 @@ extern "C" { #endif // _di_f_string_triples_decrease_by_ #ifndef _di_f_string_triples_increase_ - f_status_t f_string_triples_increase(const f_array_length_t step, f_string_triples_t * const triples) { + f_status_t f_string_triples_increase(const f_number_unsigned_t step, f_string_triples_t * const triples) { #ifndef _di_level_0_parameter_checking_ if (!triples) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && triples->used + 1 > triples->size) { - f_array_length_t size = triples->used + F_memory_default_allocation_small_d; + f_number_unsigned_t size = triples->used + F_memory_default_allocation_small_d; - if (size > F_array_length_t_size_d) { - if (triples->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (triples->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_string_triples_resize(size, triples); @@ -150,7 +150,7 @@ extern "C" { #endif // _di_f_string_triples_increase_ #ifndef _di_f_string_triples_increase_by_ - f_status_t f_string_triples_increase_by(const f_array_length_t amount, f_string_triples_t * const triples) { + f_status_t f_string_triples_increase_by(const f_number_unsigned_t amount, f_string_triples_t * const triples) { #ifndef _di_level_0_parameter_checking_ if (!triples) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -158,7 +158,7 @@ extern "C" { if (!amount) return F_data_not; if (triples->used + amount > triples->size) { - if (triples->used + amount > F_array_length_t_size_d) { + if (triples->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -170,7 +170,7 @@ extern "C" { #endif // _di_f_string_triples_increase_by_ #ifndef _di_f_string_triples_resize_ - f_status_t f_string_triples_resize(const f_array_length_t length, f_string_triples_t * const triples) { + f_status_t f_string_triples_resize(const f_number_unsigned_t length, f_string_triples_t * const triples) { #ifndef _di_level_0_parameter_checking_ if (!triples) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_string/c/string/triples.h b/level_0/f_string/c/string/triples.h index e44254d..3c7adae 100644 --- a/level_0/f_string/c/string/triples.h +++ b/level_0/f_string/c/string/triples.h @@ -27,8 +27,8 @@ extern "C" { typedef struct { f_string_triple_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_string_triples_t; #define f_string_triples_t_initialize f_string_statics_t_initialize @@ -65,7 +65,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_string_triples_adjust_ - extern f_status_t f_string_triples_adjust(const f_array_length_t length, f_string_triples_t * const triples); + extern f_status_t f_string_triples_adjust(const f_number_unsigned_t length, f_string_triples_t * const triples); #endif // _di_f_string_triples_adjust_ /** @@ -131,7 +131,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_triples_decimate_by_ - extern f_status_t f_string_triples_decimate_by(const f_array_length_t amount, f_string_triples_t * const triples); + extern f_status_t f_string_triples_decimate_by(const f_number_unsigned_t amount, f_string_triples_t * const triples); #endif // _di_f_string_triples_decimate_by_ /** @@ -155,13 +155,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_triples_decrease_by_ - extern f_status_t f_string_triples_decrease_by(const f_array_length_t amount, f_string_triples_t * const triples); + extern f_status_t f_string_triples_decrease_by(const f_number_unsigned_t amount, f_string_triples_t * const triples); #endif // _di_f_string_triples_decrease_by_ /** * Increase the size of the string triples 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -180,14 +180,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_triples_increase_ - extern f_status_t f_string_triples_increase(const f_array_length_t step, f_string_triples_t * const triples); + extern f_status_t f_string_triples_increase(const f_number_unsigned_t step, f_string_triples_t * const triples); #endif // _di_f_string_triples_increase_ /** * Resize the string triples 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -205,7 +205,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_triples_increase_by_ - extern f_status_t f_string_triples_increase_by(const f_array_length_t amount, f_string_triples_t * const triples); + extern f_status_t f_string_triples_increase_by(const f_number_unsigned_t amount, f_string_triples_t * const triples); #endif // _di_f_string_triples_increase_by_ /** @@ -224,7 +224,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_triples_resize_ - extern f_status_t f_string_triples_resize(const f_array_length_t length, f_string_triples_t * const triples); + extern f_status_t f_string_triples_resize(const f_number_unsigned_t length, f_string_triples_t * const triples); #endif // _di_f_string_triples_resize_ #ifdef __cplusplus diff --git a/level_0/f_string/c/string/tripless.c b/level_0/f_string/c/string/tripless.c index 90e5e07..542361a 100644 --- a/level_0/f_string/c/string/tripless.c +++ b/level_0/f_string/c/string/tripless.c @@ -50,7 +50,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].used = 0; @@ -65,7 +65,7 @@ extern "C" { #endif // _di_f_string_tripless_append_all_ #ifndef _di_f_string_tripless_adjust_ - f_status_t f_string_tripless_adjust(const f_array_length_t length, f_string_tripless_t * const tripless) { + f_status_t f_string_tripless_adjust(const f_number_unsigned_t length, f_string_tripless_t * const tripless) { #ifndef _di_level_0_parameter_checking_ if (!tripless) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -75,7 +75,7 @@ extern "C" { #endif // _di_f_string_tripless_adjust_ #ifndef _di_f_string_tripless_decimate_by_ - f_status_t f_string_tripless_decimate_by(const f_array_length_t amount, f_string_tripless_t * const tripless) { + f_status_t f_string_tripless_decimate_by(const f_number_unsigned_t amount, f_string_tripless_t * const tripless) { #ifndef _di_level_0_parameter_checking_ if (!tripless) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -91,7 +91,7 @@ extern "C" { #endif // _di_f_string_tripless_decimate_by_ #ifndef _di_f_string_tripless_decrease_by_ - f_status_t f_string_tripless_decrease_by(const f_array_length_t amount, f_string_tripless_t * const tripless) { + f_status_t f_string_tripless_decrease_by(const f_number_unsigned_t amount, f_string_tripless_t * const tripless) { #ifndef _di_level_0_parameter_checking_ if (!tripless) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -107,20 +107,20 @@ extern "C" { #endif // _di_f_string_tripless_decrease_by_ #ifndef _di_f_string_tripless_increase_ - f_status_t f_string_tripless_increase(const f_array_length_t step, f_string_tripless_t * const tripless) { + f_status_t f_string_tripless_increase(const f_number_unsigned_t step, f_string_tripless_t * const tripless) { #ifndef _di_level_0_parameter_checking_ if (!tripless) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && tripless->used + 1 > tripless->size) { - f_array_length_t size = tripless->used + step; + f_number_unsigned_t size = tripless->used + step; - if (size > F_array_length_t_size_d) { - if (tripless->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (tripless->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_string_tripless_resize(size, tripless); @@ -131,7 +131,7 @@ extern "C" { #endif // _di_f_string_tripless_increase_ #ifndef _di_f_string_tripless_increase_by_ - f_status_t f_string_tripless_increase_by(const f_array_length_t amount, f_string_tripless_t * const tripless) { + f_status_t f_string_tripless_increase_by(const f_number_unsigned_t amount, f_string_tripless_t * const tripless) { #ifndef _di_level_0_parameter_checking_ if (!tripless) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -139,7 +139,7 @@ extern "C" { if (!amount) return F_data_not; if (tripless->used + amount > tripless->size) { - if (tripless->used + amount > F_array_length_t_size_d) { + if (tripless->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -151,7 +151,7 @@ extern "C" { #endif // _di_f_string_tripless_increase_by_ #ifndef _di_f_string_tripless_resize_ - f_status_t f_string_tripless_resize(const f_array_length_t length, f_string_tripless_t * const tripless) { + f_status_t f_string_tripless_resize(const f_number_unsigned_t length, f_string_tripless_t * const tripless) { #ifndef _di_level_0_parameter_checking_ if (!tripless) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_string/c/string/tripless.h b/level_0/f_string/c/string/tripless.h index 94a5e6f..63d6b78 100644 --- a/level_0/f_string/c/string/tripless.h +++ b/level_0/f_string/c/string/tripless.h @@ -27,8 +27,8 @@ extern "C" { typedef struct { f_string_triples_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_string_tripless_t; #define f_string_tripless_t_initialize f_string_statics_t_initialize @@ -65,7 +65,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_string_tripless_adjust_ - extern f_status_t f_string_tripless_adjust(const f_array_length_t length, f_string_tripless_t * const tripless); + extern f_status_t f_string_tripless_adjust(const f_number_unsigned_t length, f_string_tripless_t * const tripless); #endif // _di_f_string_tripless_adjust_ /** @@ -131,7 +131,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_tripless_decimate_by_ - extern f_status_t f_string_tripless_decimate_by(const f_array_length_t amount, f_string_tripless_t * const tripless); + extern f_status_t f_string_tripless_decimate_by(const f_number_unsigned_t amount, f_string_tripless_t * const tripless); #endif // _di_f_string_tripless_decimate_by_ /** @@ -155,13 +155,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_tripless_decrease_by_ - extern f_status_t f_string_tripless_decrease_by(const f_array_length_t amount, f_string_tripless_t * const tripless); + extern f_status_t f_string_tripless_decrease_by(const f_number_unsigned_t amount, f_string_tripless_t * const tripless); #endif // _di_f_string_tripless_decrease_by_ /** * Increase the size of the string tripless 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -180,14 +180,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_tripless_increase_ - extern f_status_t f_string_tripless_increase(const f_array_length_t step, f_string_tripless_t * const tripless); + extern f_status_t f_string_tripless_increase(const f_number_unsigned_t step, f_string_tripless_t * const tripless); #endif // _di_f_string_tripless_increase_ /** * Resize the string tripless 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -205,7 +205,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_tripless_increase_by_ - extern f_status_t f_string_tripless_increase_by(const f_array_length_t amount, f_string_tripless_t * const tripless); + extern f_status_t f_string_tripless_increase_by(const f_number_unsigned_t amount, f_string_tripless_t * const tripless); #endif // _di_f_string_tripless_increase_by_ /** @@ -224,7 +224,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_tripless_resize_ - extern f_status_t f_string_tripless_resize(const f_array_length_t length, f_string_tripless_t * const tripless); + extern f_status_t f_string_tripless_resize(const f_number_unsigned_t length, f_string_tripless_t * const tripless); #endif // _di_f_string_tripless_resize_ #ifdef __cplusplus diff --git a/level_0/f_string/tests/unit/c/test-string-dynamic_terminate.c b/level_0/f_string/tests/unit/c/test-string-dynamic_terminate.c index f81cb82..7b0c1c4 100644 --- a/level_0/f_string/tests/unit/c/test-string-dynamic_terminate.c +++ b/level_0/f_string/tests/unit/c/test-string-dynamic_terminate.c @@ -7,7 +7,7 @@ extern "C" { void test__f_string_dynamic_terminate__appends_null(void **state) { - const f_array_length_t length = 2; + const f_number_unsigned_t length = 2; f_string_dynamic_t data = f_string_dynamic_t_initialize; // Put some value in the unused section at the end so that it gets overridden. @@ -32,7 +32,7 @@ void test__f_string_dynamic_terminate__appends_null(void **state) { void test__f_string_dynamic_terminate__doesnt_append_null(void **state) { - const f_array_length_t length = 2; + const f_number_unsigned_t length = 2; f_string_dynamic_t data = f_string_dynamic_t_initialize; // Ensure a NULL already exists so that the test can confirm that another NULL is not appended. diff --git a/level_0/f_string/tests/unit/c/test-string-dynamic_terminate_after.c b/level_0/f_string/tests/unit/c/test-string-dynamic_terminate_after.c index 0f2e318..f553e95 100644 --- a/level_0/f_string/tests/unit/c/test-string-dynamic_terminate_after.c +++ b/level_0/f_string/tests/unit/c/test-string-dynamic_terminate_after.c @@ -6,7 +6,7 @@ extern "C" { #endif void test__f_string_dynamic_terminate_after__appends_null(void **state) { - const f_array_length_t length = 2; + const f_number_unsigned_t length = 2; f_string_dynamic_t data = f_string_dynamic_t_initialize; // Put some value in the unused section at the end so that it gets overridden. @@ -33,7 +33,7 @@ void test__f_string_dynamic_terminate_after__appends_null(void **state) { void test__f_string_dynamic_terminate_after__doesnt_append_null(void **state) { - const f_array_length_t length = 2; + const f_number_unsigned_t length = 2; f_string_dynamic_t data = f_string_dynamic_t_initialize; // Ensure a NULL already exists so that the test can confirm that another NULL is not appended. diff --git a/level_0/f_string/tests/unit/c/test-string-dynamics_append_all.c b/level_0/f_string/tests/unit/c/test-string-dynamics_append_all.c index 64a46f4..05c2b03 100644 --- a/level_0/f_string/tests/unit/c/test-string-dynamics_append_all.c +++ b/level_0/f_string/tests/unit/c/test-string-dynamics_append_all.c @@ -41,7 +41,7 @@ void test__f_string_dynamics_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < length_inner; ++i) { + for (f_number_unsigned_t i = 0; i < length_inner; ++i) { assert_int_equal(destination.array[i].used, source.array[i].used); @@ -49,11 +49,11 @@ void test__f_string_dynamics_append_all__works(void **state) { } // for } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { free((void *) source.array[i].string); } // for - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].string); } // for diff --git a/level_0/f_string/tests/unit/c/test-string-dynamicss_append.c b/level_0/f_string/tests/unit/c/test-string-dynamicss_append.c index d67dc81..f44fcc2 100644 --- a/level_0/f_string/tests/unit/c/test-string-dynamicss_append.c +++ b/level_0/f_string/tests/unit/c/test-string-dynamicss_append.c @@ -38,19 +38,19 @@ void test__f_string_dynamicss_append__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.array[0].used, length_inner); - for (f_array_length_t i = 0; i < length_inner; ++i) { + for (f_number_unsigned_t i = 0; i < length_inner; ++i) { assert_int_equal(destination.array[0].array[i].used, test_names[i].used); assert_string_equal(destination.array[0].array[i].string, test_names[i].string); } // for } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { free((void *) source.array[i].string); } // for - for (f_array_length_t i = 0; i < destination.array[0].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[0].used; ++i) { free((void *) destination.array[0].array[i].string); } // for diff --git a/level_0/f_string/tests/unit/c/test-string-dynamicss_append_all.c b/level_0/f_string/tests/unit/c/test-string-dynamicss_append_all.c index 54873f0..efe62b0 100644 --- a/level_0/f_string/tests/unit/c/test-string-dynamicss_append_all.c +++ b/level_0/f_string/tests/unit/c/test-string-dynamicss_append_all.c @@ -24,7 +24,7 @@ void test__f_string_dynamicss_append_all__works(void **state) { assert_int_equal(source.used, 0); assert_int_equal(source.size, length_outer); - f_array_length_t i = 0; + f_number_unsigned_t i = 0; for (; source.used < length_outer; ++source.used) { @@ -53,9 +53,9 @@ void test__f_string_dynamicss_append_all__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, source.used); - for (f_array_length_t j = 0; j < length_outer; ++j) { + for (f_number_unsigned_t j = 0; j < length_outer; ++j) { - for (f_array_length_t i = 0; i < length_inner; ++i) { + for (f_number_unsigned_t i = 0; i < length_inner; ++i) { assert_int_equal(destination.array[j].array[i].used, test_names[i].used); @@ -64,18 +64,18 @@ void test__f_string_dynamicss_append_all__works(void **state) { } // for } - for (f_array_length_t j = 0; j < source.used; ++j) { + for (f_number_unsigned_t j = 0; j < source.used; ++j) { - for (f_array_length_t i = 0; i < source.array[j].used; ++i) { + for (f_number_unsigned_t i = 0; i < source.array[j].used; ++i) { free((void *) source.array[j].array[i].string); } // for free((void *) source.array[j].array); } // for - for (f_array_length_t j = 0; j < destination.used; ++j) { + for (f_number_unsigned_t j = 0; j < destination.used; ++j) { - for (f_array_length_t i = 0; i < destination.array[j].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[j].used; ++i) { free((void *) destination.array[j].array[i].string); } // for diff --git a/level_0/f_string/tests/unit/c/test-string-map_multis_append_all.c b/level_0/f_string/tests/unit/c/test-string-map_multis_append_all.c index 1370ae6..7b3d9a4 100644 --- a/level_0/f_string/tests/unit/c/test-string-map_multis_append_all.c +++ b/level_0/f_string/tests/unit/c/test-string-map_multis_append_all.c @@ -51,7 +51,7 @@ void test__f_string_map_multis_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < length_inner; ++i) { + for (f_number_unsigned_t i = 0; i < length_inner; ++i) { assert_int_equal(destination.array[i].name.used, source.array[i].name.used); assert_int_equal(destination.array[i].value.used, source.array[i].value.used); @@ -64,7 +64,7 @@ void test__f_string_map_multis_append_all__works(void **state) { } // for } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { free((void *) source.array[i].name.string); free((void *) source.array[i].value.array[0].string); @@ -72,7 +72,7 @@ void test__f_string_map_multis_append_all__works(void **state) { free((void *) source.array[i].value.array); } // for - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].name.string); free((void *) destination.array[i].value.array[0].string); diff --git a/level_0/f_string/tests/unit/c/test-string-map_multiss_append.c b/level_0/f_string/tests/unit/c/test-string-map_multiss_append.c index ec8276c..8786a12 100644 --- a/level_0/f_string/tests/unit/c/test-string-map_multiss_append.c +++ b/level_0/f_string/tests/unit/c/test-string-map_multiss_append.c @@ -64,7 +64,7 @@ void test__f_string_map_multiss_append__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.array[0].used, length_inner); - for (f_array_length_t i = 0; i < length_inner; ++i) { + for (f_number_unsigned_t i = 0; i < length_inner; ++i) { assert_int_equal(destination.array[0].array[i].name.used, test_names[i].used); assert_int_equal(destination.array[0].array[i].value.used, test_values[i].used); @@ -77,7 +77,7 @@ void test__f_string_map_multiss_append__works(void **state) { } // for } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { free((void *) source.array[i].name.string); free((void *) source.array[i].value.array[0].string); @@ -86,7 +86,7 @@ void test__f_string_map_multiss_append__works(void **state) { } // for - for (f_array_length_t i = 0; i < destination.array[0].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[0].used; ++i) { free((void *) destination.array[0].array[i].name.string); free((void *) destination.array[0].array[i].value.array[0].string); diff --git a/level_0/f_string/tests/unit/c/test-string-map_multiss_append_all.c b/level_0/f_string/tests/unit/c/test-string-map_multiss_append_all.c index 6fe4f20..68b7ada 100644 --- a/level_0/f_string/tests/unit/c/test-string-map_multiss_append_all.c +++ b/level_0/f_string/tests/unit/c/test-string-map_multiss_append_all.c @@ -40,7 +40,7 @@ void test__f_string_map_multiss_append_all__works(void **state) { assert_int_equal(source.used, 0); assert_int_equal(source.size, length_outer); - f_array_length_t i = 0; + f_number_unsigned_t i = 0; for (; source.used < length_outer; ++source.used) { @@ -79,9 +79,9 @@ void test__f_string_map_multiss_append_all__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, source.used); - for (f_array_length_t j = 0; j < length_outer; ++j) { + for (f_number_unsigned_t j = 0; j < length_outer; ++j) { - for (f_array_length_t i = 0; i < length_inner; ++i) { + for (f_number_unsigned_t i = 0; i < length_inner; ++i) { assert_int_equal(destination.array[j].array[i].name.used, test_names[i].used); assert_int_equal(destination.array[j].array[i].value.used, test_values[i].used); @@ -95,9 +95,9 @@ void test__f_string_map_multiss_append_all__works(void **state) { } // for } - for (f_array_length_t j = 0; j < source.used; ++j) { + for (f_number_unsigned_t j = 0; j < source.used; ++j) { - for (f_array_length_t i = 0; i < source.array[j].used; ++i) { + for (f_number_unsigned_t i = 0; i < source.array[j].used; ++i) { free((void *) source.array[j].array[i].name.string); free((void *) source.array[j].array[i].value.array[0].string); @@ -108,9 +108,9 @@ void test__f_string_map_multiss_append_all__works(void **state) { free((void *) source.array[j].array); } // for - for (f_array_length_t j = 0; j < destination.used; ++j) { + for (f_number_unsigned_t j = 0; j < destination.used; ++j) { - for (f_array_length_t i = 0; i < destination.array[j].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[j].used; ++i) { free((void *) destination.array[j].array[i].name.string); free((void *) destination.array[j].array[i].value.array[0].string); diff --git a/level_0/f_string/tests/unit/c/test-string-maps_append_all.c b/level_0/f_string/tests/unit/c/test-string-maps_append_all.c index 1514f56..3194cac 100644 --- a/level_0/f_string/tests/unit/c/test-string-maps_append_all.c +++ b/level_0/f_string/tests/unit/c/test-string-maps_append_all.c @@ -43,7 +43,7 @@ void test__f_string_maps_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < length_inner; ++i) { + for (f_number_unsigned_t i = 0; i < length_inner; ++i) { assert_int_equal(destination.array[i].name.used, source.array[i].name.used); assert_int_equal(destination.array[i].value.used, source.array[i].value.used); @@ -53,13 +53,13 @@ void test__f_string_maps_append_all__works(void **state) { } // for } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { free((void *) source.array[i].name.string); free((void *) source.array[i].value.string); } // for - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].name.string); free((void *) destination.array[i].value.string); diff --git a/level_0/f_string/tests/unit/c/test-string-mapss_append.c b/level_0/f_string/tests/unit/c/test-string-mapss_append.c index 09e1fa0..853312c 100644 --- a/level_0/f_string/tests/unit/c/test-string-mapss_append.c +++ b/level_0/f_string/tests/unit/c/test-string-mapss_append.c @@ -49,7 +49,7 @@ void test__f_string_mapss_append__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.array[0].used, length_inner); - for (f_array_length_t i = 0; i < length_inner; ++i) { + for (f_number_unsigned_t i = 0; i < length_inner; ++i) { assert_int_equal(destination.array[0].array[i].name.used, test_names[i].used); assert_int_equal(destination.array[0].array[i].value.used, test_values[i].used); @@ -59,14 +59,14 @@ void test__f_string_mapss_append__works(void **state) { } // for } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { free((void *) source.array[i].name.string); free((void *) source.array[i].value.string); } // for - for (f_array_length_t i = 0; i < destination.array[0].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[0].used; ++i) { free((void *) destination.array[0].array[i].name.string); free((void *) destination.array[0].array[i].value.string); diff --git a/level_0/f_string/tests/unit/c/test-string-mapss_append_all.c b/level_0/f_string/tests/unit/c/test-string-mapss_append_all.c index 5e45bca..74a1f1c 100644 --- a/level_0/f_string/tests/unit/c/test-string-mapss_append_all.c +++ b/level_0/f_string/tests/unit/c/test-string-mapss_append_all.c @@ -29,7 +29,7 @@ void test__f_string_mapss_append_all__works(void **state) { assert_int_equal(source.used, 0); assert_int_equal(source.size, length_outer); - f_array_length_t i = 0; + f_number_unsigned_t i = 0; for (; source.used < length_outer; ++source.used) { @@ -64,9 +64,9 @@ void test__f_string_mapss_append_all__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, source.used); - for (f_array_length_t j = 0; j < length_outer; ++j) { + for (f_number_unsigned_t j = 0; j < length_outer; ++j) { - for (f_array_length_t i = 0; i < length_inner; ++i) { + for (f_number_unsigned_t i = 0; i < length_inner; ++i) { assert_int_equal(destination.array[j].array[i].name.used, test_names[i].used); assert_int_equal(destination.array[j].array[i].value.used, test_values[i].used); @@ -77,9 +77,9 @@ void test__f_string_mapss_append_all__works(void **state) { } // for } - for (f_array_length_t j = 0; j < source.used; ++j) { + for (f_number_unsigned_t j = 0; j < source.used; ++j) { - for (f_array_length_t i = 0; i < source.array[j].used; ++i) { + for (f_number_unsigned_t i = 0; i < source.array[j].used; ++i) { free((void *) source.array[j].array[i].name.string); free((void *) source.array[j].array[i].value.string); @@ -88,9 +88,9 @@ void test__f_string_mapss_append_all__works(void **state) { free((void *) source.array[j].array); } // for - for (f_array_length_t j = 0; j < destination.used; ++j) { + for (f_number_unsigned_t j = 0; j < destination.used; ++j) { - for (f_array_length_t i = 0; i < destination.array[j].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[j].used; ++i) { free((void *) destination.array[j].array[i].name.string); free((void *) destination.array[j].array[i].value.string); diff --git a/level_0/f_string/tests/unit/c/test-string-quantitys_append_all.c b/level_0/f_string/tests/unit/c/test-string-quantitys_append_all.c index 6142d47..ef784b1 100644 --- a/level_0/f_string/tests/unit/c/test-string-quantitys_append_all.c +++ b/level_0/f_string/tests/unit/c/test-string-quantitys_append_all.c @@ -24,7 +24,7 @@ void test__f_string_quantitys_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < length_sources; ++i) { + for (f_number_unsigned_t i = 0; i < length_sources; ++i) { assert_int_equal(destination.array[i].start, source.array[i].start); assert_int_equal(destination.array[i].total, source.array[i].total); diff --git a/level_0/f_string/tests/unit/c/test-string-quantityss_append.c b/level_0/f_string/tests/unit/c/test-string-quantityss_append.c index b145dc9..5176f98 100644 --- a/level_0/f_string/tests/unit/c/test-string-quantityss_append.c +++ b/level_0/f_string/tests/unit/c/test-string-quantityss_append.c @@ -23,7 +23,7 @@ void test__f_string_quantityss_append__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.array[0].used, length_sources); - for (f_array_length_t i = 0; i < length_sources; ++i) { + for (f_number_unsigned_t i = 0; i < length_sources; ++i) { assert_int_equal(destination.array[0].array[i].start, sources_array[i].start); assert_int_equal(destination.array[0].array[i].total, sources_array[i].total); diff --git a/level_0/f_string/tests/unit/c/test-string-quantityss_append_all.c b/level_0/f_string/tests/unit/c/test-string-quantityss_append_all.c index 06f8fd9..79df178 100644 --- a/level_0/f_string/tests/unit/c/test-string-quantityss_append_all.c +++ b/level_0/f_string/tests/unit/c/test-string-quantityss_append_all.c @@ -34,9 +34,9 @@ void test__f_string_quantityss_append_all__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, source.used); - for (f_array_length_t j = 0; j < length_sources_set; ++j) { + for (f_number_unsigned_t j = 0; j < length_sources_set; ++j) { - for (f_array_length_t i = 0; i < length_sources; ++i) { + for (f_number_unsigned_t i = 0; i < length_sources; ++i) { assert_int_equal(destination.array[j].array[i].start, sources_set_array[j].array[i].start); assert_int_equal(destination.array[j].array[i].total, sources_set_array[j].array[i].total); @@ -44,7 +44,7 @@ void test__f_string_quantityss_append_all__works(void **state) { } // for } - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_string/tests/unit/c/test-string-ranges_append_all.c b/level_0/f_string/tests/unit/c/test-string-ranges_append_all.c index d820235..ff68b82 100644 --- a/level_0/f_string/tests/unit/c/test-string-ranges_append_all.c +++ b/level_0/f_string/tests/unit/c/test-string-ranges_append_all.c @@ -24,7 +24,7 @@ void test__f_string_ranges_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < length_sources; ++i) { + for (f_number_unsigned_t i = 0; i < length_sources; ++i) { assert_int_equal(destination.array[i].start, source.array[i].start); assert_int_equal(destination.array[i].stop, source.array[i].stop); diff --git a/level_0/f_string/tests/unit/c/test-string-rangess_append.c b/level_0/f_string/tests/unit/c/test-string-rangess_append.c index c27460d..549cca1 100644 --- a/level_0/f_string/tests/unit/c/test-string-rangess_append.c +++ b/level_0/f_string/tests/unit/c/test-string-rangess_append.c @@ -23,7 +23,7 @@ void test__f_string_rangess_append__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.array[0].used, length_sources); - for (f_array_length_t i = 0; i < length_sources; ++i) { + for (f_number_unsigned_t i = 0; i < length_sources; ++i) { assert_int_equal(destination.array[0].array[i].start, sources_array[i].start); assert_int_equal(destination.array[0].array[i].stop, sources_array[i].stop); diff --git a/level_0/f_string/tests/unit/c/test-string-rangess_append_all.c b/level_0/f_string/tests/unit/c/test-string-rangess_append_all.c index 333a6e8..216b28e 100644 --- a/level_0/f_string/tests/unit/c/test-string-rangess_append_all.c +++ b/level_0/f_string/tests/unit/c/test-string-rangess_append_all.c @@ -34,9 +34,9 @@ void test__f_string_rangess_append_all__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, source.used); - for (f_array_length_t j = 0; j < length_sources_set; ++j) { + for (f_number_unsigned_t j = 0; j < length_sources_set; ++j) { - for (f_array_length_t i = 0; i < length_sources; ++i) { + for (f_number_unsigned_t i = 0; i < length_sources; ++i) { assert_int_equal(destination.array[j].array[i].start, sources_set_array[j].array[i].start); assert_int_equal(destination.array[j].array[i].stop, sources_set_array[j].array[i].stop); @@ -44,7 +44,7 @@ void test__f_string_rangess_append_all__works(void **state) { } // for } - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_string/tests/unit/c/test-string-triples_append_all.c b/level_0/f_string/tests/unit/c/test-string-triples_append_all.c index e34cad4..c525489 100644 --- a/level_0/f_string/tests/unit/c/test-string-triples_append_all.c +++ b/level_0/f_string/tests/unit/c/test-string-triples_append_all.c @@ -32,7 +32,7 @@ void test__f_string_triples_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < length_sources; ++i) { + for (f_number_unsigned_t i = 0; i < length_sources; ++i) { assert_int_equal(destination.array[i].a.used, source.array[i].a.used); assert_int_equal(destination.array[i].b.used, source.array[i].b.used); @@ -44,7 +44,7 @@ void test__f_string_triples_append_all__works(void **state) { } // for } - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].a.string); free((void *) destination.array[i].b.string); diff --git a/level_0/f_string/tests/unit/c/test-string-tripless_append.c b/level_0/f_string/tests/unit/c/test-string-tripless_append.c index 7dd6577..a25386e 100644 --- a/level_0/f_string/tests/unit/c/test-string-tripless_append.c +++ b/level_0/f_string/tests/unit/c/test-string-tripless_append.c @@ -31,7 +31,7 @@ void test__f_string_tripless_append__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.array[0].used, length_sources); - for (f_array_length_t i = 0; i < length_sources; ++i) { + for (f_number_unsigned_t i = 0; i < length_sources; ++i) { assert_int_equal(destination.array[0].array[i].a.used, sources_array[i].a.used); assert_int_equal(destination.array[0].array[i].b.used, sources_array[i].b.used); @@ -43,7 +43,7 @@ void test__f_string_tripless_append__works(void **state) { } // for } - for (f_array_length_t i = 0; i < destination.array[0].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[0].used; ++i) { free((void *) destination.array[0].array[i].a.string); free((void *) destination.array[0].array[i].b.string); diff --git a/level_0/f_string/tests/unit/c/test-string-tripless_append_all.c b/level_0/f_string/tests/unit/c/test-string-tripless_append_all.c index 86e6a10..c024ddf 100644 --- a/level_0/f_string/tests/unit/c/test-string-tripless_append_all.c +++ b/level_0/f_string/tests/unit/c/test-string-tripless_append_all.c @@ -50,9 +50,9 @@ void test__f_string_tripless_append_all__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, source.used); - for (f_array_length_t j = 0; j < length_sources_set; ++j) { + for (f_number_unsigned_t j = 0; j < length_sources_set; ++j) { - for (f_array_length_t i = 0; i < length_sources; ++i) { + for (f_number_unsigned_t i = 0; i < length_sources; ++i) { assert_int_equal(destination.array[j].array[i].a.used, sources_set_array[j].array[i].a.used); assert_int_equal(destination.array[j].array[i].b.used, sources_set_array[j].array[i].b.used); @@ -65,9 +65,9 @@ void test__f_string_tripless_append_all__works(void **state) { } // for } - for (f_array_length_t j = 0; j < destination.used; ++j) { + for (f_number_unsigned_t j = 0; j < destination.used; ++j) { - for (f_array_length_t i = 0; i < destination.array[j].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[j].used; ++i) { free((void *) destination.array[j].array[i].a.string); free((void *) destination.array[j].array[i].b.string); diff --git a/level_0/f_thread/c/private-thread.c b/level_0/f_thread/c/private-thread.c index c3c37eb..974c774 100644 --- a/level_0/f_thread/c/private-thread.c +++ b/level_0/f_thread/c/private-thread.c @@ -19,11 +19,11 @@ extern "C" { #endif // !defined(_di_f_thread_attributes_adjust_) || !defined(_di_f_thread_attributes_decimate_by_) || !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_) || !defined(_di_f_thread_attributes_resize_) || !defined(_di_f_thread_sets_adjust_) || !defined(_di_f_thread_sets_decimate_by_) || !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_) || !defined(_di_f_thread_sets_resize_) #if !defined(_di_f_thread_attributes_adjust_) || !defined(_di_f_thread_attributes_decimate_by_) - f_status_t private_f_thread_attributes_adjust(const f_array_length_t length, f_thread_attributes_t * const attributes) { + f_status_t private_f_thread_attributes_adjust(const f_number_unsigned_t length, f_thread_attributes_t * const attributes) { f_status_t status = F_none; - for (f_array_length_t i = length; i < attributes->size; ++i) { + for (f_number_unsigned_t i = length; i < attributes->size; ++i) { status = private_f_thread_attribute_delete(&attributes->array[i]); if (F_status_is_error(status)) return status; @@ -43,11 +43,11 @@ extern "C" { #endif // !defined(_di_f_thread_attributes_adjust_) || !defined(_di_f_thread_attributes_decimate_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_) - f_status_t private_f_thread_attributes_resize(const f_array_length_t length, f_thread_attributes_t * const attributes) { + f_status_t private_f_thread_attributes_resize(const f_number_unsigned_t length, f_thread_attributes_t * const attributes) { f_status_t status = F_none; - for (f_array_length_t i = length; i < attributes->size; ++i) { + for (f_number_unsigned_t i = length; i < attributes->size; ++i) { status = private_f_thread_attribute_delete(&attributes->array[i]); if (F_status_is_error(status)) return status; @@ -85,11 +85,11 @@ extern "C" { #endif // !defined(_di_f_thread_barriers_adjust_) || !defined(_di_f_thread_barriers_decimate_by_) || !defined(_di_f_thread_barriers_decrease_) || !defined(_di_f_thread_barriers_decrease_by_) || !defined(_di_f_thread_barriers_increase_) || !defined(_di_f_thread_barriers_increase_by_) || !defined(_di_f_thread_barriers_resize_) #if !defined(_di_f_thread_barriers_adjust_) || !defined(_di_f_thread_barriers_decimate_by_) - f_status_t private_f_thread_barriers_adjust(const f_array_length_t length, f_thread_barriers_t * const barriers) { + f_status_t private_f_thread_barriers_adjust(const f_number_unsigned_t length, f_thread_barriers_t * const barriers) { f_status_t status = F_none; - for (f_array_length_t i = length; i < barriers->size; ++i) { + for (f_number_unsigned_t i = length; i < barriers->size; ++i) { status = private_f_thread_barrier_delete(&barriers->array[i]); if (F_status_is_error(status)) return status; @@ -109,11 +109,11 @@ extern "C" { #endif // !defined(_di_f_thread_barriers_adjust_) || !defined(_di_f_thread_barriers_decimate_by_) #if !defined(_di_f_thread_barriers_decrease_) || !defined(_di_f_thread_barriers_decrease_by_) || !defined(_di_f_thread_barriers_increase_) || !defined(_di_f_thread_barriers_increase_by_) - f_status_t private_f_thread_barriers_resize(const f_array_length_t length, f_thread_barriers_t * const barriers) { + f_status_t private_f_thread_barriers_resize(const f_number_unsigned_t length, f_thread_barriers_t * const barriers) { f_status_t status = F_none; - for (f_array_length_t i = length; i < barriers->size; ++i) { + for (f_number_unsigned_t i = length; i < barriers->size; ++i) { status = private_f_thread_barrier_delete(&barriers->array[i]); if (F_status_is_error(status)) return status; @@ -146,11 +146,11 @@ extern "C" { #endif // !defined(_di_f_thread_barrier_attributes_adjust_) || !defined(_di_f_thread_barrier_attributes_decimate_by_) || !defined(_di_f_thread_barrier_attributes_decrease_) || !defined(_di_f_thread_barrier_attributes_decrease_by_) || !defined(_di_f_thread_barrier_attributes_increase_) || !defined(_di_f_thread_barrier_attributes_increase_by_) || !defined(_di_f_thread_barrier_attributes_resize_) #if !defined(_di_f_thread_barrier_attributes_adjust_) || !defined(_di_f_thread_barrier_attributes_decimate_by_) - f_status_t private_f_thread_barrier_attributes_adjust(const f_array_length_t length, f_thread_barrier_attributes_t * const attributes) { + f_status_t private_f_thread_barrier_attributes_adjust(const f_number_unsigned_t length, f_thread_barrier_attributes_t * const attributes) { f_status_t status = F_none; - for (f_array_length_t i = length; i < attributes->size; ++i) { + for (f_number_unsigned_t i = length; i < attributes->size; ++i) { status = private_f_thread_barrier_attribute_delete(&attributes->array[i]); if (F_status_is_error(status)) return status; @@ -170,11 +170,11 @@ extern "C" { #endif // !defined(_di_f_thread_barrier_attributes_adjust_) || !defined(_di_f_thread_barrier_attributes_decimate_by_) #if !defined(_di_f_thread_barrier_attributes_decrease_) || !defined(_di_f_thread_barrier_attributes_decrease_by_) || !defined(_di_f_thread_barrier_attributes_increase_) || !defined(_di_f_thread_barrier_attributes_increase_by_) - f_status_t private_f_thread_barrier_attributes_resize(const f_array_length_t length, f_thread_barrier_attributes_t * const attributes) { + f_status_t private_f_thread_barrier_attributes_resize(const f_number_unsigned_t length, f_thread_barrier_attributes_t * const attributes) { f_status_t status = F_none; - for (f_array_length_t i = length; i < attributes->size; ++i) { + for (f_number_unsigned_t i = length; i < attributes->size; ++i) { status = private_f_thread_barrier_attribute_delete(&attributes->array[i]); if (F_status_is_error(status)) return status; @@ -210,11 +210,11 @@ extern "C" { #endif // !defined(_di_f_thread_condition_attributes_adjust_) || !defined(_di_f_thread_condition_attributes_decimate_by_) || !defined(_di_f_thread_condition_attributes_decrease_) || !defined(_di_f_thread_condition_attributes_decrease_by_) || !defined(_di_f_thread_condition_attributes_increase_) || !defined(_di_f_thread_condition_attributes_increase_by_) || !defined(_di_f_thread_condition_attributes_resize_) #if !defined(_di_f_thread_condition_attributes_adjust_) || !defined(_di_f_thread_condition_attributes_decimate_by_) - f_status_t private_f_thread_condition_attributes_adjust(const f_array_length_t length, f_thread_condition_attributes_t * const attributes) { + f_status_t private_f_thread_condition_attributes_adjust(const f_number_unsigned_t length, f_thread_condition_attributes_t * const attributes) { f_status_t status = F_none; - for (f_array_length_t i = length; i < attributes->size; ++i) { + for (f_number_unsigned_t i = length; i < attributes->size; ++i) { status = private_f_thread_condition_attribute_delete(&attributes->array[i]); if (F_status_is_error(status)) return status; @@ -234,11 +234,11 @@ extern "C" { #endif // !defined(_di_f_thread_condition_attributes_adjust_) || !defined(_di_f_thread_condition_attributes_decimate_by_) #if !defined(_di_f_thread_condition_attributes_decrease_) || !defined(_di_f_thread_condition_attributes_decrease_by_) || !defined(_di_f_thread_condition_attributes_increase_) || !defined(_di_f_thread_condition_attributes_increase_by_) - f_status_t private_f_thread_condition_attributes_resize(const f_array_length_t length, f_thread_condition_attributes_t * const attributes) { + f_status_t private_f_thread_condition_attributes_resize(const f_number_unsigned_t length, f_thread_condition_attributes_t * const attributes) { f_status_t status = F_none; - for (f_array_length_t i = length; i < attributes->size; ++i) { + for (f_number_unsigned_t i = length; i < attributes->size; ++i) { status = private_f_thread_condition_attribute_delete(&attributes->array[i]); if (F_status_is_error(status)) return status; @@ -274,11 +274,11 @@ extern "C" { #endif // !defined(_di_f_thread_condition_delete_) || !defined(_di_f_thread_conditions_adjust_) || !defined(_di_f_thread_conditions_decimate_by_) || !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_) || !defined(_di_f_thread_conditions_resize_) #if !defined(_di_f_thread_conditions_adjust_) || !defined(_di_f_thread_conditions_decimate_by_) - f_status_t private_f_thread_conditions_adjust(const f_array_length_t length, f_thread_conditions_t * const conditions) { + f_status_t private_f_thread_conditions_adjust(const f_number_unsigned_t length, f_thread_conditions_t * const conditions) { f_status_t status = F_none; - for (f_array_length_t i = length; i < conditions->size; ++i) { + for (f_number_unsigned_t i = length; i < conditions->size; ++i) { status = private_f_thread_condition_delete(&conditions->array[i]); if (F_status_is_error(status)) return status; @@ -298,11 +298,11 @@ extern "C" { #endif // !defined(_di_f_thread_conditions_adjust_) || !defined(_di_f_thread_conditions_decimate_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_) - f_status_t private_f_thread_conditions_resize(const f_array_length_t length, f_thread_conditions_t * const conditions) { + f_status_t private_f_thread_conditions_resize(const f_number_unsigned_t length, f_thread_conditions_t * const conditions) { f_status_t status = F_none; - for (f_array_length_t i = length; i < conditions->size; ++i) { + for (f_number_unsigned_t i = length; i < conditions->size; ++i) { status = private_f_thread_condition_delete(&conditions->array[i]); if (F_status_is_error(status)) return status; @@ -322,11 +322,11 @@ extern "C" { #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_adjust_) || !defined(_di_f_thread_ids_decimate_by_) - f_status_t private_f_thread_ids_adjust(const f_array_length_t length, f_thread_ids_t * const ids) { + f_status_t private_f_thread_ids_adjust(const f_number_unsigned_t length, f_thread_ids_t * const ids) { f_status_t status = F_none; - for (f_array_length_t i = length; i < ids->size; ++i) { + for (f_number_unsigned_t i = length; i < ids->size; ++i) { memset(&ids->array[i], 0, sizeof(f_thread_id_t)); } // for @@ -344,7 +344,7 @@ extern "C" { #endif // !defined(_di_f_thread_ids_adjust_) || !defined(_di_f_thread_ids_decimate_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_) - f_status_t private_f_thread_ids_resize(const f_array_length_t length, f_thread_ids_t * const ids) { + f_status_t private_f_thread_ids_resize(const f_number_unsigned_t length, f_thread_ids_t * const ids) { const f_status_t status = f_memory_resize(ids->size, length, sizeof(f_thread_id_t), (void **) & ids->array); if (F_status_is_error(status)) return status; @@ -373,11 +373,11 @@ extern "C" { #endif // !defined(_di_f_thread_keys_adjust_) || !defined(_di_f_thread_keys_decimate_by_) || !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_) || !defined(_di_f_thread_keys_resize_) #if !defined(_di_f_thread_keys_adjust_) || !defined(_di_f_thread_keys_decimate_by_) - f_status_t private_f_thread_keys_adjust(const f_array_length_t length, f_thread_keys_t * const keys) { + f_status_t private_f_thread_keys_adjust(const f_number_unsigned_t length, f_thread_keys_t * const keys) { f_status_t status = F_none; - for (f_array_length_t i = length; i < keys->size; ++i) { + for (f_number_unsigned_t i = length; i < keys->size; ++i) { status = private_f_thread_key_delete(&keys->array[i]); if (F_status_is_error(status)) return status; @@ -397,11 +397,11 @@ extern "C" { #endif // !defined(_di_f_thread_keys_adjust_) || !defined(_di_f_thread_keys_decimate_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_) - f_status_t private_f_thread_keys_resize(const f_array_length_t length, f_thread_keys_t * const keys) { + f_status_t private_f_thread_keys_resize(const f_number_unsigned_t length, f_thread_keys_t * const keys) { f_status_t status = F_none; - for (f_array_length_t i = length; i < keys->size; ++i) { + for (f_number_unsigned_t i = length; i < keys->size; ++i) { status = private_f_thread_key_delete(&keys->array[i]); if (F_status_is_error(status)) return status; @@ -437,11 +437,11 @@ extern "C" { #endif // !defined(_di_f_thread_lock_attributes_adjust_) || !defined(_di_f_thread_lock_attributes_decimate_by_) || !defined(_di_f_thread_lock_attributes_decrease_) || !defined(_di_f_thread_lock_attributes_decrease_by_) || !defined(_di_f_thread_lock_attributes_increase_) || !defined(_di_f_thread_lock_attributes_increase_by_) || !defined(_di_f_thread_lock_attributes_resize_) #if !defined(_di_f_thread_lock_attributes_adjust_) || !defined(_di_f_thread_lock_attributes_decimate_by_) - f_status_t private_f_thread_lock_attributes_adjust(const f_array_length_t length, f_thread_lock_attributes_t * const attributes) { + f_status_t private_f_thread_lock_attributes_adjust(const f_number_unsigned_t length, f_thread_lock_attributes_t * const attributes) { f_status_t status = F_none; - for (f_array_length_t i = length; i < attributes->size; ++i) { + for (f_number_unsigned_t i = length; i < attributes->size; ++i) { status = private_f_thread_lock_attribute_delete(&attributes->array[i]); if (F_status_is_error(status)) return status; @@ -461,11 +461,11 @@ extern "C" { #endif // !defined(_di_f_thread_lock_attributes_adjust_) || !defined(_di_f_thread_lock_attributes_decimate_by_) #if !defined(_di_f_thread_lock_attributes_decrease_) || !defined(_di_f_thread_lock_attributes_decrease_by_) || !defined(_di_f_thread_lock_attributes_increase_) || !defined(_di_f_thread_lock_attributes_increase_by_) - f_status_t private_f_thread_lock_attributes_resize(const f_array_length_t length, f_thread_lock_attributes_t * const attributes) { + f_status_t private_f_thread_lock_attributes_resize(const f_number_unsigned_t length, f_thread_lock_attributes_t * const attributes) { f_status_t status = F_none; - for (f_array_length_t i = length; i < attributes->size; ++i) { + for (f_number_unsigned_t i = length; i < attributes->size; ++i) { status = private_f_thread_lock_attribute_delete(&attributes->array[i]); if (F_status_is_error(status)) return status; @@ -501,11 +501,11 @@ extern "C" { #endif // !defined(_di_f_thread_lock_delete_) || !defined(_di_f_thread_locks_adjust_) || !defined(_di_f_thread_locks_decimate_by_) || !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_) || !defined(_di_f_thread_locks_resize_) #if !defined(_di_f_thread_locks_adjust_) || !defined(_di_f_thread_locks_decimate_by_) - f_status_t private_f_thread_locks_adjust(const f_array_length_t length, f_thread_locks_t * const locks) { + f_status_t private_f_thread_locks_adjust(const f_number_unsigned_t length, f_thread_locks_t * const locks) { f_status_t status = F_none; - for (f_array_length_t i = length; i < locks->size; ++i) { + for (f_number_unsigned_t i = length; i < locks->size; ++i) { status = private_f_thread_lock_delete(&locks->array[i]); if (F_status_is_error(status)) return status; @@ -525,11 +525,11 @@ extern "C" { #endif // !defined(_di_f_thread_locks_adjust_) || !defined(_di_f_thread_locks_decimate_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_) - f_status_t private_f_thread_locks_resize(const f_array_length_t length, f_thread_locks_t * const locks) { + f_status_t private_f_thread_locks_resize(const f_number_unsigned_t length, f_thread_locks_t * const locks) { f_status_t status = F_none; - for (f_array_length_t i = length; i < locks->size; ++i) { + for (f_number_unsigned_t i = length; i < locks->size; ++i) { status = private_f_thread_lock_delete(&locks->array[i]); if (F_status_is_error(status)) return status; @@ -565,11 +565,11 @@ extern "C" { #endif // !defined(_di_f_thread_mutex_attributes_adjust_) || !defined(_di_f_thread_mutex_attributes_decimate_by_) || !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_) || !defined(_di_f_thread_mutex_attributes_resize_) #if !defined(_di_f_thread_mutex_attributes_adjust_) || !defined(_di_f_thread_mutex_attributes_decimate_by_) - f_status_t private_f_thread_mutex_attributes_adjust(const f_array_length_t length, f_thread_mutex_attributes_t * const attributes) { + f_status_t private_f_thread_mutex_attributes_adjust(const f_number_unsigned_t length, f_thread_mutex_attributes_t * const attributes) { f_status_t status = F_none; - for (f_array_length_t i = length; i < attributes->size; ++i) { + for (f_number_unsigned_t i = length; i < attributes->size; ++i) { status = private_f_thread_mutex_attribute_delete(&attributes->array[i]); if (F_status_is_error(status)) return status; @@ -589,11 +589,11 @@ extern "C" { #endif // !defined(_di_f_thread_mutex_attributes_adjust_) || !defined(_di_f_thread_mutex_attributes_decimate_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_) - f_status_t private_f_thread_mutex_attributes_resize(const f_array_length_t length, f_thread_mutex_attributes_t * const attributes) { + f_status_t private_f_thread_mutex_attributes_resize(const f_number_unsigned_t length, f_thread_mutex_attributes_t * const attributes) { f_status_t status = F_none; - for (f_array_length_t i = length; i < attributes->size; ++i) { + for (f_number_unsigned_t i = length; i < attributes->size; ++i) { status = private_f_thread_mutex_attribute_delete(&attributes->array[i]); if (F_status_is_error(status)) return status; @@ -630,11 +630,11 @@ extern "C" { #endif // !defined(_di_f_thread_mutex_delete_) || !defined(_di_f_thread_mutexs_adjust_) || !defined(_di_f_thread_mutexs_decimate_by_) || !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_) || !defined(_di_f_thread_mutexs_resize_) #if !defined(_di_f_thread_mutexs_adjust_) || !defined(_di_f_thread_mutexs_decimate_by_) - f_status_t private_f_thread_mutexs_adjust(const f_array_length_t length, f_thread_mutexs_t * const mutexs) { + f_status_t private_f_thread_mutexs_adjust(const f_number_unsigned_t length, f_thread_mutexs_t * const mutexs) { f_status_t status = F_none; - for (f_array_length_t i = length; i < mutexs->size; ++i) { + for (f_number_unsigned_t i = length; i < mutexs->size; ++i) { status = private_f_thread_mutex_delete(&mutexs->array[i]); if (F_status_is_error(status)) return status; @@ -654,11 +654,11 @@ extern "C" { #endif // !defined(_di_f_thread_mutexs_adjust_) || !defined(_di_f_thread_mutexs_decimate_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_) - f_status_t private_f_thread_mutexs_resize(const f_array_length_t length, f_thread_mutexs_t * const mutexs) { + f_status_t private_f_thread_mutexs_resize(const f_number_unsigned_t length, f_thread_mutexs_t * const mutexs) { f_status_t status = F_none; - for (f_array_length_t i = length; i < mutexs->size; ++i) { + for (f_number_unsigned_t i = length; i < mutexs->size; ++i) { status = private_f_thread_mutex_delete(&mutexs->array[i]); if (F_status_is_error(status)) return status; @@ -678,9 +678,9 @@ extern "C" { #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_onces_adjust_) || !defined(_di_f_thread_onces_decimate_by_) - f_status_t private_f_thread_onces_adjust(const f_array_length_t length, f_thread_onces_t * const onces) { + f_status_t private_f_thread_onces_adjust(const f_number_unsigned_t length, f_thread_onces_t * const onces) { - for (f_array_length_t i = length; i < onces->size; ++i) { + for (f_number_unsigned_t i = length; i < onces->size; ++i) { memset(&onces->array[i], 0, sizeof(f_thread_once_t)); } // for @@ -698,7 +698,7 @@ extern "C" { #endif // !defined(_di_f_thread_onces_adjust_) || !defined(_di_f_thread_onces_decimate_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_) - f_status_t private_f_thread_onces_resize(const f_array_length_t length, f_thread_onces_t * const onces) { + f_status_t private_f_thread_onces_resize(const f_number_unsigned_t length, f_thread_onces_t * const onces) { f_status_t status = F_none; @@ -731,11 +731,11 @@ extern "C" { #endif // !defined(_di_f_thread_semaphores_adjust_) || !defined(_di_f_thread_semaphores_decimate_by_) || !defined(_di_f_thread_semaphores_decrease_) || !defined(_di_f_thread_semaphores_decrease_by_) || !defined(_di_f_thread_semaphores_increase_) || !defined(_di_f_thread_semaphores_increase_by_) || !defined(_di_f_thread_semaphores_resize_) #if !defined(_di_f_thread_semaphores_adjust_) || !defined(_di_f_thread_semaphores_decimate_by_) - f_status_t private_f_thread_semaphores_adjust(const f_array_length_t length, f_thread_semaphores_t * const semaphores) { + f_status_t private_f_thread_semaphores_adjust(const f_number_unsigned_t length, f_thread_semaphores_t * const semaphores) { f_status_t status = F_none; - for (f_array_length_t i = length; i < semaphores->size; ++i) { + for (f_number_unsigned_t i = length; i < semaphores->size; ++i) { status = private_f_thread_semaphore_delete(&semaphores->array[i]); if (F_status_is_error(status)) return status; @@ -756,11 +756,11 @@ extern "C" { #endif // !defined(_di_f_thread_semaphores_adjust_) || !defined(_di_f_thread_semaphores_decimate_by_) #if !defined(_di_f_thread_semaphores_decrease_) || !defined(_di_f_thread_semaphores_decrease_by_) || !defined(_di_f_thread_semaphores_increase_) || !defined(_di_f_thread_semaphores_increase_by_) - f_status_t private_f_thread_semaphores_resize(const f_array_length_t length, f_thread_semaphores_t * const semaphores) { + f_status_t private_f_thread_semaphores_resize(const f_number_unsigned_t length, f_thread_semaphores_t * const semaphores) { f_status_t status = F_none; - for (f_array_length_t i = length; i < semaphores->size; ++i) { + for (f_number_unsigned_t i = length; i < semaphores->size; ++i) { status = private_f_thread_semaphore_delete(&semaphores->array[i]); if (F_status_is_error(status)) return status; @@ -780,11 +780,11 @@ extern "C" { #endif // !defined(_di_f_thread_semaphores_decrease_) || !defined(_di_f_thread_semaphores_decrease_by_) || !defined(_di_f_thread_semaphores_increase_) || !defined(_di_f_thread_semaphores_increase_by_) #if !defined(_di_f_thread_sets_adjust_) || !defined(_di_f_thread_sets_decimate_by_) - f_status_t private_f_thread_sets_adjust(const f_array_length_t length, f_thread_sets_t * const sets) { + f_status_t private_f_thread_sets_adjust(const f_number_unsigned_t length, f_thread_sets_t * const sets) { f_status_t status = F_none; - for (f_array_length_t i = length; i < sets->size; ++i) { + for (f_number_unsigned_t i = length; i < sets->size; ++i) { status = private_f_thread_attribute_delete(&sets->array[i].attribute); if (F_status_is_error(status)) return status; @@ -804,11 +804,11 @@ extern "C" { #endif // !defined(_di_f_thread_sets_adjust_) || !defined(_di_f_thread_sets_decimate_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_) - f_status_t private_f_thread_sets_resize(const f_array_length_t length, f_thread_sets_t * const sets) { + f_status_t private_f_thread_sets_resize(const f_number_unsigned_t length, f_thread_sets_t * const sets) { f_status_t status = F_none; - for (f_array_length_t i = length; i < sets->size; ++i) { + for (f_number_unsigned_t i = length; i < sets->size; ++i) { status = private_f_thread_attribute_delete(&sets->array[i].attribute); if (F_status_is_error(status)) return status; @@ -844,11 +844,11 @@ extern "C" { #endif // !defined(_di_f_thread_spins_adjust_) || !defined(_di_f_thread_spins_decimate_by_) || !defined(_di_f_thread_spins_decrease_) || !defined(_di_f_thread_spins_decrease_by_) || !defined(_di_f_thread_spins_increase_) || !defined(_di_f_thread_spins_increase_by_) || !defined(_di_f_thread_spins_resize_) #if !defined(_di_f_thread_spins_adjust_) || !defined(_di_f_thread_spins_decimate_by_) - f_status_t private_f_thread_spins_adjust(const f_array_length_t length, f_thread_spins_t * const spins) { + f_status_t private_f_thread_spins_adjust(const f_number_unsigned_t length, f_thread_spins_t * const spins) { f_status_t status = F_none; - for (f_array_length_t i = length; i < spins->size; ++i) { + for (f_number_unsigned_t i = length; i < spins->size; ++i) { status = private_f_thread_spin_delete(&spins->array[i]); if (F_status_is_error(status)) return status; @@ -868,11 +868,11 @@ extern "C" { #endif // !defined(_di_f_thread_spins_adjust_) || !defined(_di_f_thread_spins_decimate_by_) #if !defined(_di_f_thread_spins_decrease_) || !defined(_di_f_thread_spins_decrease_by_) || !defined(_di_f_thread_spins_increase_) || !defined(_di_f_thread_spins_increase_by_) - f_status_t private_f_thread_spins_resize(const f_array_length_t length, f_thread_spins_t * const spins) { + f_status_t private_f_thread_spins_resize(const f_number_unsigned_t length, f_thread_spins_t * const spins) { f_status_t status = F_none; - for (f_array_length_t i = length; i < spins->size; ++i) { + for (f_number_unsigned_t i = length; i < spins->size; ++i) { status = private_f_thread_spin_delete(&spins->array[i]); if (F_status_is_error(status)) return status; diff --git a/level_0/f_thread/c/private-thread.h b/level_0/f_thread/c/private-thread.h index b69ba06..4472d29 100644 --- a/level_0/f_thread/c/private-thread.h +++ b/level_0/f_thread/c/private-thread.h @@ -73,7 +73,7 @@ extern "C" { * @see f_thread_attributes_decimate_by() */ #if !defined(_di_f_thread_attributes_adjust_) || !defined(_di_f_thread_attributes_decimate_by_) - extern f_status_t private_f_thread_attributes_adjust(const f_array_length_t length, f_thread_attributes_t * const attributes) F_attribute_visibility_internal_d; + extern f_status_t private_f_thread_attributes_adjust(const f_number_unsigned_t length, f_thread_attributes_t * const attributes) F_attribute_visibility_internal_d; #endif // !defined(_di_f_thread_attributes_adjust_) || !defined(_di_f_thread_attributes_decimate_by_) /** @@ -97,7 +97,7 @@ extern "C" { * @see f_thread_attributes_increase_by() */ #if !defined(_di_f_thread_attributes_decrease_by_) || !defined(_di_f_thread_attributes_increase_) || !defined(_di_f_thread_attributes_increase_by_) - extern f_status_t private_f_thread_attributes_resize(const f_array_length_t length, f_thread_attributes_t * const attributes) F_attribute_visibility_internal_d; + extern f_status_t private_f_thread_attributes_resize(const f_number_unsigned_t length, f_thread_attributes_t * const attributes) F_attribute_visibility_internal_d; #endif // !defined(_di_f_thread_attributes_decrease_by_) || !defined(_di_f_thread_attributes_increase_) || !defined(_di_f_thread_attributes_increase_by_) /** @@ -151,7 +151,7 @@ extern "C" { * @see f_thread_barriers_decimate_by() */ #if !defined(_di_f_thread_barriers_adjust_) || !defined(_di_f_thread_barriers_decimate_by_) - extern f_status_t private_f_thread_barriers_adjust(const f_array_length_t length, f_thread_barriers_t * const barriers) F_attribute_visibility_internal_d; + extern f_status_t private_f_thread_barriers_adjust(const f_number_unsigned_t length, f_thread_barriers_t * const barriers) F_attribute_visibility_internal_d; #endif // !defined(_di_f_thread_barriers_adjust_) || !defined(_di_f_thread_barriers_decimate_by_) /** @@ -175,7 +175,7 @@ extern "C" { * @see f_thread_barriers_increase_by() */ #if !defined(_di_f_thread_barriers_decrease_by_) || !defined(_di_f_thread_barriers_increase_) || !defined(_di_f_thread_barriers_increase_by_) - extern f_status_t private_f_thread_barriers_resize(const f_array_length_t length, f_thread_barriers_t * const barriers) F_attribute_visibility_internal_d; + extern f_status_t private_f_thread_barriers_resize(const f_number_unsigned_t length, f_thread_barriers_t * const barriers) F_attribute_visibility_internal_d; #endif // !defined(_di_f_thread_barriers_decrease_by_) || !defined(_di_f_thread_barriers_increase_) || !defined(_di_f_thread_barriers_increase_by_) /** @@ -229,7 +229,7 @@ extern "C" { * @see f_thread_barrier_attributes_decimate_by() */ #if !defined(_di_f_thread_barrier_attributes_adjust_) || !defined(_di_f_thread_barrier_attributes_decimate_by_) - extern f_status_t private_f_thread_barrier_attributes_adjust(const f_array_length_t length, f_thread_barrier_attributes_t * const attributes) F_attribute_visibility_internal_d; + extern f_status_t private_f_thread_barrier_attributes_adjust(const f_number_unsigned_t length, f_thread_barrier_attributes_t * const attributes) F_attribute_visibility_internal_d; #endif // !defined(_di_f_thread_barrier_attributes_adjust_) || !defined(_di_f_thread_barrier_attributes_decimate_by_) /** @@ -253,7 +253,7 @@ extern "C" { * @see f_thread_barrier_attributes_increase_by() */ #if !defined(_di_f_thread_barrier_attributes_decrease_by_) || !defined(_di_f_thread_barrier_attributes_increase_) || !defined(_di_f_thread_barrier_attributes_increase_by_) - extern f_status_t private_f_thread_barrier_attributes_resize(const f_array_length_t length, f_thread_barrier_attributes_t * const attributes) F_attribute_visibility_internal_d; + extern f_status_t private_f_thread_barrier_attributes_resize(const f_number_unsigned_t length, f_thread_barrier_attributes_t * const attributes) F_attribute_visibility_internal_d; #endif // !defined(_di_f_thread_barrier_attributes_decrease_by_) || !defined(_di_f_thread_barrier_attributes_increase_) || !defined(_di_f_thread_barrier_attributes_increase_by_) /** @@ -307,7 +307,7 @@ extern "C" { * @see f_thread_condition_attributes_decimate_by() */ #if !defined(_di_f_thread_condition_attributes_adjust_) || !defined(_di_f_thread_condition_attributes_decimate_by_) - extern f_status_t private_f_thread_condition_attributes_adjust(const f_array_length_t length, f_thread_condition_attributes_t * const attributes) F_attribute_visibility_internal_d; + extern f_status_t private_f_thread_condition_attributes_adjust(const f_number_unsigned_t length, f_thread_condition_attributes_t * const attributes) F_attribute_visibility_internal_d; #endif // !defined(_di_f_thread_condition_attributes_adjust_) || !defined(_di_f_thread_condition_attributes_decimate_by_) /** @@ -331,7 +331,7 @@ extern "C" { * @see f_thread_condition_attributes_increase_by() */ #if !defined(_di_f_thread_condition_attributes_decrease_by_) || !defined(_di_f_thread_condition_attributes_increase_) || !defined(_di_f_thread_condition_attributes_increase_by_) - extern f_status_t private_f_thread_condition_attributes_resize(const f_array_length_t length, f_thread_condition_attributes_t * const attributes) F_attribute_visibility_internal_d; + extern f_status_t private_f_thread_condition_attributes_resize(const f_number_unsigned_t length, f_thread_condition_attributes_t * const attributes) F_attribute_visibility_internal_d; #endif // !defined(_di_f_thread_condition_attributes_decrease_by_) || !defined(_di_f_thread_condition_attributes_increase_) || !defined(_di_f_thread_condition_attributes_increase_by_) /** @@ -386,7 +386,7 @@ extern "C" { * @see f_thread_conditions_decimate_by() */ #if !defined(_di_f_thread_conditions_adjust_) || !defined(_di_f_thread_conditions_decimate_by_) - extern f_status_t private_f_thread_conditions_adjust(const f_array_length_t length, f_thread_conditions_t * const conditions) F_attribute_visibility_internal_d; + extern f_status_t private_f_thread_conditions_adjust(const f_number_unsigned_t length, f_thread_conditions_t * const conditions) F_attribute_visibility_internal_d; #endif // !defined(_di_f_thread_conditions_adjust_) || !defined(_di_f_thread_conditions_decimate_by_) /** @@ -410,7 +410,7 @@ extern "C" { * @see f_thread_conditions_increase_by() */ #if !defined(_di_f_thread_conditions_decrease_by_) || !defined(_di_f_thread_conditions_increase_) || !defined(_di_f_thread_conditions_increase_by_) - extern f_status_t private_f_thread_conditions_resize(const f_array_length_t length, f_thread_conditions_t * const conditions) F_attribute_visibility_internal_d; + extern f_status_t private_f_thread_conditions_resize(const f_number_unsigned_t length, f_thread_conditions_t * const conditions) F_attribute_visibility_internal_d; #endif // !defined(_di_f_thread_conditions_decrease_by_) || !defined(_di_f_thread_conditions_increase_) || !defined(_di_f_thread_conditions_increase_by_) /** @@ -433,7 +433,7 @@ extern "C" { * @see f_thread_ids_decimate_by() */ #if !defined(_di_f_thread_ids_adjust_) || !defined(_di_f_thread_ids_decimate_by_) - extern f_status_t private_f_thread_ids_adjust(const f_array_length_t length, f_thread_ids_t * const ids) F_attribute_visibility_internal_d; + extern f_status_t private_f_thread_ids_adjust(const f_number_unsigned_t length, f_thread_ids_t * const ids) F_attribute_visibility_internal_d; #endif // !defined(_di_f_thread_ids_adjust_) || !defined(_di_f_thread_ids_decimate_by_) /** @@ -457,7 +457,7 @@ extern "C" { * @see f_thread_ids_increase_by() */ #if !defined(_di_f_thread_ids_decrease_by_) || !defined(_di_f_thread_ids_increase_) || !defined(_di_f_thread_ids_increase_by_) - extern f_status_t private_f_thread_ids_resize(const f_array_length_t length, f_thread_ids_t * const ids) F_attribute_visibility_internal_d; + extern f_status_t private_f_thread_ids_resize(const f_number_unsigned_t length, f_thread_ids_t * const ids) F_attribute_visibility_internal_d; #endif // !defined(_di_f_thread_ids_decrease_by_) || !defined(_di_f_thread_ids_increase_) || !defined(_di_f_thread_ids_increase_by_) /** @@ -509,7 +509,7 @@ extern "C" { * @see f_thread_keys_decimate_by() */ #if !defined(_di_f_thread_keys_adjust_) || !defined(_di_f_thread_keys_decimate_by_) - extern f_status_t private_f_thread_keys_adjust(const f_array_length_t length, f_thread_keys_t * const keys) F_attribute_visibility_internal_d; + extern f_status_t private_f_thread_keys_adjust(const f_number_unsigned_t length, f_thread_keys_t * const keys) F_attribute_visibility_internal_d; #endif // !defined(_di_f_thread_keys_adjust_) || !defined(_di_f_thread_keys_decimate_by_) /** @@ -533,7 +533,7 @@ extern "C" { * @see f_thread_keys_increase_by() */ #if !defined(_di_f_thread_keys_decrease_by_) || !defined(_di_f_thread_keys_increase_) || !defined(_di_f_thread_keys_increase_by_) - extern f_status_t private_f_thread_keys_resize(const f_array_length_t length, f_thread_keys_t * const keys) F_attribute_visibility_internal_d; + extern f_status_t private_f_thread_keys_resize(const f_number_unsigned_t length, f_thread_keys_t * const keys) F_attribute_visibility_internal_d; #endif // !defined(_di_f_thread_keys_decrease_by_) || !defined(_di_f_thread_keys_increase_) || !defined(_di_f_thread_keys_increase_by_) /** @@ -585,7 +585,7 @@ extern "C" { * @see f_thread_lock_attributes_decimate_by() */ #if !defined(_di_f_thread_lock_attributes_adjust_) || !defined(_di_f_thread_lock_attributes_decimate_by_) - extern f_status_t private_f_thread_lock_attributes_adjust(const f_array_length_t length, f_thread_lock_attributes_t * const attributes) F_attribute_visibility_internal_d; + extern f_status_t private_f_thread_lock_attributes_adjust(const f_number_unsigned_t length, f_thread_lock_attributes_t * const attributes) F_attribute_visibility_internal_d; #endif // !defined(_di_f_thread_lock_attributes_adjust_) || !defined(_di_f_thread_lock_attributes_decimate_by_) /** @@ -609,7 +609,7 @@ extern "C" { * @see f_thread_lock_attributes_increase_by() */ #if !defined(_di_f_thread_lock_attributes_decrease_by_) || !defined(_di_f_thread_lock_attributes_increase_) || !defined(_di_f_thread_lock_attributes_increase_by_) - extern f_status_t private_f_thread_lock_attributes_resize(const f_array_length_t length, f_thread_lock_attributes_t * const attributes) F_attribute_visibility_internal_d; + extern f_status_t private_f_thread_lock_attributes_resize(const f_number_unsigned_t length, f_thread_lock_attributes_t * const attributes) F_attribute_visibility_internal_d; #endif // !defined(_di_f_thread_lock_attributes_decrease_by_) || !defined(_di_f_thread_lock_attributes_increase_) || !defined(_di_f_thread_lock_attributes_increase_by_) /** @@ -662,7 +662,7 @@ extern "C" { * @see f_thread_locks_decimate_by() */ #if !defined(_di_f_thread_locks_adjust_) || !defined(_di_f_thread_locks_decimate_by_) - extern f_status_t private_f_thread_locks_adjust(const f_array_length_t length, f_thread_locks_t * const locks) F_attribute_visibility_internal_d; + extern f_status_t private_f_thread_locks_adjust(const f_number_unsigned_t length, f_thread_locks_t * const locks) F_attribute_visibility_internal_d; #endif // !defined(_di_f_thread_locks_adjust_) || !defined(_di_f_thread_locks_decimate_by_) /** @@ -686,7 +686,7 @@ extern "C" { * @see f_thread_locks_increase_by() */ #if !defined(_di_f_thread_locks_decrease_by_) || !defined(_di_f_thread_locks_increase_) || !defined(_di_f_thread_locks_increase_by_) - extern f_status_t private_f_thread_locks_resize(const f_array_length_t length, f_thread_locks_t * const locks) F_attribute_visibility_internal_d; + extern f_status_t private_f_thread_locks_resize(const f_number_unsigned_t length, f_thread_locks_t * const locks) F_attribute_visibility_internal_d; #endif // !defined(_di_f_thread_locks_decrease_by_) || !defined(_di_f_thread_locks_increase_) || !defined(_di_f_thread_locks_increase_by_) /** * Private implementation for deleting (and destroying). @@ -737,7 +737,7 @@ extern "C" { * @see f_thread_mutex_attributes_decimate_by() */ #if !defined(_di_f_thread_mutex_attributes_adjust_) || !defined(_di_f_thread_mutex_attributes_decimate_by_) - extern f_status_t private_f_thread_mutex_attributes_adjust(const f_array_length_t length, f_thread_mutex_attributes_t * const attributes) F_attribute_visibility_internal_d; + extern f_status_t private_f_thread_mutex_attributes_adjust(const f_number_unsigned_t length, f_thread_mutex_attributes_t * const attributes) F_attribute_visibility_internal_d; #endif // !defined(_di_f_thread_mutex_attributes_adjust_) || !defined(_di_f_thread_mutex_attributes_decimate_by_) /** @@ -761,7 +761,7 @@ extern "C" { * @see f_thread_mutex_attributes_increase_by() */ #if !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_status_t private_f_thread_mutex_attributes_resize(const f_array_length_t length, f_thread_mutex_attributes_t * const attributes) F_attribute_visibility_internal_d; + extern f_status_t private_f_thread_mutex_attributes_resize(const f_number_unsigned_t length, f_thread_mutex_attributes_t * const attributes) F_attribute_visibility_internal_d; #endif // !defined(_di_f_thread_mutex_attributes_decrease_by_) || !defined(_di_f_thread_mutex_attributes_increase_) || !defined(_di_f_thread_mutex_attributes_increase_by_) /** @@ -814,7 +814,7 @@ extern "C" { * @see f_thread_mutexs_decimate_by() */ #if !defined(_di_f_thread_mutexs_adjust_) || !defined(_di_f_thread_mutexs_decimate_by_) - extern f_status_t private_f_thread_mutexs_adjust(const f_array_length_t length, f_thread_mutexs_t * const mutexs) F_attribute_visibility_internal_d; + extern f_status_t private_f_thread_mutexs_adjust(const f_number_unsigned_t length, f_thread_mutexs_t * const mutexs) F_attribute_visibility_internal_d; #endif // !defined(_di_f_thread_mutexs_adjust_) || !defined(_di_f_thread_mutexs_decimate_by_) /** @@ -838,7 +838,7 @@ extern "C" { * @see f_thread_mutexs_increase_by() */ #if !defined(_di_f_thread_mutexs_decrease_by_) || !defined(_di_f_thread_mutexs_increase_) || !defined(_di_f_thread_mutexs_increase_by_) - extern f_status_t private_f_thread_mutexs_resize(const f_array_length_t length, f_thread_mutexs_t * const mutexs) F_attribute_visibility_internal_d; + extern f_status_t private_f_thread_mutexs_resize(const f_number_unsigned_t length, f_thread_mutexs_t * const mutexs) F_attribute_visibility_internal_d; #endif // !defined(_di_f_thread_mutexs_decrease_by_) || !defined(_di_f_thread_mutexs_increase_) || !defined(_di_f_thread_mutexs_increase_by_) /** @@ -861,7 +861,7 @@ extern "C" { * @see f_thread_onces_decimate_by() */ #if !defined(_di_f_thread_onces_adjust_) || !defined(_di_f_thread_onces_decimate_by_) - extern f_status_t private_f_thread_onces_adjust(const f_array_length_t length, f_thread_onces_t * const onces) F_attribute_visibility_internal_d; + extern f_status_t private_f_thread_onces_adjust(const f_number_unsigned_t length, f_thread_onces_t * const onces) F_attribute_visibility_internal_d; #endif // !defined(_di_f_thread_onces_adjust_) || !defined(_di_f_thread_onces_decimate_by_) /** @@ -885,7 +885,7 @@ extern "C" { * @see f_thread_onces_increase_by() */ #if !defined(_di_f_thread_onces_decrease_by_) || !defined(_di_f_thread_onces_increase_) || !defined(_di_f_thread_onces_increase_by_) - extern f_status_t private_f_thread_onces_resize(const f_array_length_t length, f_thread_onces_t * const onces) F_attribute_visibility_internal_d; + extern f_status_t private_f_thread_onces_resize(const f_number_unsigned_t length, f_thread_onces_t * const onces) F_attribute_visibility_internal_d; #endif // !defined(_di_f_thread_onces_decrease_by_) || !defined(_di_f_thread_onces_increase_) || !defined(_di_f_thread_onces_increase_by_) /** @@ -937,7 +937,7 @@ extern "C" { * @see f_thread_semaphores_decimate_by() */ #if !defined(_di_f_thread_semaphores_adjust_) || !defined(_di_f_thread_semaphores_decimate_by_) - extern f_status_t private_f_thread_semaphores_adjust(const f_array_length_t length, f_thread_semaphores_t * const semaphores) F_attribute_visibility_internal_d; + extern f_status_t private_f_thread_semaphores_adjust(const f_number_unsigned_t length, f_thread_semaphores_t * const semaphores) F_attribute_visibility_internal_d; #endif // !defined(_di_f_thread_semaphores_adjust_) || !defined(_di_f_thread_semaphores_decimate_by_) /** @@ -961,7 +961,7 @@ extern "C" { * @see f_thread_semaphores_increase_by() */ #if !defined(_di_f_thread_semaphores_decrease_by_) || !defined(_di_f_thread_semaphores_increase_) || !defined(_di_f_thread_semaphores_increase_by_) - extern f_status_t private_f_thread_semaphores_resize(const f_array_length_t length, f_thread_semaphores_t * const semaphores) F_attribute_visibility_internal_d; + extern f_status_t private_f_thread_semaphores_resize(const f_number_unsigned_t length, f_thread_semaphores_t * const semaphores) F_attribute_visibility_internal_d; #endif // !defined(_di_f_thread_semaphores_decrease_by_) || !defined(_di_f_thread_semaphores_increase_) || !defined(_di_f_thread_semaphores_increase_by_) /** @@ -984,7 +984,7 @@ extern "C" { * @see f_thread_sets_decimate_by() */ #if !defined(_di_f_thread_sets_adjust_) || !defined(_di_f_thread_sets_decimate_by_) - extern f_status_t private_f_thread_sets_adjust(const f_array_length_t length, f_thread_sets_t * const sets) F_attribute_visibility_internal_d; + extern f_status_t private_f_thread_sets_adjust(const f_number_unsigned_t length, f_thread_sets_t * const sets) F_attribute_visibility_internal_d; #endif // !defined(_di_f_thread_sets_adjust_) || !defined(_di_f_thread_sets_decimate_by_) /** @@ -1008,7 +1008,7 @@ extern "C" { * @see f_thread_sets_increase_by() */ #if !defined(_di_f_thread_sets_decrease_by_) || !defined(_di_f_thread_sets_increase_) || !defined(_di_f_thread_sets_increase_by_) - extern f_status_t private_f_thread_sets_resize(const f_array_length_t length, f_thread_sets_t * const sets) F_attribute_visibility_internal_d; + extern f_status_t private_f_thread_sets_resize(const f_number_unsigned_t length, f_thread_sets_t * const sets) F_attribute_visibility_internal_d; #endif // !defined(_di_f_thread_sets_decrease_by_) || !defined(_di_f_thread_sets_increase_) || !defined(_di_f_thread_sets_increase_by_) /** @@ -1060,7 +1060,7 @@ extern "C" { * @see f_thread_spins_decimate_by() */ #if !defined(_di_f_thread_spins_adjust_) || !defined(_di_f_thread_spins_decimate_by_) - extern f_status_t private_f_thread_spins_adjust(const f_array_length_t length, f_thread_spins_t * const spins) F_attribute_visibility_internal_d; + extern f_status_t private_f_thread_spins_adjust(const f_number_unsigned_t length, f_thread_spins_t * const spins) F_attribute_visibility_internal_d; #endif // !defined(_di_f_thread_spins_adjust_) || !defined(_di_f_thread_spins_decimate_by_) /** @@ -1084,7 +1084,7 @@ extern "C" { * @see f_thread_spins_increase_by() */ #if !defined(_di_f_thread_spins_decrease_by_) || !defined(_di_f_thread_spins_increase_) || !defined(_di_f_thread_spins_increase_by_) - extern f_status_t private_f_thread_spins_resize(const f_array_length_t length, f_thread_spins_t * const spins) F_attribute_visibility_internal_d; + extern f_status_t private_f_thread_spins_resize(const f_number_unsigned_t length, f_thread_spins_t * const spins) F_attribute_visibility_internal_d; #endif // !defined(_di_f_thread_spins_decrease_by_) || !defined(_di_f_thread_spins_increase_) || !defined(_di_f_thread_spins_increase_by_) #ifdef __cplusplus diff --git a/level_0/f_thread/c/thread/attribute.c b/level_0/f_thread/c/thread/attribute.c index f248e04..df1dadc 100644 --- a/level_0/f_thread/c/thread/attribute.c +++ b/level_0/f_thread/c/thread/attribute.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_thread_attributes_adjust_ - f_status_t f_thread_attributes_adjust(const f_array_length_t length, f_thread_attributes_t * const attributes) { + f_status_t f_thread_attributes_adjust(const f_number_unsigned_t length, f_thread_attributes_t * const attributes) { #ifndef _di_level_0_parameter_checking_ if (!attributes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -17,7 +17,7 @@ extern "C" { #endif // _di_f_thread_attributes_adjust_ #ifndef _di_f_thread_attributes_decimate_by_ - f_status_t f_thread_attributes_decimate_by(const f_array_length_t amount, f_thread_attributes_t * const attributes) { + f_status_t f_thread_attributes_decimate_by(const f_number_unsigned_t amount, f_thread_attributes_t * const attributes) { #ifndef _di_level_0_parameter_checking_ if (!attributes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -33,7 +33,7 @@ extern "C" { #endif // _di_f_thread_attributes_decimate_by_ #ifndef _di_f_thread_attributes_decrease_by_ - f_status_t f_thread_attributes_decrease_by(const f_array_length_t amount, f_thread_attributes_t * const attributes) { + f_status_t f_thread_attributes_decrease_by(const f_number_unsigned_t amount, f_thread_attributes_t * const attributes) { #ifndef _di_level_0_parameter_checking_ if (!attributes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -49,20 +49,20 @@ extern "C" { #endif // _di_f_thread_attributes_decrease_by_ #ifndef _di_f_thread_attributes_increase_ - f_status_t f_thread_attributes_increase(const f_array_length_t step, f_thread_attributes_t * const attributes) { + f_status_t f_thread_attributes_increase(const f_number_unsigned_t step, f_thread_attributes_t * const attributes) { #ifndef _di_level_0_parameter_checking_ if (!attributes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && attributes->used + 1 > attributes->size) { - f_array_length_t size = attributes->used + step; + f_number_unsigned_t size = attributes->used + step; - if (size > F_array_length_t_size_d) { - if (attributes->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (attributes->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_thread_attributes_resize(size, attributes); @@ -73,7 +73,7 @@ extern "C" { #endif // _di_f_thread_attributes_increase_ #ifndef _di_f_thread_attributes_increase_by_ - f_status_t f_thread_attributes_increase_by(const f_array_length_t amount, f_thread_attributes_t * const attributes) { + f_status_t f_thread_attributes_increase_by(const f_number_unsigned_t amount, f_thread_attributes_t * const attributes) { #ifndef _di_level_0_parameter_checking_ if (!attributes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -81,7 +81,7 @@ extern "C" { if (!amount) return F_data_not; if (attributes->used + amount > attributes->size) { - if (attributes->used + amount > F_array_length_t_size_d) { + if (attributes->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -93,7 +93,7 @@ extern "C" { #endif // _di_f_thread_attributes_increase_by_ #ifndef _di_f_thread_attributes_resize_ - f_status_t f_thread_attributes_resize(const f_array_length_t length, f_thread_attributes_t * const attributes) { + f_status_t f_thread_attributes_resize(const f_number_unsigned_t length, f_thread_attributes_t * const attributes) { #ifndef _di_level_0_parameter_checking_ if (!attributes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_thread/c/thread/attribute.h b/level_0/f_thread/c/thread/attribute.h index e53063b..b3a0b2c 100644 --- a/level_0/f_thread/c/thread/attribute.h +++ b/level_0/f_thread/c/thread/attribute.h @@ -43,8 +43,8 @@ extern "C" { typedef struct { f_thread_attribute_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_thread_attributes_t; #define f_thread_attributes_t_initialize { 0, 0, 0 } @@ -81,7 +81,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_attributes_adjust_ - extern f_status_t f_thread_attributes_adjust(const f_array_length_t length, f_thread_attributes_t * const attributes); + extern f_status_t f_thread_attributes_adjust(const f_number_unsigned_t length, f_thread_attributes_t * const attributes); #endif // _di_f_thread_attributes_adjust_ /** @@ -104,7 +104,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_attributes_decimate_by_ - extern f_status_t f_thread_attributes_decimate_by(const f_array_length_t amount, f_thread_attributes_t * const attributes); + extern f_status_t f_thread_attributes_decimate_by(const f_number_unsigned_t amount, f_thread_attributes_t * const attributes); #endif // _di_f_thread_attributes_decimate_by_ /** @@ -127,13 +127,13 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_attributes_decrease_by_ - extern f_status_t f_thread_attributes_decrease_by(const f_array_length_t amount, f_thread_attributes_t * const attributes); + extern f_status_t f_thread_attributes_decrease_by(const f_number_unsigned_t amount, f_thread_attributes_t * const attributes); #endif // _di_f_thread_attributes_decrease_by_ /** * Increase the size of the thread 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -151,14 +151,14 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_attributes_increase_ - extern f_status_t f_thread_attributes_increase(const f_array_length_t step, f_thread_attributes_t * const attributes); + extern f_status_t f_thread_attributes_increase(const f_number_unsigned_t step, f_thread_attributes_t * const attributes); #endif // _di_f_thread_attributes_increase_ /** * Resize the thread 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -175,7 +175,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_attributes_increase_by_ - extern f_status_t f_thread_attributes_increase_by(const f_array_length_t amount, f_thread_attributes_t * const attributes); + extern f_status_t f_thread_attributes_increase_by(const f_number_unsigned_t amount, f_thread_attributes_t * const attributes); #endif // _di_f_thread_attributes_increase_by_ /** @@ -193,7 +193,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_attributes_resize_ - extern f_status_t f_thread_attributes_resize(const f_array_length_t length, f_thread_attributes_t * const attributes); + extern f_status_t f_thread_attributes_resize(const f_number_unsigned_t length, f_thread_attributes_t * const attributes); #endif // _di_f_thread_attributes_resize_ #ifdef __cplusplus diff --git a/level_0/f_thread/c/thread/barrier.c b/level_0/f_thread/c/thread/barrier.c index c31fe1a..c2aa4b8 100644 --- a/level_0/f_thread/c/thread/barrier.c +++ b/level_0/f_thread/c/thread/barrier.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_thread_barriers_adjust_ - f_status_t f_thread_barriers_adjust(const f_array_length_t length, f_thread_barriers_t * const barriers) { + f_status_t f_thread_barriers_adjust(const f_number_unsigned_t length, f_thread_barriers_t * const barriers) { #ifndef _di_level_0_parameter_checking_ if (!barriers) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -17,7 +17,7 @@ extern "C" { #endif // _di_f_thread_barriers_adjust_ #ifndef _di_f_thread_barriers_decimate_by_ - f_status_t f_thread_barriers_decimate_by(const f_array_length_t amount, f_thread_barriers_t * const barriers) { + f_status_t f_thread_barriers_decimate_by(const f_number_unsigned_t amount, f_thread_barriers_t * const barriers) { #ifndef _di_level_0_parameter_checking_ if (!barriers) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -33,7 +33,7 @@ extern "C" { #endif // _di_f_thread_barriers_decimate_by_ #ifndef _di_f_thread_barriers_decrease_by_ - f_status_t f_thread_barriers_decrease_by(const f_array_length_t amount, f_thread_barriers_t * const barriers) { + f_status_t f_thread_barriers_decrease_by(const f_number_unsigned_t amount, f_thread_barriers_t * const barriers) { #ifndef _di_level_0_parameter_checking_ if (!barriers) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -49,20 +49,20 @@ extern "C" { #endif // _di_f_thread_barriers_decrease_by_ #ifndef _di_f_thread_barriers_increase_ - f_status_t f_thread_barriers_increase(const f_array_length_t step, f_thread_barriers_t * const barriers) { + f_status_t f_thread_barriers_increase(const f_number_unsigned_t step, f_thread_barriers_t * const barriers) { #ifndef _di_level_0_parameter_checking_ if (!barriers) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && barriers->used + 1 > barriers->size) { - f_array_length_t size = barriers->used + step; + f_number_unsigned_t size = barriers->used + step; - if (size > F_array_length_t_size_d) { - if (barriers->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (barriers->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_thread_barriers_resize(size, barriers); @@ -73,7 +73,7 @@ extern "C" { #endif // _di_f_thread_barriers_increase_ #ifndef _di_f_thread_barriers_increase_by_ - f_status_t f_thread_barriers_increase_by(const f_array_length_t amount, f_thread_barriers_t * const barriers) { + f_status_t f_thread_barriers_increase_by(const f_number_unsigned_t amount, f_thread_barriers_t * const barriers) { #ifndef _di_level_0_parameter_checking_ if (!barriers) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -81,7 +81,7 @@ extern "C" { if (!amount) return F_data_not; if (barriers->used + amount > barriers->size) { - if (barriers->used + amount > F_array_length_t_size_d) { + if (barriers->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -93,7 +93,7 @@ extern "C" { #endif // _di_f_thread_barriers_increase_by_ #ifndef _di_f_thread_barriers_resize_ - f_status_t f_thread_barriers_resize(const f_array_length_t length, f_thread_barriers_t * const barriers) { + f_status_t f_thread_barriers_resize(const f_number_unsigned_t length, f_thread_barriers_t * const barriers) { #ifndef _di_level_0_parameter_checking_ if (!barriers) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_thread/c/thread/barrier.h b/level_0/f_thread/c/thread/barrier.h index 0b2fbc7..c2411f2 100644 --- a/level_0/f_thread/c/thread/barrier.h +++ b/level_0/f_thread/c/thread/barrier.h @@ -42,8 +42,8 @@ extern "C" { typedef struct { f_thread_barrier_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_thread_barriers_t; #define f_thread_barriers_t_initialize { 0, 0, 0 } @@ -80,7 +80,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_barriers_adjust_ - extern f_status_t f_thread_barriers_adjust(const f_array_length_t length, f_thread_barriers_t * const barriers); + extern f_status_t f_thread_barriers_adjust(const f_number_unsigned_t length, f_thread_barriers_t * const barriers); #endif // _di_f_thread_barriers_adjust_ /** @@ -103,7 +103,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_barriers_decimate_by_ - extern f_status_t f_thread_barriers_decimate_by(const f_array_length_t amount, f_thread_barriers_t * const barriers); + extern f_status_t f_thread_barriers_decimate_by(const f_number_unsigned_t amount, f_thread_barriers_t * const barriers); #endif // _di_f_thread_barriers_decimate_by_ /** @@ -126,13 +126,13 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_barriers_decrease_by_ - extern f_status_t f_thread_barriers_decrease_by(const f_array_length_t amount, f_thread_barriers_t * const barriers); + extern f_status_t f_thread_barriers_decrease_by(const f_number_unsigned_t amount, f_thread_barriers_t * const barriers); #endif // _di_f_thread_barriers_decrease_by_ /** * Increase the size of the thread barriers 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -150,14 +150,14 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_barriers_increase_ - extern f_status_t f_thread_barriers_increase(const f_array_length_t step, f_thread_barriers_t * const barriers); + extern f_status_t f_thread_barriers_increase(const f_number_unsigned_t step, f_thread_barriers_t * const barriers); #endif // _di_f_thread_barriers_increase_ /** * Resize the thread barriers 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -174,7 +174,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_barriers_increase_by_ - extern f_status_t f_thread_barriers_increase_by(const f_array_length_t amount, f_thread_barriers_t * const barriers); + extern f_status_t f_thread_barriers_increase_by(const f_number_unsigned_t amount, f_thread_barriers_t * const barriers); #endif // _di_f_thread_barriers_increase_by_ /** @@ -192,7 +192,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_barriers_resize_ - extern f_status_t f_thread_barriers_resize(const f_array_length_t length, f_thread_barriers_t * const barriers); + extern f_status_t f_thread_barriers_resize(const f_number_unsigned_t length, f_thread_barriers_t * const barriers); #endif // _di_f_thread_barriers_resize_ #ifdef __cplusplus diff --git a/level_0/f_thread/c/thread/barrier_attribute.c b/level_0/f_thread/c/thread/barrier_attribute.c index afa4c70..2f9a151 100644 --- a/level_0/f_thread/c/thread/barrier_attribute.c +++ b/level_0/f_thread/c/thread/barrier_attribute.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_thread_barrier_attributes_adjust_ - f_status_t f_thread_barrier_attributes_adjust(const f_array_length_t length, f_thread_barrier_attributes_t * const attributes) { + f_status_t f_thread_barrier_attributes_adjust(const f_number_unsigned_t length, f_thread_barrier_attributes_t * const attributes) { #ifndef _di_level_0_parameter_checking_ if (!attributes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -17,7 +17,7 @@ extern "C" { #endif // _di_f_thread_barrier_attributes_adjust_ #ifndef _di_f_thread_barrier_attributes_decimate_by_ - f_status_t f_thread_barrier_attributes_decimate_by(const f_array_length_t amount, f_thread_barrier_attributes_t * const attributes) { + f_status_t f_thread_barrier_attributes_decimate_by(const f_number_unsigned_t amount, f_thread_barrier_attributes_t * const attributes) { #ifndef _di_level_0_parameter_checking_ if (!attributes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -33,7 +33,7 @@ extern "C" { #endif // _di_f_thread_barrier_attributes_decimate_by_ #ifndef _di_f_thread_barrier_attributes_decrease_by_ - f_status_t f_thread_barrier_attributes_decrease_by(const f_array_length_t amount, f_thread_barrier_attributes_t * const attributes) { + f_status_t f_thread_barrier_attributes_decrease_by(const f_number_unsigned_t amount, f_thread_barrier_attributes_t * const attributes) { #ifndef _di_level_0_parameter_checking_ if (!attributes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -49,20 +49,20 @@ extern "C" { #endif // _di_f_thread_barrier_attributes_decrease_by_ #ifndef _di_f_thread_barrier_attributes_increase_ - f_status_t f_thread_barrier_attributes_increase(const f_array_length_t step, f_thread_barrier_attributes_t * const attributes) { + f_status_t f_thread_barrier_attributes_increase(const f_number_unsigned_t step, f_thread_barrier_attributes_t * const attributes) { #ifndef _di_level_0_parameter_checking_ if (!attributes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && attributes->used + 1 > attributes->size) { - f_array_length_t size = attributes->used + step; + f_number_unsigned_t size = attributes->used + step; - if (size > F_array_length_t_size_d) { - if (attributes->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (attributes->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_thread_barrier_attributes_resize(size, attributes); @@ -73,7 +73,7 @@ extern "C" { #endif // _di_f_thread_barrier_attributes_increase_ #ifndef _di_f_thread_barrier_attributes_increase_by_ - f_status_t f_thread_barrier_attributes_increase_by(const f_array_length_t amount, f_thread_barrier_attributes_t * const attributes) { + f_status_t f_thread_barrier_attributes_increase_by(const f_number_unsigned_t amount, f_thread_barrier_attributes_t * const attributes) { #ifndef _di_level_0_parameter_checking_ if (!attributes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -81,7 +81,7 @@ extern "C" { if (!amount) return F_data_not; if (attributes->used + amount > attributes->size) { - if (attributes->used + amount > F_array_length_t_size_d) { + if (attributes->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -93,7 +93,7 @@ extern "C" { #endif // _di_f_thread_barrier_attributes_increase_by_ #ifndef _di_f_thread_barrier_attributes_resize_ - f_status_t f_thread_barrier_attributes_resize(const f_array_length_t length, f_thread_barrier_attributes_t * const attributes) { + f_status_t f_thread_barrier_attributes_resize(const f_number_unsigned_t length, f_thread_barrier_attributes_t * const attributes) { #ifndef _di_level_0_parameter_checking_ if (!attributes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_thread/c/thread/barrier_attribute.h b/level_0/f_thread/c/thread/barrier_attribute.h index 93c113e..c4f56c9 100644 --- a/level_0/f_thread/c/thread/barrier_attribute.h +++ b/level_0/f_thread/c/thread/barrier_attribute.h @@ -43,8 +43,8 @@ extern "C" { typedef struct { f_thread_barrier_attribute_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_thread_barrier_attributes_t; #define f_thread_barrier_attributes_t_initialize { 0, 0, 0 } @@ -81,7 +81,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_barrier_attributes_adjust_ - extern f_status_t f_thread_barrier_attributes_adjust(const f_array_length_t length, f_thread_barrier_attributes_t * const attributes); + extern f_status_t f_thread_barrier_attributes_adjust(const f_number_unsigned_t length, f_thread_barrier_attributes_t * const attributes); #endif // _di_f_thread_barrier_attributes_adjust_ /** @@ -104,7 +104,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_barrier_attributes_decimate_by_ - extern f_status_t f_thread_barrier_attributes_decimate_by(const f_array_length_t amount, f_thread_barrier_attributes_t * const attributes); + extern f_status_t f_thread_barrier_attributes_decimate_by(const f_number_unsigned_t amount, f_thread_barrier_attributes_t * const attributes); #endif // _di_f_thread_barrier_attributes_decimate_by_ /** @@ -127,13 +127,13 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_barrier_attributes_decrease_by_ - extern f_status_t f_thread_barrier_attributes_decrease_by(const f_array_length_t amount, f_thread_barrier_attributes_t * const attributes); + extern f_status_t f_thread_barrier_attributes_decrease_by(const f_number_unsigned_t amount, f_thread_barrier_attributes_t * const attributes); #endif // _di_f_thread_barrier_attributes_decrease_by_ /** * Increase the size of the thread barrier 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -151,14 +151,14 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_barrier_attributes_increase_ - extern f_status_t f_thread_barrier_attributes_increase(const f_array_length_t step, f_thread_barrier_attributes_t * const attributes); + extern f_status_t f_thread_barrier_attributes_increase(const f_number_unsigned_t step, f_thread_barrier_attributes_t * const attributes); #endif // _di_f_thread_barrier_attributes_increase_ /** * Resize the thread barrier 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -175,7 +175,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_barrier_attributes_increase_by_ - extern f_status_t f_thread_barrier_attributes_increase_by(const f_array_length_t amount, f_thread_barrier_attributes_t * const attributes); + extern f_status_t f_thread_barrier_attributes_increase_by(const f_number_unsigned_t amount, f_thread_barrier_attributes_t * const attributes); #endif // _di_f_thread_barrier_attributes_increase_by_ /** @@ -193,7 +193,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_barrier_attributes_resize_ - extern f_status_t f_thread_barrier_attributes_resize(const f_array_length_t length, f_thread_barrier_attributes_t * const attributes); + extern f_status_t f_thread_barrier_attributes_resize(const f_number_unsigned_t length, f_thread_barrier_attributes_t * const attributes); #endif // _di_f_thread_barrier_attributes_resize_ #ifdef __cplusplus diff --git a/level_0/f_thread/c/thread/condition.c b/level_0/f_thread/c/thread/condition.c index a7363ae..5600e65 100644 --- a/level_0/f_thread/c/thread/condition.c +++ b/level_0/f_thread/c/thread/condition.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_thread_conditions_adjust_ - f_status_t f_thread_conditions_adjust(const f_array_length_t length, f_thread_conditions_t * const conditions) { + f_status_t f_thread_conditions_adjust(const f_number_unsigned_t length, f_thread_conditions_t * const conditions) { #ifndef _di_level_0_parameter_checking_ if (!conditions) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -17,7 +17,7 @@ extern "C" { #endif // _di_f_thread_conditions_adjust_ #ifndef _di_f_thread_conditions_decimate_by_ - f_status_t f_thread_conditions_decimate_by(const f_array_length_t amount, f_thread_conditions_t * const conditions) { + f_status_t f_thread_conditions_decimate_by(const f_number_unsigned_t amount, f_thread_conditions_t * const conditions) { #ifndef _di_level_0_parameter_checking_ if (!conditions) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -33,7 +33,7 @@ extern "C" { #endif // _di_f_thread_conditions_decimate_by_ #ifndef _di_f_thread_conditions_decrease_by_ - f_status_t f_thread_conditions_decrease_by(const f_array_length_t amount, f_thread_conditions_t * const conditions) { + f_status_t f_thread_conditions_decrease_by(const f_number_unsigned_t amount, f_thread_conditions_t * const conditions) { #ifndef _di_level_0_parameter_checking_ if (!conditions) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -49,20 +49,20 @@ extern "C" { #endif // _di_f_thread_conditions_decrease_by_ #ifndef _di_f_thread_conditions_increase_ - f_status_t f_thread_conditions_increase(const f_array_length_t step, f_thread_conditions_t * const conditions) { + f_status_t f_thread_conditions_increase(const f_number_unsigned_t step, f_thread_conditions_t * const conditions) { #ifndef _di_level_0_parameter_checking_ if (!conditions) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && conditions->used + 1 > conditions->size) { - f_array_length_t size = conditions->used + step; + f_number_unsigned_t size = conditions->used + step; - if (size > F_array_length_t_size_d) { - if (conditions->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (conditions->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_thread_conditions_resize(size, conditions); @@ -73,7 +73,7 @@ extern "C" { #endif // _di_f_thread_conditions_increase_ #ifndef _di_f_thread_conditions_increase_by_ - f_status_t f_thread_conditions_increase_by(const f_array_length_t amount, f_thread_conditions_t * const conditions) { + f_status_t f_thread_conditions_increase_by(const f_number_unsigned_t amount, f_thread_conditions_t * const conditions) { #ifndef _di_level_0_parameter_checking_ if (!conditions) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -81,7 +81,7 @@ extern "C" { if (!amount) return F_data_not; if (conditions->used + amount > conditions->size) { - if (conditions->used + amount > F_array_length_t_size_d) { + if (conditions->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -93,7 +93,7 @@ extern "C" { #endif // _di_f_thread_conditions_increase_by_ #ifndef _di_f_thread_conditions_resize_ - f_status_t f_thread_conditions_resize(const f_array_length_t length, f_thread_conditions_t * const conditions) { + f_status_t f_thread_conditions_resize(const f_number_unsigned_t length, f_thread_conditions_t * const conditions) { #ifndef _di_level_0_parameter_checking_ if (!conditions) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_thread/c/thread/condition.h b/level_0/f_thread/c/thread/condition.h index df28fe9..35ecc01 100644 --- a/level_0/f_thread/c/thread/condition.h +++ b/level_0/f_thread/c/thread/condition.h @@ -43,8 +43,8 @@ extern "C" { typedef struct { f_thread_condition_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_thread_conditions_t; #define f_thread_conditions_t_initialize { 0, 0, 0 } @@ -81,7 +81,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_conditions_adjust_ - extern f_status_t f_thread_conditions_adjust(const f_array_length_t length, f_thread_conditions_t * const conditions); + extern f_status_t f_thread_conditions_adjust(const f_number_unsigned_t length, f_thread_conditions_t * const conditions); #endif // _di_f_thread_conditions_adjust_ /** @@ -104,7 +104,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_conditions_decimate_by_ - extern f_status_t f_thread_conditions_decimate_by(const f_array_length_t amount, f_thread_conditions_t * const conditions); + extern f_status_t f_thread_conditions_decimate_by(const f_number_unsigned_t amount, f_thread_conditions_t * const conditions); #endif // _di_f_thread_conditions_decimate_by_ /** @@ -127,13 +127,13 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_conditions_decrease_by_ - extern f_status_t f_thread_conditions_decrease_by(const f_array_length_t amount, f_thread_conditions_t * const conditions); + extern f_status_t f_thread_conditions_decrease_by(const f_number_unsigned_t amount, f_thread_conditions_t * const conditions); #endif // _di_f_thread_conditions_decrease_by_ /** * Increase the size of the thread 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -151,14 +151,14 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_conditions_increase_ - extern f_status_t f_thread_conditions_increase(const f_array_length_t step, f_thread_conditions_t * const conditions); + extern f_status_t f_thread_conditions_increase(const f_number_unsigned_t step, f_thread_conditions_t * const conditions); #endif // _di_f_thread_conditions_increase_ /** * Resize the thread 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -175,7 +175,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_conditions_increase_by_ - extern f_status_t f_thread_conditions_increase_by(const f_array_length_t amount, f_thread_conditions_t * const conditions); + extern f_status_t f_thread_conditions_increase_by(const f_number_unsigned_t amount, f_thread_conditions_t * const conditions); #endif // _di_f_thread_conditions_increase_by_ /** @@ -193,7 +193,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_conditions_resize_ - extern f_status_t f_thread_conditions_resize(const f_array_length_t length, f_thread_conditions_t * const conditions); + extern f_status_t f_thread_conditions_resize(const f_number_unsigned_t length, f_thread_conditions_t * const conditions); #endif // _di_f_thread_conditions_resize_ #ifdef __cplusplus diff --git a/level_0/f_thread/c/thread/condition_attribute.c b/level_0/f_thread/c/thread/condition_attribute.c index 3b2c412..e6277d9 100644 --- a/level_0/f_thread/c/thread/condition_attribute.c +++ b/level_0/f_thread/c/thread/condition_attribute.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_thread_condition_attributes_adjust_ - f_status_t f_thread_condition_attributes_adjust(const f_array_length_t length, f_thread_condition_attributes_t * const attributes) { + f_status_t f_thread_condition_attributes_adjust(const f_number_unsigned_t length, f_thread_condition_attributes_t * const attributes) { #ifndef _di_level_0_parameter_checking_ if (!attributes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -17,7 +17,7 @@ extern "C" { #endif // _di_f_thread_condition_attributes_adjust_ #ifndef _di_f_thread_condition_attributes_decimate_by_ - f_status_t f_thread_condition_attributes_decimate_by(const f_array_length_t amount, f_thread_condition_attributes_t * const attributes) { + f_status_t f_thread_condition_attributes_decimate_by(const f_number_unsigned_t amount, f_thread_condition_attributes_t * const attributes) { #ifndef _di_level_0_parameter_checking_ if (!attributes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -33,7 +33,7 @@ extern "C" { #endif // _di_f_thread_condition_attributes_decimate_by_ #ifndef _di_f_thread_condition_attributes_decrease_by_ - f_status_t f_thread_condition_attributes_decrease_by(const f_array_length_t amount, f_thread_condition_attributes_t * const attributes) { + f_status_t f_thread_condition_attributes_decrease_by(const f_number_unsigned_t amount, f_thread_condition_attributes_t * const attributes) { #ifndef _di_level_0_parameter_checking_ if (!attributes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -49,20 +49,20 @@ extern "C" { #endif // _di_f_thread_condition_attributes_decrease_by_ #ifndef _di_f_thread_condition_attributes_increase_ - f_status_t f_thread_condition_attributes_increase(const f_array_length_t step, f_thread_condition_attributes_t * const attributes) { + f_status_t f_thread_condition_attributes_increase(const f_number_unsigned_t step, f_thread_condition_attributes_t * const attributes) { #ifndef _di_level_0_parameter_checking_ if (!attributes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && attributes->used + 1 > attributes->size) { - f_array_length_t size = attributes->used + step; + f_number_unsigned_t size = attributes->used + step; - if (size > F_array_length_t_size_d) { - if (attributes->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (attributes->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_thread_condition_attributes_resize(size, attributes); @@ -73,7 +73,7 @@ extern "C" { #endif // _di_f_thread_condition_attributes_increase_ #ifndef _di_f_thread_condition_attributes_increase_by_ - f_status_t f_thread_condition_attributes_increase_by(const f_array_length_t amount, f_thread_condition_attributes_t * const attributes) { + f_status_t f_thread_condition_attributes_increase_by(const f_number_unsigned_t amount, f_thread_condition_attributes_t * const attributes) { #ifndef _di_level_0_parameter_checking_ if (!attributes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -81,7 +81,7 @@ extern "C" { if (!amount) return F_data_not; if (attributes->used + amount > attributes->size) { - if (attributes->used + amount > F_array_length_t_size_d) { + if (attributes->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -93,7 +93,7 @@ extern "C" { #endif // _di_f_thread_condition_attributes_increase_by_ #ifndef _di_f_thread_condition_attributes_resize_ - f_status_t f_thread_condition_attributes_resize(const f_array_length_t length, f_thread_condition_attributes_t * const attributes) { + f_status_t f_thread_condition_attributes_resize(const f_number_unsigned_t length, f_thread_condition_attributes_t * const attributes) { #ifndef _di_level_0_parameter_checking_ if (!attributes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_thread/c/thread/condition_attribute.h b/level_0/f_thread/c/thread/condition_attribute.h index 10cc60a..a95a44f 100644 --- a/level_0/f_thread/c/thread/condition_attribute.h +++ b/level_0/f_thread/c/thread/condition_attribute.h @@ -43,8 +43,8 @@ extern "C" { typedef struct { f_thread_condition_attribute_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_thread_condition_attributes_t; #define f_thread_condition_attributes_t_initialize { 0, 0, 0 } @@ -81,7 +81,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_condition_attributes_adjust_ - extern f_status_t f_thread_condition_attributes_adjust(const f_array_length_t length, f_thread_condition_attributes_t * const attributes); + extern f_status_t f_thread_condition_attributes_adjust(const f_number_unsigned_t length, f_thread_condition_attributes_t * const attributes); #endif // _di_f_thread_condition_attributes_adjust_ /** @@ -104,7 +104,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_condition_attributes_decimate_by_ - extern f_status_t f_thread_condition_attributes_decimate_by(const f_array_length_t amount, f_thread_condition_attributes_t * const attributes); + extern f_status_t f_thread_condition_attributes_decimate_by(const f_number_unsigned_t amount, f_thread_condition_attributes_t * const attributes); #endif // _di_f_thread_condition_attributes_decimate_by_ /** @@ -127,13 +127,13 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_condition_attributes_decrease_by_ - extern f_status_t f_thread_condition_attributes_decrease_by(const f_array_length_t amount, f_thread_condition_attributes_t * const attributes); + extern f_status_t f_thread_condition_attributes_decrease_by(const f_number_unsigned_t amount, f_thread_condition_attributes_t * const attributes); #endif // _di_f_thread_condition_attributes_decrease_by_ /** * Increase the size of the thread 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -151,14 +151,14 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_condition_attributes_increase_ - extern f_status_t f_thread_condition_attributes_increase(const f_array_length_t step, f_thread_condition_attributes_t * const attributes); + extern f_status_t f_thread_condition_attributes_increase(const f_number_unsigned_t step, f_thread_condition_attributes_t * const attributes); #endif // _di_f_thread_condition_attributes_increase_ /** * Resize the thread 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -175,7 +175,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_condition_attributes_increase_by_ - extern f_status_t f_thread_condition_attributes_increase_by(const f_array_length_t amount, f_thread_condition_attributes_t * const attributes); + extern f_status_t f_thread_condition_attributes_increase_by(const f_number_unsigned_t amount, f_thread_condition_attributes_t * const attributes); #endif // _di_f_thread_condition_attributes_increase_by_ /** @@ -193,7 +193,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_condition_attributes_resize_ - extern f_status_t f_thread_condition_attributes_resize(const f_array_length_t length, f_thread_condition_attributes_t * const attributes); + extern f_status_t f_thread_condition_attributes_resize(const f_number_unsigned_t length, f_thread_condition_attributes_t * const attributes); #endif // _di_f_thread_condition_attributes_resize_ #ifdef __cplusplus diff --git a/level_0/f_thread/c/thread/id.c b/level_0/f_thread/c/thread/id.c index 1267342..0fcb7cd 100644 --- a/level_0/f_thread/c/thread/id.c +++ b/level_0/f_thread/c/thread/id.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_thread_ids_adjust_ - f_status_t f_thread_ids_adjust(const f_array_length_t length, f_thread_ids_t * const ids) { + f_status_t f_thread_ids_adjust(const f_number_unsigned_t length, f_thread_ids_t * const ids) { #ifndef _di_level_0_parameter_checking_ if (!ids) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -17,7 +17,7 @@ extern "C" { #endif // _di_f_thread_ids_adjust_ #ifndef _di_f_thread_ids_decimate_by_ - f_status_t f_thread_ids_decimate_by(const f_array_length_t amount, f_thread_ids_t * const ids) { + f_status_t f_thread_ids_decimate_by(const f_number_unsigned_t amount, f_thread_ids_t * const ids) { #ifndef _di_level_0_parameter_checking_ if (!ids) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -33,7 +33,7 @@ extern "C" { #endif // _di_f_thread_ids_decimate_by_ #ifndef _di_f_thread_ids_decrease_by_ - f_status_t f_thread_ids_decrease_by(const f_array_length_t amount, f_thread_ids_t * const ids) { + f_status_t f_thread_ids_decrease_by(const f_number_unsigned_t amount, f_thread_ids_t * const ids) { #ifndef _di_level_0_parameter_checking_ if (!ids) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -49,20 +49,20 @@ extern "C" { #endif // _di_f_thread_ids_decrease_by_ #ifndef _di_f_thread_ids_increase_ - f_status_t f_thread_ids_increase(const f_array_length_t step, f_thread_ids_t * const ids) { + f_status_t f_thread_ids_increase(const f_number_unsigned_t step, f_thread_ids_t * const ids) { #ifndef _di_level_0_parameter_checking_ if (!ids) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && ids->used + 1 > ids->size) { - f_array_length_t size = ids->used + step; + f_number_unsigned_t size = ids->used + step; - if (size > F_array_length_t_size_d) { - if (ids->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (ids->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_thread_ids_resize(size, ids); @@ -73,7 +73,7 @@ extern "C" { #endif // _di_f_thread_ids_increase_ #ifndef _di_f_thread_ids_increase_by_ - f_status_t f_thread_ids_increase_by(const f_array_length_t amount, f_thread_ids_t * const ids) { + f_status_t f_thread_ids_increase_by(const f_number_unsigned_t amount, f_thread_ids_t * const ids) { #ifndef _di_level_0_parameter_checking_ if (!ids) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -81,7 +81,7 @@ extern "C" { if (!amount) return F_data_not; if (ids->used + amount > ids->size) { - if (ids->used + amount > F_array_length_t_size_d) { + if (ids->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -93,7 +93,7 @@ extern "C" { #endif // _di_f_thread_ids_increase_by_ #ifndef _di_f_thread_ids_resize_ - f_status_t f_thread_ids_resize(const f_array_length_t length, f_thread_ids_t * const ids) { + f_status_t f_thread_ids_resize(const f_number_unsigned_t length, f_thread_ids_t * const ids) { #ifndef _di_level_0_parameter_checking_ if (!ids) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_thread/c/thread/id.h b/level_0/f_thread/c/thread/id.h index d545d50..3fba7ac 100644 --- a/level_0/f_thread/c/thread/id.h +++ b/level_0/f_thread/c/thread/id.h @@ -38,8 +38,8 @@ extern "C" { typedef struct { f_thread_id_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_thread_ids_t; #define f_thread_ids_t_initialize { 0, 0, 0 } @@ -76,7 +76,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_ids_adjust_ - extern f_status_t f_thread_ids_adjust(const f_array_length_t length, f_thread_ids_t * const ids); + extern f_status_t f_thread_ids_adjust(const f_number_unsigned_t length, f_thread_ids_t * const ids); #endif // _di_f_thread_ids_adjust_ /** @@ -99,7 +99,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_ids_decimate_by_ - extern f_status_t f_thread_ids_decimate_by(const f_array_length_t amount, f_thread_ids_t * const ids); + extern f_status_t f_thread_ids_decimate_by(const f_number_unsigned_t amount, f_thread_ids_t * const ids); #endif // _di_f_thread_ids_decimate_by_ /** @@ -122,13 +122,13 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_ids_decrease_by_ - extern f_status_t f_thread_ids_decrease_by(const f_array_length_t amount, f_thread_ids_t * const ids); + extern f_status_t f_thread_ids_decrease_by(const f_number_unsigned_t amount, f_thread_ids_t * const ids); #endif // _di_f_thread_ids_decrease_by_ /** * Increase the size of the thread 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -146,14 +146,14 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_ids_increase_ - extern f_status_t f_thread_ids_increase(const f_array_length_t step, f_thread_ids_t * const ids); + extern f_status_t f_thread_ids_increase(const f_number_unsigned_t step, f_thread_ids_t * const ids); #endif // _di_f_thread_ids_increase_ /** * Resize the thread 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -170,7 +170,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_ids_increase_by_ - extern f_status_t f_thread_ids_increase_by(const f_array_length_t amount, f_thread_ids_t * const ids); + extern f_status_t f_thread_ids_increase_by(const f_number_unsigned_t amount, f_thread_ids_t * const ids); #endif // _di_f_thread_ids_increase_by_ /** @@ -188,7 +188,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_ids_resize_ - extern f_status_t f_thread_ids_resize(const f_array_length_t length, f_thread_ids_t * const ids); + extern f_status_t f_thread_ids_resize(const f_number_unsigned_t length, f_thread_ids_t * const ids); #endif // _di_f_thread_ids_resize_ #ifdef __cplusplus diff --git a/level_0/f_thread/c/thread/key.c b/level_0/f_thread/c/thread/key.c index 45d27b8..d5844b0 100644 --- a/level_0/f_thread/c/thread/key.c +++ b/level_0/f_thread/c/thread/key.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_thread_keys_adjust_ - f_status_t f_thread_keys_adjust(const f_array_length_t length, f_thread_keys_t * const keys) { + f_status_t f_thread_keys_adjust(const f_number_unsigned_t length, f_thread_keys_t * const keys) { #ifndef _di_level_0_parameter_checking_ if (!keys) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -17,7 +17,7 @@ extern "C" { #endif // _di_f_thread_keys_adjust_ #ifndef _di_f_thread_keys_decimate_by_ - f_status_t f_thread_keys_decimate_by(const f_array_length_t amount, f_thread_keys_t * const keys) { + f_status_t f_thread_keys_decimate_by(const f_number_unsigned_t amount, f_thread_keys_t * const keys) { #ifndef _di_level_0_parameter_checking_ if (!keys) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -33,7 +33,7 @@ extern "C" { #endif // _di_f_thread_keys_decimate_by_ #ifndef _di_f_thread_keys_decrease_by_ - f_status_t f_thread_keys_decrease_by(const f_array_length_t amount, f_thread_keys_t * const keys) { + f_status_t f_thread_keys_decrease_by(const f_number_unsigned_t amount, f_thread_keys_t * const keys) { #ifndef _di_level_0_parameter_checking_ if (!keys) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -49,20 +49,20 @@ extern "C" { #endif // _di_f_thread_keys_decrease_by_ #ifndef _di_f_thread_keys_increase_ - f_status_t f_thread_keys_increase(const f_array_length_t step, f_thread_keys_t * const keys) { + f_status_t f_thread_keys_increase(const f_number_unsigned_t step, f_thread_keys_t * const keys) { #ifndef _di_level_0_parameter_checking_ if (!keys) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && keys->used + 1 > keys->size) { - f_array_length_t size = keys->used + step; + f_number_unsigned_t size = keys->used + step; - if (size > F_array_length_t_size_d) { - if (keys->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (keys->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_thread_keys_resize(size, keys); @@ -73,7 +73,7 @@ extern "C" { #endif // _di_f_thread_keys_increase_ #ifndef _di_f_thread_keys_increase_by_ - f_status_t f_thread_keys_increase_by(const f_array_length_t amount, f_thread_keys_t * const keys) { + f_status_t f_thread_keys_increase_by(const f_number_unsigned_t amount, f_thread_keys_t * const keys) { #ifndef _di_level_0_parameter_checking_ if (!keys) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -81,7 +81,7 @@ extern "C" { if (!amount) return F_data_not; if (keys->used + amount > keys->size) { - if (keys->used + amount > F_array_length_t_size_d) { + if (keys->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -93,7 +93,7 @@ extern "C" { #endif // _di_f_thread_keys_increase_by_ #ifndef _di_f_thread_keys_resize_ - f_status_t f_thread_keys_resize(const f_array_length_t length, f_thread_keys_t * const keys) { + f_status_t f_thread_keys_resize(const f_number_unsigned_t length, f_thread_keys_t * const keys) { #ifndef _di_level_0_parameter_checking_ if (!keys) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_thread/c/thread/key.h b/level_0/f_thread/c/thread/key.h index 353700c..32d7d1f 100644 --- a/level_0/f_thread/c/thread/key.h +++ b/level_0/f_thread/c/thread/key.h @@ -42,8 +42,8 @@ extern "C" { typedef struct { f_thread_key_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_thread_keys_t; #define f_thread_keys_t_initialize { 0, 0, 0 } @@ -80,7 +80,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_keys_adjust_ - extern f_status_t f_thread_keys_adjust(const f_array_length_t length, f_thread_keys_t * const keys); + extern f_status_t f_thread_keys_adjust(const f_number_unsigned_t length, f_thread_keys_t * const keys); #endif // _di_f_thread_keys_adjust_ /** @@ -103,7 +103,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_keys_decimate_by_ - extern f_status_t f_thread_keys_decimate_by(const f_array_length_t amount, f_thread_keys_t * const keys); + extern f_status_t f_thread_keys_decimate_by(const f_number_unsigned_t amount, f_thread_keys_t * const keys); #endif // _di_f_thread_keys_decimate_by_ /** @@ -126,13 +126,13 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_keys_decrease_by_ - extern f_status_t f_thread_keys_decrease_by(const f_array_length_t amount, f_thread_keys_t * const keys); + extern f_status_t f_thread_keys_decrease_by(const f_number_unsigned_t amount, f_thread_keys_t * const keys); #endif // _di_f_thread_keys_decrease_by_ /** * Increase the size of the thread 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -150,14 +150,14 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_keys_increase_ - extern f_status_t f_thread_keys_increase(const f_array_length_t step, f_thread_keys_t * const keys); + extern f_status_t f_thread_keys_increase(const f_number_unsigned_t step, f_thread_keys_t * const keys); #endif // _di_f_thread_keys_increase_ /** * Resize the thread 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -174,7 +174,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_keys_increase_by_ - extern f_status_t f_thread_keys_increase_by(const f_array_length_t amount, f_thread_keys_t * const keys); + extern f_status_t f_thread_keys_increase_by(const f_number_unsigned_t amount, f_thread_keys_t * const keys); #endif // _di_f_thread_keys_increase_by_ /** @@ -192,7 +192,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_keys_resize_ - extern f_status_t f_thread_keys_resize(const f_array_length_t length, f_thread_keys_t * const keys); + extern f_status_t f_thread_keys_resize(const f_number_unsigned_t length, f_thread_keys_t * const keys); #endif // _di_f_thread_keys_resize_ #ifdef __cplusplus diff --git a/level_0/f_thread/c/thread/lock.c b/level_0/f_thread/c/thread/lock.c index ecc28bc..db7dc8c 100644 --- a/level_0/f_thread/c/thread/lock.c +++ b/level_0/f_thread/c/thread/lock.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_thread_locks_adjust_ - f_status_t f_thread_locks_adjust(const f_array_length_t length, f_thread_locks_t * const locks) { + f_status_t f_thread_locks_adjust(const f_number_unsigned_t length, f_thread_locks_t * const locks) { #ifndef _di_level_0_parameter_checking_ if (!locks) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -17,7 +17,7 @@ extern "C" { #endif // _di_f_thread_locks_adjust_ #ifndef _di_f_thread_locks_decimate_by_ - f_status_t f_thread_locks_decimate_by(const f_array_length_t amount, f_thread_locks_t * const locks) { + f_status_t f_thread_locks_decimate_by(const f_number_unsigned_t amount, f_thread_locks_t * const locks) { #ifndef _di_level_0_parameter_checking_ if (!locks) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -33,7 +33,7 @@ extern "C" { #endif // _di_f_thread_locks_decimate_by_ #ifndef _di_f_thread_locks_decrease_by_ - f_status_t f_thread_locks_decrease_by(const f_array_length_t amount, f_thread_locks_t * const locks) { + f_status_t f_thread_locks_decrease_by(const f_number_unsigned_t amount, f_thread_locks_t * const locks) { #ifndef _di_level_0_parameter_checking_ if (!locks) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -49,20 +49,20 @@ extern "C" { #endif // _di_f_thread_locks_decrease_by_ #ifndef _di_f_thread_locks_increase_ - f_status_t f_thread_locks_increase(const f_array_length_t step, f_thread_locks_t * const locks) { + f_status_t f_thread_locks_increase(const f_number_unsigned_t step, f_thread_locks_t * const locks) { #ifndef _di_level_0_parameter_checking_ if (!locks) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && locks->used + 1 > locks->size) { - f_array_length_t size = locks->used + step; + f_number_unsigned_t size = locks->used + step; - if (size > F_array_length_t_size_d) { - if (locks->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (locks->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_thread_locks_resize(size, locks); @@ -73,7 +73,7 @@ extern "C" { #endif // _di_f_thread_locks_increase_ #ifndef _di_f_thread_locks_increase_by_ - f_status_t f_thread_locks_increase_by(const f_array_length_t amount, f_thread_locks_t * const locks) { + f_status_t f_thread_locks_increase_by(const f_number_unsigned_t amount, f_thread_locks_t * const locks) { #ifndef _di_level_0_parameter_checking_ if (!locks) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -81,7 +81,7 @@ extern "C" { if (!amount) return F_data_not; if (locks->used + amount > locks->size) { - if (locks->used + amount > F_array_length_t_size_d) { + if (locks->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -93,7 +93,7 @@ extern "C" { #endif // _di_f_thread_locks_increase_by_ #ifndef _di_f_thread_locks_resize_ - f_status_t f_thread_locks_resize(const f_array_length_t length, f_thread_locks_t * const locks) { + f_status_t f_thread_locks_resize(const f_number_unsigned_t length, f_thread_locks_t * const locks) { #ifndef _di_level_0_parameter_checking_ if (!locks) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_thread/c/thread/lock.h b/level_0/f_thread/c/thread/lock.h index 6671190..16037aa 100644 --- a/level_0/f_thread/c/thread/lock.h +++ b/level_0/f_thread/c/thread/lock.h @@ -43,8 +43,8 @@ extern "C" { typedef struct { f_thread_lock_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_thread_locks_t; #define f_thread_locks_t_initialize { 0, 0, 0 } @@ -79,7 +79,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_locks_adjust_ - extern f_status_t f_thread_locks_adjust(const f_array_length_t length, f_thread_locks_t * const locks); + extern f_status_t f_thread_locks_adjust(const f_number_unsigned_t length, f_thread_locks_t * const locks); #endif // _di_f_thread_locks_adjust_ /** @@ -102,7 +102,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_locks_decimate_by_ - extern f_status_t f_thread_locks_decimate_by(const f_array_length_t amount, f_thread_locks_t * const locks); + extern f_status_t f_thread_locks_decimate_by(const f_number_unsigned_t amount, f_thread_locks_t * const locks); #endif // _di_f_thread_locks_decimate_by_ /** @@ -125,13 +125,13 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_locks_decrease_by_ - extern f_status_t f_thread_locks_decrease_by(const f_array_length_t amount, f_thread_locks_t * const locks); + extern f_status_t f_thread_locks_decrease_by(const f_number_unsigned_t amount, f_thread_locks_t * const locks); #endif // _di_f_thread_locks_decrease_by_ /** * Increase the size of the read/write 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -149,14 +149,14 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_locks_increase_ - extern f_status_t f_thread_locks_increase(const f_array_length_t step, f_thread_locks_t * const locks); + extern f_status_t f_thread_locks_increase(const f_number_unsigned_t step, f_thread_locks_t * const locks); #endif // _di_f_thread_locks_increase_ /** * Resize the read/write 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -173,7 +173,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_locks_increase_by_ - extern f_status_t f_thread_locks_increase_by(const f_array_length_t amount, f_thread_locks_t * const locks); + extern f_status_t f_thread_locks_increase_by(const f_number_unsigned_t amount, f_thread_locks_t * const locks); #endif // _di_f_thread_locks_increase_by_ /** @@ -191,7 +191,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_locks_resize_ - extern f_status_t f_thread_locks_resize(const f_array_length_t length, f_thread_locks_t * const locks); + extern f_status_t f_thread_locks_resize(const f_number_unsigned_t length, f_thread_locks_t * const locks); #endif // _di_f_thread_locks_resize_ #ifdef __cplusplus diff --git a/level_0/f_thread/c/thread/lock_attribute.c b/level_0/f_thread/c/thread/lock_attribute.c index 3794481..b1a3520 100644 --- a/level_0/f_thread/c/thread/lock_attribute.c +++ b/level_0/f_thread/c/thread/lock_attribute.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_thread_lock_attributes_adjust_ - f_status_t f_thread_lock_attributes_adjust(const f_array_length_t length, f_thread_lock_attributes_t * const attributes) { + f_status_t f_thread_lock_attributes_adjust(const f_number_unsigned_t length, f_thread_lock_attributes_t * const attributes) { #ifndef _di_level_0_parameter_checking_ if (!attributes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -17,7 +17,7 @@ extern "C" { #endif // _di_f_thread_lock_attributes_adjust_ #ifndef _di_f_thread_lock_attributes_decimate_by_ - f_status_t f_thread_lock_attributes_decimate_by(const f_array_length_t amount, f_thread_lock_attributes_t * const attributes) { + f_status_t f_thread_lock_attributes_decimate_by(const f_number_unsigned_t amount, f_thread_lock_attributes_t * const attributes) { #ifndef _di_level_0_parameter_checking_ if (!attributes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -33,7 +33,7 @@ extern "C" { #endif // _di_f_thread_lock_attributes_decimate_by_ #ifndef _di_f_thread_lock_attributes_decrease_by_ - f_status_t f_thread_lock_attributes_decrease_by(const f_array_length_t amount, f_thread_lock_attributes_t * const attributes) { + f_status_t f_thread_lock_attributes_decrease_by(const f_number_unsigned_t amount, f_thread_lock_attributes_t * const attributes) { #ifndef _di_level_0_parameter_checking_ if (!attributes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -49,20 +49,20 @@ extern "C" { #endif // _di_f_thread_lock_attributes_decrease_by_ #ifndef _di_f_thread_lock_attributes_increase_ - f_status_t f_thread_lock_attributes_increase(const f_array_length_t step, f_thread_lock_attributes_t * const attributes) { + f_status_t f_thread_lock_attributes_increase(const f_number_unsigned_t step, f_thread_lock_attributes_t * const attributes) { #ifndef _di_level_0_parameter_checking_ if (!attributes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && attributes->used + 1 > attributes->size) { - f_array_length_t size = attributes->used + step; + f_number_unsigned_t size = attributes->used + step; - if (size > F_array_length_t_size_d) { - if (attributes->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (attributes->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_thread_lock_attributes_resize(size, attributes); @@ -73,7 +73,7 @@ extern "C" { #endif // _di_f_thread_lock_attributes_increase_ #ifndef _di_f_thread_lock_attributes_increase_by_ - f_status_t f_thread_lock_attributes_increase_by(const f_array_length_t amount, f_thread_lock_attributes_t * const attributes) { + f_status_t f_thread_lock_attributes_increase_by(const f_number_unsigned_t amount, f_thread_lock_attributes_t * const attributes) { #ifndef _di_level_0_parameter_checking_ if (!attributes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -81,7 +81,7 @@ extern "C" { if (!amount) return F_data_not; if (attributes->used + amount > attributes->size) { - if (attributes->used + amount > F_array_length_t_size_d) { + if (attributes->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -93,7 +93,7 @@ extern "C" { #endif // _di_f_thread_lock_attributes_increase_by_ #ifndef _di_f_thread_lock_attributes_resize_ - f_status_t f_thread_lock_attributes_resize(const f_array_length_t length, f_thread_lock_attributes_t * const attributes) { + f_status_t f_thread_lock_attributes_resize(const f_number_unsigned_t length, f_thread_lock_attributes_t * const attributes) { #ifndef _di_level_0_parameter_checking_ if (!attributes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_thread/c/thread/lock_attribute.h b/level_0/f_thread/c/thread/lock_attribute.h index d1a68d2..872c9c7 100644 --- a/level_0/f_thread/c/thread/lock_attribute.h +++ b/level_0/f_thread/c/thread/lock_attribute.h @@ -43,8 +43,8 @@ extern "C" { typedef struct { f_thread_lock_attribute_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_thread_lock_attributes_t; #define f_thread_lock_attributes_t_initialize { 0, 0, 0 } @@ -81,7 +81,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_lock_attributes_adjust_ - extern f_status_t f_thread_lock_attributes_adjust(const f_array_length_t length, f_thread_lock_attributes_t * const attributes); + extern f_status_t f_thread_lock_attributes_adjust(const f_number_unsigned_t length, f_thread_lock_attributes_t * const attributes); #endif // _di_f_thread_lock_attributes_adjust_ /** @@ -104,7 +104,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_lock_attributes_decimate_by_ - extern f_status_t f_thread_lock_attributes_decimate_by(const f_array_length_t amount, f_thread_lock_attributes_t * const attributes); + extern f_status_t f_thread_lock_attributes_decimate_by(const f_number_unsigned_t amount, f_thread_lock_attributes_t * const attributes); #endif // _di_f_thread_lock_attributes_decimate_by_ /** @@ -127,13 +127,13 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_lock_attributes_decrease_by_ - extern f_status_t f_thread_lock_attributes_decrease_by(const f_array_length_t amount, f_thread_lock_attributes_t * const attributes); + extern f_status_t f_thread_lock_attributes_decrease_by(const f_number_unsigned_t amount, f_thread_lock_attributes_t * const attributes); #endif // _di_f_thread_lock_attributes_decrease_by_ /** * Increase the size of the thread 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -151,14 +151,14 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_lock_attributes_increase_ - extern f_status_t f_thread_lock_attributes_increase(const f_array_length_t step, f_thread_lock_attributes_t * const attributes); + extern f_status_t f_thread_lock_attributes_increase(const f_number_unsigned_t step, f_thread_lock_attributes_t * const attributes); #endif // _di_f_thread_lock_attributes_increase_ /** * Resize the thread 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -175,7 +175,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_lock_attributes_increase_by_ - extern f_status_t f_thread_lock_attributes_increase_by(const f_array_length_t amount, f_thread_lock_attributes_t * const attributes); + extern f_status_t f_thread_lock_attributes_increase_by(const f_number_unsigned_t amount, f_thread_lock_attributes_t * const attributes); #endif // _di_f_thread_lock_attributes_increase_by_ /** @@ -193,7 +193,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_lock_attributes_resize_ - extern f_status_t f_thread_lock_attributes_resize(const f_array_length_t length, f_thread_lock_attributes_t * const attributes); + extern f_status_t f_thread_lock_attributes_resize(const f_number_unsigned_t length, f_thread_lock_attributes_t * const attributes); #endif // _di_f_thread_lock_attributes_resize_ #ifdef __cplusplus diff --git a/level_0/f_thread/c/thread/mutex.c b/level_0/f_thread/c/thread/mutex.c index e2478cb..d6df593 100644 --- a/level_0/f_thread/c/thread/mutex.c +++ b/level_0/f_thread/c/thread/mutex.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_thread_mutexs_adjust_ - f_status_t f_thread_mutexs_adjust(const f_array_length_t length, f_thread_mutexs_t * const mutexs) { + f_status_t f_thread_mutexs_adjust(const f_number_unsigned_t length, f_thread_mutexs_t * const mutexs) { #ifndef _di_level_0_parameter_checking_ if (!mutexs) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -17,7 +17,7 @@ extern "C" { #endif // _di_f_thread_mutexs_adjust_ #ifndef _di_f_thread_mutexs_decimate_by_ - f_status_t f_thread_mutexs_decimate_by(const f_array_length_t amount, f_thread_mutexs_t * const mutexs) { + f_status_t f_thread_mutexs_decimate_by(const f_number_unsigned_t amount, f_thread_mutexs_t * const mutexs) { #ifndef _di_level_0_parameter_checking_ if (!mutexs) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -33,7 +33,7 @@ extern "C" { #endif // _di_f_thread_mutexs_decimate_by_ #ifndef _di_f_thread_mutexs_decrease_by_ - f_status_t f_thread_mutexs_decrease_by(const f_array_length_t amount, f_thread_mutexs_t * const mutexs) { + f_status_t f_thread_mutexs_decrease_by(const f_number_unsigned_t amount, f_thread_mutexs_t * const mutexs) { #ifndef _di_level_0_parameter_checking_ if (!mutexs) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -49,20 +49,20 @@ extern "C" { #endif // _di_f_thread_mutexs_decrease_by_ #ifndef _di_f_thread_mutexs_increase_ - f_status_t f_thread_mutexs_increase(const f_array_length_t step, f_thread_mutexs_t * const mutexs) { + f_status_t f_thread_mutexs_increase(const f_number_unsigned_t step, f_thread_mutexs_t * const mutexs) { #ifndef _di_level_0_parameter_checking_ if (!mutexs) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && mutexs->used + 1 > mutexs->size) { - f_array_length_t size = mutexs->used + step; + f_number_unsigned_t size = mutexs->used + step; - if (size > F_array_length_t_size_d) { - if (mutexs->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (mutexs->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_thread_mutexs_resize(size, mutexs); @@ -73,7 +73,7 @@ extern "C" { #endif // _di_f_thread_mutexs_increase_ #ifndef _di_f_thread_mutexs_increase_by_ - f_status_t f_thread_mutexs_increase_by(const f_array_length_t amount, f_thread_mutexs_t * const mutexs) { + f_status_t f_thread_mutexs_increase_by(const f_number_unsigned_t amount, f_thread_mutexs_t * const mutexs) { #ifndef _di_level_0_parameter_checking_ if (!mutexs) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -81,7 +81,7 @@ extern "C" { if (!amount) return F_data_not; if (mutexs->used + amount > mutexs->size) { - if (mutexs->used + amount > F_array_length_t_size_d) { + if (mutexs->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -93,7 +93,7 @@ extern "C" { #endif // _di_f_thread_mutexs_increase_by_ #ifndef _di_f_thread_mutexs_resize_ - f_status_t f_thread_mutexs_resize(const f_array_length_t length, f_thread_mutexs_t * const mutexs) { + f_status_t f_thread_mutexs_resize(const f_number_unsigned_t length, f_thread_mutexs_t * const mutexs) { #ifndef _di_level_0_parameter_checking_ if (!mutexs) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_thread/c/thread/mutex.h b/level_0/f_thread/c/thread/mutex.h index db8e265..1b12168 100644 --- a/level_0/f_thread/c/thread/mutex.h +++ b/level_0/f_thread/c/thread/mutex.h @@ -45,8 +45,8 @@ extern "C" { typedef struct { f_thread_mutex_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_thread_mutexs_t; #define f_thread_mutexs_t_initialize { 0, 0, 0 } @@ -83,7 +83,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_mutexs_adjust_ - extern f_status_t f_thread_mutexs_adjust(const f_array_length_t length, f_thread_mutexs_t * const mutexs); + extern f_status_t f_thread_mutexs_adjust(const f_number_unsigned_t length, f_thread_mutexs_t * const mutexs); #endif // _di_f_thread_mutexs_adjust_ /** @@ -106,7 +106,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_mutexs_decimate_by_ - extern f_status_t f_thread_mutexs_decimate_by(const f_array_length_t amount, f_thread_mutexs_t * const mutexs); + extern f_status_t f_thread_mutexs_decimate_by(const f_number_unsigned_t amount, f_thread_mutexs_t * const mutexs); #endif // _di_f_thread_mutexs_decimate_by_ /** @@ -129,13 +129,13 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_mutexs_decrease_by_ - extern f_status_t f_thread_mutexs_decrease_by(const f_array_length_t amount, f_thread_mutexs_t * const mutexs); + extern f_status_t f_thread_mutexs_decrease_by(const f_number_unsigned_t amount, f_thread_mutexs_t * const mutexs); #endif // _di_f_thread_mutexs_decrease_by_ /** * Increase the size of the thread 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -153,14 +153,14 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_mutexs_increase_ - extern f_status_t f_thread_mutexs_increase(const f_array_length_t step, f_thread_mutexs_t * const mutexs); + extern f_status_t f_thread_mutexs_increase(const f_number_unsigned_t step, f_thread_mutexs_t * const mutexs); #endif // _di_f_thread_mutexs_increase_ /** * Resize the thread 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -177,7 +177,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_mutexs_increase_by_ - extern f_status_t f_thread_mutexs_increase_by(const f_array_length_t amount, f_thread_mutexs_t * const mutexs); + extern f_status_t f_thread_mutexs_increase_by(const f_number_unsigned_t amount, f_thread_mutexs_t * const mutexs); #endif // _di_f_thread_mutexs_increase_by_ /** @@ -195,7 +195,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_mutexs_resize_ - extern f_status_t f_thread_mutexs_resize(const f_array_length_t length, f_thread_mutexs_t * const mutexs); + extern f_status_t f_thread_mutexs_resize(const f_number_unsigned_t length, f_thread_mutexs_t * const mutexs); #endif // _di_f_thread_mutexs_resize_ #ifdef __cplusplus diff --git a/level_0/f_thread/c/thread/mutex_attribute.c b/level_0/f_thread/c/thread/mutex_attribute.c index fa7b609..749404b 100644 --- a/level_0/f_thread/c/thread/mutex_attribute.c +++ b/level_0/f_thread/c/thread/mutex_attribute.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_thread_mutex_attributes_adjust_ - f_status_t f_thread_mutex_attributes_adjust(const f_array_length_t length, f_thread_mutex_attributes_t * const attributes) { + f_status_t f_thread_mutex_attributes_adjust(const f_number_unsigned_t length, f_thread_mutex_attributes_t * const attributes) { #ifndef _di_level_0_parameter_checking_ if (!attributes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -17,7 +17,7 @@ extern "C" { #endif // _di_f_thread_mutex_attributes_adjust_ #ifndef _di_f_thread_mutex_attributes_decimate_by_ - f_status_t f_thread_mutex_attributes_decimate_by(const f_array_length_t amount, f_thread_mutex_attributes_t * const attributes) { + f_status_t f_thread_mutex_attributes_decimate_by(const f_number_unsigned_t amount, f_thread_mutex_attributes_t * const attributes) { #ifndef _di_level_0_parameter_checking_ if (!attributes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -33,7 +33,7 @@ extern "C" { #endif // _di_f_thread_mutex_attributes_decimate_by_ #ifndef _di_f_thread_mutex_attributes_decrease_by_ - f_status_t f_thread_mutex_attributes_decrease_by(const f_array_length_t amount, f_thread_mutex_attributes_t * const attributes) { + f_status_t f_thread_mutex_attributes_decrease_by(const f_number_unsigned_t amount, f_thread_mutex_attributes_t * const attributes) { #ifndef _di_level_0_parameter_checking_ if (!attributes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -49,20 +49,20 @@ extern "C" { #endif // _di_f_thread_mutex_attributes_decrease_by_ #ifndef _di_f_thread_mutex_attributes_increase_ - f_status_t f_thread_mutex_attributes_increase(const f_array_length_t step, f_thread_mutex_attributes_t * const attributes) { + f_status_t f_thread_mutex_attributes_increase(const f_number_unsigned_t step, f_thread_mutex_attributes_t * const attributes) { #ifndef _di_level_0_parameter_checking_ if (!attributes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && attributes->used + 1 > attributes->size) { - f_array_length_t size = attributes->used + step; + f_number_unsigned_t size = attributes->used + step; - if (size > F_array_length_t_size_d) { - if (attributes->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (attributes->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_thread_mutex_attributes_resize(size, attributes); @@ -73,7 +73,7 @@ extern "C" { #endif // _di_f_thread_mutex_attributes_increase_ #ifndef _di_f_thread_mutex_attributes_increase_by_ - f_status_t f_thread_mutex_attributes_increase_by(const f_array_length_t amount, f_thread_mutex_attributes_t * const attributes) { + f_status_t f_thread_mutex_attributes_increase_by(const f_number_unsigned_t amount, f_thread_mutex_attributes_t * const attributes) { #ifndef _di_level_0_parameter_checking_ if (!attributes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -81,7 +81,7 @@ extern "C" { if (!amount) return F_data_not; if (attributes->used + amount > attributes->size) { - if (attributes->used + amount > F_array_length_t_size_d) { + if (attributes->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -93,7 +93,7 @@ extern "C" { #endif // _di_f_thread_mutex_attributes_increase_by_ #ifndef _di_f_thread_mutex_attributes_resize_ - f_status_t f_thread_mutex_attributes_resize(const f_array_length_t length, f_thread_mutex_attributes_t * const attributes) { + f_status_t f_thread_mutex_attributes_resize(const f_number_unsigned_t length, f_thread_mutex_attributes_t * const attributes) { #ifndef _di_level_0_parameter_checking_ if (!attributes) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_thread/c/thread/mutex_attribute.h b/level_0/f_thread/c/thread/mutex_attribute.h index 8ee8b46..5f346a9 100644 --- a/level_0/f_thread/c/thread/mutex_attribute.h +++ b/level_0/f_thread/c/thread/mutex_attribute.h @@ -43,8 +43,8 @@ extern "C" { typedef struct { f_thread_mutex_attribute_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_thread_mutex_attributes_t; #define f_thread_mutex_attributes_t_initialize { 0, 0, 0 } @@ -81,7 +81,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_mutex_attributes_adjust_ - extern f_status_t f_thread_mutex_attributes_adjust(const f_array_length_t length, f_thread_mutex_attributes_t * const attributes); + extern f_status_t f_thread_mutex_attributes_adjust(const f_number_unsigned_t length, f_thread_mutex_attributes_t * const attributes); #endif // _di_f_thread_mutex_attributes_adjust_ /** @@ -104,7 +104,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_mutex_attributes_decimate_by_ - extern f_status_t f_thread_mutex_attributes_decimate_by(const f_array_length_t amount, f_thread_mutex_attributes_t * const attributes); + extern f_status_t f_thread_mutex_attributes_decimate_by(const f_number_unsigned_t amount, f_thread_mutex_attributes_t * const attributes); #endif // _di_f_thread_mutex_attributes_decimate_by_ /** @@ -127,13 +127,13 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_mutex_attributes_decrease_by_ - extern f_status_t f_thread_mutex_attributes_decrease_by(const f_array_length_t amount, f_thread_mutex_attributes_t * const attributes); + extern f_status_t f_thread_mutex_attributes_decrease_by(const f_number_unsigned_t amount, f_thread_mutex_attributes_t * const attributes); #endif // _di_f_thread_mutex_attributes_decrease_by_ /** * Increase the size of the thread 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -151,14 +151,14 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_mutex_attributes_increase_ - extern f_status_t f_thread_mutex_attributes_increase(const f_array_length_t step, f_thread_mutex_attributes_t * const attributes); + extern f_status_t f_thread_mutex_attributes_increase(const f_number_unsigned_t step, f_thread_mutex_attributes_t * const attributes); #endif // _di_f_thread_mutex_attributes_increase_ /** * Resize the thread 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -175,7 +175,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_mutex_attributes_increase_by_ - extern f_status_t f_thread_mutex_attributes_increase_by(const f_array_length_t amount, f_thread_mutex_attributes_t * const attributes); + extern f_status_t f_thread_mutex_attributes_increase_by(const f_number_unsigned_t amount, f_thread_mutex_attributes_t * const attributes); #endif // _di_f_thread_mutex_attributes_increase_by_ /** @@ -193,7 +193,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_mutex_attributes_resize_ - extern f_status_t f_thread_mutex_attributes_resize(const f_array_length_t length, f_thread_mutex_attributes_t * const attributes); + extern f_status_t f_thread_mutex_attributes_resize(const f_number_unsigned_t length, f_thread_mutex_attributes_t * const attributes); #endif // _di_f_thread_mutex_attributes_resize_ #ifdef __cplusplus diff --git a/level_0/f_thread/c/thread/once.c b/level_0/f_thread/c/thread/once.c index 28a5a45..cfe8f82 100644 --- a/level_0/f_thread/c/thread/once.c +++ b/level_0/f_thread/c/thread/once.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_thread_onces_adjust_ - f_status_t f_thread_onces_adjust(const f_array_length_t length, f_thread_onces_t * const onces) { + f_status_t f_thread_onces_adjust(const f_number_unsigned_t length, f_thread_onces_t * const onces) { #ifndef _di_level_0_parameter_checking_ if (!onces) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -17,7 +17,7 @@ extern "C" { #endif // _di_f_thread_onces_adjust_ #ifndef _di_f_thread_onces_decimate_by_ - f_status_t f_thread_onces_decimate_by(const f_array_length_t amount, f_thread_onces_t * const onces) { + f_status_t f_thread_onces_decimate_by(const f_number_unsigned_t amount, f_thread_onces_t * const onces) { #ifndef _di_level_0_parameter_checking_ if (!onces) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -33,7 +33,7 @@ extern "C" { #endif // _di_f_thread_onces_decimate_by_ #ifndef _di_f_thread_onces_decrease_by_ - f_status_t f_thread_onces_decrease_by(const f_array_length_t amount, f_thread_onces_t * const onces) { + f_status_t f_thread_onces_decrease_by(const f_number_unsigned_t amount, f_thread_onces_t * const onces) { #ifndef _di_level_0_parameter_checking_ if (!onces) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -49,20 +49,20 @@ extern "C" { #endif // _di_f_thread_onces_decrease_by_ #ifndef _di_f_thread_onces_increase_ - f_status_t f_thread_onces_increase(const f_array_length_t step, f_thread_onces_t * const onces) { + f_status_t f_thread_onces_increase(const f_number_unsigned_t step, f_thread_onces_t * const onces) { #ifndef _di_level_0_parameter_checking_ if (!onces) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && onces->used + 1 > onces->size) { - f_array_length_t size = onces->used + step; + f_number_unsigned_t size = onces->used + step; - if (size > F_array_length_t_size_d) { - if (onces->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (onces->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_thread_onces_resize(size, onces); @@ -73,7 +73,7 @@ extern "C" { #endif // _di_f_thread_onces_increase_ #ifndef _di_f_thread_onces_increase_by_ - f_status_t f_thread_onces_increase_by(const f_array_length_t amount, f_thread_onces_t * const onces) { + f_status_t f_thread_onces_increase_by(const f_number_unsigned_t amount, f_thread_onces_t * const onces) { #ifndef _di_level_0_parameter_checking_ if (!onces) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -81,7 +81,7 @@ extern "C" { if (!amount) return F_data_not; if (onces->used + amount > onces->size) { - if (onces->used + amount > F_array_length_t_size_d) { + if (onces->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -93,7 +93,7 @@ extern "C" { #endif // _di_f_thread_onces_increase_by_ #ifndef _di_f_thread_onces_resize_ - f_status_t f_thread_onces_resize(const f_array_length_t length, f_thread_onces_t * const onces) { + f_status_t f_thread_onces_resize(const f_number_unsigned_t length, f_thread_onces_t * const onces) { #ifndef _di_level_0_parameter_checking_ if (!onces) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_thread/c/thread/once.h b/level_0/f_thread/c/thread/once.h index b8bf770..5edc07d 100644 --- a/level_0/f_thread/c/thread/once.h +++ b/level_0/f_thread/c/thread/once.h @@ -40,8 +40,8 @@ extern "C" { typedef struct { f_thread_once_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_thread_onces_t; #define f_thread_onces_t_initialize { 0, 0, 0 } @@ -81,7 +81,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_onces_adjust_ - extern f_status_t f_thread_onces_adjust(const f_array_length_t length, f_thread_onces_t * const onces); + extern f_status_t f_thread_onces_adjust(const f_number_unsigned_t length, f_thread_onces_t * const onces); #endif // _di_f_thread_onces_adjust_ /** @@ -104,7 +104,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_onces_decimate_by_ - extern f_status_t f_thread_onces_decimate_by(const f_array_length_t amount, f_thread_onces_t * const onces); + extern f_status_t f_thread_onces_decimate_by(const f_number_unsigned_t amount, f_thread_onces_t * const onces); #endif // _di_f_thread_onces_decimate_by_ /** @@ -127,13 +127,13 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_onces_decrease_by_ - extern f_status_t f_thread_onces_decrease_by(const f_array_length_t amount, f_thread_onces_t * const onces); + extern f_status_t f_thread_onces_decrease_by(const f_number_unsigned_t amount, f_thread_onces_t * const onces); #endif // _di_f_thread_onces_decrease_by_ /** * Increase the size of the thread 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -151,14 +151,14 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_onces_increase_ - extern f_status_t f_thread_onces_increase(const f_array_length_t step, f_thread_onces_t * const onces); + extern f_status_t f_thread_onces_increase(const f_number_unsigned_t step, f_thread_onces_t * const onces); #endif // _di_f_thread_onces_increase_ /** * Resize the thread 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -175,7 +175,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_onces_increase_by_ - extern f_status_t f_thread_onces_increase_by(const f_array_length_t amount, f_thread_onces_t * const onces); + extern f_status_t f_thread_onces_increase_by(const f_number_unsigned_t amount, f_thread_onces_t * const onces); #endif // _di_f_thread_onces_increase_by_ /** @@ -193,7 +193,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_onces_resize_ - extern f_status_t f_thread_onces_resize(const f_array_length_t length, f_thread_onces_t * const onces); + extern f_status_t f_thread_onces_resize(const f_number_unsigned_t length, f_thread_onces_t * const onces); #endif // _di_f_thread_onces_resize_ #ifdef __cplusplus diff --git a/level_0/f_thread/c/thread/semaphore.c b/level_0/f_thread/c/thread/semaphore.c index 9aa9569..0acfd18 100644 --- a/level_0/f_thread/c/thread/semaphore.c +++ b/level_0/f_thread/c/thread/semaphore.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_thread_semaphores_adjust_ - f_status_t f_thread_semaphores_adjust(const f_array_length_t length, f_thread_semaphores_t * const semaphores) { + f_status_t f_thread_semaphores_adjust(const f_number_unsigned_t length, f_thread_semaphores_t * const semaphores) { #ifndef _di_level_0_parameter_checking_ if (!semaphores) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -17,7 +17,7 @@ extern "C" { #endif // _di_f_thread_semaphores_adjust_ #ifndef _di_f_thread_semaphores_decimate_by_ - f_status_t f_thread_semaphores_decimate_by(const f_array_length_t amount, f_thread_semaphores_t * const semaphores) { + f_status_t f_thread_semaphores_decimate_by(const f_number_unsigned_t amount, f_thread_semaphores_t * const semaphores) { #ifndef _di_level_0_parameter_checking_ if (!semaphores) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -33,7 +33,7 @@ extern "C" { #endif // _di_f_thread_semaphores_decimate_by_ #ifndef _di_f_thread_semaphores_decrease_by_ - f_status_t f_thread_semaphores_decrease_by(const f_array_length_t amount, f_thread_semaphores_t * const semaphores) { + f_status_t f_thread_semaphores_decrease_by(const f_number_unsigned_t amount, f_thread_semaphores_t * const semaphores) { #ifndef _di_level_0_parameter_checking_ if (!semaphores) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -49,20 +49,20 @@ extern "C" { #endif // _di_f_thread_semaphores_decrease_by_ #ifndef _di_f_thread_semaphores_increase_ - f_status_t f_thread_semaphores_increase(const f_array_length_t step, f_thread_semaphores_t * const semaphores) { + f_status_t f_thread_semaphores_increase(const f_number_unsigned_t step, f_thread_semaphores_t * const semaphores) { #ifndef _di_level_0_parameter_checking_ if (!semaphores) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && semaphores->used + 1 > semaphores->size) { - f_array_length_t size = semaphores->used + step; + f_number_unsigned_t size = semaphores->used + step; - if (size > F_array_length_t_size_d) { - if (semaphores->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (semaphores->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_thread_semaphores_resize(size, semaphores); @@ -73,7 +73,7 @@ extern "C" { #endif // _di_f_thread_semaphores_increase_ #ifndef _di_f_thread_semaphores_increase_by_ - f_status_t f_thread_semaphores_increase_by(const f_array_length_t amount, f_thread_semaphores_t * const semaphores) { + f_status_t f_thread_semaphores_increase_by(const f_number_unsigned_t amount, f_thread_semaphores_t * const semaphores) { #ifndef _di_level_0_parameter_checking_ if (!semaphores) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -81,7 +81,7 @@ extern "C" { if (!amount) return F_data_not; if (semaphores->used + amount > semaphores->size) { - if (semaphores->used + amount > F_array_length_t_size_d) { + if (semaphores->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -93,7 +93,7 @@ extern "C" { #endif // _di_f_thread_semaphores_increase_by_ #ifndef _di_f_thread_semaphores_resize_ - f_status_t f_thread_semaphores_resize(const f_array_length_t length, f_thread_semaphores_t * const semaphores) { + f_status_t f_thread_semaphores_resize(const f_number_unsigned_t length, f_thread_semaphores_t * const semaphores) { #ifndef _di_level_0_parameter_checking_ if (!semaphores) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_thread/c/thread/semaphore.h b/level_0/f_thread/c/thread/semaphore.h index c8242be..5ed869a 100644 --- a/level_0/f_thread/c/thread/semaphore.h +++ b/level_0/f_thread/c/thread/semaphore.h @@ -44,8 +44,8 @@ extern "C" { typedef struct { f_thread_semaphore_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_thread_semaphores_t; #define f_thread_semaphores_t_initialize { 0, 0, 0 } @@ -82,7 +82,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_semaphores_adjust_ - extern f_status_t f_thread_semaphores_adjust(const f_array_length_t length, f_thread_semaphores_t * const semaphores); + extern f_status_t f_thread_semaphores_adjust(const f_number_unsigned_t length, f_thread_semaphores_t * const semaphores); #endif // _di_f_thread_semaphores_adjust_ /** @@ -105,7 +105,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_semaphores_decimate_by_ - extern f_status_t f_thread_semaphores_decimate_by(const f_array_length_t amount, f_thread_semaphores_t * const semaphores); + extern f_status_t f_thread_semaphores_decimate_by(const f_number_unsigned_t amount, f_thread_semaphores_t * const semaphores); #endif // _di_f_thread_semaphores_decimate_by_ /** @@ -128,13 +128,13 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_semaphores_decrease_by_ - extern f_status_t f_thread_semaphores_decrease_by(const f_array_length_t amount, f_thread_semaphores_t * const semaphores); + extern f_status_t f_thread_semaphores_decrease_by(const f_number_unsigned_t amount, f_thread_semaphores_t * const semaphores); #endif // _di_f_thread_semaphores_decrease_by_ /** * Increase the size of the thread semaphores 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -152,14 +152,14 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_semaphores_increase_ - extern f_status_t f_thread_semaphores_increase(const f_array_length_t step, f_thread_semaphores_t * const semaphores); + extern f_status_t f_thread_semaphores_increase(const f_number_unsigned_t step, f_thread_semaphores_t * const semaphores); #endif // _di_f_thread_semaphores_increase_ /** * Resize the thread semaphores 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -176,7 +176,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_semaphores_increase_by_ - extern f_status_t f_thread_semaphores_increase_by(const f_array_length_t amount, f_thread_semaphores_t * const semaphores); + extern f_status_t f_thread_semaphores_increase_by(const f_number_unsigned_t amount, f_thread_semaphores_t * const semaphores); #endif // _di_f_thread_semaphores_increase_by_ /** @@ -194,7 +194,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_semaphores_resize_ - extern f_status_t f_thread_semaphores_resize(const f_array_length_t length, f_thread_semaphores_t * const semaphores); + extern f_status_t f_thread_semaphores_resize(const f_number_unsigned_t length, f_thread_semaphores_t * const semaphores); #endif // _di_f_thread_semaphores_resize_ #ifdef __cplusplus diff --git a/level_0/f_thread/c/thread/set.c b/level_0/f_thread/c/thread/set.c index b0228c2..afa1dd0 100644 --- a/level_0/f_thread/c/thread/set.c +++ b/level_0/f_thread/c/thread/set.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_thread_sets_adjust_ - f_status_t f_thread_sets_adjust(const f_array_length_t length, f_thread_sets_t * const sets) { + f_status_t f_thread_sets_adjust(const f_number_unsigned_t length, f_thread_sets_t * const sets) { #ifndef _di_level_0_parameter_checking_ if (!sets) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -17,7 +17,7 @@ extern "C" { #endif // _di_f_thread_sets_adjust_ #ifndef _di_f_thread_sets_decimate_by_ - f_status_t f_thread_sets_decimate_by(const f_array_length_t amount, f_thread_sets_t * const sets) { + f_status_t f_thread_sets_decimate_by(const f_number_unsigned_t amount, f_thread_sets_t * const sets) { #ifndef _di_level_0_parameter_checking_ if (!sets) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -33,7 +33,7 @@ extern "C" { #endif // _di_f_thread_sets_decimate_by_ #ifndef _di_f_thread_sets_decrease_by_ - f_status_t f_thread_sets_decrease_by(const f_array_length_t amount, f_thread_sets_t * const sets) { + f_status_t f_thread_sets_decrease_by(const f_number_unsigned_t amount, f_thread_sets_t * const sets) { #ifndef _di_level_0_parameter_checking_ if (!sets) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -49,20 +49,20 @@ extern "C" { #endif // _di_f_thread_sets_decrease_by_ #ifndef _di_f_thread_sets_increase_ - f_status_t f_thread_sets_increase(const f_array_length_t step, f_thread_sets_t * const sets) { + f_status_t f_thread_sets_increase(const f_number_unsigned_t step, f_thread_sets_t * const sets) { #ifndef _di_level_0_parameter_checking_ if (!sets) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && sets->used + 1 > sets->size) { - f_array_length_t size = sets->used + step; + f_number_unsigned_t size = sets->used + step; - if (size > F_array_length_t_size_d) { - if (sets->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (sets->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_thread_sets_resize(size, sets); @@ -73,7 +73,7 @@ extern "C" { #endif // _di_f_thread_sets_increase_ #ifndef _di_f_thread_sets_increase_by_ - f_status_t f_thread_sets_increase_by(const f_array_length_t amount, f_thread_sets_t * const sets) { + f_status_t f_thread_sets_increase_by(const f_number_unsigned_t amount, f_thread_sets_t * const sets) { #ifndef _di_level_0_parameter_checking_ if (!sets) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -81,7 +81,7 @@ extern "C" { if (!amount) return F_data_not; if (sets->used + amount > sets->size) { - if (sets->used + amount > F_array_length_t_size_d) { + if (sets->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -93,7 +93,7 @@ extern "C" { #endif // _di_f_thread_sets_increase_by_ #ifndef _di_f_thread_sets_resize_ - f_status_t f_thread_sets_resize(const f_array_length_t length, f_thread_sets_t * const sets) { + f_status_t f_thread_sets_resize(const f_number_unsigned_t length, f_thread_sets_t * const sets) { #ifndef _di_level_0_parameter_checking_ if (!sets) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_thread/c/thread/set.h b/level_0/f_thread/c/thread/set.h index cb67ed3..4f9721b 100644 --- a/level_0/f_thread/c/thread/set.h +++ b/level_0/f_thread/c/thread/set.h @@ -53,8 +53,8 @@ extern "C" { typedef struct { f_thread_set_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_thread_sets_t; #define f_thread_sets_t_initialize { 0, 0, 0 } @@ -91,7 +91,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_sets_adjust_ - extern f_status_t f_thread_sets_adjust(const f_array_length_t length, f_thread_sets_t * const sets); + extern f_status_t f_thread_sets_adjust(const f_number_unsigned_t length, f_thread_sets_t * const sets); #endif // _di_f_thread_sets_adjust_ /** @@ -114,7 +114,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_sets_decimate_by_ - extern f_status_t f_thread_sets_decimate_by(const f_array_length_t amount, f_thread_sets_t * const sets); + extern f_status_t f_thread_sets_decimate_by(const f_number_unsigned_t amount, f_thread_sets_t * const sets); #endif // _di_f_thread_sets_decimate_by_ /** @@ -137,13 +137,13 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_sets_decrease_by_ - extern f_status_t f_thread_sets_decrease_by(const f_array_length_t amount, f_thread_sets_t * const sets); + extern f_status_t f_thread_sets_decrease_by(const f_number_unsigned_t amount, f_thread_sets_t * const sets); #endif // _di_f_thread_sets_decrease_by_ /** * Increase the size of the thread 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -161,14 +161,14 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_sets_increase_ - extern f_status_t f_thread_sets_increase(const f_array_length_t step, f_thread_sets_t * const sets); + extern f_status_t f_thread_sets_increase(const f_number_unsigned_t step, f_thread_sets_t * const sets); #endif // _di_f_thread_sets_increase_ /** * Resize the thread 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -185,7 +185,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_sets_increase_by_ - extern f_status_t f_thread_sets_increase_by(const f_array_length_t amount, f_thread_sets_t * const sets); + extern f_status_t f_thread_sets_increase_by(const f_number_unsigned_t amount, f_thread_sets_t * const sets); #endif // _di_f_thread_sets_increase_by_ /** @@ -203,7 +203,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_sets_resize_ - extern f_status_t f_thread_sets_resize(const f_array_length_t length, f_thread_sets_t * const sets); + extern f_status_t f_thread_sets_resize(const f_number_unsigned_t length, f_thread_sets_t * const sets); #endif // _di_f_thread_sets_resize_ #ifdef __cplusplus diff --git a/level_0/f_thread/c/thread/spin.c b/level_0/f_thread/c/thread/spin.c index da7a2b2..e12db09 100644 --- a/level_0/f_thread/c/thread/spin.c +++ b/level_0/f_thread/c/thread/spin.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_thread_spins_adjust_ - f_status_t f_thread_spins_adjust(const f_array_length_t length, f_thread_spins_t * const spins) { + f_status_t f_thread_spins_adjust(const f_number_unsigned_t length, f_thread_spins_t * const spins) { #ifndef _di_level_0_parameter_checking_ if (!spins) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -17,7 +17,7 @@ extern "C" { #endif // _di_f_thread_spins_adjust_ #ifndef _di_f_thread_spins_decimate_by_ - f_status_t f_thread_spins_decimate_by(const f_array_length_t amount, f_thread_spins_t * const spins) { + f_status_t f_thread_spins_decimate_by(const f_number_unsigned_t amount, f_thread_spins_t * const spins) { #ifndef _di_level_0_parameter_checking_ if (!spins) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -33,7 +33,7 @@ extern "C" { #endif // _di_f_thread_spins_decimate_by_ #ifndef _di_f_thread_spins_decrease_by_ - f_status_t f_thread_spins_decrease_by(const f_array_length_t amount, f_thread_spins_t * const spins) { + f_status_t f_thread_spins_decrease_by(const f_number_unsigned_t amount, f_thread_spins_t * const spins) { #ifndef _di_level_0_parameter_checking_ if (!spins) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -49,20 +49,20 @@ extern "C" { #endif // _di_f_thread_spins_decrease_by_ #ifndef _di_f_thread_spins_increase_ - f_status_t f_thread_spins_increase(const f_array_length_t step, f_thread_spins_t * const spins) { + f_status_t f_thread_spins_increase(const f_number_unsigned_t step, f_thread_spins_t * const spins) { #ifndef _di_level_0_parameter_checking_ if (!spins) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && spins->used + 1 > spins->size) { - f_array_length_t size = spins->used + step; + f_number_unsigned_t size = spins->used + step; - if (size > F_array_length_t_size_d) { - if (spins->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (spins->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_thread_spins_resize(size, spins); @@ -73,7 +73,7 @@ extern "C" { #endif // _di_f_thread_spins_increase_ #ifndef _di_f_thread_spins_increase_by_ - f_status_t f_thread_spins_increase_by(const f_array_length_t amount, f_thread_spins_t * const spins) { + f_status_t f_thread_spins_increase_by(const f_number_unsigned_t amount, f_thread_spins_t * const spins) { #ifndef _di_level_0_parameter_checking_ if (!spins) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -81,7 +81,7 @@ extern "C" { if (!amount) return F_data_not; if (spins->used + amount > spins->size) { - if (spins->used + amount > F_array_length_t_size_d) { + if (spins->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -93,7 +93,7 @@ extern "C" { #endif // _di_f_thread_spins_increase_by_ #ifndef _di_f_thread_spins_resize_ - f_status_t f_thread_spins_resize(const f_array_length_t length, f_thread_spins_t * const spins) { + f_status_t f_thread_spins_resize(const f_number_unsigned_t length, f_thread_spins_t * const spins) { #ifndef _di_level_0_parameter_checking_ if (!spins) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_thread/c/thread/spin.h b/level_0/f_thread/c/thread/spin.h index 77c6de7..0d920a3 100644 --- a/level_0/f_thread/c/thread/spin.h +++ b/level_0/f_thread/c/thread/spin.h @@ -42,8 +42,8 @@ extern "C" { typedef struct { f_thread_spin_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_thread_spins_t; #define f_thread_spins_t_initialize { 0, 0, 0 } @@ -80,7 +80,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_spins_adjust_ - extern f_status_t f_thread_spins_adjust(const f_array_length_t length, f_thread_spins_t * const spins); + extern f_status_t f_thread_spins_adjust(const f_number_unsigned_t length, f_thread_spins_t * const spins); #endif // _di_f_thread_spins_adjust_ /** @@ -103,7 +103,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_spins_decimate_by_ - extern f_status_t f_thread_spins_decimate_by(const f_array_length_t amount, f_thread_spins_t * const spins); + extern f_status_t f_thread_spins_decimate_by(const f_number_unsigned_t amount, f_thread_spins_t * const spins); #endif // _di_f_thread_spins_decimate_by_ /** @@ -126,13 +126,13 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_spins_decrease_by_ - extern f_status_t f_thread_spins_decrease_by(const f_array_length_t amount, f_thread_spins_t * const spins); + extern f_status_t f_thread_spins_decrease_by(const f_number_unsigned_t amount, f_thread_spins_t * const spins); #endif // _di_f_thread_spins_decrease_by_ /** * Increase the size of the thread spin 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -150,14 +150,14 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_spins_increase_ - extern f_status_t f_thread_spins_increase(const f_array_length_t step, f_thread_spins_t * const spins); + extern f_status_t f_thread_spins_increase(const f_number_unsigned_t step, f_thread_spins_t * const spins); #endif // _di_f_thread_spins_increase_ /** * Resize the thread spin 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -174,7 +174,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_spins_increase_by_ - extern f_status_t f_thread_spins_increase_by(const f_array_length_t amount, f_thread_spins_t * const spins); + extern f_status_t f_thread_spins_increase_by(const f_number_unsigned_t amount, f_thread_spins_t * const spins); #endif // _di_f_thread_spins_increase_by_ /** @@ -192,7 +192,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_thread_spins_resize_ - extern f_status_t f_thread_spins_resize(const f_array_length_t length, f_thread_spins_t * const spins); + extern f_status_t f_thread_spins_resize(const f_number_unsigned_t length, f_thread_spins_t * const spins); #endif // _di_f_thread_spins_resize_ #ifdef __cplusplus diff --git a/level_0/f_type/c/type.h b/level_0/f_type/c/type.h index 9e0ebd8..e87d029 100644 --- a/level_0/f_type/c/type.h +++ b/level_0/f_type/c/type.h @@ -321,25 +321,6 @@ extern "C" { #endif // _di_f_type_d_ /** - * Defines a variable to be used by arrays. - * - * There are problems in some libc's and systems that do not handle lengths greater than 2^63. - * This is primarily a problem with libc string functions. - * This may need to be set to a signed 64-bit integer on some system (or a smaller unsigned). - * There are problems, however, with signed integers and binary operations as well as with overflows to be aware of. - */ -#ifndef _di_f_array_length_t_ - typedef f_number_unsigned_t f_array_length_t; - - #define f_array_length_t_initialize 0 - - #define macro_f_array_length_t_initialize_1(length) length - - #define F_array_length_t_size_d F_number_t_size_unsigned_d - #define F_array_length_t_size_max_d F_number_t_size_max_unsigned_d -#endif // _di_f_array_length_t_ - -/** * A structure designating a row and column, just like a cell in a table. * * row: The row position. @@ -347,8 +328,8 @@ extern "C" { */ #ifndef _di_f_cell_t_ typedef struct { - f_array_length_t row; - f_array_length_t column; + f_number_unsigned_t row; + f_number_unsigned_t column; } f_cell_t; #define f_cell_t_initialize { 0, 0 } @@ -373,8 +354,8 @@ extern "C" { typedef struct { f_cell_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_cells_t; #define f_cells_t_initialize { 0, 0, 0 } @@ -396,8 +377,8 @@ extern "C" { typedef struct { f_cells_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_cellss_t; #define f_cellss_t_initialize { 0, 0, 0 } @@ -557,19 +538,19 @@ extern "C" { * size: Total amount of allocated space. * used: Total number of allocated spaces used. */ -#ifndef _di_f_array_lengths_t_ +#ifndef _di_f_number_unsigneds_t_ typedef struct { - f_array_length_t *array; + f_number_unsigned_t *array; - f_array_length_t size; - f_array_length_t used; - } f_array_lengths_t; + f_number_unsigned_t size; + f_number_unsigned_t used; + } f_number_unsigneds_t; - #define f_array_lengths_t_initialize { 0, 0, 0 } + #define f_number_unsigneds_t_initialize { 0, 0, 0 } - #define macro_f_array_lengths_t_initialize_1(array, size, used) { array, size, used } - #define macro_f_array_lengths_t_initialize_2(array, length) { array, length, length } -#endif // _di_f_array_lengths_t_ + #define macro_f_number_unsigneds_t_initialize_1(array, size, used) { array, size, used } + #define macro_f_number_unsigneds_t_initialize_2(array, length) { array, length, length } +#endif // _di_f_number_unsigneds_t_ /** * An array of an array of array lengths. @@ -580,19 +561,19 @@ extern "C" { * size: Total amount of allocated space. * used: Total number of allocated spaces used. */ -#ifndef _di_f_array_lengthss_t_ +#ifndef _di_f_number_unsignedss_t_ typedef struct { - f_array_lengths_t *array; + f_number_unsigneds_t *array; - f_array_length_t size; - f_array_length_t used; - } f_array_lengthss_t; + f_number_unsigned_t size; + f_number_unsigned_t used; + } f_number_unsignedss_t; - #define f_array_lengthss_t_initialize { 0, 0, 0 } + #define f_number_unsignedss_t_initialize { 0, 0, 0 } - #define macro_f_array_lengthss_t_initialize_1(array, size, used) { array, size, used } - #define macro_f_array_lengthss_t_initialize_2(array, length) { array, length, length } -#endif // _di_f_array_lengthss_t_ + #define macro_f_number_unsignedss_t_initialize_1(array, size, used) { array, size, used } + #define macro_f_number_unsignedss_t_initialize_2(array, length) { array, length, length } +#endif // _di_f_number_unsignedss_t_ /** * An array of array int8_t. @@ -607,8 +588,8 @@ extern "C" { typedef struct { int8_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_int8s_t; #define f_int8s_t_initialize { 0, 0, 0 } @@ -630,8 +611,8 @@ extern "C" { typedef struct { f_int8s_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_int8ss_t; #define f_int8ss_t_initialize { 0, 0, 0 } @@ -653,8 +634,8 @@ extern "C" { typedef struct { uint8_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_uint8s_t; #define f_uint8s_t_initialize { 0, 0, 0 } @@ -676,8 +657,8 @@ extern "C" { typedef struct { f_uint8s_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_uint8ss_t; #define f_uint8ss_t_initialize { 0, 0, 0 } @@ -699,8 +680,8 @@ extern "C" { typedef struct { int16_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_int16s_t; #define f_int16s_t_initialize { 0, 0, 0 } @@ -722,8 +703,8 @@ extern "C" { typedef struct { f_int16s_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_int16ss_t; #define f_int16ss_t_initialize { 0, 0, 0 } @@ -745,8 +726,8 @@ extern "C" { typedef struct { uint16_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_uint16s_t; #define f_uint16s_t_initialize { 0, 0, 0 } @@ -768,8 +749,8 @@ extern "C" { typedef struct { f_uint16s_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_uint16ss_t; #define f_uint16ss_t_initialize { 0, 0, 0 } @@ -791,8 +772,8 @@ extern "C" { typedef struct { int32_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_int32s_t; #define f_int32s_t_initialize { 0, 0, 0 } @@ -814,8 +795,8 @@ extern "C" { typedef struct { f_int32s_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_int32ss_t; #define f_int32ss_t_initialize { 0, 0, 0 } @@ -837,8 +818,8 @@ extern "C" { typedef struct { uint32_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_uint32s_t; #define f_uint32s_t_initialize { 0, 0, 0 } @@ -860,8 +841,8 @@ extern "C" { typedef struct { f_uint32s_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_uint32ss_t; #define f_uint32ss_t_initialize { 0, 0, 0 } @@ -883,8 +864,8 @@ extern "C" { typedef struct { int64_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_int64s_t; #define f_int64s_t_initialize { 0, 0, 0 } @@ -906,8 +887,8 @@ extern "C" { typedef struct { f_int64s_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_int64ss_t; #define f_int64ss_t_initialize { 0, 0, 0 } @@ -929,8 +910,8 @@ extern "C" { typedef struct { uint64_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_uint64s_t; #define f_uint64s_t_initialize { 0, 0, 0 } @@ -952,8 +933,8 @@ extern "C" { typedef struct { f_uint64s_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_uint64ss_t; #define f_uint64ss_t_initialize { 0, 0, 0 } @@ -1000,8 +981,8 @@ extern "C" { typedef struct { int128_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_int128s_t; #define f_int128s_t_initialize { 0, 0, 0 } @@ -1023,8 +1004,8 @@ extern "C" { typedef struct { f_int128s_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_int128ss_t; #define f_int128ss_t_initialize { 0, 0, 0 } @@ -1046,8 +1027,8 @@ extern "C" { typedef struct { uint128_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_uint128s_t; #define f_uint128s_t_initialize { 0, 0, 0 } @@ -1069,8 +1050,8 @@ extern "C" { typedef struct { f_uint128s_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_uint128ss_t; #define f_uint128ss_t_initialize { 0, 0, 0 } @@ -1092,8 +1073,8 @@ extern "C" { typedef struct { f_status_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_statuss_t; #define f_statuss_t_initialize { 0, 0, 0 } @@ -1115,8 +1096,8 @@ extern "C" { typedef struct { f_statuss_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_statusss_t; #define f_statusss_t_initialize { 0, 0, 0 } @@ -1138,8 +1119,8 @@ extern "C" { typedef struct { f_state_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_states_t; #define f_states_t_initialize { 0, 0, 0 } @@ -1161,8 +1142,8 @@ extern "C" { typedef struct { f_states_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_statess_t; #define f_statess_t_initialize { 0, 0, 0 } @@ -1236,8 +1217,8 @@ extern "C" { typedef struct { f_fll_id_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_fll_ids_t; #define f_fll_ids_t_initialize { 0, 0, 0 } @@ -1259,8 +1240,8 @@ extern "C" { typedef struct { f_fll_ids_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_fll_idss_t; #define f_fll_idss_t_initialize { 0, 0, 0 } diff --git a/level_0/f_type_array/c/type_array.h b/level_0/f_type_array/c/type_array.h index 24cc3be..b0b709e 100644 --- a/level_0/f_type_array/c/type_array.h +++ b/level_0/f_type_array/c/type_array.h @@ -19,7 +19,6 @@ // FLL-0 type_array includes. #include -#include #include #include #include @@ -27,6 +26,7 @@ #include #include #include +#include #include #include #include diff --git a/level_0/f_type_array/c/type_array/array_length.c b/level_0/f_type_array/c/type_array/array_length.c deleted file mode 100644 index 455029b..0000000 --- a/level_0/f_type_array/c/type_array/array_length.c +++ /dev/null @@ -1,285 +0,0 @@ -#include "../type_array.h" -#include "array_length.h" -#include "private-array_length.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef _di_f_array_lengths_adjust_ - f_status_t f_array_lengths_adjust(const f_array_length_t length, f_array_lengths_t *lengths) { - #ifndef _di_level_0_parameter_checking_ - if (!lengths) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - return private_f_array_lengths_adjust(length, lengths); - } -#endif // _di_f_array_lengths_adjust_ - -#ifndef _di_f_array_lengths_append_ - f_status_t f_array_lengths_append(const f_array_length_t source, f_array_lengths_t *destination) { - #ifndef _di_level_0_parameter_checking_ - if (!destination) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (destination->used + 1 > destination->size) { - const f_status_t status = private_f_array_lengths_resize(destination->used + F_memory_default_allocation_small_d, destination); - if (F_status_is_error(status)) return status; - } - - destination->array[destination->used++] = source; - - return F_none; - } -#endif // _di_f_array_lengths_append_ - -#ifndef _di_f_array_lengths_append_all_ - f_status_t f_array_lengths_append_all(const f_array_lengths_t source, f_array_lengths_t *destination) { - #ifndef _di_level_0_parameter_checking_ - if (!destination) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (!source.used) return F_data_not; - - return private_f_array_lengths_append_all(source, destination); - } -#endif // _di_f_array_lengths_append_all_ - -#ifndef _di_f_array_lengths_decimate_by_ - f_status_t f_array_lengths_decimate_by(const f_array_length_t amount, f_array_lengths_t *lengths) { - #ifndef _di_level_0_parameter_checking_ - if (!lengths) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (!amount) return F_data_not; - - if (lengths->size - amount > 0) { - return private_f_array_lengths_adjust(lengths->size - amount, lengths); - } - - return private_f_array_lengths_adjust(0, lengths); - } -#endif // _di_f_array_lengths_decimate_by_ - -#ifndef _di_f_array_lengths_decrease_by_ - f_status_t f_array_lengths_decrease_by(const f_array_length_t amount, f_array_lengths_t *lengths) { - #ifndef _di_level_0_parameter_checking_ - if (!lengths) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (!amount) return F_data_not; - - if (lengths->size - amount > 0) { - return private_f_array_lengths_resize(lengths->size - amount, lengths); - } - - return private_f_array_lengths_resize(0, lengths); - } -#endif // _di_f_array_lengths_decrease_by_ - -#ifndef _di_f_array_lengths_increase_ - f_status_t f_array_lengths_increase(const f_array_length_t step, f_array_lengths_t *lengths) { - #ifndef _di_level_0_parameter_checking_ - if (!lengths) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (step && lengths->used + 1 > lengths->size) { - f_array_length_t size = lengths->used + step; - - if (size > F_array_length_t_size_d) { - if (lengths->used + 1 > F_array_length_t_size_d) { - return F_status_set_error(F_array_too_large); - } - - size = F_array_length_t_size_d; - } - - return private_f_array_lengths_resize(size, lengths); - } - - return F_data_not; - } -#endif // _di_f_array_lengths_increase_ - -#ifndef _di_f_array_lengths_increase_by_ - f_status_t f_array_lengths_increase_by(const f_array_length_t amount, f_array_lengths_t *lengths) { - #ifndef _di_level_0_parameter_checking_ - if (!lengths) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (!amount) return F_data_not; - - if (lengths->used + amount > lengths->size) { - if (lengths->used + amount > F_array_length_t_size_d) { - return F_status_set_error(F_array_too_large); - } - - return private_f_array_lengths_resize(lengths->used + amount, lengths); - } - - return F_data_not; - } -#endif // _di_f_array_lengths_increase_by_ - -#ifndef _di_f_array_lengths_resize_ - f_status_t f_array_lengths_resize(const f_array_length_t length, f_array_lengths_t *lengths) { - #ifndef _di_level_0_parameter_checking_ - if (!lengths) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - return private_f_array_lengths_resize(length, lengths); - } -#endif // _di_f_array_lengths_resize_ - -#ifndef _di_f_array_lengthss_adjust_ - f_status_t f_array_lengthss_adjust(const f_array_length_t length, f_array_lengthss_t *lengthss) { - #ifndef _di_level_0_parameter_checking_ - if (!lengthss) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - return private_f_array_lengthss_adjust(length, lengthss); - } -#endif // _di_f_array_lengthss_adjust_ - -#ifndef _di_f_array_lengthss_append_ - f_status_t f_array_lengthss_append(const f_array_lengths_t source, f_array_lengthss_t *destination) { - #ifndef _di_level_0_parameter_checking_ - if (!destination) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (!source.used) return F_data_not; - - f_status_t status = F_none; - - if (destination->used + 1 > destination->size) { - status = private_f_array_lengthss_resize(destination->used + F_memory_default_allocation_small_d, destination); - if (F_status_is_error(status)) return status; - } - - status = private_f_array_lengths_append_all(source, &destination->array[destination->used]); - if (F_status_is_error(status)) return status; - - ++destination->used; - - return F_none; - } -#endif // _di_f_array_lengthss_append_ - -#ifndef _di_f_array_lengthss_append_all_ - f_status_t f_array_lengthss_append_all(const f_array_lengthss_t source, f_array_lengthss_t *destination) { - #ifndef _di_level_0_parameter_checking_ - if (!destination) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (!source.used) return F_data_not; - - f_status_t status = F_none; - - if (destination->used + source.used > destination->size) { - status = private_f_array_lengthss_resize(destination->used + source.used, destination); - if (F_status_is_error(status)) return status; - } - - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { - - destination->array[destination->used].used = 0; - - if (source.array[i].used) { - status = private_f_array_lengths_append_all(source.array[i], &destination->array[destination->used]); - if (F_status_is_error(status)) return status; - } - } // for - - return F_none; - } -#endif // _di_f_array_lengthss_append_all_ - -#ifndef _di_f_array_lengthss_decimate_by_ - f_status_t f_array_lengthss_decimate_by(const f_array_length_t amount, f_array_lengthss_t *lengthss) { - #ifndef _di_level_0_parameter_checking_ - if (!lengthss) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (!amount) return F_data_not; - - if (lengthss->size - amount > 0) { - return private_f_array_lengthss_adjust(lengthss->size - amount, lengthss); - } - - return private_f_array_lengthss_adjust(0, lengthss); - } -#endif // _di_f_array_lengthss_decimate_by_ - -#ifndef _di_f_array_lengthss_decrease_by_ - f_status_t f_array_lengthss_decrease_by(const f_array_length_t amount, f_array_lengthss_t *lengthss) { - #ifndef _di_level_0_parameter_checking_ - if (!lengthss) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (!amount) return F_data_not; - - if (lengthss->size - amount > 0) { - return private_f_array_lengthss_resize(lengthss->size - amount, lengthss); - } - - return private_f_array_lengthss_resize(0, lengthss); - } -#endif // _di_f_array_lengthss_decrease_by_ - -#ifndef _di_f_array_lengthss_increase_ - f_status_t f_array_lengthss_increase(const f_array_length_t step, f_array_lengthss_t *lengthss) { - #ifndef _di_level_0_parameter_checking_ - if (!lengthss) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (step && lengthss->used + 1 > lengthss->size) { - f_array_length_t size = lengthss->used + step; - - if (size > F_array_length_t_size_d) { - if (lengthss->used + 1 > F_array_length_t_size_d) { - return F_status_set_error(F_array_too_large); - } - - size = F_array_length_t_size_d; - } - - return private_f_array_lengthss_resize(size, lengthss); - } - - return F_data_not; - } -#endif // _di_f_array_lengthss_increase_ - -#ifndef _di_f_array_lengthss_increase_by_ - f_status_t f_array_lengthss_increase_by(const f_array_length_t amount, f_array_lengthss_t *lengthss) { - #ifndef _di_level_0_parameter_checking_ - if (!lengthss) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (!amount) return F_data_not; - - if (lengthss->used + amount > lengthss->size) { - if (lengthss->used + amount > F_array_length_t_size_d) { - return F_status_set_error(F_array_too_large); - } - - return private_f_array_lengthss_resize(lengthss->used + amount, lengthss); - } - - return F_data_not; - } -#endif // _di_f_array_lengthss_increase_by_ - -#ifndef _di_f_array_lengthss_resize_ - f_status_t f_array_lengthss_resize(const f_array_length_t length, f_array_lengthss_t *lengthss) { - #ifndef _di_level_0_parameter_checking_ - if (!lengthss) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - return private_f_array_lengthss_resize(length, lengthss); - } -#endif // _di_f_array_lengthss_resize_ - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/level_0/f_type_array/c/type_array/cell.c b/level_0/f_type_array/c/type_array/cell.c index 4eb3503..f43dd5b 100644 --- a/level_0/f_type_array/c/type_array/cell.c +++ b/level_0/f_type_array/c/type_array/cell.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_cells_adjust_ - f_status_t f_cells_adjust(const f_array_length_t length, f_cells_t *cells) { + f_status_t f_cells_adjust(const f_number_unsigned_t length, f_cells_t *cells) { #ifndef _di_level_0_parameter_checking_ if (!cells) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -39,7 +39,7 @@ extern "C" { #endif // _di_f_cells_append_all_ #ifndef _di_f_cells_decimate_by_ - f_status_t f_cells_decimate_by(const f_array_length_t amount, f_cells_t *cells) { + f_status_t f_cells_decimate_by(const f_number_unsigned_t amount, f_cells_t *cells) { #ifndef _di_level_0_parameter_checking_ if (!cells) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -55,7 +55,7 @@ extern "C" { #endif // _di_f_cells_decimate_by_ #ifndef _di_f_cells_decrease_by_ - f_status_t f_cells_decrease_by(const f_array_length_t amount, f_cells_t *cells) { + f_status_t f_cells_decrease_by(const f_number_unsigned_t amount, f_cells_t *cells) { #ifndef _di_level_0_parameter_checking_ if (!cells) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -71,20 +71,20 @@ extern "C" { #endif // _di_f_cells_decrease_by_ #ifndef _di_f_cells_increase_ - f_status_t f_cells_increase(const f_array_length_t step, f_cells_t *cells) { + f_status_t f_cells_increase(const f_number_unsigned_t step, f_cells_t *cells) { #ifndef _di_level_0_parameter_checking_ if (!cells) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && cells->used + 1 > cells->size) { - f_array_length_t size = cells->used + step; + f_number_unsigned_t size = cells->used + step; - if (size > F_array_length_t_size_d) { - if (cells->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (cells->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_cells_resize(size, cells); @@ -95,7 +95,7 @@ extern "C" { #endif // _di_f_cells_increase_ #ifndef _di_f_cells_increase_by_ - f_status_t f_cells_increase_by(const f_array_length_t amount, f_cells_t *cells) { + f_status_t f_cells_increase_by(const f_number_unsigned_t amount, f_cells_t *cells) { #ifndef _di_level_0_parameter_checking_ if (!cells) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -103,7 +103,7 @@ extern "C" { if (!amount) return F_data_not; if (cells->used + amount > cells->size) { - if (cells->used + amount > F_array_length_t_size_d) { + if (cells->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -115,7 +115,7 @@ extern "C" { #endif // _di_f_cells_increase_by_ #ifndef _di_f_cells_resize_ - f_status_t f_cells_resize(const f_array_length_t length, f_cells_t *cells) { + f_status_t f_cells_resize(const f_number_unsigned_t length, f_cells_t *cells) { #ifndef _di_level_0_parameter_checking_ if (!cells) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -125,7 +125,7 @@ extern "C" { #endif // _di_f_cells_resize_ #ifndef _di_f_cellss_adjust_ - f_status_t f_cellss_adjust(const f_array_length_t length, f_cellss_t *cellss) { + f_status_t f_cellss_adjust(const f_number_unsigned_t length, f_cellss_t *cellss) { #ifndef _di_level_0_parameter_checking_ if (!cellss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -173,7 +173,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].used = 0; @@ -188,7 +188,7 @@ extern "C" { #endif // _di_f_cellss_append_all_ #ifndef _di_f_cellss_decimate_by_ - f_status_t f_cellss_decimate_by(const f_array_length_t amount, f_cellss_t *cellss) { + f_status_t f_cellss_decimate_by(const f_number_unsigned_t amount, f_cellss_t *cellss) { #ifndef _di_level_0_parameter_checking_ if (!cellss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -204,7 +204,7 @@ extern "C" { #endif // _di_f_cellss_decimate_by_ #ifndef _di_f_cellss_decrease_by_ - f_status_t f_cellss_decrease_by(const f_array_length_t amount, f_cellss_t *cellss) { + f_status_t f_cellss_decrease_by(const f_number_unsigned_t amount, f_cellss_t *cellss) { #ifndef _di_level_0_parameter_checking_ if (!cellss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -220,20 +220,20 @@ extern "C" { #endif // _di_f_cellss_decrease_by_ #ifndef _di_f_cellss_increase_ - f_status_t f_cellss_increase(const f_array_length_t step, f_cellss_t *cellss) { + f_status_t f_cellss_increase(const f_number_unsigned_t step, f_cellss_t *cellss) { #ifndef _di_level_0_parameter_checking_ if (!cellss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && cellss->used + 1 > cellss->size) { - f_array_length_t size = cellss->used + step; + f_number_unsigned_t size = cellss->used + step; - if (size > F_array_length_t_size_d) { - if (cellss->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (cellss->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_cellss_resize(size, cellss); @@ -244,7 +244,7 @@ extern "C" { #endif // _di_f_cellss_increase_ #ifndef _di_f_cellss_increase_by_ - f_status_t f_cellss_increase_by(const f_array_length_t amount, f_cellss_t *cellss) { + f_status_t f_cellss_increase_by(const f_number_unsigned_t amount, f_cellss_t *cellss) { #ifndef _di_level_0_parameter_checking_ if (!cellss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -252,7 +252,7 @@ extern "C" { if (!amount) return F_data_not; if (cellss->used + amount > cellss->size) { - if (cellss->used + amount > F_array_length_t_size_d) { + if (cellss->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -264,7 +264,7 @@ extern "C" { #endif // _di_f_cellss_increase_by_ #ifndef _di_f_cellss_resize_ - f_status_t f_cellss_resize(const f_array_length_t length, f_cellss_t *cellss) { + f_status_t f_cellss_resize(const f_number_unsigned_t length, f_cellss_t *cellss) { #ifndef _di_level_0_parameter_checking_ if (!cellss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_type_array/c/type_array/cell.h b/level_0/f_type_array/c/type_array/cell.h index 1ead915..b62ac2e 100644 --- a/level_0/f_type_array/c/type_array/cell.h +++ b/level_0/f_type_array/c/type_array/cell.h @@ -32,7 +32,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_cells_adjust_ - extern f_status_t f_cells_adjust(const f_array_length_t length, f_cells_t *cells); + extern f_status_t f_cells_adjust(const f_number_unsigned_t length, f_cells_t *cells); #endif // _di_f_cells_adjust_ /** @@ -96,7 +96,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_cells_decimate_by_ - extern f_status_t f_cells_decimate_by(const f_array_length_t amount, f_cells_t *cells); + extern f_status_t f_cells_decimate_by(const f_number_unsigned_t amount, f_cells_t *cells); #endif // _di_f_cells_decimate_by_ /** @@ -120,13 +120,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_cells_decrease_by_ - extern f_status_t f_cells_decrease_by(const f_array_length_t amount, f_cells_t *cells); + extern f_status_t f_cells_decrease_by(const f_number_unsigned_t amount, f_cells_t *cells); #endif // _di_f_cells_decrease_by_ /** * Increase the size of the string cells array, but only if necesary. * - * If the given length is too large for the buffer, then attempt to set max buffer size (F_array_length_t_size_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -145,14 +145,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_cells_increase_ - extern f_status_t f_cells_increase(const f_array_length_t step, f_cells_t *cells); + extern f_status_t f_cells_increase(const f_number_unsigned_t step, f_cells_t *cells); #endif // _di_f_cells_increase_ /** * Resize the string cells 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -170,7 +170,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_cells_increase_by_ - extern f_status_t f_cells_increase_by(const f_array_length_t amount, f_cells_t *cells); + extern f_status_t f_cells_increase_by(const f_number_unsigned_t amount, f_cells_t *cells); #endif // _di_f_cells_increase_by_ /** @@ -189,7 +189,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_cells_resize_ - extern f_status_t f_cells_resize(const f_array_length_t length, f_cells_t *cells); + extern f_status_t f_cells_resize(const f_number_unsigned_t length, f_cells_t *cells); #endif // _di_f_cells_resize_ /** @@ -209,7 +209,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_cellss_adjust_ - extern f_status_t f_cellss_adjust(const f_array_length_t length, f_cellss_t *cellss); + extern f_status_t f_cellss_adjust(const f_number_unsigned_t length, f_cellss_t *cellss); #endif // _di_f_cellss_adjust_ /** @@ -273,7 +273,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_cellss_decimate_by_ - extern f_status_t f_cellss_decimate_by(const f_array_length_t amount, f_cellss_t *cellss); + extern f_status_t f_cellss_decimate_by(const f_number_unsigned_t amount, f_cellss_t *cellss); #endif // _di_f_cellss_decimate_by_ /** @@ -297,13 +297,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_cellss_decrease_by_ - extern f_status_t f_cellss_decrease_by(const f_array_length_t amount, f_cellss_t *cellss); + extern f_status_t f_cellss_decrease_by(const f_number_unsigned_t amount, f_cellss_t *cellss); #endif // _di_f_cellss_decrease_by_ /** * Increase the size of the string cellss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -322,14 +322,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_cellss_increase_ - extern f_status_t f_cellss_increase(const f_array_length_t step, f_cellss_t *cellss); + extern f_status_t f_cellss_increase(const f_number_unsigned_t step, f_cellss_t *cellss); #endif // _di_f_cellss_increase_ /** * Resize the string cellss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -347,7 +347,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_cellss_increase_by_ - extern f_status_t f_cellss_increase_by(const f_array_length_t amount, f_cellss_t *cellss); + extern f_status_t f_cellss_increase_by(const f_number_unsigned_t amount, f_cellss_t *cellss); #endif // _di_f_cellss_increase_by_ /** @@ -367,7 +367,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_cellss_resize_ - extern f_status_t f_cellss_resize(const f_array_length_t length, f_cellss_t *cellss); + extern f_status_t f_cellss_resize(const f_number_unsigned_t length, f_cellss_t *cellss); #endif // _di_f_cellss_resize_ #ifdef __cplusplus diff --git a/level_0/f_type_array/c/type_array/common.h b/level_0/f_type_array/c/type_array/common.h index c809fd3..d97df8f 100644 --- a/level_0/f_type_array/c/type_array/common.h +++ b/level_0/f_type_array/c/type_array/common.h @@ -161,40 +161,40 @@ extern "C" { #endif // _di_f_fll_idss_t_ /** - * Macros for f_array_lengths_t, see type.h for typedefs. + * Macros for f_number_unsigneds_t, see type.h for typedefs. */ -#ifndef _di_f_array_lengths_t_ - #define macro_f_array_lengths_t_clear(lengths) macro_f_memory_structures_clear(lengths) +#ifndef _di_f_number_unsigneds_t_ + #define macro_f_number_unsigneds_t_clear(lengths) macro_f_memory_structures_clear(lengths) - #define macro_f_array_lengths_t_resize(status, lengths, length) status = f_array_lengths_resize(length, &lengths); - #define macro_f_array_lengths_t_adjust(status, lengths, length) status = f_array_lengths_adjust(length, &lengths); + #define macro_f_number_unsigneds_t_resize(status, lengths, length) status = f_number_unsigneds_resize(length, &lengths); + #define macro_f_number_unsigneds_t_adjust(status, lengths, length) status = f_number_unsigneds_adjust(length, &lengths); - #define macro_f_array_lengths_t_delete_simple(lengths) f_array_lengths_resize(0, &lengths); - #define macro_f_array_lengths_t_destroy_simple(lengths) f_array_lengths_adjust(0, &lengths); + #define macro_f_number_unsigneds_t_delete_simple(lengths) f_number_unsigneds_resize(0, &lengths); + #define macro_f_number_unsigneds_t_destroy_simple(lengths) f_number_unsigneds_adjust(0, &lengths); - #define macro_f_array_lengths_t_increase(status, step, lengths) status = f_array_lengths_increase(step, &lengths); - #define macro_f_array_lengths_t_increase_by(status, lengths, amount) status = f_array_lengths_increase_by(amount, &lengths); - #define macro_f_array_lengths_t_decrease_by(status, lengths, amount) status = f_array_lengths_decrease_by(amount, &lengths); - #define macro_f_array_lengths_t_decimate_by(status, lengths, amount) status = f_array_lengths_decimate_by(amount, &lengths); -#endif // _di_f_array_lengths_t_ + #define macro_f_number_unsigneds_t_increase(status, step, lengths) status = f_number_unsigneds_increase(step, &lengths); + #define macro_f_number_unsigneds_t_increase_by(status, lengths, amount) status = f_number_unsigneds_increase_by(amount, &lengths); + #define macro_f_number_unsigneds_t_decrease_by(status, lengths, amount) status = f_number_unsigneds_decrease_by(amount, &lengths); + #define macro_f_number_unsigneds_t_decimate_by(status, lengths, amount) status = f_number_unsigneds_decimate_by(amount, &lengths); +#endif // _di_f_number_unsigneds_t_ /** - * Macros for f_array_lengths_t, see type.h for typedefs. + * Macros for f_number_unsigneds_t, see type.h for typedefs. */ -#ifndef _di_f_array_lengthss_t_ - #define macro_f_array_lengthss_t_clear(lengthss) macro_f_memory_structures_clear(lengthss) +#ifndef _di_f_number_unsignedss_t_ + #define macro_f_number_unsignedss_t_clear(lengthss) macro_f_memory_structures_clear(lengthss) - #define macro_f_array_lengthss_t_resize(status, lengths, length) status = f_array_lengthss_resize(length, &lengths); - #define macro_f_array_lengthss_t_adjust(status, lengths, length) status = f_array_lengthss_adjust(length, &lengths); + #define macro_f_number_unsignedss_t_resize(status, lengths, length) status = f_number_unsignedss_resize(length, &lengths); + #define macro_f_number_unsignedss_t_adjust(status, lengths, length) status = f_number_unsignedss_adjust(length, &lengths); - #define macro_f_array_lengthss_t_delete_simple(lengths) f_array_lengthss_resize(0, &lengths); - #define macro_f_array_lengthss_t_destroy_simple(lengths) f_array_lengthss_adjust(0, &lengths); + #define macro_f_number_unsignedss_t_delete_simple(lengths) f_number_unsignedss_resize(0, &lengths); + #define macro_f_number_unsignedss_t_destroy_simple(lengths) f_number_unsignedss_adjust(0, &lengths); - #define macro_f_array_lengthss_t_increase(status, step, lengths) status = f_array_lengthss_increase(step, &lengths); - #define macro_f_array_lengthss_t_increase_by(status, lengths, amount) status = f_array_lengthss_increase_by(amount, &lengths); - #define macro_f_array_lengthss_t_decrease_by(status, lengths, amount) status = f_array_lengthss_decrease_by(amount, &lengths); - #define macro_f_array_lengthss_t_decimate_by(status, lengths, amount) status = f_array_lengthss_decimate_by(amount, &lengths); -#endif // _di_f_array_lengthss_t_ + #define macro_f_number_unsignedss_t_increase(status, step, lengths) status = f_number_unsignedss_increase(step, &lengths); + #define macro_f_number_unsignedss_t_increase_by(status, lengths, amount) status = f_number_unsignedss_increase_by(amount, &lengths); + #define macro_f_number_unsignedss_t_decrease_by(status, lengths, amount) status = f_number_unsignedss_decrease_by(amount, &lengths); + #define macro_f_number_unsignedss_t_decimate_by(status, lengths, amount) status = f_number_unsignedss_decimate_by(amount, &lengths); +#endif // _di_f_number_unsignedss_t_ /** * Macros for int8_t, see type.h for typedefs. @@ -359,7 +359,7 @@ extern "C" { #endif // _di_f_int32s_t_ /** - * Macros for f_array_lengths_t, see type.h for typedefs. + * Macros for f_number_unsigneds_t, see type.h for typedefs. */ #ifndef _di_f_int32ss_t_ #define macro_f_int32ss_t_clear(int32ss) macro_f_memory_structures_clear(int32ss) diff --git a/level_0/f_type_array/c/type_array/fll_id.c b/level_0/f_type_array/c/type_array/fll_id.c index f122a35..9d75d8f 100644 --- a/level_0/f_type_array/c/type_array/fll_id.c +++ b/level_0/f_type_array/c/type_array/fll_id.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_fll_ids_adjust_ - f_status_t f_fll_ids_adjust(const f_array_length_t length, f_fll_ids_t *ids) { + f_status_t f_fll_ids_adjust(const f_number_unsigned_t length, f_fll_ids_t *ids) { #ifndef _di_level_0_parameter_checking_ if (!ids) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -39,7 +39,7 @@ extern "C" { #endif // _di_f_fll_ids_append_all_ #ifndef _di_f_fll_ids_decimate_by_ - f_status_t f_fll_ids_decimate_by(const f_array_length_t amount, f_fll_ids_t *ids) { + f_status_t f_fll_ids_decimate_by(const f_number_unsigned_t amount, f_fll_ids_t *ids) { #ifndef _di_level_0_parameter_checking_ if (!ids) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -55,7 +55,7 @@ extern "C" { #endif // _di_f_fll_ids_decimate_by_ #ifndef _di_f_fll_ids_decrease_by_ - f_status_t f_fll_ids_decrease_by(const f_array_length_t amount, f_fll_ids_t *ids) { + f_status_t f_fll_ids_decrease_by(const f_number_unsigned_t amount, f_fll_ids_t *ids) { #ifndef _di_level_0_parameter_checking_ if (!ids) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -71,20 +71,20 @@ extern "C" { #endif // _di_f_fll_ids_decrease_by_ #ifndef _di_f_fll_ids_increase_ - f_status_t f_fll_ids_increase(const f_array_length_t step, f_fll_ids_t *ids) { + f_status_t f_fll_ids_increase(const f_number_unsigned_t step, f_fll_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 (step && ids->used + 1 > ids->size) { - f_array_length_t size = ids->used + step; + f_number_unsigned_t size = ids->used + step; - if (size > F_array_length_t_size_d) { - if (ids->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (ids->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_fll_ids_resize(size, ids); @@ -95,7 +95,7 @@ extern "C" { #endif // _di_f_fll_ids_increase_ #ifndef _di_f_fll_ids_increase_by_ - f_status_t f_fll_ids_increase_by(const f_array_length_t amount, f_fll_ids_t *ids) { + f_status_t f_fll_ids_increase_by(const f_number_unsigned_t amount, f_fll_ids_t *ids) { #ifndef _di_level_0_parameter_checking_ if (!ids) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -103,7 +103,7 @@ extern "C" { if (!amount) return F_data_not; if (ids->used + amount > ids->size) { - if (ids->used + amount > F_array_length_t_size_d) { + if (ids->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -115,7 +115,7 @@ extern "C" { #endif // _di_f_fll_ids_increase_by_ #ifndef _di_f_fll_ids_resize_ - f_status_t f_fll_ids_resize(const f_array_length_t length, f_fll_ids_t *ids) { + f_status_t f_fll_ids_resize(const f_number_unsigned_t length, f_fll_ids_t *ids) { #ifndef _di_level_0_parameter_checking_ if (!ids) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -125,7 +125,7 @@ extern "C" { #endif // _di_f_fll_ids_resize_ #ifndef _di_f_fll_idss_adjust_ - f_status_t f_fll_idss_adjust(const f_array_length_t length, f_fll_idss_t *idss) { + f_status_t f_fll_idss_adjust(const f_number_unsigned_t length, f_fll_idss_t *idss) { #ifndef _di_level_0_parameter_checking_ if (!idss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -173,7 +173,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].used = 0; @@ -188,7 +188,7 @@ extern "C" { #endif // _di_f_fll_idss_append_all_ #ifndef _di_f_fll_idss_decimate_by_ - f_status_t f_fll_idss_decimate_by(const f_array_length_t amount, f_fll_idss_t *idss) { + f_status_t f_fll_idss_decimate_by(const f_number_unsigned_t amount, f_fll_idss_t *idss) { #ifndef _di_level_0_parameter_checking_ if (!idss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -204,7 +204,7 @@ extern "C" { #endif // _di_f_fll_idss_decimate_by_ #ifndef _di_f_fll_idss_decrease_by_ - f_status_t f_fll_idss_decrease_by(const f_array_length_t amount, f_fll_idss_t *idss) { + f_status_t f_fll_idss_decrease_by(const f_number_unsigned_t amount, f_fll_idss_t *idss) { #ifndef _di_level_0_parameter_checking_ if (!idss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -220,20 +220,20 @@ extern "C" { #endif // _di_f_fll_idss_decrease_by_ #ifndef _di_f_fll_idss_increase_ - f_status_t f_fll_idss_increase(const f_array_length_t step, f_fll_idss_t *idss) { + f_status_t f_fll_idss_increase(const f_number_unsigned_t step, f_fll_idss_t *idss) { #ifndef _di_level_0_parameter_checking_ if (!idss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && idss->used + 1 > idss->size) { - f_array_length_t size = idss->used + step; + f_number_unsigned_t size = idss->used + step; - if (size > F_array_length_t_size_d) { - if (idss->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (idss->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_fll_idss_resize(size, idss); @@ -244,7 +244,7 @@ extern "C" { #endif // _di_f_fll_idss_increase_ #ifndef _di_f_fll_idss_increase_by_ - f_status_t f_fll_idss_increase_by(const f_array_length_t amount, f_fll_idss_t *idss) { + f_status_t f_fll_idss_increase_by(const f_number_unsigned_t amount, f_fll_idss_t *idss) { #ifndef _di_level_0_parameter_checking_ if (!idss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -252,7 +252,7 @@ extern "C" { if (!amount) return F_data_not; if (idss->used + amount > idss->size) { - if (idss->used + amount > F_array_length_t_size_d) { + if (idss->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -264,7 +264,7 @@ extern "C" { #endif // _di_f_fll_idss_increase_by_ #ifndef _di_f_fll_idss_resize_ - f_status_t f_fll_idss_resize(const f_array_length_t length, f_fll_idss_t *idss) { + f_status_t f_fll_idss_resize(const f_number_unsigned_t length, f_fll_idss_t *idss) { #ifndef _di_level_0_parameter_checking_ if (!idss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_type_array/c/type_array/fll_id.h b/level_0/f_type_array/c/type_array/fll_id.h index c6cb75a..9569cd3 100644 --- a/level_0/f_type_array/c/type_array/fll_id.h +++ b/level_0/f_type_array/c/type_array/fll_id.h @@ -32,7 +32,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_fll_ids_adjust_ - extern f_status_t f_fll_ids_adjust(const f_array_length_t length, f_fll_ids_t *ids); + extern f_status_t f_fll_ids_adjust(const f_number_unsigned_t length, f_fll_ids_t *ids); #endif // _di_f_fll_ids_adjust_ /** @@ -96,7 +96,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_fll_ids_decimate_by_ - extern f_status_t f_fll_ids_decimate_by(const f_array_length_t amount, f_fll_ids_t *ids); + extern f_status_t f_fll_ids_decimate_by(const f_number_unsigned_t amount, f_fll_ids_t *ids); #endif // _di_f_fll_ids_decimate_by_ /** @@ -120,13 +120,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_fll_ids_decrease_by_ - extern f_status_t f_fll_ids_decrease_by(const f_array_length_t amount, f_fll_ids_t *ids); + extern f_status_t f_fll_ids_decrease_by(const f_number_unsigned_t amount, f_fll_ids_t *ids); #endif // _di_f_fll_ids_decrease_by_ /** * Increase the size of the string ids array, but only if necesary. * - * If the given length is too large for the buffer, then attempt to set max buffer size (F_array_length_t_size_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -145,14 +145,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_fll_ids_increase_ - extern f_status_t f_fll_ids_increase(const f_array_length_t step, f_fll_ids_t *ids); + extern f_status_t f_fll_ids_increase(const f_number_unsigned_t step, f_fll_ids_t *ids); #endif // _di_f_fll_ids_increase_ /** * Resize the string 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -170,7 +170,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_fll_ids_increase_by_ - extern f_status_t f_fll_ids_increase_by(const f_array_length_t amount, f_fll_ids_t *ids); + extern f_status_t f_fll_ids_increase_by(const f_number_unsigned_t amount, f_fll_ids_t *ids); #endif // _di_f_fll_ids_increase_by_ /** @@ -189,7 +189,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_fll_ids_resize_ - extern f_status_t f_fll_ids_resize(const f_array_length_t length, f_fll_ids_t *ids); + extern f_status_t f_fll_ids_resize(const f_number_unsigned_t length, f_fll_ids_t *ids); #endif // _di_f_fll_ids_resize_ /** @@ -209,7 +209,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_fll_idss_adjust_ - extern f_status_t f_fll_idss_adjust(const f_array_length_t length, f_fll_idss_t *idss); + extern f_status_t f_fll_idss_adjust(const f_number_unsigned_t length, f_fll_idss_t *idss); #endif // _di_f_fll_idss_adjust_ /** @@ -273,7 +273,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_fll_idss_decimate_by_ - extern f_status_t f_fll_idss_decimate_by(const f_array_length_t amount, f_fll_idss_t *idss); + extern f_status_t f_fll_idss_decimate_by(const f_number_unsigned_t amount, f_fll_idss_t *idss); #endif // _di_f_fll_idss_decimate_by_ /** @@ -297,13 +297,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_fll_idss_decrease_by_ - extern f_status_t f_fll_idss_decrease_by(const f_array_length_t amount, f_fll_idss_t *idss); + extern f_status_t f_fll_idss_decrease_by(const f_number_unsigned_t amount, f_fll_idss_t *idss); #endif // _di_f_fll_idss_decrease_by_ /** * Increase the size of the string idss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -322,14 +322,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_fll_idss_increase_ - extern f_status_t f_fll_idss_increase(const f_array_length_t step, f_fll_idss_t *idss); + extern f_status_t f_fll_idss_increase(const f_number_unsigned_t step, f_fll_idss_t *idss); #endif // _di_f_fll_idss_increase_ /** * Resize the string idss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -347,7 +347,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_fll_idss_increase_by_ - extern f_status_t f_fll_idss_increase_by(const f_array_length_t amount, f_fll_idss_t *idss); + extern f_status_t f_fll_idss_increase_by(const f_number_unsigned_t amount, f_fll_idss_t *idss); #endif // _di_f_fll_idss_increase_by_ /** @@ -367,7 +367,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_fll_idss_resize_ - extern f_status_t f_fll_idss_resize(const f_array_length_t length, f_fll_idss_t *idss); + extern f_status_t f_fll_idss_resize(const f_number_unsigned_t length, f_fll_idss_t *idss); #endif // _di_f_fll_idss_resize_ #ifdef __cplusplus diff --git a/level_0/f_type_array/c/type_array/int128.c b/level_0/f_type_array/c/type_array/int128.c index 5d6128d..d444218 100644 --- a/level_0/f_type_array/c/type_array/int128.c +++ b/level_0/f_type_array/c/type_array/int128.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_int128s_adjust_ - f_status_t f_int128s_adjust(const f_array_length_t length, f_int128s_t *int128s) { + f_status_t f_int128s_adjust(const f_number_unsigned_t length, f_int128s_t *int128s) { #ifndef _di_level_0_parameter_checking_ if (!int128s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -39,7 +39,7 @@ extern "C" { #endif // _di_f_int128s_append_all_ #ifndef _di_f_int128s_decimate_by_ - f_status_t f_int128s_decimate_by(const f_array_length_t amount, f_int128s_t *int128s) { + f_status_t f_int128s_decimate_by(const f_number_unsigned_t amount, f_int128s_t *int128s) { #ifndef _di_level_0_parameter_checking_ if (!int128s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -55,7 +55,7 @@ extern "C" { #endif // _di_f_int128s_decimate_by_ #ifndef _di_f_int128s_decrease_by_ - f_status_t f_int128s_decrease_by(const f_array_length_t amount, f_int128s_t *int128s) { + f_status_t f_int128s_decrease_by(const f_number_unsigned_t amount, f_int128s_t *int128s) { #ifndef _di_level_0_parameter_checking_ if (!int128s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -71,20 +71,20 @@ extern "C" { #endif // _di_f_int128s_decrease_by_ #ifndef _di_f_int128s_increase_ - f_status_t f_int128s_increase(const f_array_length_t step, f_int128s_t *int128s) { + f_status_t f_int128s_increase(const f_number_unsigned_t step, f_int128s_t *int128s) { #ifndef _di_level_0_parameter_checking_ if (!int128s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && int128s->used + 1 > int128s->size) { - f_array_length_t size = int128s->used + step; + f_number_unsigned_t size = int128s->used + step; - if (size > F_array_length_t_size_d) { - if (int128s->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (int128s->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_int128s_resize(size, int128s); @@ -95,7 +95,7 @@ extern "C" { #endif // _di_f_int128s_increase_ #ifndef _di_f_int128s_increase_by_ - f_status_t f_int128s_increase_by(const f_array_length_t amount, f_int128s_t *int128s) { + f_status_t f_int128s_increase_by(const f_number_unsigned_t amount, f_int128s_t *int128s) { #ifndef _di_level_0_parameter_checking_ if (!int128s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -103,7 +103,7 @@ extern "C" { if (!amount) return F_data_not; if (int128s->used + amount > int128s->size) { - if (int128s->used + amount > F_array_length_t_size_d) { + if (int128s->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -115,7 +115,7 @@ extern "C" { #endif // _di_f_int128s_increase_by_ #ifndef _di_f_int128s_resize_ - f_status_t f_int128s_resize(const f_array_length_t length, f_int128s_t *int128s) { + f_status_t f_int128s_resize(const f_number_unsigned_t length, f_int128s_t *int128s) { #ifndef _di_level_0_parameter_checking_ if (!int128s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -125,7 +125,7 @@ extern "C" { #endif // _di_f_int128s_resize_ #ifndef _di_f_int128ss_adjust_ - f_status_t f_int128ss_adjust(const f_array_length_t length, f_int128ss_t *int128ss) { + f_status_t f_int128ss_adjust(const f_number_unsigned_t length, f_int128ss_t *int128ss) { #ifndef _di_level_0_parameter_checking_ if (!int128ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -173,7 +173,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].used = 0; @@ -188,7 +188,7 @@ extern "C" { #endif // _di_f_int128ss_append_all_ #ifndef _di_f_int128ss_decimate_by_ - f_status_t f_int128ss_decimate_by(const f_array_length_t amount, f_int128ss_t *int128ss) { + f_status_t f_int128ss_decimate_by(const f_number_unsigned_t amount, f_int128ss_t *int128ss) { #ifndef _di_level_0_parameter_checking_ if (!int128ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -204,7 +204,7 @@ extern "C" { #endif // _di_f_int128ss_decimate_by_ #ifndef _di_f_int128ss_decrease_by_ - f_status_t f_int128ss_decrease_by(const f_array_length_t amount, f_int128ss_t *int128ss) { + f_status_t f_int128ss_decrease_by(const f_number_unsigned_t amount, f_int128ss_t *int128ss) { #ifndef _di_level_0_parameter_checking_ if (!int128ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -220,20 +220,20 @@ extern "C" { #endif // _di_f_int128ss_decrease_by_ #ifndef _di_f_int128ss_increase_ - f_status_t f_int128ss_increase(const f_array_length_t step, f_int128ss_t *int128ss) { + f_status_t f_int128ss_increase(const f_number_unsigned_t step, f_int128ss_t *int128ss) { #ifndef _di_level_0_parameter_checking_ if (!int128ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && int128ss->used + 1 > int128ss->size) { - f_array_length_t size = int128ss->used + step; + f_number_unsigned_t size = int128ss->used + step; - if (size > F_array_length_t_size_d) { - if (int128ss->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (int128ss->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_int128ss_resize(size, int128ss); @@ -244,7 +244,7 @@ extern "C" { #endif // _di_f_int128ss_increase_ #ifndef _di_f_int128ss_increase_by_ - f_status_t f_int128ss_increase_by(const f_array_length_t amount, f_int128ss_t *int128ss) { + f_status_t f_int128ss_increase_by(const f_number_unsigned_t amount, f_int128ss_t *int128ss) { #ifndef _di_level_0_parameter_checking_ if (!int128ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -252,7 +252,7 @@ extern "C" { if (!amount) return F_data_not; if (int128ss->used + amount > int128ss->size) { - if (int128ss->used + amount > F_array_length_t_size_d) { + if (int128ss->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -264,7 +264,7 @@ extern "C" { #endif // _di_f_int128ss_increase_by_ #ifndef _di_f_int128ss_resize_ - f_status_t f_int128ss_resize(const f_array_length_t length, f_int128ss_t *int128ss) { + f_status_t f_int128ss_resize(const f_number_unsigned_t length, f_int128ss_t *int128ss) { #ifndef _di_level_0_parameter_checking_ if (!int128ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_type_array/c/type_array/int128.h b/level_0/f_type_array/c/type_array/int128.h index 3110dfb..7acd869 100644 --- a/level_0/f_type_array/c/type_array/int128.h +++ b/level_0/f_type_array/c/type_array/int128.h @@ -32,7 +32,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_int128s_adjust_ - extern f_status_t f_int128s_adjust(const f_array_length_t length, f_int128s_t *int128s); + extern f_status_t f_int128s_adjust(const f_number_unsigned_t length, f_int128s_t *int128s); #endif // _di_f_int128s_adjust_ /** @@ -96,7 +96,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_int128s_decimate_by_ - extern f_status_t f_int128s_decimate_by(const f_array_length_t amount, f_int128s_t *int128s); + extern f_status_t f_int128s_decimate_by(const f_number_unsigned_t amount, f_int128s_t *int128s); #endif // _di_f_int128s_decimate_by_ /** @@ -120,13 +120,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int128s_decrease_by_ - extern f_status_t f_int128s_decrease_by(const f_array_length_t amount, f_int128s_t *int128s); + extern f_status_t f_int128s_decrease_by(const f_number_unsigned_t amount, f_int128s_t *int128s); #endif // _di_f_int128s_decrease_by_ /** * Increase the size of the int128s array, but only if necesary. * - * If the given length is too large for the buffer, then attempt to set max buffer size (F_array_length_t_size_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -145,14 +145,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int128s_increase_ - extern f_status_t f_int128s_increase(const f_array_length_t step, f_int128s_t *int128s); + extern f_status_t f_int128s_increase(const f_number_unsigned_t step, f_int128s_t *int128s); #endif // _di_f_int128s_increase_ /** * Resize the int128s 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -170,7 +170,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int128s_increase_by_ - extern f_status_t f_int128s_increase_by(const f_array_length_t amount, f_int128s_t *int128s); + extern f_status_t f_int128s_increase_by(const f_number_unsigned_t amount, f_int128s_t *int128s); #endif // _di_f_int128s_increase_by_ /** @@ -189,7 +189,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int128s_resize_ - extern f_status_t f_int128s_resize(const f_array_length_t length, f_int128s_t *int128s); + extern f_status_t f_int128s_resize(const f_number_unsigned_t length, f_int128s_t *int128s); #endif // _di_f_int128s_resize_ /** @@ -209,7 +209,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_int128ss_adjust_ - extern f_status_t f_int128ss_adjust(const f_array_length_t length, f_int128ss_t *int128ss); + extern f_status_t f_int128ss_adjust(const f_number_unsigned_t length, f_int128ss_t *int128ss); #endif // _di_f_int128ss_adjust_ /** @@ -273,7 +273,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_int128ss_decimate_by_ - extern f_status_t f_int128ss_decimate_by(const f_array_length_t amount, f_int128ss_t *int128ss); + extern f_status_t f_int128ss_decimate_by(const f_number_unsigned_t amount, f_int128ss_t *int128ss); #endif // _di_f_int128ss_decimate_by_ /** @@ -297,13 +297,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int128ss_decrease_by_ - extern f_status_t f_int128ss_decrease_by(const f_array_length_t amount, f_int128ss_t *int128ss); + extern f_status_t f_int128ss_decrease_by(const f_number_unsigned_t amount, f_int128ss_t *int128ss); #endif // _di_f_int128ss_decrease_by_ /** * Increase the size of the int128ss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -322,14 +322,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int128ss_increase_ - extern f_status_t f_int128ss_increase(const f_array_length_t step, f_int128ss_t *int128ss); + extern f_status_t f_int128ss_increase(const f_number_unsigned_t step, f_int128ss_t *int128ss); #endif // _di_f_int128ss_increase_ /** * Resize the int128ss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -347,7 +347,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int128ss_increase_by_ - extern f_status_t f_int128ss_increase_by(const f_array_length_t amount, f_int128ss_t *int128ss); + extern f_status_t f_int128ss_increase_by(const f_number_unsigned_t amount, f_int128ss_t *int128ss); #endif // _di_f_int128ss_increase_by_ /** @@ -367,7 +367,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int128ss_resize_ - extern f_status_t f_int128ss_resize(const f_array_length_t length, f_int128ss_t *int128ss); + extern f_status_t f_int128ss_resize(const f_number_unsigned_t length, f_int128ss_t *int128ss); #endif // _di_f_int128ss_resize_ #ifdef __cplusplus diff --git a/level_0/f_type_array/c/type_array/int16.c b/level_0/f_type_array/c/type_array/int16.c index f580fd3..2a59e2a 100644 --- a/level_0/f_type_array/c/type_array/int16.c +++ b/level_0/f_type_array/c/type_array/int16.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_int16s_adjust_ - f_status_t f_int16s_adjust(const f_array_length_t length, f_int16s_t *int16s) { + f_status_t f_int16s_adjust(const f_number_unsigned_t length, f_int16s_t *int16s) { #ifndef _di_level_0_parameter_checking_ if (!int16s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -39,7 +39,7 @@ extern "C" { #endif // _di_f_int16s_append_all_ #ifndef _di_f_int16s_decimate_by_ - f_status_t f_int16s_decimate_by(const f_array_length_t amount, f_int16s_t *int16s) { + f_status_t f_int16s_decimate_by(const f_number_unsigned_t amount, f_int16s_t *int16s) { #ifndef _di_level_0_parameter_checking_ if (!int16s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -55,7 +55,7 @@ extern "C" { #endif // _di_f_int16s_decimate_by_ #ifndef _di_f_int16s_decrease_by_ - f_status_t f_int16s_decrease_by(const f_array_length_t amount, f_int16s_t *int16s) { + f_status_t f_int16s_decrease_by(const f_number_unsigned_t amount, f_int16s_t *int16s) { #ifndef _di_level_0_parameter_checking_ if (!int16s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -71,20 +71,20 @@ extern "C" { #endif // _di_f_int16s_decrease_by_ #ifndef _di_f_int16s_increase_ - f_status_t f_int16s_increase(const f_array_length_t step, f_int16s_t *int16s) { + f_status_t f_int16s_increase(const f_number_unsigned_t step, f_int16s_t *int16s) { #ifndef _di_level_0_parameter_checking_ if (!int16s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && int16s->used + 1 > int16s->size) { - f_array_length_t size = int16s->used + step; + f_number_unsigned_t size = int16s->used + step; - if (size > F_array_length_t_size_d) { - if (int16s->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (int16s->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_int16s_resize(size, int16s); @@ -95,7 +95,7 @@ extern "C" { #endif // _di_f_int16s_increase_ #ifndef _di_f_int16s_increase_by_ - f_status_t f_int16s_increase_by(const f_array_length_t amount, f_int16s_t *int16s) { + f_status_t f_int16s_increase_by(const f_number_unsigned_t amount, f_int16s_t *int16s) { #ifndef _di_level_0_parameter_checking_ if (!int16s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -103,7 +103,7 @@ extern "C" { if (!amount) return F_data_not; if (int16s->used + amount > int16s->size) { - if (int16s->used + amount > F_array_length_t_size_d) { + if (int16s->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -115,7 +115,7 @@ extern "C" { #endif // _di_f_int16s_increase_by_ #ifndef _di_f_int16s_resize_ - f_status_t f_int16s_resize(const f_array_length_t length, f_int16s_t *int16s) { + f_status_t f_int16s_resize(const f_number_unsigned_t length, f_int16s_t *int16s) { #ifndef _di_level_0_parameter_checking_ if (!int16s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -125,7 +125,7 @@ extern "C" { #endif // _di_f_int16s_resize_ #ifndef _di_f_int16ss_adjust_ - f_status_t f_int16ss_adjust(const f_array_length_t length, f_int16ss_t *int16ss) { + f_status_t f_int16ss_adjust(const f_number_unsigned_t length, f_int16ss_t *int16ss) { #ifndef _di_level_0_parameter_checking_ if (!int16ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -173,7 +173,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].used = 0; @@ -188,7 +188,7 @@ extern "C" { #endif // _di_f_int16ss_append_all_ #ifndef _di_f_int16ss_decimate_by_ - f_status_t f_int16ss_decimate_by(const f_array_length_t amount, f_int16ss_t *int16ss) { + f_status_t f_int16ss_decimate_by(const f_number_unsigned_t amount, f_int16ss_t *int16ss) { #ifndef _di_level_0_parameter_checking_ if (!int16ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -204,7 +204,7 @@ extern "C" { #endif // _di_f_int16ss_decimate_by_ #ifndef _di_f_int16ss_decrease_by_ - f_status_t f_int16ss_decrease_by(const f_array_length_t amount, f_int16ss_t *int16ss) { + f_status_t f_int16ss_decrease_by(const f_number_unsigned_t amount, f_int16ss_t *int16ss) { #ifndef _di_level_0_parameter_checking_ if (!int16ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -220,20 +220,20 @@ extern "C" { #endif // _di_f_int16ss_decrease_by_ #ifndef _di_f_int16ss_increase_ - f_status_t f_int16ss_increase(const f_array_length_t step, f_int16ss_t *int16ss) { + f_status_t f_int16ss_increase(const f_number_unsigned_t step, f_int16ss_t *int16ss) { #ifndef _di_level_0_parameter_checking_ if (!int16ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && int16ss->used + 1 > int16ss->size) { - f_array_length_t size = int16ss->used + step; + f_number_unsigned_t size = int16ss->used + step; - if (size > F_array_length_t_size_d) { - if (int16ss->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (int16ss->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_int16ss_resize(size, int16ss); @@ -244,7 +244,7 @@ extern "C" { #endif // _di_f_int16ss_increase_ #ifndef _di_f_int16ss_increase_by_ - f_status_t f_int16ss_increase_by(const f_array_length_t amount, f_int16ss_t *int16ss) { + f_status_t f_int16ss_increase_by(const f_number_unsigned_t amount, f_int16ss_t *int16ss) { #ifndef _di_level_0_parameter_checking_ if (!int16ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -252,7 +252,7 @@ extern "C" { if (!amount) return F_data_not; if (int16ss->used + amount > int16ss->size) { - if (int16ss->used + amount > F_array_length_t_size_d) { + if (int16ss->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -264,7 +264,7 @@ extern "C" { #endif // _di_f_int16ss_increase_by_ #ifndef _di_f_int16ss_resize_ - f_status_t f_int16ss_resize(const f_array_length_t length, f_int16ss_t *int16ss) { + f_status_t f_int16ss_resize(const f_number_unsigned_t length, f_int16ss_t *int16ss) { #ifndef _di_level_0_parameter_checking_ if (!int16ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_type_array/c/type_array/int16.h b/level_0/f_type_array/c/type_array/int16.h index 2d33eed..fdf9c0b 100644 --- a/level_0/f_type_array/c/type_array/int16.h +++ b/level_0/f_type_array/c/type_array/int16.h @@ -32,7 +32,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_int16s_adjust_ - extern f_status_t f_int16s_adjust(const f_array_length_t length, f_int16s_t *int16s); + extern f_status_t f_int16s_adjust(const f_number_unsigned_t length, f_int16s_t *int16s); #endif // _di_f_int16s_adjust_ /** @@ -96,7 +96,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_int16s_decimate_by_ - extern f_status_t f_int16s_decimate_by(const f_array_length_t amount, f_int16s_t *int16s); + extern f_status_t f_int16s_decimate_by(const f_number_unsigned_t amount, f_int16s_t *int16s); #endif // _di_f_int16s_decimate_by_ /** @@ -120,13 +120,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int16s_decrease_by_ - extern f_status_t f_int16s_decrease_by(const f_array_length_t amount, f_int16s_t *int16s); + extern f_status_t f_int16s_decrease_by(const f_number_unsigned_t amount, f_int16s_t *int16s); #endif // _di_f_int16s_decrease_by_ /** * Increase the size of the int16s array, but only if necesary. * - * If the given length is too large for the buffer, then attempt to set max buffer size (F_array_length_t_size_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -145,14 +145,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int16s_increase_ - extern f_status_t f_int16s_increase(const f_array_length_t step, f_int16s_t *int16s); + extern f_status_t f_int16s_increase(const f_number_unsigned_t step, f_int16s_t *int16s); #endif // _di_f_int16s_increase_ /** * Resize the int16s 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -170,7 +170,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int16s_increase_by_ - extern f_status_t f_int16s_increase_by(const f_array_length_t amount, f_int16s_t *int16s); + extern f_status_t f_int16s_increase_by(const f_number_unsigned_t amount, f_int16s_t *int16s); #endif // _di_f_int16s_increase_by_ /** @@ -189,7 +189,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int16s_resize_ - extern f_status_t f_int16s_resize(const f_array_length_t length, f_int16s_t *int16s); + extern f_status_t f_int16s_resize(const f_number_unsigned_t length, f_int16s_t *int16s); #endif // _di_f_int16s_resize_ /** @@ -209,7 +209,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_int16ss_adjust_ - extern f_status_t f_int16ss_adjust(const f_array_length_t length, f_int16ss_t *int16ss); + extern f_status_t f_int16ss_adjust(const f_number_unsigned_t length, f_int16ss_t *int16ss); #endif // _di_f_int16ss_adjust_ /** @@ -274,7 +274,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_int16ss_decimate_by_ - extern f_status_t f_int16ss_decimate_by(const f_array_length_t amount, f_int16ss_t *int16ss); + extern f_status_t f_int16ss_decimate_by(const f_number_unsigned_t amount, f_int16ss_t *int16ss); #endif // _di_f_int16ss_decimate_by_ /** @@ -299,13 +299,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int16ss_decrease_by_ - extern f_status_t f_int16ss_decrease_by(const f_array_length_t amount, f_int16ss_t *int16ss); + extern f_status_t f_int16ss_decrease_by(const f_number_unsigned_t amount, f_int16ss_t *int16ss); #endif // _di_f_int16ss_decrease_by_ /** * Increase the size of the int16ss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -324,14 +324,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int16ss_increase_ - extern f_status_t f_int16ss_increase(const f_array_length_t step, f_int16ss_t *int16ss); + extern f_status_t f_int16ss_increase(const f_number_unsigned_t step, f_int16ss_t *int16ss); #endif // _di_f_int16ss_increase_ /** * Resize the int16ss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -349,7 +349,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int16ss_increase_by_ - extern f_status_t f_int16ss_increase_by(const f_array_length_t amount, f_int16ss_t *int16ss); + extern f_status_t f_int16ss_increase_by(const f_number_unsigned_t amount, f_int16ss_t *int16ss); #endif // _di_f_int16ss_increase_by_ /** @@ -369,7 +369,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int16ss_resize_ - extern f_status_t f_int16ss_resize(const f_array_length_t length, f_int16ss_t *int16ss); + extern f_status_t f_int16ss_resize(const f_number_unsigned_t length, f_int16ss_t *int16ss); #endif // _di_f_int16ss_resize_ #ifdef __cplusplus diff --git a/level_0/f_type_array/c/type_array/int32.c b/level_0/f_type_array/c/type_array/int32.c index aff3139..cc9d7a0 100644 --- a/level_0/f_type_array/c/type_array/int32.c +++ b/level_0/f_type_array/c/type_array/int32.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_int32s_adjust_ - f_status_t f_int32s_adjust(const f_array_length_t length, f_int32s_t *int32s) { + f_status_t f_int32s_adjust(const f_number_unsigned_t length, f_int32s_t *int32s) { #ifndef _di_level_0_parameter_checking_ if (!int32s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -39,7 +39,7 @@ extern "C" { #endif // _di_f_int32s_append_all_ #ifndef _di_f_int32s_decimate_by_ - f_status_t f_int32s_decimate_by(const f_array_length_t amount, f_int32s_t *int32s) { + f_status_t f_int32s_decimate_by(const f_number_unsigned_t amount, f_int32s_t *int32s) { #ifndef _di_level_0_parameter_checking_ if (!int32s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -55,7 +55,7 @@ extern "C" { #endif // _di_f_int32s_decimate_by_ #ifndef _di_f_int32s_decrease_by_ - f_status_t f_int32s_decrease_by(const f_array_length_t amount, f_int32s_t *int32s) { + f_status_t f_int32s_decrease_by(const f_number_unsigned_t amount, f_int32s_t *int32s) { #ifndef _di_level_0_parameter_checking_ if (!int32s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -71,20 +71,20 @@ extern "C" { #endif // _di_f_int32s_decrease_by_ #ifndef _di_f_int32s_increase_ - f_status_t f_int32s_increase(const f_array_length_t step, f_int32s_t *int32s) { + f_status_t f_int32s_increase(const f_number_unsigned_t step, f_int32s_t *int32s) { #ifndef _di_level_0_parameter_checking_ if (!int32s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && int32s->used + 1 > int32s->size) { - f_array_length_t size = int32s->used + step; + f_number_unsigned_t size = int32s->used + step; - if (size > F_array_length_t_size_d) { - if (int32s->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (int32s->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_int32s_resize(size, int32s); @@ -95,7 +95,7 @@ extern "C" { #endif // _di_f_int32s_increase_ #ifndef _di_f_int32s_increase_by_ - f_status_t f_int32s_increase_by(const f_array_length_t amount, f_int32s_t *int32s) { + f_status_t f_int32s_increase_by(const f_number_unsigned_t amount, f_int32s_t *int32s) { #ifndef _di_level_0_parameter_checking_ if (!int32s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -103,7 +103,7 @@ extern "C" { if (!amount) return F_data_not; if (int32s->used + amount > int32s->size) { - if (int32s->used + amount > F_array_length_t_size_d) { + if (int32s->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -115,7 +115,7 @@ extern "C" { #endif // _di_f_int32s_increase_by_ #ifndef _di_f_int32s_resize_ - f_status_t f_int32s_resize(const f_array_length_t length, f_int32s_t *int32s) { + f_status_t f_int32s_resize(const f_number_unsigned_t length, f_int32s_t *int32s) { #ifndef _di_level_0_parameter_checking_ if (!int32s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -125,7 +125,7 @@ extern "C" { #endif // _di_f_int32s_resize_ #ifndef _di_f_int32ss_adjust_ - f_status_t f_int32ss_adjust(const f_array_length_t length, f_int32ss_t *int32ss) { + f_status_t f_int32ss_adjust(const f_number_unsigned_t length, f_int32ss_t *int32ss) { #ifndef _di_level_0_parameter_checking_ if (!int32ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -173,7 +173,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].used = 0; @@ -188,7 +188,7 @@ extern "C" { #endif // _di_f_int32ss_append_all_ #ifndef _di_f_int32ss_decimate_by_ - f_status_t f_int32ss_decimate_by(const f_array_length_t amount, f_int32ss_t *int32ss) { + f_status_t f_int32ss_decimate_by(const f_number_unsigned_t amount, f_int32ss_t *int32ss) { #ifndef _di_level_0_parameter_checking_ if (!int32ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -204,7 +204,7 @@ extern "C" { #endif // _di_f_int32ss_decimate_by_ #ifndef _di_f_int32ss_decrease_by_ - f_status_t f_int32ss_decrease_by(const f_array_length_t amount, f_int32ss_t *int32ss) { + f_status_t f_int32ss_decrease_by(const f_number_unsigned_t amount, f_int32ss_t *int32ss) { #ifndef _di_level_0_parameter_checking_ if (!int32ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -220,20 +220,20 @@ extern "C" { #endif // _di_f_int32ss_decrease_by_ #ifndef _di_f_int32ss_increase_ - f_status_t f_int32ss_increase(const f_array_length_t step, f_int32ss_t *int32ss) { + f_status_t f_int32ss_increase(const f_number_unsigned_t step, f_int32ss_t *int32ss) { #ifndef _di_level_0_parameter_checking_ if (!int32ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && int32ss->used + 1 > int32ss->size) { - f_array_length_t size = int32ss->used + step; + f_number_unsigned_t size = int32ss->used + step; - if (size > F_array_length_t_size_d) { - if (int32ss->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (int32ss->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_int32ss_resize(size, int32ss); @@ -244,7 +244,7 @@ extern "C" { #endif // _di_f_int32ss_increase_ #ifndef _di_f_int32ss_increase_by_ - f_status_t f_int32ss_increase_by(const f_array_length_t amount, f_int32ss_t *int32ss) { + f_status_t f_int32ss_increase_by(const f_number_unsigned_t amount, f_int32ss_t *int32ss) { #ifndef _di_level_0_parameter_checking_ if (!int32ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -252,7 +252,7 @@ extern "C" { if (!amount) return F_data_not; if (int32ss->used + amount > int32ss->size) { - if (int32ss->used + amount > F_array_length_t_size_d) { + if (int32ss->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -264,7 +264,7 @@ extern "C" { #endif // _di_f_int32ss_increase_by_ #ifndef _di_f_int32ss_resize_ - f_status_t f_int32ss_resize(const f_array_length_t length, f_int32ss_t *int32ss) { + f_status_t f_int32ss_resize(const f_number_unsigned_t length, f_int32ss_t *int32ss) { #ifndef _di_level_0_parameter_checking_ if (!int32ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_type_array/c/type_array/int32.h b/level_0/f_type_array/c/type_array/int32.h index 8e8ee35..040147f 100644 --- a/level_0/f_type_array/c/type_array/int32.h +++ b/level_0/f_type_array/c/type_array/int32.h @@ -32,7 +32,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_int32s_adjust_ - extern f_status_t f_int32s_adjust(const f_array_length_t length, f_int32s_t *int32s); + extern f_status_t f_int32s_adjust(const f_number_unsigned_t length, f_int32s_t *int32s); #endif // _di_f_int32s_adjust_ /** @@ -96,7 +96,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_int32s_decimate_by_ - extern f_status_t f_int32s_decimate_by(const f_array_length_t amount, f_int32s_t *int32s); + extern f_status_t f_int32s_decimate_by(const f_number_unsigned_t amount, f_int32s_t *int32s); #endif // _di_f_int32s_decimate_by_ /** @@ -119,13 +119,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int32s_decrease_by_ - extern f_status_t f_int32s_decrease_by(const f_array_length_t amount, f_int32s_t *int32s); + extern f_status_t f_int32s_decrease_by(const f_number_unsigned_t amount, f_int32s_t *int32s); #endif // _di_f_int32s_decrease_by_ /** * Increase the size of the int32s array, but only if necesary. * - * If the given length is too large for the buffer, then attempt to set max buffer size (F_array_length_t_size_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -144,14 +144,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int32s_increase_ - extern f_status_t f_int32s_increase(const f_array_length_t step, f_int32s_t *int32s); + extern f_status_t f_int32s_increase(const f_number_unsigned_t step, f_int32s_t *int32s); #endif // _di_f_int32s_increase_ /** * Resize the int32s 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -169,7 +169,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int32s_increase_by_ - extern f_status_t f_int32s_increase_by(const f_array_length_t amount, f_int32s_t *int32s); + extern f_status_t f_int32s_increase_by(const f_number_unsigned_t amount, f_int32s_t *int32s); #endif // _di_f_int32s_increase_by_ /** @@ -188,7 +188,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int32s_resize_ - extern f_status_t f_int32s_resize(const f_array_length_t length, f_int32s_t *int32s); + extern f_status_t f_int32s_resize(const f_number_unsigned_t length, f_int32s_t *int32s); #endif // _di_f_int32s_resize_ /** @@ -208,7 +208,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_int32ss_adjust_ - extern f_status_t f_int32ss_adjust(const f_array_length_t length, f_int32ss_t *int32ss); + extern f_status_t f_int32ss_adjust(const f_number_unsigned_t length, f_int32ss_t *int32ss); #endif // _di_f_int32ss_adjust_ /** @@ -273,7 +273,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_int32ss_decimate_by_ - extern f_status_t f_int32ss_decimate_by(const f_array_length_t amount, f_int32ss_t *int32ss); + extern f_status_t f_int32ss_decimate_by(const f_number_unsigned_t amount, f_int32ss_t *int32ss); #endif // _di_f_int32ss_decimate_by_ /** @@ -297,13 +297,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int32ss_decrease_by_ - extern f_status_t f_int32ss_decrease_by(const f_array_length_t amount, f_int32ss_t *int32ss); + extern f_status_t f_int32ss_decrease_by(const f_number_unsigned_t amount, f_int32ss_t *int32ss); #endif // _di_f_int32ss_decrease_by_ /** * Increase the size of the int32ss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -322,14 +322,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int32ss_increase_ - extern f_status_t f_int32ss_increase(const f_array_length_t step, f_int32ss_t *int32ss); + extern f_status_t f_int32ss_increase(const f_number_unsigned_t step, f_int32ss_t *int32ss); #endif // _di_f_int32ss_increase_ /** * Resize the int32ss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -347,7 +347,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int32ss_increase_by_ - extern f_status_t f_int32ss_increase_by(const f_array_length_t amount, f_int32ss_t *int32ss); + extern f_status_t f_int32ss_increase_by(const f_number_unsigned_t amount, f_int32ss_t *int32ss); #endif // _di_f_int32ss_increase_by_ /** @@ -367,7 +367,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int32ss_resize_ - extern f_status_t f_int32ss_resize(const f_array_length_t length, f_int32ss_t *int32ss); + extern f_status_t f_int32ss_resize(const f_number_unsigned_t length, f_int32ss_t *int32ss); #endif // _di_f_int32ss_resize_ #ifdef __cplusplus diff --git a/level_0/f_type_array/c/type_array/int64.c b/level_0/f_type_array/c/type_array/int64.c index d661974..1aa1303 100644 --- a/level_0/f_type_array/c/type_array/int64.c +++ b/level_0/f_type_array/c/type_array/int64.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_int64s_adjust_ - f_status_t f_int64s_adjust(const f_array_length_t length, f_int64s_t *int64s) { + f_status_t f_int64s_adjust(const f_number_unsigned_t length, f_int64s_t *int64s) { #ifndef _di_level_0_parameter_checking_ if (!int64s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -39,7 +39,7 @@ extern "C" { #endif // _di_f_int64s_append_all_ #ifndef _di_f_int64s_decimate_by_ - f_status_t f_int64s_decimate_by(const f_array_length_t amount, f_int64s_t *int64s) { + f_status_t f_int64s_decimate_by(const f_number_unsigned_t amount, f_int64s_t *int64s) { #ifndef _di_level_0_parameter_checking_ if (!int64s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -55,7 +55,7 @@ extern "C" { #endif // _di_f_int64s_decimate_by_ #ifndef _di_f_int64s_decrease_by_ - f_status_t f_int64s_decrease_by(const f_array_length_t amount, f_int64s_t *int64s) { + f_status_t f_int64s_decrease_by(const f_number_unsigned_t amount, f_int64s_t *int64s) { #ifndef _di_level_0_parameter_checking_ if (!int64s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -71,20 +71,20 @@ extern "C" { #endif // _di_f_int64s_decrease_by_ #ifndef _di_f_int64s_increase_ - f_status_t f_int64s_increase(const f_array_length_t step, f_int64s_t *int64s) { + f_status_t f_int64s_increase(const f_number_unsigned_t step, f_int64s_t *int64s) { #ifndef _di_level_0_parameter_checking_ if (!int64s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && int64s->used + 1 > int64s->size) { - f_array_length_t size = int64s->used + step; + f_number_unsigned_t size = int64s->used + step; - if (size > F_array_length_t_size_d) { - if (int64s->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (int64s->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_int64s_resize(size, int64s); @@ -95,7 +95,7 @@ extern "C" { #endif // _di_f_int64s_increase_ #ifndef _di_f_int64s_increase_by_ - f_status_t f_int64s_increase_by(const f_array_length_t amount, f_int64s_t *int64s) { + f_status_t f_int64s_increase_by(const f_number_unsigned_t amount, f_int64s_t *int64s) { #ifndef _di_level_0_parameter_checking_ if (!int64s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -103,7 +103,7 @@ extern "C" { if (!amount) return F_data_not; if (int64s->used + amount > int64s->size) { - if (int64s->used + amount > F_array_length_t_size_d) { + if (int64s->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -115,7 +115,7 @@ extern "C" { #endif // _di_f_int64s_increase_by_ #ifndef _di_f_int64s_resize_ - f_status_t f_int64s_resize(const f_array_length_t length, f_int64s_t *int64s) { + f_status_t f_int64s_resize(const f_number_unsigned_t length, f_int64s_t *int64s) { #ifndef _di_level_0_parameter_checking_ if (!int64s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -125,7 +125,7 @@ extern "C" { #endif // _di_f_int64s_resize_ #ifndef _di_f_int64ss_adjust_ - f_status_t f_int64ss_adjust(const f_array_length_t length, f_int64ss_t *int64ss) { + f_status_t f_int64ss_adjust(const f_number_unsigned_t length, f_int64ss_t *int64ss) { #ifndef _di_level_0_parameter_checking_ if (!int64ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -173,7 +173,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].used = 0; @@ -188,7 +188,7 @@ extern "C" { #endif // _di_f_int64ss_append_all_ #ifndef _di_f_int64ss_decimate_by_ - f_status_t f_int64ss_decimate_by(const f_array_length_t amount, f_int64ss_t *int64ss) { + f_status_t f_int64ss_decimate_by(const f_number_unsigned_t amount, f_int64ss_t *int64ss) { #ifndef _di_level_0_parameter_checking_ if (!int64ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -204,7 +204,7 @@ extern "C" { #endif // _di_f_int64ss_decimate_by_ #ifndef _di_f_int64ss_decrease_by_ - f_status_t f_int64ss_decrease_by(const f_array_length_t amount, f_int64ss_t *int64ss) { + f_status_t f_int64ss_decrease_by(const f_number_unsigned_t amount, f_int64ss_t *int64ss) { #ifndef _di_level_0_parameter_checking_ if (!int64ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -220,20 +220,20 @@ extern "C" { #endif // _di_f_int64ss_decrease_by_ #ifndef _di_f_int64ss_increase_ - f_status_t f_int64ss_increase(const f_array_length_t step, f_int64ss_t *int64ss) { + f_status_t f_int64ss_increase(const f_number_unsigned_t step, f_int64ss_t *int64ss) { #ifndef _di_level_0_parameter_checking_ if (!int64ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && int64ss->used + 1 > int64ss->size) { - f_array_length_t size = int64ss->used + step; + f_number_unsigned_t size = int64ss->used + step; - if (size > F_array_length_t_size_d) { - if (int64ss->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (int64ss->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_int64ss_resize(size, int64ss); @@ -244,7 +244,7 @@ extern "C" { #endif // _di_f_int64ss_increase_ #ifndef _di_f_int64ss_increase_by_ - f_status_t f_int64ss_increase_by(const f_array_length_t amount, f_int64ss_t *int64ss) { + f_status_t f_int64ss_increase_by(const f_number_unsigned_t amount, f_int64ss_t *int64ss) { #ifndef _di_level_0_parameter_checking_ if (!int64ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -252,7 +252,7 @@ extern "C" { if (!amount) return F_data_not; if (int64ss->used + amount > int64ss->size) { - if (int64ss->used + amount > F_array_length_t_size_d) { + if (int64ss->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -264,7 +264,7 @@ extern "C" { #endif // _di_f_int64ss_increase_by_ #ifndef _di_f_int64ss_resize_ - f_status_t f_int64ss_resize(const f_array_length_t length, f_int64ss_t *int64ss) { + f_status_t f_int64ss_resize(const f_number_unsigned_t length, f_int64ss_t *int64ss) { #ifndef _di_level_0_parameter_checking_ if (!int64ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_type_array/c/type_array/int64.h b/level_0/f_type_array/c/type_array/int64.h index 31ba1b8..1742945 100644 --- a/level_0/f_type_array/c/type_array/int64.h +++ b/level_0/f_type_array/c/type_array/int64.h @@ -32,7 +32,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_int64s_adjust_ - extern f_status_t f_int64s_adjust(const f_array_length_t length, f_int64s_t *int64s); + extern f_status_t f_int64s_adjust(const f_number_unsigned_t length, f_int64s_t *int64s); #endif // _di_f_int64s_adjust_ /** @@ -96,7 +96,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_int64s_decimate_by_ - extern f_status_t f_int64s_decimate_by(const f_array_length_t amount, f_int64s_t *int64s); + extern f_status_t f_int64s_decimate_by(const f_number_unsigned_t amount, f_int64s_t *int64s); #endif // _di_f_int64s_decimate_by_ /** @@ -120,13 +120,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int64s_decrease_by_ - extern f_status_t f_int64s_decrease_by(const f_array_length_t amount, f_int64s_t *int64s); + extern f_status_t f_int64s_decrease_by(const f_number_unsigned_t amount, f_int64s_t *int64s); #endif // _di_f_int64s_decrease_by_ /** * Increase the size of the int64s array, but only if necesary. * - * If the given length is too large for the buffer, then attempt to set max buffer size (F_array_length_t_size_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -145,14 +145,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int64s_increase_ - extern f_status_t f_int64s_increase(const f_array_length_t step, f_int64s_t *int64s); + extern f_status_t f_int64s_increase(const f_number_unsigned_t step, f_int64s_t *int64s); #endif // _di_f_int64s_increase_ /** * Resize the int64s 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -170,7 +170,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int64s_increase_by_ - extern f_status_t f_int64s_increase_by(const f_array_length_t amount, f_int64s_t *int64s); + extern f_status_t f_int64s_increase_by(const f_number_unsigned_t amount, f_int64s_t *int64s); #endif // _di_f_int64s_increase_by_ /** @@ -189,7 +189,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int64s_resize_ - extern f_status_t f_int64s_resize(const f_array_length_t length, f_int64s_t *int64s); + extern f_status_t f_int64s_resize(const f_number_unsigned_t length, f_int64s_t *int64s); #endif // _di_f_int64s_resize_ /** @@ -209,7 +209,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_int64ss_adjust_ - extern f_status_t f_int64ss_adjust(const f_array_length_t length, f_int64ss_t *int64ss); + extern f_status_t f_int64ss_adjust(const f_number_unsigned_t length, f_int64ss_t *int64ss); #endif // _di_f_int64ss_adjust_ /** @@ -274,7 +274,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_int64ss_decimate_by_ - extern f_status_t f_int64ss_decimate_by(const f_array_length_t amount, f_int64ss_t *int64ss); + extern f_status_t f_int64ss_decimate_by(const f_number_unsigned_t amount, f_int64ss_t *int64ss); #endif // _di_f_int64ss_decimate_by_ /** @@ -299,13 +299,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int64ss_decrease_by_ - extern f_status_t f_int64ss_decrease_by(const f_array_length_t amount, f_int64ss_t *int64ss); + extern f_status_t f_int64ss_decrease_by(const f_number_unsigned_t amount, f_int64ss_t *int64ss); #endif // _di_f_int64ss_decrease_by_ /** * Increase the size of the int64ss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -324,14 +324,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int64ss_increase_ - extern f_status_t f_int64ss_increase(const f_array_length_t step, f_int64ss_t *int64ss); + extern f_status_t f_int64ss_increase(const f_number_unsigned_t step, f_int64ss_t *int64ss); #endif // _di_f_int64ss_increase_ /** * Resize the int64ss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -349,7 +349,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int64ss_increase_by_ - extern f_status_t f_int64ss_increase_by(const f_array_length_t amount, f_int64ss_t *int64ss); + extern f_status_t f_int64ss_increase_by(const f_number_unsigned_t amount, f_int64ss_t *int64ss); #endif // _di_f_int64ss_increase_by_ /** @@ -369,7 +369,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int64ss_resize_ - extern f_status_t f_int64ss_resize(const f_array_length_t length, f_int64ss_t *int64ss); + extern f_status_t f_int64ss_resize(const f_number_unsigned_t length, f_int64ss_t *int64ss); #endif // _di_f_int64ss_resize_ #ifdef __cplusplus diff --git a/level_0/f_type_array/c/type_array/int8.c b/level_0/f_type_array/c/type_array/int8.c index 0c3de4a..7d38725 100644 --- a/level_0/f_type_array/c/type_array/int8.c +++ b/level_0/f_type_array/c/type_array/int8.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_int8s_adjust_ - f_status_t f_int8s_adjust(const f_array_length_t length, f_int8s_t *int8s) { + f_status_t f_int8s_adjust(const f_number_unsigned_t length, f_int8s_t *int8s) { #ifndef _di_level_0_parameter_checking_ if (!int8s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -39,7 +39,7 @@ extern "C" { #endif // _di_f_int8s_append_all_ #ifndef _di_f_int8s_decimate_by_ - f_status_t f_int8s_decimate_by(const f_array_length_t amount, f_int8s_t *int8s) { + f_status_t f_int8s_decimate_by(const f_number_unsigned_t amount, f_int8s_t *int8s) { #ifndef _di_level_0_parameter_checking_ if (!int8s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -55,7 +55,7 @@ extern "C" { #endif // _di_f_int8s_decimate_by_ #ifndef _di_f_int8s_decrease_by_ - f_status_t f_int8s_decrease_by(const f_array_length_t amount, f_int8s_t *int8s) { + f_status_t f_int8s_decrease_by(const f_number_unsigned_t amount, f_int8s_t *int8s) { #ifndef _di_level_0_parameter_checking_ if (!int8s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -71,20 +71,20 @@ extern "C" { #endif // _di_f_int8s_decrease_by_ #ifndef _di_f_int8s_increase_ - f_status_t f_int8s_increase(const f_array_length_t step, f_int8s_t *int8s) { + f_status_t f_int8s_increase(const f_number_unsigned_t step, f_int8s_t *int8s) { #ifndef _di_level_0_parameter_checking_ if (!int8s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && int8s->used + 1 > int8s->size) { - f_array_length_t size = int8s->used + step; + f_number_unsigned_t size = int8s->used + step; - if (size > F_array_length_t_size_d) { - if (int8s->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (int8s->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_int8s_resize(size, int8s); @@ -95,7 +95,7 @@ extern "C" { #endif // _di_f_int8s_increase_ #ifndef _di_f_int8s_increase_by_ - f_status_t f_int8s_increase_by(const f_array_length_t amount, f_int8s_t *int8s) { + f_status_t f_int8s_increase_by(const f_number_unsigned_t amount, f_int8s_t *int8s) { #ifndef _di_level_0_parameter_checking_ if (!int8s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -103,7 +103,7 @@ extern "C" { if (!amount) return F_data_not; if (int8s->used + amount > int8s->size) { - if (int8s->used + amount > F_array_length_t_size_d) { + if (int8s->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -115,7 +115,7 @@ extern "C" { #endif // _di_f_int8s_increase_by_ #ifndef _di_f_int8s_resize_ - f_status_t f_int8s_resize(const f_array_length_t length, f_int8s_t *int8s) { + f_status_t f_int8s_resize(const f_number_unsigned_t length, f_int8s_t *int8s) { #ifndef _di_level_0_parameter_checking_ if (!int8s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -125,7 +125,7 @@ extern "C" { #endif // _di_f_int8s_resize_ #ifndef _di_f_int8ss_adjust_ - f_status_t f_int8ss_adjust(const f_array_length_t length, f_int8ss_t *int8ss) { + f_status_t f_int8ss_adjust(const f_number_unsigned_t length, f_int8ss_t *int8ss) { #ifndef _di_level_0_parameter_checking_ if (!int8ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -173,7 +173,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].used = 0; @@ -188,7 +188,7 @@ extern "C" { #endif // _di_f_int8ss_append_all_ #ifndef _di_f_int8ss_decimate_by_ - f_status_t f_int8ss_decimate_by(const f_array_length_t amount, f_int8ss_t *int8ss) { + f_status_t f_int8ss_decimate_by(const f_number_unsigned_t amount, f_int8ss_t *int8ss) { #ifndef _di_level_0_parameter_checking_ if (!int8ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -204,7 +204,7 @@ extern "C" { #endif // _di_f_int8ss_decimate_by_ #ifndef _di_f_int8ss_decrease_by_ - f_status_t f_int8ss_decrease_by(const f_array_length_t amount, f_int8ss_t *int8ss) { + f_status_t f_int8ss_decrease_by(const f_number_unsigned_t amount, f_int8ss_t *int8ss) { #ifndef _di_level_0_parameter_checking_ if (!int8ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -220,20 +220,20 @@ extern "C" { #endif // _di_f_int8ss_decrease_by_ #ifndef _di_f_int8ss_increase_ - f_status_t f_int8ss_increase(const f_array_length_t step, f_int8ss_t *int8ss) { + f_status_t f_int8ss_increase(const f_number_unsigned_t step, f_int8ss_t *int8ss) { #ifndef _di_level_0_parameter_checking_ if (!int8ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && int8ss->used + 1 > int8ss->size) { - f_array_length_t size = int8ss->used + step; + f_number_unsigned_t size = int8ss->used + step; - if (size > F_array_length_t_size_d) { - if (int8ss->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (int8ss->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_int8ss_resize(size, int8ss); @@ -244,7 +244,7 @@ extern "C" { #endif // _di_f_int8ss_increase_ #ifndef _di_f_int8ss_increase_by_ - f_status_t f_int8ss_increase_by(const f_array_length_t amount, f_int8ss_t *int8ss) { + f_status_t f_int8ss_increase_by(const f_number_unsigned_t amount, f_int8ss_t *int8ss) { #ifndef _di_level_0_parameter_checking_ if (!int8ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -252,7 +252,7 @@ extern "C" { if (!amount) return F_data_not; if (int8ss->used + amount > int8ss->size) { - if (int8ss->used + amount > F_array_length_t_size_d) { + if (int8ss->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -264,7 +264,7 @@ extern "C" { #endif // _di_f_int8ss_increase_by_ #ifndef _di_f_int8ss_resize_ - f_status_t f_int8ss_resize(const f_array_length_t length, f_int8ss_t *int8ss) { + f_status_t f_int8ss_resize(const f_number_unsigned_t length, f_int8ss_t *int8ss) { #ifndef _di_level_0_parameter_checking_ if (!int8ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_type_array/c/type_array/int8.h b/level_0/f_type_array/c/type_array/int8.h index 83db61c..01b9041 100644 --- a/level_0/f_type_array/c/type_array/int8.h +++ b/level_0/f_type_array/c/type_array/int8.h @@ -32,7 +32,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_int8s_adjust_ - extern f_status_t f_int8s_adjust(const f_array_length_t length, f_int8s_t *int8s); + extern f_status_t f_int8s_adjust(const f_number_unsigned_t length, f_int8s_t *int8s); #endif // _di_f_int8s_adjust_ /** @@ -96,7 +96,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_int8s_decimate_by_ - extern f_status_t f_int8s_decimate_by(const f_array_length_t amount, f_int8s_t *int8s); + extern f_status_t f_int8s_decimate_by(const f_number_unsigned_t amount, f_int8s_t *int8s); #endif // _di_f_int8s_decimate_by_ /** @@ -120,13 +120,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int8s_decrease_by_ - extern f_status_t f_int8s_decrease_by(const f_array_length_t amount, f_int8s_t *int8s); + extern f_status_t f_int8s_decrease_by(const f_number_unsigned_t amount, f_int8s_t *int8s); #endif // _di_f_int8s_decrease_by_ /** * Increase the size of the int8s array, but only if necesary. * - * If the given length is too large for the buffer, then attempt to set max buffer size (F_array_length_t_size_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -145,14 +145,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int8s_increase_ - extern f_status_t f_int8s_increase(const f_array_length_t step, f_int8s_t *int8s); + extern f_status_t f_int8s_increase(const f_number_unsigned_t step, f_int8s_t *int8s); #endif // _di_f_int8s_increase_ /** * Resize the int8s 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -170,7 +170,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int8s_increase_by_ - extern f_status_t f_int8s_increase_by(const f_array_length_t amount, f_int8s_t *int8s); + extern f_status_t f_int8s_increase_by(const f_number_unsigned_t amount, f_int8s_t *int8s); #endif // _di_f_int8s_increase_by_ /** @@ -189,7 +189,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int8s_resize_ - extern f_status_t f_int8s_resize(const f_array_length_t length, f_int8s_t *int8s); + extern f_status_t f_int8s_resize(const f_number_unsigned_t length, f_int8s_t *int8s); #endif // _di_f_int8s_resize_ /** @@ -209,7 +209,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_int8ss_adjust_ - extern f_status_t f_int8ss_adjust(const f_array_length_t length, f_int8ss_t *int8ss); + extern f_status_t f_int8ss_adjust(const f_number_unsigned_t length, f_int8ss_t *int8ss); #endif // _di_f_int8ss_adjust_ /** @@ -274,7 +274,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_int8ss_decimate_by_ - extern f_status_t f_int8ss_decimate_by(const f_array_length_t amount, f_int8ss_t *int8ss); + extern f_status_t f_int8ss_decimate_by(const f_number_unsigned_t amount, f_int8ss_t *int8ss); #endif // _di_f_int8ss_decimate_by_ /** @@ -299,13 +299,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int8ss_decrease_by_ - extern f_status_t f_int8ss_decrease_by(const f_array_length_t amount, f_int8ss_t *int8ss); + extern f_status_t f_int8ss_decrease_by(const f_number_unsigned_t amount, f_int8ss_t *int8ss); #endif // _di_f_int8ss_decrease_by_ /** * Increase the size of the int8ss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -324,14 +324,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int8ss_increase_ - extern f_status_t f_int8ss_increase(const f_array_length_t step, f_int8ss_t *int8ss); + extern f_status_t f_int8ss_increase(const f_number_unsigned_t step, f_int8ss_t *int8ss); #endif // _di_f_int8ss_increase_ /** * Resize the int8ss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -349,7 +349,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int8ss_increase_by_ - extern f_status_t f_int8ss_increase_by(const f_array_length_t amount, f_int8ss_t *int8ss); + extern f_status_t f_int8ss_increase_by(const f_number_unsigned_t amount, f_int8ss_t *int8ss); #endif // _di_f_int8ss_increase_by_ /** @@ -369,7 +369,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_int8ss_resize_ - extern f_status_t f_int8ss_resize(const f_array_length_t length, f_int8ss_t *int8ss); + extern f_status_t f_int8ss_resize(const f_number_unsigned_t length, f_int8ss_t *int8ss); #endif // _di_f_int8ss_resize_ #ifdef __cplusplus diff --git a/level_0/f_type_array/c/type_array/number_unsigned.c b/level_0/f_type_array/c/type_array/number_unsigned.c new file mode 100644 index 0000000..8f0b939 --- /dev/null +++ b/level_0/f_type_array/c/type_array/number_unsigned.c @@ -0,0 +1,285 @@ +#include "../type_array.h" +#include "number_unsigned.h" +#include "private-number_unsigned.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef _di_f_number_unsigneds_adjust_ + f_status_t f_number_unsigneds_adjust(const f_number_unsigned_t length, f_number_unsigneds_t *lengths) { + #ifndef _di_level_0_parameter_checking_ + if (!lengths) return F_status_set_error(F_parameter); + #endif // _di_level_0_parameter_checking_ + + return private_f_number_unsigneds_adjust(length, lengths); + } +#endif // _di_f_number_unsigneds_adjust_ + +#ifndef _di_f_number_unsigneds_append_ + f_status_t f_number_unsigneds_append(const f_number_unsigned_t source, f_number_unsigneds_t *destination) { + #ifndef _di_level_0_parameter_checking_ + if (!destination) return F_status_set_error(F_parameter); + #endif // _di_level_0_parameter_checking_ + + if (destination->used + 1 > destination->size) { + const f_status_t status = private_f_number_unsigneds_resize(destination->used + F_memory_default_allocation_small_d, destination); + if (F_status_is_error(status)) return status; + } + + destination->array[destination->used++] = source; + + return F_none; + } +#endif // _di_f_number_unsigneds_append_ + +#ifndef _di_f_number_unsigneds_append_all_ + f_status_t f_number_unsigneds_append_all(const f_number_unsigneds_t source, f_number_unsigneds_t *destination) { + #ifndef _di_level_0_parameter_checking_ + if (!destination) return F_status_set_error(F_parameter); + #endif // _di_level_0_parameter_checking_ + + if (!source.used) return F_data_not; + + return private_f_number_unsigneds_append_all(source, destination); + } +#endif // _di_f_number_unsigneds_append_all_ + +#ifndef _di_f_number_unsigneds_decimate_by_ + f_status_t f_number_unsigneds_decimate_by(const f_number_unsigned_t amount, f_number_unsigneds_t *lengths) { + #ifndef _di_level_0_parameter_checking_ + if (!lengths) return F_status_set_error(F_parameter); + #endif // _di_level_0_parameter_checking_ + + if (!amount) return F_data_not; + + if (lengths->size - amount > 0) { + return private_f_number_unsigneds_adjust(lengths->size - amount, lengths); + } + + return private_f_number_unsigneds_adjust(0, lengths); + } +#endif // _di_f_number_unsigneds_decimate_by_ + +#ifndef _di_f_number_unsigneds_decrease_by_ + f_status_t f_number_unsigneds_decrease_by(const f_number_unsigned_t amount, f_number_unsigneds_t *lengths) { + #ifndef _di_level_0_parameter_checking_ + if (!lengths) return F_status_set_error(F_parameter); + #endif // _di_level_0_parameter_checking_ + + if (!amount) return F_data_not; + + if (lengths->size - amount > 0) { + return private_f_number_unsigneds_resize(lengths->size - amount, lengths); + } + + return private_f_number_unsigneds_resize(0, lengths); + } +#endif // _di_f_number_unsigneds_decrease_by_ + +#ifndef _di_f_number_unsigneds_increase_ + f_status_t f_number_unsigneds_increase(const f_number_unsigned_t step, f_number_unsigneds_t *lengths) { + #ifndef _di_level_0_parameter_checking_ + if (!lengths) return F_status_set_error(F_parameter); + #endif // _di_level_0_parameter_checking_ + + if (step && lengths->used + 1 > lengths->size) { + f_number_unsigned_t size = lengths->used + step; + + if (size > F_number_t_size_unsigned_d) { + if (lengths->used + 1 > F_number_t_size_unsigned_d) { + return F_status_set_error(F_array_too_large); + } + + size = F_number_t_size_unsigned_d; + } + + return private_f_number_unsigneds_resize(size, lengths); + } + + return F_data_not; + } +#endif // _di_f_number_unsigneds_increase_ + +#ifndef _di_f_number_unsigneds_increase_by_ + f_status_t f_number_unsigneds_increase_by(const f_number_unsigned_t amount, f_number_unsigneds_t *lengths) { + #ifndef _di_level_0_parameter_checking_ + if (!lengths) return F_status_set_error(F_parameter); + #endif // _di_level_0_parameter_checking_ + + if (!amount) return F_data_not; + + if (lengths->used + amount > lengths->size) { + if (lengths->used + amount > F_number_t_size_unsigned_d) { + return F_status_set_error(F_array_too_large); + } + + return private_f_number_unsigneds_resize(lengths->used + amount, lengths); + } + + return F_data_not; + } +#endif // _di_f_number_unsigneds_increase_by_ + +#ifndef _di_f_number_unsigneds_resize_ + f_status_t f_number_unsigneds_resize(const f_number_unsigned_t length, f_number_unsigneds_t *lengths) { + #ifndef _di_level_0_parameter_checking_ + if (!lengths) return F_status_set_error(F_parameter); + #endif // _di_level_0_parameter_checking_ + + return private_f_number_unsigneds_resize(length, lengths); + } +#endif // _di_f_number_unsigneds_resize_ + +#ifndef _di_f_number_unsignedss_adjust_ + f_status_t f_number_unsignedss_adjust(const f_number_unsigned_t length, f_number_unsignedss_t *lengthss) { + #ifndef _di_level_0_parameter_checking_ + if (!lengthss) return F_status_set_error(F_parameter); + #endif // _di_level_0_parameter_checking_ + + return private_f_number_unsignedss_adjust(length, lengthss); + } +#endif // _di_f_number_unsignedss_adjust_ + +#ifndef _di_f_number_unsignedss_append_ + f_status_t f_number_unsignedss_append(const f_number_unsigneds_t source, f_number_unsignedss_t *destination) { + #ifndef _di_level_0_parameter_checking_ + if (!destination) return F_status_set_error(F_parameter); + #endif // _di_level_0_parameter_checking_ + + if (!source.used) return F_data_not; + + f_status_t status = F_none; + + if (destination->used + 1 > destination->size) { + status = private_f_number_unsignedss_resize(destination->used + F_memory_default_allocation_small_d, destination); + if (F_status_is_error(status)) return status; + } + + status = private_f_number_unsigneds_append_all(source, &destination->array[destination->used]); + if (F_status_is_error(status)) return status; + + ++destination->used; + + return F_none; + } +#endif // _di_f_number_unsignedss_append_ + +#ifndef _di_f_number_unsignedss_append_all_ + f_status_t f_number_unsignedss_append_all(const f_number_unsignedss_t source, f_number_unsignedss_t *destination) { + #ifndef _di_level_0_parameter_checking_ + if (!destination) return F_status_set_error(F_parameter); + #endif // _di_level_0_parameter_checking_ + + if (!source.used) return F_data_not; + + f_status_t status = F_none; + + if (destination->used + source.used > destination->size) { + status = private_f_number_unsignedss_resize(destination->used + source.used, destination); + if (F_status_is_error(status)) return status; + } + + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { + + destination->array[destination->used].used = 0; + + if (source.array[i].used) { + status = private_f_number_unsigneds_append_all(source.array[i], &destination->array[destination->used]); + if (F_status_is_error(status)) return status; + } + } // for + + return F_none; + } +#endif // _di_f_number_unsignedss_append_all_ + +#ifndef _di_f_number_unsignedss_decimate_by_ + f_status_t f_number_unsignedss_decimate_by(const f_number_unsigned_t amount, f_number_unsignedss_t *lengthss) { + #ifndef _di_level_0_parameter_checking_ + if (!lengthss) return F_status_set_error(F_parameter); + #endif // _di_level_0_parameter_checking_ + + if (!amount) return F_data_not; + + if (lengthss->size - amount > 0) { + return private_f_number_unsignedss_adjust(lengthss->size - amount, lengthss); + } + + return private_f_number_unsignedss_adjust(0, lengthss); + } +#endif // _di_f_number_unsignedss_decimate_by_ + +#ifndef _di_f_number_unsignedss_decrease_by_ + f_status_t f_number_unsignedss_decrease_by(const f_number_unsigned_t amount, f_number_unsignedss_t *lengthss) { + #ifndef _di_level_0_parameter_checking_ + if (!lengthss) return F_status_set_error(F_parameter); + #endif // _di_level_0_parameter_checking_ + + if (!amount) return F_data_not; + + if (lengthss->size - amount > 0) { + return private_f_number_unsignedss_resize(lengthss->size - amount, lengthss); + } + + return private_f_number_unsignedss_resize(0, lengthss); + } +#endif // _di_f_number_unsignedss_decrease_by_ + +#ifndef _di_f_number_unsignedss_increase_ + f_status_t f_number_unsignedss_increase(const f_number_unsigned_t step, f_number_unsignedss_t *lengthss) { + #ifndef _di_level_0_parameter_checking_ + if (!lengthss) return F_status_set_error(F_parameter); + #endif // _di_level_0_parameter_checking_ + + if (step && lengthss->used + 1 > lengthss->size) { + f_number_unsigned_t size = lengthss->used + step; + + if (size > F_number_t_size_unsigned_d) { + if (lengthss->used + 1 > F_number_t_size_unsigned_d) { + return F_status_set_error(F_array_too_large); + } + + size = F_number_t_size_unsigned_d; + } + + return private_f_number_unsignedss_resize(size, lengthss); + } + + return F_data_not; + } +#endif // _di_f_number_unsignedss_increase_ + +#ifndef _di_f_number_unsignedss_increase_by_ + f_status_t f_number_unsignedss_increase_by(const f_number_unsigned_t amount, f_number_unsignedss_t *lengthss) { + #ifndef _di_level_0_parameter_checking_ + if (!lengthss) return F_status_set_error(F_parameter); + #endif // _di_level_0_parameter_checking_ + + if (!amount) return F_data_not; + + if (lengthss->used + amount > lengthss->size) { + if (lengthss->used + amount > F_number_t_size_unsigned_d) { + return F_status_set_error(F_array_too_large); + } + + return private_f_number_unsignedss_resize(lengthss->used + amount, lengthss); + } + + return F_data_not; + } +#endif // _di_f_number_unsignedss_increase_by_ + +#ifndef _di_f_number_unsignedss_resize_ + f_status_t f_number_unsignedss_resize(const f_number_unsigned_t length, f_number_unsignedss_t *lengthss) { + #ifndef _di_level_0_parameter_checking_ + if (!lengthss) return F_status_set_error(F_parameter); + #endif // _di_level_0_parameter_checking_ + + return private_f_number_unsignedss_resize(length, lengthss); + } +#endif // _di_f_number_unsignedss_resize_ + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/level_0/f_type_array/c/type_array/array_length.h b/level_0/f_type_array/c/type_array/number_unsigned.h similarity index 70% rename from level_0/f_type_array/c/type_array/array_length.h rename to level_0/f_type_array/c/type_array/number_unsigned.h index e0bb674..946f837 100644 --- a/level_0/f_type_array/c/type_array/array_length.h +++ b/level_0/f_type_array/c/type_array/number_unsigned.h @@ -9,8 +9,8 @@ * * This is auto-included by type_array.h and should not need to be explicitly included. */ -#ifndef _F_type_array_array_length_h -#define _F_type_array_array_length_h +#ifndef _F_type_array_number_unsigned_h +#define _F_type_array_number_unsigned_h #ifdef __cplusplus extern "C" { @@ -31,9 +31,9 @@ extern "C" { * * Errors (with error bit) from: f_memory_adjust(). */ -#ifndef _di_f_array_lengths_adjust_ - extern f_status_t f_array_lengths_adjust(const f_array_length_t length, f_array_lengths_t *lengths); -#endif // _di_f_array_lengths_adjust_ +#ifndef _di_f_number_unsigneds_adjust_ + extern f_status_t f_number_unsigneds_adjust(const f_number_unsigned_t length, f_number_unsigneds_t *lengths); +#endif // _di_f_number_unsigneds_adjust_ /** * Append the single source length onto the destination. @@ -51,9 +51,9 @@ extern "C" { * * Errors (with error bit) from: f_memory_resize(). */ -#ifndef _di_f_array_lengths_append_ - extern f_status_t f_array_lengths_append(const f_array_length_t source, f_array_lengths_t *destination); -#endif // _di_f_array_lengths_append_ +#ifndef _di_f_number_unsigneds_append_ + extern f_status_t f_number_unsigneds_append(const f_number_unsigned_t source, f_number_unsigneds_t *destination); +#endif // _di_f_number_unsigneds_append_ /** * Append the source lengths onto the destination. @@ -71,9 +71,9 @@ extern "C" { * * Errors (with error bit) from: f_memory_resize(). */ -#ifndef _di_f_array_lengths_append_all_ - extern f_status_t f_array_lengths_append_all(const f_array_lengths_t source, f_array_lengths_t *destination); -#endif // _di_f_array_lengths_append_all_ +#ifndef _di_f_number_unsigneds_append_all_ + extern f_status_t f_number_unsigneds_append_all(const f_number_unsigneds_t source, f_number_unsigneds_t *destination); +#endif // _di_f_number_unsigneds_append_all_ /** * Resize the string lengths array to a smaller size. @@ -94,9 +94,9 @@ extern "C" { * * Errors (with error bit) from: f_memory_adjust(). */ -#ifndef _di_f_array_lengths_decimate_by_ - extern f_status_t f_array_lengths_decimate_by(const f_array_length_t amount, f_array_lengths_t *lengths); -#endif // _di_f_array_lengths_decimate_by_ +#ifndef _di_f_number_unsigneds_decimate_by_ + extern f_status_t f_number_unsigneds_decimate_by(const f_number_unsigned_t amount, f_number_unsigneds_t *lengths); +#endif // _di_f_number_unsigneds_decimate_by_ /** * Resize the string lengths array to a smaller size. @@ -117,14 +117,14 @@ extern "C" { * * Errors (with error bit) from: f_memory_resize(). */ -#ifndef _di_f_array_lengths_decrease_by_ - extern f_status_t f_array_lengths_decrease_by(const f_array_length_t amount, f_array_lengths_t *lengths); -#endif // _di_f_array_lengths_decrease_by_ +#ifndef _di_f_number_unsigneds_decrease_by_ + extern f_status_t f_number_unsigneds_decrease_by(const f_number_unsigned_t amount, f_number_unsigneds_t *lengths); +#endif // _di_f_number_unsigneds_decrease_by_ /** * Increase the size of the string lengths array, but only if necesary. * - * If the given length is too large for the buffer, then attempt to set max buffer size (F_array_length_t_size_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -142,15 +142,15 @@ extern "C" { * * Errors (with error bit) from: f_memory_resize(). */ -#ifndef _di_f_array_lengths_increase_ - extern f_status_t f_array_lengths_increase(const f_array_length_t step, f_array_lengths_t *lengths); -#endif // _di_f_array_lengths_increase_ +#ifndef _di_f_number_unsigneds_increase_ + extern f_status_t f_number_unsigneds_increase(const f_number_unsigned_t step, f_number_unsigneds_t *lengths); +#endif // _di_f_number_unsigneds_increase_ /** * Resize the string lengths 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -167,9 +167,9 @@ extern "C" { * * Errors (with error bit) from: f_memory_resize(). */ -#ifndef _di_f_array_lengths_increase_by_ - extern f_status_t f_array_lengths_increase_by(const f_array_length_t amount, f_array_lengths_t *lengths); -#endif // _di_f_array_lengths_increase_by_ +#ifndef _di_f_number_unsigneds_increase_by_ + extern f_status_t f_number_unsigneds_increase_by(const f_number_unsigned_t amount, f_number_unsigneds_t *lengths); +#endif // _di_f_number_unsigneds_increase_by_ /** * Resize the string lengths array. @@ -186,9 +186,9 @@ extern "C" { * * Errors (with error bit) from: f_memory_resize(). */ -#ifndef _di_f_array_lengths_resize_ - extern f_status_t f_array_lengths_resize(const f_array_length_t length, f_array_lengths_t *lengths); -#endif // _di_f_array_lengths_resize_ +#ifndef _di_f_number_unsigneds_resize_ + extern f_status_t f_number_unsigneds_resize(const f_number_unsigned_t length, f_number_unsigneds_t *lengths); +#endif // _di_f_number_unsigneds_resize_ /** * Resize the string lengthss array. @@ -206,9 +206,9 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). * Errors (with error bit) from: f_memory_destroy(). */ -#ifndef _di_f_array_lengthss_adjust_ - extern f_status_t f_array_lengthss_adjust(const f_array_length_t length, f_array_lengthss_t *lengthss); -#endif // _di_f_array_lengthss_adjust_ +#ifndef _di_f_number_unsignedss_adjust_ + extern f_status_t f_number_unsignedss_adjust(const f_number_unsigned_t length, f_number_unsignedss_t *lengthss); +#endif // _di_f_number_unsignedss_adjust_ /** * Append the single source lengths onto the destination. @@ -226,9 +226,9 @@ extern "C" { * * Errors (with error bit) from: f_memory_resize(). */ -#ifndef _di_f_array_lengthss_append_ - extern f_status_t f_array_lengthss_append(const f_array_lengths_t source, f_array_lengthss_t *destination); -#endif // _di_f_array_lengthss_append_ +#ifndef _di_f_number_unsignedss_append_ + extern f_status_t f_number_unsignedss_append(const f_number_unsigneds_t source, f_number_unsignedss_t *destination); +#endif // _di_f_number_unsignedss_append_ /** * Append the source lengthss onto the destination. @@ -246,9 +246,9 @@ extern "C" { * * Errors (with error bit) from: f_memory_resize(). */ -#ifndef _di_f_array_lengthss_append_all_ - extern f_status_t f_array_lengthss_append_all(const f_array_lengthss_t source, f_array_lengthss_t *destination); -#endif // _di_f_array_lengthss_append_all_ +#ifndef _di_f_number_unsignedss_append_all_ + extern f_status_t f_number_unsignedss_append_all(const f_number_unsignedss_t source, f_number_unsignedss_t *destination); +#endif // _di_f_number_unsignedss_append_all_ /** * Resize the string lengthss array to a smaller size. @@ -271,9 +271,9 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). * Errors (with error bit) from: f_memory_destroy(). */ -#ifndef _di_f_array_lengthss_decimate_by_ - extern f_status_t f_array_lengthss_decimate_by(const f_array_length_t amount, f_array_lengthss_t *lengthss); -#endif // _di_f_array_lengthss_decimate_by_ +#ifndef _di_f_number_unsignedss_decimate_by_ + extern f_status_t f_number_unsignedss_decimate_by(const f_number_unsigned_t amount, f_number_unsignedss_t *lengthss); +#endif // _di_f_number_unsignedss_decimate_by_ /** * Resize the string lengthss array to a smaller size. @@ -296,14 +296,14 @@ extern "C" { * Errors (with error bit) from: f_memory_delete(). * Errors (with error bit) from: f_memory_resize(). */ -#ifndef _di_f_array_lengthss_decrease_by_ - extern f_status_t f_array_lengthss_decrease_by(const f_array_length_t amount, f_array_lengthss_t *lengthss); -#endif // _di_f_array_lengthss_decrease_by_ +#ifndef _di_f_number_unsignedss_decrease_by_ + extern f_status_t f_number_unsignedss_decrease_by(const f_number_unsigned_t amount, f_number_unsignedss_t *lengthss); +#endif // _di_f_number_unsignedss_decrease_by_ /** * Increase the size of the string lengthss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -321,15 +321,15 @@ extern "C" { * * Errors (with error bit) from: f_memory_resize(). */ -#ifndef _di_f_array_lengthss_increase_ - extern f_status_t f_array_lengthss_increase(const f_array_length_t step, f_array_lengthss_t *lengthss); -#endif // _di_f_array_lengthss_increase_ +#ifndef _di_f_number_unsignedss_increase_ + extern f_status_t f_number_unsignedss_increase(const f_number_unsigned_t step, f_number_unsignedss_t *lengthss); +#endif // _di_f_number_unsignedss_increase_ /** * Resize the string lengthss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -346,9 +346,9 @@ extern "C" { * * Errors (with error bit) from: f_memory_resize(). */ -#ifndef _di_f_array_lengthss_increase_by_ - extern f_status_t f_array_lengthss_increase_by(const f_array_length_t amount, f_array_lengthss_t *lengthss); -#endif // _di_f_array_lengthss_increase_by_ +#ifndef _di_f_number_unsignedss_increase_by_ + extern f_status_t f_number_unsignedss_increase_by(const f_number_unsigned_t amount, f_number_unsignedss_t *lengthss); +#endif // _di_f_number_unsignedss_increase_by_ /** * Resize the string lengthss array. @@ -366,12 +366,12 @@ extern "C" { * Errors (with error bit) from: f_memory_delete(). * Errors (with error bit) from: f_memory_resize(). */ -#ifndef _di_f_array_lengthss_resize_ - extern f_status_t f_array_lengthss_resize(const f_array_length_t length, f_array_lengthss_t *lengthss); -#endif // _di_f_array_lengthss_resize_ +#ifndef _di_f_number_unsignedss_resize_ + extern f_status_t f_number_unsignedss_resize(const f_number_unsigned_t length, f_number_unsignedss_t *lengthss); +#endif // _di_f_number_unsignedss_resize_ #ifdef __cplusplus } // extern "C" #endif -#endif // _F_type_array_array_length_h +#endif // _F_type_array_number_unsigned_h diff --git a/level_0/f_type_array/c/type_array/private-array_length.c b/level_0/f_type_array/c/type_array/private-array_length.c deleted file mode 100644 index d460204..0000000 --- a/level_0/f_type_array/c/type_array/private-array_length.c +++ /dev/null @@ -1,126 +0,0 @@ -#include "../type_array.h" -#include "private-array_length.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#if !defined(_di_f_array_lengths_adjust_) || !defined(_di_f_array_lengths_decimate_by_) - f_status_t private_f_array_lengths_adjust(const f_array_length_t length, f_array_lengths_t *array_lengths) { - - const f_status_t status = f_memory_adjust(array_lengths->size, length, sizeof(f_array_length_t), (void **) & array_lengths->array); - if (F_status_is_error(status)) return status; - - array_lengths->size = length; - - if (array_lengths->used > array_lengths->size) { - array_lengths->used = length; - } - - return F_none; - } -#endif // !defined(_di_f_array_lengths_adjust_) || !defined(_di_f_array_lengths_decimate_by_) - -#if !defined(_di_f_array_lengths_append_) || !defined(_di_f_array_lengthss_append_) - extern f_status_t private_f_array_lengths_append(const f_array_length_t source, f_array_lengths_t *destination) { - - if (destination->used + 1 > destination->size) { - const f_status_t status = private_f_array_lengths_resize(destination->used + F_memory_default_allocation_small_d, destination); - if (F_status_is_error(status)) return status; - } - - destination->array[destination->used++] = source; - - return F_none; - } -#endif // !defined(_di_f_array_lengths_append_) || !defined(_di_f_array_lengthss_append_) - -#if !defined(_di_f_array_lengths_append_) || !defined(_di_f_array_lengths_append_all_) || !defined(_di_f_array_lengthss_append_all_) - extern f_status_t private_f_array_lengths_append_all(const f_array_lengths_t source, f_array_lengths_t *destination) { - - if (destination->used + source.used > destination->size) { - const f_status_t status = private_f_array_lengths_resize(destination->used + source.used, destination); - if (F_status_is_error(status)) return status; - } - - for (f_array_length_t i = 0; i < source.used; ++i) { - destination->array[destination->used++] = source.array[i]; - } // for - - return F_none; - } -#endif // !defined(_di_f_array_lengths_append_) || !defined(_di_f_array_lengths_append_all_) || !defined(_di_f_array_lengthss_append_all_) - -#if !defined(_di_f_array_lengths_resize_) || !defined(_di_f_array_lengths_append_) || !defined(_di_f_array_lengths_decrease_by_) || !defined(_di_f_array_lengthss_append_) - f_status_t private_f_array_lengths_resize(const f_array_length_t length, f_array_lengths_t *lengths) { - - const f_status_t status = f_memory_resize(lengths->size, length, sizeof(f_array_length_t), (void **) & lengths->array); - if (F_status_is_error(status)) return status; - - lengths->size = length; - - if (lengths->used > lengths->size) { - lengths->used = length; - } - - return F_none; - } -#endif // !defined(_di_f_array_lengths_resize_) || !defined(_di_f_array_lengths_append_) || !defined(_di_f_array_lengths_decrease_by_) || !defined(_di_f_array_lengthss_append_) - -#if !defined(_di_f_array_lengthss_adjust_) || !defined(_di_f_array_lengthss_decimate_by_) - f_status_t private_f_array_lengthss_adjust(const f_array_length_t length, f_array_lengthss_t *lengthss) { - - f_status_t status = F_none; - - for (f_array_length_t i = length; i < lengthss->size; ++i) { - - status = f_memory_destroy(lengthss->array[i].size, sizeof(f_array_lengths_t), (void **) & lengthss->array[i].array); - if (F_status_is_error(status)) return status; - - lengthss->array[i].size = 0; - lengthss->array[i].used = 0; - } // for - - status = f_memory_adjust(lengthss->size, length, sizeof(f_array_lengths_t), (void **) & lengthss->array); - if (F_status_is_error(status)) return status; - - lengthss->size = length; - - if (lengthss->used > lengthss->size) { - lengthss->used = length; - } - - return F_none; - } -#endif // !defined(_di_f_array_lengthss_adjust_) || !defined(_di_f_array_lengthss_decimate_by_) - -#if !defined(_di_f_array_lengthss_decrease_by_) || !defined(_di_f_array_lengthss_increase_) || !defined(_di_f_array_lengthss_increase_by_) || !defined(_di_f_array_lengthss_resize_) - f_status_t private_f_array_lengthss_resize(const f_array_length_t length, f_array_lengthss_t *lengthss) { - - f_status_t status = F_none; - - for (f_array_length_t i = length; i < lengthss->size; ++i) { - - status = f_memory_delete(lengthss->array[i].size, sizeof(f_array_lengths_t), (void **) & lengthss->array[i].array); - if (F_status_is_error(status)) return status; - - lengthss->array[i].size = 0; - lengthss->array[i].used = 0; - } // for - - status = f_memory_resize(lengthss->size, length, sizeof(f_array_lengths_t), (void **) & lengthss->array); - if (F_status_is_error(status)) return status; - - lengthss->size = length; - - if (lengthss->used > lengthss->size) { - lengthss->used = length; - } - - return F_none; - } -#endif // !defined(_di_f_array_lengthss_decrease_by_) || !defined(_di_f_array_lengthss_increase_) || !defined(_di_f_array_lengthss_increase_by_) || !defined(_di_f_array_lengthss_resize_) - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/level_0/f_type_array/c/type_array/private-array_length.h b/level_0/f_type_array/c/type_array/private-array_length.h deleted file mode 100644 index a4a6eaa..0000000 --- a/level_0/f_type_array/c/type_array/private-array_length.h +++ /dev/null @@ -1,175 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: Type - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * These are provided for internal reduction in redundant code. - * These should not be exposed/used outside of this project. - */ -#ifndef _PRIVATE_F_type_array_array_length_h -#define _PRIVATE_F_type_array_array_length_h - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * Private implementation for resizing the array_lengths array. - * - * Intended to be shared to each of the different implementation variations. - * - * @param length - * The length to adjust to. - * @param lengths - * The lengths array to adjust. - * - * @return - * F_none on success. - * F_data_not on success, but there is no reason to increase size (used + 1 <= size). - * - * Errors (with error bit) from: f_memory_adjust(). - * - * @see f_array_lengths_adjust() - * @see f_array_lengths_decimate_by() - */ -#if !defined(_di_f_array_lengths_adjust_) || !defined(_di_f_array_lengths_decimate_by_) - extern f_status_t private_f_array_lengths_adjust(const f_array_length_t length, f_array_lengths_t *lengths) F_attribute_visibility_internal_d; -#endif // !defined(_di_f_array_lengths_adjust_) || !defined(_di_f_array_lengths_decimate_by_) - -/** - * Private implementation for appending the array_length array. - * - * Intended to be shared to each of the different implementation variations. - * - * @param source - * The source array_length to append. - * @param destination - * The destination lengths the source is appended onto. - * - * @return - * F_none on success. - * - * Errors (with error bit) from: f_memory_resize(). - * - * @see f_memory_resize() - * @see f_array_lengths_append() - * @see f_array_lengthss_append() - */ -#if !defined(_di_f_array_lengths_append_) || !defined(_di_f_array_lengthss_append_) - extern f_status_t private_f_array_lengths_append(const f_array_length_t source, f_array_lengths_t *destination) F_attribute_visibility_internal_d; -#endif // !defined(_di_f_array_lengths_append_) || !defined(_di_f_array_lengthss_append_) - -/** - * Private implementation for appending the array_length array. - * - * Intended to be shared to each of the different implementation variations. - * - * @param source - * The source array_lengths to append. - * @param destination - * The destination lengths the source is appended onto. - * - * @return - * F_none on success. - * - * Errors (with error bit) from: f_memory_resize(). - * - * @see f_memory_resize() - * @see f_array_lengths_append_all() - * @see f_array_lengthss_append() - * @see f_array_lengthss_append_all() - */ -#if !defined(_di_f_array_lengths_append_) || !defined(_di_f_array_lengths_append_all_) || !defined(_di_f_array_lengthss_append_all_) - extern f_status_t private_f_array_lengths_append_all(const f_array_lengths_t source, f_array_lengths_t *destination) F_attribute_visibility_internal_d; -#endif // !defined(_di_f_array_lengths_append_) || !defined(_di_f_array_lengths_append_all_) || !defined(_di_f_array_lengthss_append_all_) - -/** - * Private implementation for resizing the array_lengths array. - * - * Intended to be shared to each of the different implementation variations. - * - * @param length - * The length to adjust to. - * @param lengths - * The lengths array to adjust. - * - * @return - * F_none on success. - * F_data_not on success, but there is no reason to increase size (used + 1 <= size). - * - * Errors (with error bit) from: f_memory_resize(). - * - * @see f_array_lengths_resize() - * @see f_array_lengths_append() - * @see f_array_lengths_decrease_by() - * @see f_array_lengthss_append() - */ -#if !defined(_di_f_array_lengths_resize_) || !defined(_di_f_array_lengths_append_) || !defined(_di_f_array_lengths_decrease_by_) || !defined(_di_f_array_lengthss_append_) - extern f_status_t private_f_array_lengths_resize(const f_array_length_t length, f_array_lengths_t *lengths) F_attribute_visibility_internal_d; -#endif // !defined(_di_f_array_lengths_resize_) || !defined(_di_f_array_lengths_append_) || !defined(_di_f_array_lengths_decrease_by_) || !defined(_di_f_array_lengthss_append_) - -/** - * Private implementation for resizing the lengthss array. - * - * Intended to be shared to each of the different implementation variations. - * - * @param length - * The length to adjust to. - * @param lengthss - * The lengthss array to adjust. - * - * @return - * F_none on success. - * F_data_not on success, but there is no reason to increase size (used + 1 <= size). - * - * F_array_too_large (with error bit) if new length is larger than max array length. - * F_memory_not (with error bit) on out of memory. - * F_parameter (with error bit) if a parameter is invalid. - * - * Errors (with error bit) from: f_memory_adjust(). - * Errors (with error bit) from: f_memory_destroy(). - * - * @see f_array_lengthss_adjust() - * @see f_array_lengthss_decimate_by() - */ -#if !defined(_di_f_array_lengthss_adjust_) || !defined(_di_f_array_lengthss_decimate_by_) - extern f_status_t private_f_array_lengthss_adjust(const f_array_length_t length, f_array_lengthss_t *lengthss) F_attribute_visibility_internal_d; -#endif // !defined(_di_f_array_lengthss_adjust_) || !defined(_di_f_array_lengthss_decimate_by_) - -/** - * Private implementation for resizing the lengthss array. - * - * Intended to be shared to each of the different implementation variations. - * - * @param length - * The length to resize to. - * @param lengthss - * The lengthss array to resize. - * - * @return - * F_none on success. - * F_data_not on success, but there is no reason to increase size (used + 1 <= size). - * - * F_array_too_large (with error bit) if new length is larger than max array length. - * F_memory_not (with error bit) on out of memory. - * F_parameter (with error bit) if a parameter is invalid. - * - * Errors (with error bit) from: f_memory_delete(). - * Errors (with error bit) from: f_memory_resize(). - * - * @see f_array_lengthss_decrease_by() - * @see f_array_lengthss_increase() - * @see f_array_lengthss_increase_by() - * @see f_array_lengthss_resize() - */ -#if !defined(_di_f_array_lengthss_decrease_by_) || !defined(_di_f_array_lengthss_increase_) || !defined(_di_f_array_lengthss_increase_by_) || !defined(_di_f_array_lengthss_resize_) - extern f_status_t private_f_array_lengthss_resize(const f_array_length_t length, f_array_lengthss_t *lengthss) F_attribute_visibility_internal_d; -#endif // !defined(_di_f_array_lengthss_decrease_by_) || !defined(_di_f_array_lengthss_increase_) || !defined(_di_f_array_lengthss_increase_by_) || !defined(_di_f_array_lengthss_resize_) - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif // _PRIVATE_F_type_array_array_length_h diff --git a/level_0/f_type_array/c/type_array/private-cell.c b/level_0/f_type_array/c/type_array/private-cell.c index 6ebe38c..6d4fee6 100644 --- a/level_0/f_type_array/c/type_array/private-cell.c +++ b/level_0/f_type_array/c/type_array/private-cell.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_f_cells_adjust_) || !defined(_di_f_cells_decimate_by_) - f_status_t private_f_cells_adjust(const f_array_length_t length, f_cells_t *cells) { + f_status_t private_f_cells_adjust(const f_number_unsigned_t length, f_cells_t *cells) { const f_status_t status = f_memory_adjust(cells->size, length, sizeof(f_cell_t), (void **) & cells->array); if (F_status_is_error(status)) return status; @@ -44,7 +44,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { destination->array[destination->used].row = source.array[i].row; destination->array[destination->used++].column = source.array[i].column; @@ -55,7 +55,7 @@ extern "C" { #endif // !defined(_di_f_cells_append_) || !defined(_di_f_cells_append_all_) || !defined(_di_f_cellss_append_all_) #if !defined(_di_f_cells_resize_) || !defined(_di_f_cells_append_) || !defined(_di_f_cells_decrease_by_) || !defined(_di_f_cellss_append_) - f_status_t private_f_cells_resize(const f_array_length_t length, f_cells_t *cells) { + f_status_t private_f_cells_resize(const f_number_unsigned_t length, f_cells_t *cells) { const f_status_t status = f_memory_resize(cells->size, length, sizeof(f_cell_t), (void **) & cells->array); if (F_status_is_error(status)) return status; @@ -71,11 +71,11 @@ extern "C" { #endif // !defined(_di_f_cells_resize_) || !defined(_di_f_cells_append_) || !defined(_di_f_cells_decrease_by_) || !defined(_di_f_cellss_append_) #if !defined(_di_f_cellss_adjust_) || !defined(_di_f_cellss_decimate_by_) - f_status_t private_f_cellss_adjust(const f_array_length_t length, f_cellss_t *cellss) { + f_status_t private_f_cellss_adjust(const f_number_unsigned_t length, f_cellss_t *cellss) { f_status_t status = F_none; - for (f_array_length_t i = length; i < cellss->size; ++i) { + for (f_number_unsigned_t i = length; i < cellss->size; ++i) { status = f_memory_destroy(cellss->array[i].size, sizeof(f_cells_t), (void **) & cellss->array[i].array); if (F_status_is_error(status)) return status; @@ -98,11 +98,11 @@ extern "C" { #endif // !defined(_di_f_cellss_adjust_) || !defined(_di_f_cellss_decimate_by_) #if !defined(_di_f_cellss_decrease_by_) || !defined(_di_f_cellss_increase_) || !defined(_di_f_cellss_increase_by_) || !defined(_di_f_cellss_resize_) - f_status_t private_f_cellss_resize(const f_array_length_t length, f_cellss_t *cellss) { + f_status_t private_f_cellss_resize(const f_number_unsigned_t length, f_cellss_t *cellss) { f_status_t status = F_none; - for (f_array_length_t i = length; i < cellss->size; ++i) { + for (f_number_unsigned_t i = length; i < cellss->size; ++i) { status = f_memory_delete(cellss->array[i].size, sizeof(f_cells_t), (void **) & cellss->array[i].array); if (F_status_is_error(status)) return status; diff --git a/level_0/f_type_array/c/type_array/private-cell.h b/level_0/f_type_array/c/type_array/private-cell.h index cf910e1..adeb1fe 100644 --- a/level_0/f_type_array/c/type_array/private-cell.h +++ b/level_0/f_type_array/c/type_array/private-cell.h @@ -35,7 +35,7 @@ extern "C" { * @see f_cells_decimate_by() */ #if !defined(_di_f_cells_adjust_) || !defined(_di_f_cells_decimate_by_) - extern f_status_t private_f_cells_adjust(const f_array_length_t length, f_cells_t *cells) F_attribute_visibility_internal_d; + extern f_status_t private_f_cells_adjust(const f_number_unsigned_t length, f_cells_t *cells) F_attribute_visibility_internal_d; #endif // !defined(_di_f_cells_adjust_) || !defined(_di_f_cells_decimate_by_) /** @@ -107,7 +107,7 @@ extern "C" { * @see f_cellss_append() */ #if !defined(_di_f_cells_resize_) || !defined(_di_f_cells_append_) || !defined(_di_f_cells_decrease_by_) || !defined(_di_f_cellss_append_) - extern f_status_t private_f_cells_resize(const f_array_length_t length, f_cells_t *cells) F_attribute_visibility_internal_d; + extern f_status_t private_f_cells_resize(const f_number_unsigned_t length, f_cells_t *cells) F_attribute_visibility_internal_d; #endif // !defined(_di_f_cells_resize_) || !defined(_di_f_cells_append_) || !defined(_di_f_cells_decrease_by_) || !defined(_di_f_cellss_append_) /** @@ -135,7 +135,7 @@ extern "C" { * @see f_cellss_decimate_by() */ #if !defined(_di_f_cellss_adjust_) || !defined(_di_f_cellss_decimate_by_) - extern f_status_t private_f_cellss_adjust(const f_array_length_t length, f_cellss_t *cellss) F_attribute_visibility_internal_d; + extern f_status_t private_f_cellss_adjust(const f_number_unsigned_t length, f_cellss_t *cellss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_cellss_adjust_) || !defined(_di_f_cellss_decimate_by_) /** @@ -165,7 +165,7 @@ extern "C" { * @see f_cellss_resize() */ #if !defined(_di_f_cellss_decrease_by_) || !defined(_di_f_cellss_increase_) || !defined(_di_f_cellss_increase_by_) || !defined(_di_f_cellss_resize_) - extern f_status_t private_f_cellss_resize(const f_array_length_t length, f_cellss_t *cellss) F_attribute_visibility_internal_d; + extern f_status_t private_f_cellss_resize(const f_number_unsigned_t length, f_cellss_t *cellss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_cellss_decrease_by_) || !defined(_di_f_cellss_increase_) || !defined(_di_f_cellss_increase_by_) || !defined(_di_f_cellss_resize_) #ifdef __cplusplus diff --git a/level_0/f_type_array/c/type_array/private-fll_id.c b/level_0/f_type_array/c/type_array/private-fll_id.c index ee16a4a..c27880e 100644 --- a/level_0/f_type_array/c/type_array/private-fll_id.c +++ b/level_0/f_type_array/c/type_array/private-fll_id.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_f_fll_ids_adjust_) || !defined(_di_f_fll_ids_decimate_by_) - f_status_t private_f_fll_ids_adjust(const f_array_length_t length, f_fll_ids_t *ids) { + f_status_t private_f_fll_ids_adjust(const f_number_unsigned_t length, f_fll_ids_t *ids) { const f_status_t status = f_memory_adjust(ids->size, length, sizeof(f_fll_id_t), (void **) & ids->array); if (F_status_is_error(status)) return status; @@ -46,7 +46,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { memcpy(destination->array[destination->used].name, source.array[i].name, sizeof(char) * f_fll_id_name_length_d); @@ -59,7 +59,7 @@ extern "C" { #endif // !defined(_di_f_fll_ids_append_) || !defined(_di_f_fll_ids_append_all_) || !defined(_di_f_fll_idss_append_all_) #if !defined(_di_f_fll_ids_resize_) || !defined(_di_f_fll_ids_append_) || !defined(_di_f_fll_ids_decrease_by_) || !defined(_di_f_fll_idss_append_) - f_status_t private_f_fll_ids_resize(const f_array_length_t length, f_fll_ids_t *ids) { + f_status_t private_f_fll_ids_resize(const f_number_unsigned_t length, f_fll_ids_t *ids) { const f_status_t status = f_memory_resize(ids->size, length, sizeof(f_fll_id_t), (void **) & ids->array); if (F_status_is_error(status)) return status; @@ -75,11 +75,11 @@ extern "C" { #endif // !defined(_di_f_fll_ids_resize_) || !defined(_di_f_fll_ids_append_) || !defined(_di_f_fll_ids_decrease_by_) || !defined(_di_f_fll_idss_append_) #if !defined(_di_f_fll_idss_adjust_) || !defined(_di_f_fll_idss_decimate_by_) - f_status_t private_f_fll_idss_adjust(const f_array_length_t length, f_fll_idss_t *idss) { + f_status_t private_f_fll_idss_adjust(const f_number_unsigned_t length, f_fll_idss_t *idss) { f_status_t status = F_none; - for (f_array_length_t i = length; i < idss->size; ++i) { + for (f_number_unsigned_t i = length; i < idss->size; ++i) { status = f_memory_destroy(idss->array[i].size, sizeof(f_fll_ids_t), (void **) & idss->array[i].array); if (F_status_is_error(status)) return status; @@ -102,11 +102,11 @@ extern "C" { #endif // !defined(_di_f_fll_idss_adjust_) || !defined(_di_f_fll_idss_decimate_by_) #if !defined(_di_f_fll_idss_decrease_by_) || !defined(_di_f_fll_idss_increase_) || !defined(_di_f_fll_idss_increase_by_) || !defined(_di_f_fll_idss_resize_) - f_status_t private_f_fll_idss_resize(const f_array_length_t length, f_fll_idss_t *idss) { + f_status_t private_f_fll_idss_resize(const f_number_unsigned_t length, f_fll_idss_t *idss) { f_status_t status = F_none; - for (f_array_length_t i = length; i < idss->size; ++i) { + for (f_number_unsigned_t i = length; i < idss->size; ++i) { status = f_memory_delete(idss->array[i].size, sizeof(f_fll_ids_t), (void **) & idss->array[i].array); if (F_status_is_error(status)) return status; diff --git a/level_0/f_type_array/c/type_array/private-fll_id.h b/level_0/f_type_array/c/type_array/private-fll_id.h index 0334ae6..809e5f3 100644 --- a/level_0/f_type_array/c/type_array/private-fll_id.h +++ b/level_0/f_type_array/c/type_array/private-fll_id.h @@ -35,7 +35,7 @@ extern "C" { * @see f_fll_ids_decimate_by() */ #if !defined(_di_f_fll_ids_adjust_) || !defined(_di_f_fll_ids_decimate_by_) - extern f_status_t private_f_fll_ids_adjust(const f_array_length_t length, f_fll_ids_t *fll_ids) F_attribute_visibility_internal_d; + extern f_status_t private_f_fll_ids_adjust(const f_number_unsigned_t length, f_fll_ids_t *fll_ids) F_attribute_visibility_internal_d; #endif // !defined(_di_f_fll_ids_adjust_) || !defined(_di_f_fll_ids_decimate_by_) /** @@ -107,7 +107,7 @@ extern "C" { * @see f_fll_idss_append() */ #if !defined(_di_f_fll_ids_resize_) || !defined(_di_f_fll_ids_append_) || !defined(_di_f_fll_ids_decrease_by_) || !defined(_di_f_fll_idss_append_) - extern f_status_t private_f_fll_ids_resize(const f_array_length_t length, f_fll_ids_t *fll_ids) F_attribute_visibility_internal_d; + extern f_status_t private_f_fll_ids_resize(const f_number_unsigned_t length, f_fll_ids_t *fll_ids) F_attribute_visibility_internal_d; #endif // !defined(_di_f_fll_ids_resize_) || !defined(_di_f_fll_ids_append_) || !defined(_di_f_fll_ids_decrease_by_) || !defined(_di_f_fll_idss_append_) /** @@ -135,7 +135,7 @@ extern "C" { * @see f_fll_idss_decimate_by() */ #if !defined(_di_f_fll_idss_adjust_) || !defined(_di_f_fll_idss_decimate_by_) - extern f_status_t private_f_fll_idss_adjust(const f_array_length_t length, f_fll_idss_t *fll_idss) F_attribute_visibility_internal_d; + extern f_status_t private_f_fll_idss_adjust(const f_number_unsigned_t length, f_fll_idss_t *fll_idss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_fll_idss_adjust_) || !defined(_di_f_fll_idss_decimate_by_) /** @@ -165,7 +165,7 @@ extern "C" { * @see f_fll_idss_resize() */ #if !defined(_di_f_fll_idss_decrease_by_) || !defined(_di_f_fll_idss_increase_) || !defined(_di_f_fll_idss_increase_by_) || !defined(_di_f_fll_idss_resize_) - extern f_status_t private_f_fll_idss_resize(const f_array_length_t length, f_fll_idss_t *fll_idss) F_attribute_visibility_internal_d; + extern f_status_t private_f_fll_idss_resize(const f_number_unsigned_t length, f_fll_idss_t *fll_idss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_fll_idss_decrease_by_) || !defined(_di_f_fll_idss_increase_) || !defined(_di_f_fll_idss_increase_by_) || !defined(_di_f_fll_idss_resize_) #ifdef __cplusplus diff --git a/level_0/f_type_array/c/type_array/private-int128.c b/level_0/f_type_array/c/type_array/private-int128.c index d1be50c..9b660a0 100644 --- a/level_0/f_type_array/c/type_array/private-int128.c +++ b/level_0/f_type_array/c/type_array/private-int128.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_f_int128s_adjust_) || !defined(_di_f_int128s_decimate_by_) - f_status_t private_f_int128s_adjust(const f_array_length_t length, f_int128s_t *int128s) { + f_status_t private_f_int128s_adjust(const f_number_unsigned_t length, f_int128s_t *int128s) { const f_status_t status = f_memory_adjust(int128s->size, length, sizeof(f_int128s_t), (void **) & int128s->array); if (F_status_is_error(status)) return status; @@ -43,7 +43,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { destination->array[destination->used++] = source.array[i]; } // for @@ -52,7 +52,7 @@ extern "C" { #endif // !defined(_di_f_int128s_append_) || !defined(_di_f_int128s_append_all_) || !defined(_di_f_int128ss_append_all_) #if !defined(_di_f_int128s_resize_) || !defined(_di_f_int128s_append_) || !defined(_di_f_int128s_decrease_by_) || !defined(_di_f_int128ss_append_) - f_status_t private_f_int128s_resize(const f_array_length_t length, f_int128s_t *int128s) { + f_status_t private_f_int128s_resize(const f_number_unsigned_t length, f_int128s_t *int128s) { const f_status_t status = f_memory_resize(int128s->size, length, sizeof(f_int128s_t), (void **) & int128s->array); if (F_status_is_error(status)) return status; @@ -68,11 +68,11 @@ extern "C" { #endif // !defined(_di_f_int128s_resize_) || !defined(_di_f_int128s_append_) || !defined(_di_f_int128s_decrease_by_) || !defined(_di_f_int128ss_append_) #if !defined(_di_f_int128ss_adjust_) || !defined(_di_f_int128ss_decimate_by_) - f_status_t private_f_int128ss_adjust(const f_array_length_t length, f_int128ss_t *int128ss) { + f_status_t private_f_int128ss_adjust(const f_number_unsigned_t length, f_int128ss_t *int128ss) { f_status_t status = F_none; - for (f_array_length_t i = length; i < int128ss->size; ++i) { + for (f_number_unsigned_t i = length; i < int128ss->size; ++i) { status = f_memory_destroy(int128ss->array[i].size, sizeof(f_int128s_t), (void **) & int128ss->array[i].array); if (F_status_is_error(status)) return status; @@ -95,11 +95,11 @@ extern "C" { #endif // !defined(_di_f_int128ss_adjust_) || !defined(_di_f_int128ss_decimate_by_) #if !defined(_di_f_int128ss_decrease_by_) || !defined(_di_f_int128ss_increase_) || !defined(_di_f_int128ss_increase_by_) || !defined(_di_f_int128ss_resize_) - f_status_t private_f_int128ss_resize(const f_array_length_t length, f_int128ss_t *int128ss) { + f_status_t private_f_int128ss_resize(const f_number_unsigned_t length, f_int128ss_t *int128ss) { f_status_t status = F_none; - for (f_array_length_t i = length; i < int128ss->size; ++i) { + for (f_number_unsigned_t i = length; i < int128ss->size; ++i) { status = f_memory_delete(int128ss->array[i].size, sizeof(f_int128s_t), (void **) & int128ss->array[i].array); if (F_status_is_error(status)) return status; diff --git a/level_0/f_type_array/c/type_array/private-int128.h b/level_0/f_type_array/c/type_array/private-int128.h index 6d89008..f7a37c9 100644 --- a/level_0/f_type_array/c/type_array/private-int128.h +++ b/level_0/f_type_array/c/type_array/private-int128.h @@ -35,7 +35,7 @@ extern "C" { * @see f_int128s_decimate_by() */ #if !defined(_di_f_int128s_adjust_) || !defined(_di_f_int128s_decimate_by_) - extern f_status_t private_f_int128s_adjust(const f_array_length_t length, f_int128s_t *int128s) F_attribute_visibility_internal_d; + extern f_status_t private_f_int128s_adjust(const f_number_unsigned_t length, f_int128s_t *int128s) F_attribute_visibility_internal_d; #endif // !defined(_di_f_int128s_adjust_) || !defined(_di_f_int128s_decimate_by_) /** @@ -107,7 +107,7 @@ extern "C" { * @see f_int128ss_append() */ #if !defined(_di_f_int128s_resize_) || !defined(_di_f_int128s_append_) || !defined(_di_f_int128s_decrease_by_) || !defined(_di_f_int128ss_append_) - extern f_status_t private_f_int128s_resize(const f_array_length_t length, f_int128s_t *int128s) F_attribute_visibility_internal_d; + extern f_status_t private_f_int128s_resize(const f_number_unsigned_t length, f_int128s_t *int128s) F_attribute_visibility_internal_d; #endif // !defined(_di_f_int128s_resize_) || !defined(_di_f_int128s_append_) || !defined(_di_f_int128s_decrease_by_) || !defined(_di_f_int128ss_append_) /** @@ -135,7 +135,7 @@ extern "C" { * @see f_int128ss_decimate_by() */ #if !defined(_di_f_int128ss_adjust_) || !defined(_di_f_int128ss_decimate_by_) - extern f_status_t private_f_int128ss_adjust(const f_array_length_t length, f_int128ss_t *int128ss) F_attribute_visibility_internal_d; + extern f_status_t private_f_int128ss_adjust(const f_number_unsigned_t length, f_int128ss_t *int128ss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_int128ss_adjust_) || !defined(_di_f_int128ss_decimate_by_) /** @@ -165,7 +165,7 @@ extern "C" { * @see f_int128ss_resize() */ #if !defined(_di_f_int128ss_decrease_by_) || !defined(_di_f_int128ss_increase_) || !defined(_di_f_int128ss_increase_by_) || !defined(_di_f_int128ss_resize_) - extern f_status_t private_f_int128ss_resize(const f_array_length_t length, f_int128ss_t *int128ss) F_attribute_visibility_internal_d; + extern f_status_t private_f_int128ss_resize(const f_number_unsigned_t length, f_int128ss_t *int128ss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_int128ss_decrease_by_) || !defined(_di_f_int128ss_increase_) || !defined(_di_f_int128ss_increase_by_) || !defined(_di_f_int128ss_resize_) #ifdef __cplusplus diff --git a/level_0/f_type_array/c/type_array/private-int16.c b/level_0/f_type_array/c/type_array/private-int16.c index 756e8aa..bc17d25 100644 --- a/level_0/f_type_array/c/type_array/private-int16.c +++ b/level_0/f_type_array/c/type_array/private-int16.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_f_int16s_adjust_) || !defined(_di_f_int16s_decimate_by_) - f_status_t private_f_int16s_adjust(const f_array_length_t length, f_int16s_t *int16s) { + f_status_t private_f_int16s_adjust(const f_number_unsigned_t length, f_int16s_t *int16s) { const f_status_t status = f_memory_adjust(int16s->size, length, sizeof(int16_t), (void **) & int16s->array); if (F_status_is_error(status)) return status; @@ -43,7 +43,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { destination->array[destination->used++] = source.array[i]; } // for @@ -52,7 +52,7 @@ extern "C" { #endif // !defined(_di_f_int16s_append_) || !defined(_di_f_int16s_append_all_) || !defined(_di_f_int16ss_append_all_) #if !defined(_di_f_int16s_resize_) || !defined(_di_f_int16s_append_) || !defined(_di_f_int16s_decrease_by_) || !defined(_di_f_int16ss_append_) - f_status_t private_f_int16s_resize(const f_array_length_t length, f_int16s_t *int16s) { + f_status_t private_f_int16s_resize(const f_number_unsigned_t length, f_int16s_t *int16s) { const f_status_t status = f_memory_resize(int16s->size, length, sizeof(int16_t), (void **) & int16s->array); if (F_status_is_error(status)) return status; @@ -68,11 +68,11 @@ extern "C" { #endif // !defined(_di_f_int16s_resize_) || !defined(_di_f_int16s_append_) || !defined(_di_f_int16s_decrease_by_) || !defined(_di_f_int16ss_append_) #if !defined(_di_f_int16ss_adjust_) || !defined(_di_f_int16ss_decimate_by_) - f_status_t private_f_int16ss_adjust(const f_array_length_t length, f_int16ss_t *int16ss) { + f_status_t private_f_int16ss_adjust(const f_number_unsigned_t length, f_int16ss_t *int16ss) { f_status_t status = F_none; - for (f_array_length_t i = length; i < int16ss->size; ++i) { + for (f_number_unsigned_t i = length; i < int16ss->size; ++i) { status = f_memory_destroy(int16ss->array[i].size, sizeof(f_int16s_t), (void **) & int16ss->array[i].array); if (F_status_is_error(status)) return status; @@ -95,11 +95,11 @@ extern "C" { #endif // !defined(_di_f_int16ss_adjust_) || !defined(_di_f_int16ss_decimate_by_) #if !defined(_di_f_int16ss_decrease_by_) || !defined(_di_f_int16ss_increase_) || !defined(_di_f_int16ss_increase_by_) || !defined(_di_f_int16ss_resize_) - f_status_t private_f_int16ss_resize(const f_array_length_t length, f_int16ss_t *int16ss) { + f_status_t private_f_int16ss_resize(const f_number_unsigned_t length, f_int16ss_t *int16ss) { f_status_t status = F_none; - for (f_array_length_t i = length; i < int16ss->size; ++i) { + for (f_number_unsigned_t i = length; i < int16ss->size; ++i) { status = f_memory_delete(int16ss->array[i].size, sizeof(f_int16s_t), (void **) & int16ss->array[i].array); if (F_status_is_error(status)) return status; diff --git a/level_0/f_type_array/c/type_array/private-int16.h b/level_0/f_type_array/c/type_array/private-int16.h index 3a0a634..39030fe 100644 --- a/level_0/f_type_array/c/type_array/private-int16.h +++ b/level_0/f_type_array/c/type_array/private-int16.h @@ -35,7 +35,7 @@ extern "C" { * @see f_int16s_decimate_by() */ #if !defined(_di_f_int16s_adjust_) || !defined(_di_f_int16s_decimate_by_) - extern f_status_t private_f_int16s_adjust(const f_array_length_t length, f_int16s_t *int16s) F_attribute_visibility_internal_d; + extern f_status_t private_f_int16s_adjust(const f_number_unsigned_t length, f_int16s_t *int16s) F_attribute_visibility_internal_d; #endif // !defined(_di_f_int16s_adjust_) || !defined(_di_f_int16s_decimate_by_) /** @@ -107,7 +107,7 @@ extern "C" { * @see f_int16ss_append() */ #if !defined(_di_f_int16s_resize_) || !defined(_di_f_int16s_append_) || !defined(_di_f_int16s_decrease_by_) || !defined(_di_f_int16ss_append_) - extern f_status_t private_f_int16s_resize(const f_array_length_t length, f_int16s_t *int16s) F_attribute_visibility_internal_d; + extern f_status_t private_f_int16s_resize(const f_number_unsigned_t length, f_int16s_t *int16s) F_attribute_visibility_internal_d; #endif // !defined(_di_f_int16s_resize_) || !defined(_di_f_int16s_append_) || !defined(_di_f_int16s_decrease_by_) || !defined(_di_f_int16ss_append_) /** @@ -135,7 +135,7 @@ extern "C" { * @see f_int16ss_decimate_by() */ #if !defined(_di_f_int16ss_adjust_) || !defined(_di_f_int16ss_decimate_by_) - extern f_status_t private_f_int16ss_adjust(const f_array_length_t length, f_int16ss_t *int16ss) F_attribute_visibility_internal_d; + extern f_status_t private_f_int16ss_adjust(const f_number_unsigned_t length, f_int16ss_t *int16ss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_int16ss_adjust_) || !defined(_di_f_int16ss_decimate_by_) /** @@ -165,7 +165,7 @@ extern "C" { * @see f_int16ss_resize() */ #if !defined(_di_f_int16ss_decrease_by_) || !defined(_di_f_int16ss_increase_) || !defined(_di_f_int16ss_increase_by_) || !defined(_di_f_int16ss_resize_) - extern f_status_t private_f_int16ss_resize(const f_array_length_t length, f_int16ss_t *int16ss) F_attribute_visibility_internal_d; + extern f_status_t private_f_int16ss_resize(const f_number_unsigned_t length, f_int16ss_t *int16ss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_int16ss_decrease_by_) || !defined(_di_f_int16ss_increase_) || !defined(_di_f_int16ss_increase_by_) || !defined(_di_f_int16ss_resize_) #ifdef __cplusplus diff --git a/level_0/f_type_array/c/type_array/private-int32.c b/level_0/f_type_array/c/type_array/private-int32.c index b2010ea..9e5a5d7 100644 --- a/level_0/f_type_array/c/type_array/private-int32.c +++ b/level_0/f_type_array/c/type_array/private-int32.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_f_int32s_adjust_) || !defined(_di_f_int32s_decimate_by_) - f_status_t private_f_int32s_adjust(const f_array_length_t length, f_int32s_t *int32s) { + f_status_t private_f_int32s_adjust(const f_number_unsigned_t length, f_int32s_t *int32s) { const f_status_t status = f_memory_adjust(int32s->size, length, sizeof(int32_t), (void **) & int32s->array); if (F_status_is_error(status)) return status; @@ -43,7 +43,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { destination->array[destination->used++] = source.array[i]; } // for @@ -52,7 +52,7 @@ extern "C" { #endif // !defined(_di_f_int32s_append_) || !defined(_di_f_int32s_append_all_) || !defined(_di_f_int32ss_append_all_) #if !defined(_di_f_int32s_resize_) || !defined(_di_f_int32s_append_) || !defined(_di_f_int32s_decrease_by_) || !defined(_di_f_int32ss_append_) - f_status_t private_f_int32s_resize(const f_array_length_t length, f_int32s_t *int32s) { + f_status_t private_f_int32s_resize(const f_number_unsigned_t length, f_int32s_t *int32s) { const f_status_t status = f_memory_resize(int32s->size, length, sizeof(int32_t), (void **) & int32s->array); if (F_status_is_error(status)) return status; @@ -68,11 +68,11 @@ extern "C" { #endif // !defined(_di_f_int32s_resize_) || !defined(_di_f_int32s_append_) || !defined(_di_f_int32s_decrease_by_) || !defined(_di_f_int32ss_append_) #if !defined(_di_f_int32ss_adjust_) || !defined(_di_f_int32ss_decimate_by_) - f_status_t private_f_int32ss_adjust(const f_array_length_t length, f_int32ss_t *int32ss) { + f_status_t private_f_int32ss_adjust(const f_number_unsigned_t length, f_int32ss_t *int32ss) { f_status_t status = F_none; - for (f_array_length_t i = length; i < int32ss->size; ++i) { + for (f_number_unsigned_t i = length; i < int32ss->size; ++i) { status = f_memory_destroy(int32ss->array[i].size, sizeof(f_int32s_t), (void **) & int32ss->array[i].array); if (F_status_is_error(status)) return status; @@ -95,11 +95,11 @@ extern "C" { #endif // !defined(_di_f_int32ss_adjust_) || !defined(_di_f_int32ss_decimate_by_) #if !defined(_di_f_int32ss_decrease_by_) || !defined(_di_f_int32ss_increase_) || !defined(_di_f_int32ss_increase_by_) || !defined(_di_f_int32ss_resize_) - f_status_t private_f_int32ss_resize(const f_array_length_t length, f_int32ss_t *int32ss) { + f_status_t private_f_int32ss_resize(const f_number_unsigned_t length, f_int32ss_t *int32ss) { f_status_t status = F_none; - for (f_array_length_t i = length; i < int32ss->size; ++i) { + for (f_number_unsigned_t i = length; i < int32ss->size; ++i) { status = f_memory_delete(int32ss->array[i].size, sizeof(f_int32s_t), (void **) & int32ss->array[i].array); if (F_status_is_error(status)) return status; diff --git a/level_0/f_type_array/c/type_array/private-int32.h b/level_0/f_type_array/c/type_array/private-int32.h index 2452e0b..697813d 100644 --- a/level_0/f_type_array/c/type_array/private-int32.h +++ b/level_0/f_type_array/c/type_array/private-int32.h @@ -35,7 +35,7 @@ extern "C" { * @see f_int32s_decimate_by() */ #if !defined(_di_f_int32s_adjust_) || !defined(_di_f_int32s_decimate_by_) - extern f_status_t private_f_int32s_adjust(const f_array_length_t length, f_int32s_t *int32s) F_attribute_visibility_internal_d; + extern f_status_t private_f_int32s_adjust(const f_number_unsigned_t length, f_int32s_t *int32s) F_attribute_visibility_internal_d; #endif // !defined(_di_f_int32s_adjust_) || !defined(_di_f_int32s_decimate_by_) /** @@ -107,7 +107,7 @@ extern "C" { * @see f_int32ss_append() */ #if !defined(_di_f_int32s_resize_) || !defined(_di_f_int32s_append_) || !defined(_di_f_int32s_decrease_by_) || !defined(_di_f_int32ss_append_) - extern f_status_t private_f_int32s_resize(const f_array_length_t length, f_int32s_t *int32s) F_attribute_visibility_internal_d; + extern f_status_t private_f_int32s_resize(const f_number_unsigned_t length, f_int32s_t *int32s) F_attribute_visibility_internal_d; #endif // !defined(_di_f_int32s_resize_) || !defined(_di_f_int32s_append_) || !defined(_di_f_int32s_decrease_by_) || !defined(_di_f_int32ss_append_) /** @@ -135,7 +135,7 @@ extern "C" { * @see f_int32ss_decimate_by() */ #if !defined(_di_f_int32ss_adjust_) || !defined(_di_f_int32ss_decimate_by_) - extern f_status_t private_f_int32ss_adjust(const f_array_length_t length, f_int32ss_t *int32ss) F_attribute_visibility_internal_d; + extern f_status_t private_f_int32ss_adjust(const f_number_unsigned_t length, f_int32ss_t *int32ss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_int32ss_adjust_) || !defined(_di_f_int32ss_decimate_by_) /** @@ -165,7 +165,7 @@ extern "C" { * @see f_int32ss_resize() */ #if !defined(_di_f_int32ss_decrease_by_) || !defined(_di_f_int32ss_increase_) || !defined(_di_f_int32ss_increase_by_) || !defined(_di_f_int32ss_resize_) - extern f_status_t private_f_int32ss_resize(const f_array_length_t length, f_int32ss_t *int32ss) F_attribute_visibility_internal_d; + extern f_status_t private_f_int32ss_resize(const f_number_unsigned_t length, f_int32ss_t *int32ss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_int32ss_decrease_by_) || !defined(_di_f_int32ss_increase_) || !defined(_di_f_int32ss_increase_by_) || !defined(_di_f_int32ss_resize_) #ifdef __cplusplus diff --git a/level_0/f_type_array/c/type_array/private-int64.c b/level_0/f_type_array/c/type_array/private-int64.c index f566daf..d4c9f3e 100644 --- a/level_0/f_type_array/c/type_array/private-int64.c +++ b/level_0/f_type_array/c/type_array/private-int64.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_f_int64s_adjust_) || !defined(_di_f_int64s_decimate_by_) - f_status_t private_f_int64s_adjust(const f_array_length_t length, f_int64s_t *int64s) { + f_status_t private_f_int64s_adjust(const f_number_unsigned_t length, f_int64s_t *int64s) { const f_status_t status = f_memory_adjust(int64s->size, length, sizeof(int64_t), (void **) & int64s->array); if (F_status_is_error(status)) return status; @@ -43,7 +43,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { destination->array[destination->used++] = source.array[i]; } // for @@ -52,7 +52,7 @@ extern "C" { #endif // !defined(_di_f_int64s_append_) || !defined(_di_f_int64s_append_all_) || !defined(_di_f_int64ss_append_all_) #if !defined(_di_f_int64s_resize_) || !defined(_di_f_int64s_append_) || !defined(_di_f_int64s_decrease_by_) || !defined(_di_f_int64ss_append_) - f_status_t private_f_int64s_resize(const f_array_length_t length, f_int64s_t *int64s) { + f_status_t private_f_int64s_resize(const f_number_unsigned_t length, f_int64s_t *int64s) { const f_status_t status = f_memory_resize(int64s->size, length, sizeof(int64_t), (void **) & int64s->array); if (F_status_is_error(status)) return status; @@ -68,11 +68,11 @@ extern "C" { #endif // !defined(_di_f_int64s_resize_) || !defined(_di_f_int64s_append_) || !defined(_di_f_int64s_decrease_by_) || !defined(_di_f_int64ss_append_) #if !defined(_di_f_int64ss_adjust_) || !defined(_di_f_int64ss_decimate_by_) - f_status_t private_f_int64ss_adjust(const f_array_length_t length, f_int64ss_t *int64ss) { + f_status_t private_f_int64ss_adjust(const f_number_unsigned_t length, f_int64ss_t *int64ss) { f_status_t status = F_none; - for (f_array_length_t i = length; i < int64ss->size; ++i) { + for (f_number_unsigned_t i = length; i < int64ss->size; ++i) { status = f_memory_destroy(int64ss->array[i].size, sizeof(f_int64s_t), (void **) & int64ss->array[i].array); if (F_status_is_error(status)) return status; @@ -95,11 +95,11 @@ extern "C" { #endif // !defined(_di_f_int64ss_adjust_) || !defined(_di_f_int64ss_decimate_by_) #if !defined(_di_f_int64ss_decrease_by_) || !defined(_di_f_int64ss_increase_) || !defined(_di_f_int64ss_increase_by_) || !defined(_di_f_int64ss_resize_) - f_status_t private_f_int64ss_resize(const f_array_length_t length, f_int64ss_t *int64ss) { + f_status_t private_f_int64ss_resize(const f_number_unsigned_t length, f_int64ss_t *int64ss) { f_status_t status = F_none; - for (f_array_length_t i = length; i < int64ss->size; ++i) { + for (f_number_unsigned_t i = length; i < int64ss->size; ++i) { status = f_memory_delete(int64ss->array[i].size, sizeof(f_int64s_t), (void **) & int64ss->array[i].array); if (F_status_is_error(status)) return status; diff --git a/level_0/f_type_array/c/type_array/private-int64.h b/level_0/f_type_array/c/type_array/private-int64.h index 3fcbfbd..02183c6 100644 --- a/level_0/f_type_array/c/type_array/private-int64.h +++ b/level_0/f_type_array/c/type_array/private-int64.h @@ -35,7 +35,7 @@ extern "C" { * @see f_int64s_decimate_by() */ #if !defined(_di_f_int64s_adjust_) || !defined(_di_f_int64s_decimate_by_) - extern f_status_t private_f_int64s_adjust(const f_array_length_t length, f_int64s_t *int64s) F_attribute_visibility_internal_d; + extern f_status_t private_f_int64s_adjust(const f_number_unsigned_t length, f_int64s_t *int64s) F_attribute_visibility_internal_d; #endif // !defined(_di_f_int64s_adjust_) || !defined(_di_f_int64s_decimate_by_) /** @@ -107,7 +107,7 @@ extern "C" { * @see f_int64ss_append() */ #if !defined(_di_f_int64s_resize_) || !defined(_di_f_int64s_append_) || !defined(_di_f_int64s_decrease_by_) || !defined(_di_f_int64ss_append_) - extern f_status_t private_f_int64s_resize(const f_array_length_t length, f_int64s_t *int64s) F_attribute_visibility_internal_d; + extern f_status_t private_f_int64s_resize(const f_number_unsigned_t length, f_int64s_t *int64s) F_attribute_visibility_internal_d; #endif // !defined(_di_f_int64s_resize_) || !defined(_di_f_int64s_append_) || !defined(_di_f_int64s_decrease_by_) || !defined(_di_f_int64ss_append_) /** @@ -135,7 +135,7 @@ extern "C" { * @see f_int64ss_decimate_by() */ #if !defined(_di_f_int64ss_adjust_) || !defined(_di_f_int64ss_decimate_by_) - extern f_status_t private_f_int64ss_adjust(const f_array_length_t length, f_int64ss_t *int64ss) F_attribute_visibility_internal_d; + extern f_status_t private_f_int64ss_adjust(const f_number_unsigned_t length, f_int64ss_t *int64ss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_int64ss_adjust_) || !defined(_di_f_int64ss_decimate_by_) /** @@ -165,7 +165,7 @@ extern "C" { * @see f_int64ss_resize() */ #if !defined(_di_f_int64ss_decrease_by_) || !defined(_di_f_int64ss_increase_) || !defined(_di_f_int64ss_increase_by_) || !defined(_di_f_int64ss_resize_) - extern f_status_t private_f_int64ss_resize(const f_array_length_t length, f_int64ss_t *int64ss) F_attribute_visibility_internal_d; + extern f_status_t private_f_int64ss_resize(const f_number_unsigned_t length, f_int64ss_t *int64ss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_int64ss_decrease_by_) || !defined(_di_f_int64ss_increase_) || !defined(_di_f_int64ss_increase_by_) || !defined(_di_f_int64ss_resize_) #ifdef __cplusplus diff --git a/level_0/f_type_array/c/type_array/private-int8.c b/level_0/f_type_array/c/type_array/private-int8.c index 7b9020e..75308d9 100644 --- a/level_0/f_type_array/c/type_array/private-int8.c +++ b/level_0/f_type_array/c/type_array/private-int8.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_f_int8s_adjust_) || !defined(_di_f_int8s_decimate_by_) - f_status_t private_f_int8s_adjust(const f_array_length_t length, f_int8s_t *int8s) { + f_status_t private_f_int8s_adjust(const f_number_unsigned_t length, f_int8s_t *int8s) { const f_status_t status = f_memory_adjust(int8s->size, length, sizeof(int8_t), (void **) & int8s->array); if (F_status_is_error(status)) return status; @@ -43,7 +43,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { destination->array[destination->used++] = source.array[i]; } // for @@ -52,7 +52,7 @@ extern "C" { #endif // !defined(_di_f_int8s_append_) || !defined(_di_f_int8s_append_all_) || !defined(_di_f_int8ss_append_all_) #if !defined(_di_f_int8s_append_) || !defined(_di_f_int8s_append_all_) || !defined(_di_f_int8s_decrease_by_) || !defined(_di_f_int8s_increase_) || !defined(_di_f_int8s_increase_by_) || !defined(_di_f_int8s_resize_) || !defined(_di_f_int8ss_append_) || !defined(_di_f_int8ss_append_all_) - f_status_t private_f_int8s_resize(const f_array_length_t length, f_int8s_t *int8s) { + f_status_t private_f_int8s_resize(const f_number_unsigned_t length, f_int8s_t *int8s) { const f_status_t status = f_memory_resize(int8s->size, length, sizeof(int8_t), (void **) & int8s->array); if (F_status_is_error(status)) return status; @@ -68,11 +68,11 @@ extern "C" { #endif // !defined(_di_f_int8s_append_) || !defined(_di_f_int8s_append_all_) || !defined(_di_f_int8s_decrease_by_) || !defined(_di_f_int8s_increase_) || !defined(_di_f_int8s_increase_by_) || !defined(_di_f_int8s_resize_) || !defined(_di_f_int8ss_append_) || !defined(_di_f_int8ss_append_all_) #if !defined(_di_f_int8ss_adjust_) || !defined(_di_f_int8ss_decimate_by_) - f_status_t private_f_int8ss_adjust(const f_array_length_t length, f_int8ss_t *int8ss) { + f_status_t private_f_int8ss_adjust(const f_number_unsigned_t length, f_int8ss_t *int8ss) { f_status_t status = F_none; - for (f_array_length_t i = length; i < int8ss->size; ++i) { + for (f_number_unsigned_t i = length; i < int8ss->size; ++i) { status = f_memory_destroy(int8ss->array[i].size, sizeof(f_int8s_t), (void **) & int8ss->array[i].array); if (F_status_is_error(status)) return status; @@ -95,11 +95,11 @@ extern "C" { #endif // !defined(_di_f_int8ss_adjust_) || !defined(_di_f_int8ss_decimate_by_) #if !defined(_di_f_int8ss_decrease_by_) || !defined(_di_f_int8ss_increase_) || !defined(_di_f_int8ss_increase_by_) || !defined(_di_f_int8ss_resize_) - f_status_t private_f_int8ss_resize(const f_array_length_t length, f_int8ss_t *int8ss) { + f_status_t private_f_int8ss_resize(const f_number_unsigned_t length, f_int8ss_t *int8ss) { f_status_t status = F_none; - for (f_array_length_t i = length; i < int8ss->size; ++i) { + for (f_number_unsigned_t i = length; i < int8ss->size; ++i) { status = f_memory_delete(int8ss->array[i].size, sizeof(f_int8s_t), (void **) & int8ss->array[i].array); if (F_status_is_error(status)) return status; diff --git a/level_0/f_type_array/c/type_array/private-int8.h b/level_0/f_type_array/c/type_array/private-int8.h index 96d3961..361e63e 100644 --- a/level_0/f_type_array/c/type_array/private-int8.h +++ b/level_0/f_type_array/c/type_array/private-int8.h @@ -35,7 +35,7 @@ extern "C" { * @see f_int8s_decimate_by() */ #if !defined(_di_f_int8s_adjust_) || !defined(_di_f_int8s_decimate_by_) - extern f_status_t private_f_int8s_adjust(const f_array_length_t length, f_int8s_t *int8s) F_attribute_visibility_internal_d; + extern f_status_t private_f_int8s_adjust(const f_number_unsigned_t length, f_int8s_t *int8s) F_attribute_visibility_internal_d; #endif // !defined(_di_f_int8s_adjust_) || !defined(_di_f_int8s_decimate_by_) /** @@ -112,7 +112,7 @@ extern "C" { * */ #if !defined(_di_f_int8s_append_) || !defined(_di_f_int8s_append_all_) || !defined(_di_f_int8s_decrease_by_) || !defined(_di_f_int8s_increase_) || !defined(_di_f_int8s_increase_by_) || !defined(_di_f_int8s_resize_) || !defined(_di_f_int8ss_append_) || !defined(_di_f_int8ss_append_all_) - extern f_status_t private_f_int8s_resize(const f_array_length_t length, f_int8s_t *int8s) F_attribute_visibility_internal_d; + extern f_status_t private_f_int8s_resize(const f_number_unsigned_t length, f_int8s_t *int8s) F_attribute_visibility_internal_d; #endif // !defined(_di_f_int8s_append_) || !defined(_di_f_int8s_append_all_) || !defined(_di_f_int8s_decrease_by_) || !defined(_di_f_int8s_increase_) || !defined(_di_f_int8s_increase_by_) || !defined(_di_f_int8s_resize_) || !defined(_di_f_int8ss_append_) || !defined(_di_f_int8ss_append_all_) /** @@ -140,7 +140,7 @@ extern "C" { * @see f_int8ss_decimate_by() */ #if !defined(_di_f_int8ss_adjust_) || !defined(_di_f_int8ss_decimate_by_) - extern f_status_t private_f_int8ss_adjust(const f_array_length_t length, f_int8ss_t *int8ss) F_attribute_visibility_internal_d; + extern f_status_t private_f_int8ss_adjust(const f_number_unsigned_t length, f_int8ss_t *int8ss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_int8ss_adjust_) || !defined(_di_f_int8ss_decimate_by_) /** @@ -170,7 +170,7 @@ extern "C" { * @see f_int8ss_resize() */ #if !defined(_di_f_int8ss_decrease_by_) || !defined(_di_f_int8ss_increase_) || !defined(_di_f_int8ss_increase_by_) || !defined(_di_f_int8ss_resize_) - extern f_status_t private_f_int8ss_resize(const f_array_length_t length, f_int8ss_t *int8ss) F_attribute_visibility_internal_d; + extern f_status_t private_f_int8ss_resize(const f_number_unsigned_t length, f_int8ss_t *int8ss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_int8ss_decrease_by_) || !defined(_di_f_int8ss_increase_) || !defined(_di_f_int8ss_increase_by_) || !defined(_di_f_int8ss_resize_) #ifdef __cplusplus diff --git a/level_0/f_type_array/c/type_array/private-number_unsigned.c b/level_0/f_type_array/c/type_array/private-number_unsigned.c new file mode 100644 index 0000000..b0dca1e --- /dev/null +++ b/level_0/f_type_array/c/type_array/private-number_unsigned.c @@ -0,0 +1,126 @@ +#include "../type_array.h" +#include "private-number_unsigned.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#if !defined(_di_f_number_unsigneds_adjust_) || !defined(_di_f_number_unsigneds_decimate_by_) + f_status_t private_f_number_unsigneds_adjust(const f_number_unsigned_t length, f_number_unsigneds_t *number_unsigneds) { + + const f_status_t status = f_memory_adjust(number_unsigneds->size, length, sizeof(f_number_unsigned_t), (void **) & number_unsigneds->array); + if (F_status_is_error(status)) return status; + + number_unsigneds->size = length; + + if (number_unsigneds->used > number_unsigneds->size) { + number_unsigneds->used = length; + } + + return F_none; + } +#endif // !defined(_di_f_number_unsigneds_adjust_) || !defined(_di_f_number_unsigneds_decimate_by_) + +#if !defined(_di_f_number_unsigneds_append_) || !defined(_di_f_number_unsignedss_append_) + extern f_status_t private_f_number_unsigneds_append(const f_number_unsigned_t source, f_number_unsigneds_t *destination) { + + if (destination->used + 1 > destination->size) { + const f_status_t status = private_f_number_unsigneds_resize(destination->used + F_memory_default_allocation_small_d, destination); + if (F_status_is_error(status)) return status; + } + + destination->array[destination->used++] = source; + + return F_none; + } +#endif // !defined(_di_f_number_unsigneds_append_) || !defined(_di_f_number_unsignedss_append_) + +#if !defined(_di_f_number_unsigneds_append_) || !defined(_di_f_number_unsigneds_append_all_) || !defined(_di_f_number_unsignedss_append_all_) + extern f_status_t private_f_number_unsigneds_append_all(const f_number_unsigneds_t source, f_number_unsigneds_t *destination) { + + if (destination->used + source.used > destination->size) { + const f_status_t status = private_f_number_unsigneds_resize(destination->used + source.used, destination); + if (F_status_is_error(status)) return status; + } + + for (f_number_unsigned_t i = 0; i < source.used; ++i) { + destination->array[destination->used++] = source.array[i]; + } // for + + return F_none; + } +#endif // !defined(_di_f_number_unsigneds_append_) || !defined(_di_f_number_unsigneds_append_all_) || !defined(_di_f_number_unsignedss_append_all_) + +#if !defined(_di_f_number_unsigneds_resize_) || !defined(_di_f_number_unsigneds_append_) || !defined(_di_f_number_unsigneds_decrease_by_) || !defined(_di_f_number_unsignedss_append_) + f_status_t private_f_number_unsigneds_resize(const f_number_unsigned_t length, f_number_unsigneds_t *lengths) { + + const f_status_t status = f_memory_resize(lengths->size, length, sizeof(f_number_unsigned_t), (void **) & lengths->array); + if (F_status_is_error(status)) return status; + + lengths->size = length; + + if (lengths->used > lengths->size) { + lengths->used = length; + } + + return F_none; + } +#endif // !defined(_di_f_number_unsigneds_resize_) || !defined(_di_f_number_unsigneds_append_) || !defined(_di_f_number_unsigneds_decrease_by_) || !defined(_di_f_number_unsignedss_append_) + +#if !defined(_di_f_number_unsignedss_adjust_) || !defined(_di_f_number_unsignedss_decimate_by_) + f_status_t private_f_number_unsignedss_adjust(const f_number_unsigned_t length, f_number_unsignedss_t *lengthss) { + + f_status_t status = F_none; + + for (f_number_unsigned_t i = length; i < lengthss->size; ++i) { + + status = f_memory_destroy(lengthss->array[i].size, sizeof(f_number_unsigneds_t), (void **) & lengthss->array[i].array); + if (F_status_is_error(status)) return status; + + lengthss->array[i].size = 0; + lengthss->array[i].used = 0; + } // for + + status = f_memory_adjust(lengthss->size, length, sizeof(f_number_unsigneds_t), (void **) & lengthss->array); + if (F_status_is_error(status)) return status; + + lengthss->size = length; + + if (lengthss->used > lengthss->size) { + lengthss->used = length; + } + + return F_none; + } +#endif // !defined(_di_f_number_unsignedss_adjust_) || !defined(_di_f_number_unsignedss_decimate_by_) + +#if !defined(_di_f_number_unsignedss_decrease_by_) || !defined(_di_f_number_unsignedss_increase_) || !defined(_di_f_number_unsignedss_increase_by_) || !defined(_di_f_number_unsignedss_resize_) + f_status_t private_f_number_unsignedss_resize(const f_number_unsigned_t length, f_number_unsignedss_t *lengthss) { + + f_status_t status = F_none; + + for (f_number_unsigned_t i = length; i < lengthss->size; ++i) { + + status = f_memory_delete(lengthss->array[i].size, sizeof(f_number_unsigneds_t), (void **) & lengthss->array[i].array); + if (F_status_is_error(status)) return status; + + lengthss->array[i].size = 0; + lengthss->array[i].used = 0; + } // for + + status = f_memory_resize(lengthss->size, length, sizeof(f_number_unsigneds_t), (void **) & lengthss->array); + if (F_status_is_error(status)) return status; + + lengthss->size = length; + + if (lengthss->used > lengthss->size) { + lengthss->used = length; + } + + return F_none; + } +#endif // !defined(_di_f_number_unsignedss_decrease_by_) || !defined(_di_f_number_unsignedss_increase_) || !defined(_di_f_number_unsignedss_increase_by_) || !defined(_di_f_number_unsignedss_resize_) + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/level_0/f_type_array/c/type_array/private-number_unsigned.h b/level_0/f_type_array/c/type_array/private-number_unsigned.h new file mode 100644 index 0000000..a607e49 --- /dev/null +++ b/level_0/f_type_array/c/type_array/private-number_unsigned.h @@ -0,0 +1,175 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * These are provided for internal reduction in redundant code. + * These should not be exposed/used outside of this project. + */ +#ifndef _PRIVATE_F_type_array_number_unsigned_h +#define _PRIVATE_F_type_array_number_unsigned_h + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * Private implementation for resizing the number array. + * + * Intended to be shared to each of the different implementation variations. + * + * @param length + * The length to adjust to. + * @param lengths + * The lengths array to adjust. + * + * @return + * F_none on success. + * F_data_not on success, but there is no reason to increase size (used + 1 <= size). + * + * Errors (with error bit) from: f_memory_adjust(). + * + * @see f_number_unsigneds_adjust() + * @see f_number_unsigneds_decimate_by() + */ +#if !defined(_di_f_number_unsigneds_adjust_) || !defined(_di_f_number_unsigneds_decimate_by_) + extern f_status_t private_f_number_unsigneds_adjust(const f_number_unsigned_t length, f_number_unsigneds_t *lengths) F_attribute_visibility_internal_d; +#endif // !defined(_di_f_number_unsigneds_adjust_) || !defined(_di_f_number_unsigneds_decimate_by_) + +/** + * Private implementation for appending the number array. + * + * Intended to be shared to each of the different implementation variations. + * + * @param source + * The source number_unsigned to append. + * @param destination + * The destination lengths the source is appended onto. + * + * @return + * F_none on success. + * + * Errors (with error bit) from: f_memory_resize(). + * + * @see f_memory_resize() + * @see f_number_unsigneds_append() + * @see f_number_unsignedss_append() + */ +#if !defined(_di_f_number_unsigneds_append_) || !defined(_di_f_number_unsignedss_append_) + extern f_status_t private_f_number_unsigneds_append(const f_number_unsigned_t source, f_number_unsigneds_t *destination) F_attribute_visibility_internal_d; +#endif // !defined(_di_f_number_unsigneds_append_) || !defined(_di_f_number_unsignedss_append_) + +/** + * Private implementation for appending the number array. + * + * Intended to be shared to each of the different implementation variations. + * + * @param source + * The source number_unsigneds to append. + * @param destination + * The destination lengths the source is appended onto. + * + * @return + * F_none on success. + * + * Errors (with error bit) from: f_memory_resize(). + * + * @see f_memory_resize() + * @see f_number_unsigneds_append_all() + * @see f_number_unsignedss_append() + * @see f_number_unsignedss_append_all() + */ +#if !defined(_di_f_number_unsigneds_append_) || !defined(_di_f_number_unsigneds_append_all_) || !defined(_di_f_number_unsignedss_append_all_) + extern f_status_t private_f_number_unsigneds_append_all(const f_number_unsigneds_t source, f_number_unsigneds_t *destination) F_attribute_visibility_internal_d; +#endif // !defined(_di_f_number_unsigneds_append_) || !defined(_di_f_number_unsigneds_append_all_) || !defined(_di_f_number_unsignedss_append_all_) + +/** + * Private implementation for resizing the number array. + * + * Intended to be shared to each of the different implementation variations. + * + * @param length + * The length to adjust to. + * @param lengths + * The lengths array to adjust. + * + * @return + * F_none on success. + * F_data_not on success, but there is no reason to increase size (used + 1 <= size). + * + * Errors (with error bit) from: f_memory_resize(). + * + * @see f_number_unsigneds_resize() + * @see f_number_unsigneds_append() + * @see f_number_unsigneds_decrease_by() + * @see f_number_unsignedss_append() + */ +#if !defined(_di_f_number_unsigneds_resize_) || !defined(_di_f_number_unsigneds_append_) || !defined(_di_f_number_unsigneds_decrease_by_) || !defined(_di_f_number_unsignedss_append_) + extern f_status_t private_f_number_unsigneds_resize(const f_number_unsigned_t length, f_number_unsigneds_t *lengths) F_attribute_visibility_internal_d; +#endif // !defined(_di_f_number_unsigneds_resize_) || !defined(_di_f_number_unsigneds_append_) || !defined(_di_f_number_unsigneds_decrease_by_) || !defined(_di_f_number_unsignedss_append_) + +/** + * Private implementation for resizing the number array. + * + * Intended to be shared to each of the different implementation variations. + * + * @param length + * The length to adjust to. + * @param lengthss + * The number array to adjust. + * + * @return + * F_none on success. + * F_data_not on success, but there is no reason to increase size (used + 1 <= size). + * + * F_array_too_large (with error bit) if new length is larger than max array length. + * F_memory_not (with error bit) on out of memory. + * F_parameter (with error bit) if a parameter is invalid. + * + * Errors (with error bit) from: f_memory_adjust(). + * Errors (with error bit) from: f_memory_destroy(). + * + * @see f_number_unsignedss_adjust() + * @see f_number_unsignedss_decimate_by() + */ +#if !defined(_di_f_number_unsignedss_adjust_) || !defined(_di_f_number_unsignedss_decimate_by_) + extern f_status_t private_f_number_unsignedss_adjust(const f_number_unsigned_t length, f_number_unsignedss_t *lengthss) F_attribute_visibility_internal_d; +#endif // !defined(_di_f_number_unsignedss_adjust_) || !defined(_di_f_number_unsignedss_decimate_by_) + +/** + * Private implementation for resizing the number array. + * + * Intended to be shared to each of the different implementation variations. + * + * @param length + * The length to resize to. + * @param lengthss + * The number array to resize. + * + * @return + * F_none on success. + * F_data_not on success, but there is no reason to increase size (used + 1 <= size). + * + * F_array_too_large (with error bit) if new length is larger than max array length. + * F_memory_not (with error bit) on out of memory. + * F_parameter (with error bit) if a parameter is invalid. + * + * Errors (with error bit) from: f_memory_delete(). + * Errors (with error bit) from: f_memory_resize(). + * + * @see f_number_unsignedss_decrease_by() + * @see f_number_unsignedss_increase() + * @see f_number_unsignedss_increase_by() + * @see f_number_unsignedss_resize() + */ +#if !defined(_di_f_number_unsignedss_decrease_by_) || !defined(_di_f_number_unsignedss_increase_) || !defined(_di_f_number_unsignedss_increase_by_) || !defined(_di_f_number_unsignedss_resize_) + extern f_status_t private_f_number_unsignedss_resize(const f_number_unsigned_t length, f_number_unsignedss_t *lengthss) F_attribute_visibility_internal_d; +#endif // !defined(_di_f_number_unsignedss_decrease_by_) || !defined(_di_f_number_unsignedss_increase_) || !defined(_di_f_number_unsignedss_increase_by_) || !defined(_di_f_number_unsignedss_resize_) + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // _PRIVATE_F_type_array_number_unsigned_h diff --git a/level_0/f_type_array/c/type_array/private-state.c b/level_0/f_type_array/c/type_array/private-state.c index 480308b..5976fae 100644 --- a/level_0/f_type_array/c/type_array/private-state.c +++ b/level_0/f_type_array/c/type_array/private-state.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_f_states_adjust_) || !defined(_di_f_states_decimate_by_) - f_status_t private_f_states_adjust(const f_array_length_t length, f_states_t *states) { + f_status_t private_f_states_adjust(const f_number_unsigned_t length, f_states_t *states) { const f_status_t status = f_memory_adjust(states->size, length, sizeof(f_state_t), (void **) & states->array); if (F_status_is_error(status)) return status; @@ -51,7 +51,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { destination->array[destination->used].step_large = source.array[i].step_large; destination->array[destination->used].step_small = source.array[i].step_small; @@ -69,7 +69,7 @@ extern "C" { #endif // !defined(_di_f_states_append_) || !defined(_di_f_states_append_all_) || !defined(_di_f_statess_append_all_) #if !defined(_di_f_states_resize_) || !defined(_di_f_states_append_) || !defined(_di_f_states_decrease_by_) || !defined(_di_f_statess_append_) - f_status_t private_f_states_resize(const f_array_length_t length, f_states_t *states) { + f_status_t private_f_states_resize(const f_number_unsigned_t length, f_states_t *states) { const f_status_t status = f_memory_resize(states->size, length, sizeof(f_state_t), (void **) & states->array); if (F_status_is_error(status)) return status; @@ -85,11 +85,11 @@ extern "C" { #endif // !defined(_di_f_states_resize_) || !defined(_di_f_states_append_) || !defined(_di_f_states_decrease_by_) || !defined(_di_f_statess_append_) #if !defined(_di_f_statess_adjust_) || !defined(_di_f_statess_decimate_by_) - f_status_t private_f_statess_adjust(const f_array_length_t length, f_statess_t *statess) { + f_status_t private_f_statess_adjust(const f_number_unsigned_t length, f_statess_t *statess) { f_status_t status = F_none; - for (f_array_length_t i = length; i < statess->size; ++i) { + for (f_number_unsigned_t i = length; i < statess->size; ++i) { status = f_memory_destroy(statess->array[i].size, sizeof(f_states_t), (void **) & statess->array[i].array); if (F_status_is_error(status)) return status; @@ -112,11 +112,11 @@ extern "C" { #endif // !defined(_di_f_statess_adjust_) || !defined(_di_f_statess_decimate_by_) #if !defined(_di_f_statess_decrease_by_) || !defined(_di_f_statess_increase_) || !defined(_di_f_statess_increase_by_) || !defined(_di_f_statess_resize_) - f_status_t private_f_statess_resize(const f_array_length_t length, f_statess_t *statess) { + f_status_t private_f_statess_resize(const f_number_unsigned_t length, f_statess_t *statess) { f_status_t status = F_none; - for (f_array_length_t i = length; i < statess->size; ++i) { + for (f_number_unsigned_t i = length; i < statess->size; ++i) { status = f_memory_delete(statess->array[i].size, sizeof(f_states_t), (void **) & statess->array[i].array); if (F_status_is_error(status)) return status; diff --git a/level_0/f_type_array/c/type_array/private-state.h b/level_0/f_type_array/c/type_array/private-state.h index 1e54493..b42fd3c 100644 --- a/level_0/f_type_array/c/type_array/private-state.h +++ b/level_0/f_type_array/c/type_array/private-state.h @@ -35,7 +35,7 @@ extern "C" { * @see f_states_decimate_by() */ #if !defined(_di_f_states_adjust_) || !defined(_di_f_states_decimate_by_) - extern f_status_t private_f_states_adjust(const f_array_length_t length, f_states_t *states) F_attribute_visibility_internal_d; + extern f_status_t private_f_states_adjust(const f_number_unsigned_t length, f_states_t *states) F_attribute_visibility_internal_d; #endif // !defined(_di_f_states_adjust_) || !defined(_di_f_states_decimate_by_) /** @@ -107,7 +107,7 @@ extern "C" { * @see f_statess_append() */ #if !defined(_di_f_states_resize_) || !defined(_di_f_states_append_) || !defined(_di_f_states_decrease_by_) || !defined(_di_f_statess_append_) - extern f_status_t private_f_states_resize(const f_array_length_t length, f_states_t *states) F_attribute_visibility_internal_d; + extern f_status_t private_f_states_resize(const f_number_unsigned_t length, f_states_t *states) F_attribute_visibility_internal_d; #endif // !defined(_di_f_states_resize_) || !defined(_di_f_states_append_) || !defined(_di_f_states_decrease_by_) || !defined(_di_f_statess_append_) /** @@ -135,7 +135,7 @@ extern "C" { * @see f_statess_decimate_by() */ #if !defined(_di_f_statess_adjust_) || !defined(_di_f_statess_decimate_by_) - extern f_status_t private_f_statess_adjust(const f_array_length_t length, f_statess_t *statess) F_attribute_visibility_internal_d; + extern f_status_t private_f_statess_adjust(const f_number_unsigned_t length, f_statess_t *statess) F_attribute_visibility_internal_d; #endif // !defined(_di_f_statess_adjust_) || !defined(_di_f_statess_decimate_by_) /** @@ -165,7 +165,7 @@ extern "C" { * @see f_statess_resize() */ #if !defined(_di_f_statess_decrease_by_) || !defined(_di_f_statess_increase_) || !defined(_di_f_statess_increase_by_) || !defined(_di_f_statess_resize_) - extern f_status_t private_f_statess_resize(const f_array_length_t length, f_statess_t *statess) F_attribute_visibility_internal_d; + extern f_status_t private_f_statess_resize(const f_number_unsigned_t length, f_statess_t *statess) F_attribute_visibility_internal_d; #endif // !defined(_di_f_statess_decrease_by_) || !defined(_di_f_statess_increase_) || !defined(_di_f_statess_increase_by_) || !defined(_di_f_statess_resize_) #ifdef __cplusplus diff --git a/level_0/f_type_array/c/type_array/private-status.c b/level_0/f_type_array/c/type_array/private-status.c index 378cba0..f65223a 100644 --- a/level_0/f_type_array/c/type_array/private-status.c +++ b/level_0/f_type_array/c/type_array/private-status.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_f_statuss_adjust_) || !defined(_di_f_statuss_decimate_by_) - f_status_t private_f_statuss_adjust(const f_array_length_t length, f_statuss_t *statuss) { + f_status_t private_f_statuss_adjust(const f_number_unsigned_t length, f_statuss_t *statuss) { const f_status_t status = f_memory_adjust(statuss->size, length, sizeof(f_status_t), (void **) & statuss->array); if (F_status_is_error(status)) return status; @@ -43,7 +43,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { destination->array[destination->used++] = source.array[i]; } // for @@ -52,7 +52,7 @@ extern "C" { #endif // !defined(_di_f_statuss_append_) || !defined(_di_f_statuss_append_all_) || !defined(_di_f_statusss_append_all_) #if !defined(_di_f_statuss_resize_) || !defined(_di_f_statuss_append_) || !defined(_di_f_statuss_decrease_by_) || !defined(_di_f_statusss_append_) - f_status_t private_f_statuss_resize(const f_array_length_t length, f_statuss_t *statuss) { + f_status_t private_f_statuss_resize(const f_number_unsigned_t length, f_statuss_t *statuss) { const f_status_t status = f_memory_resize(statuss->size, length, sizeof(f_status_t), (void **) & statuss->array); if (F_status_is_error(status)) return status; @@ -68,11 +68,11 @@ extern "C" { #endif // !defined(_di_f_statuss_resize_) || !defined(_di_f_statuss_append_) || !defined(_di_f_statuss_decrease_by_) || !defined(_di_f_statusss_append_) #if !defined(_di_f_statusss_adjust_) || !defined(_di_f_statusss_decimate_by_) - f_status_t private_f_statusss_adjust(const f_array_length_t length, f_statusss_t *statusss) { + f_status_t private_f_statusss_adjust(const f_number_unsigned_t length, f_statusss_t *statusss) { f_status_t status = F_none; - for (f_array_length_t i = length; i < statusss->size; ++i) { + for (f_number_unsigned_t i = length; i < statusss->size; ++i) { status = f_memory_destroy(statusss->array[i].size, sizeof(f_statuss_t), (void **) & statusss->array[i].array); if (F_status_is_error(status)) return status; @@ -95,11 +95,11 @@ extern "C" { #endif // !defined(_di_f_statusss_adjust_) || !defined(_di_f_statusss_decimate_by_) #if !defined(_di_f_statusss_decrease_by_) || !defined(_di_f_statusss_increase_) || !defined(_di_f_statusss_increase_by_) || !defined(_di_f_statusss_resize_) - f_status_t private_f_statusss_resize(const f_array_length_t length, f_statusss_t *statusss) { + f_status_t private_f_statusss_resize(const f_number_unsigned_t length, f_statusss_t *statusss) { f_status_t status = F_none; - for (f_array_length_t i = length; i < statusss->size; ++i) { + for (f_number_unsigned_t i = length; i < statusss->size; ++i) { status = f_memory_delete(statusss->array[i].size, sizeof(f_statuss_t), (void **) & statusss->array[i].array); if (F_status_is_error(status)) return status; diff --git a/level_0/f_type_array/c/type_array/private-status.h b/level_0/f_type_array/c/type_array/private-status.h index 9e963c6..35f7f5b 100644 --- a/level_0/f_type_array/c/type_array/private-status.h +++ b/level_0/f_type_array/c/type_array/private-status.h @@ -35,7 +35,7 @@ extern "C" { * @see f_statuss_decimate_by() */ #if !defined(_di_f_statuss_adjust_) || !defined(_di_f_statuss_decimate_by_) - extern f_status_t private_f_statuss_adjust(const f_array_length_t length, f_statuss_t *statuss) F_attribute_visibility_internal_d; + extern f_status_t private_f_statuss_adjust(const f_number_unsigned_t length, f_statuss_t *statuss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_statuss_adjust_) || !defined(_di_f_statuss_decimate_by_) /** @@ -107,7 +107,7 @@ extern "C" { * @see f_statusss_append() */ #if !defined(_di_f_statuss_resize_) || !defined(_di_f_statuss_append_) || !defined(_di_f_statuss_decrease_by_) || !defined(_di_f_statusss_append_) - extern f_status_t private_f_statuss_resize(const f_array_length_t length, f_statuss_t *statuss) F_attribute_visibility_internal_d; + extern f_status_t private_f_statuss_resize(const f_number_unsigned_t length, f_statuss_t *statuss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_statuss_resize_) || !defined(_di_f_statuss_append_) || !defined(_di_f_statuss_decrease_by_) || !defined(_di_f_statusss_append_) /** @@ -135,7 +135,7 @@ extern "C" { * @see f_statusss_decimate_by() */ #if !defined(_di_f_statusss_adjust_) || !defined(_di_f_statusss_decimate_by_) - extern f_status_t private_f_statusss_adjust(const f_array_length_t length, f_statusss_t *statusss) F_attribute_visibility_internal_d; + extern f_status_t private_f_statusss_adjust(const f_number_unsigned_t length, f_statusss_t *statusss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_statusss_adjust_) || !defined(_di_f_statusss_decimate_by_) /** @@ -165,7 +165,7 @@ extern "C" { * @see f_statusss_resize() */ #if !defined(_di_f_statusss_decrease_by_) || !defined(_di_f_statusss_increase_) || !defined(_di_f_statusss_increase_by_) || !defined(_di_f_statusss_resize_) - extern f_status_t private_f_statusss_resize(const f_array_length_t length, f_statusss_t *statusss) F_attribute_visibility_internal_d; + extern f_status_t private_f_statusss_resize(const f_number_unsigned_t length, f_statusss_t *statusss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_statusss_decrease_by_) || !defined(_di_f_statusss_increase_) || !defined(_di_f_statusss_increase_by_) || !defined(_di_f_statusss_resize_) #ifdef __cplusplus diff --git a/level_0/f_type_array/c/type_array/private-uint128.c b/level_0/f_type_array/c/type_array/private-uint128.c index c73662c..e8b4f6f 100644 --- a/level_0/f_type_array/c/type_array/private-uint128.c +++ b/level_0/f_type_array/c/type_array/private-uint128.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_f_uint128s_adjust_) || !defined(_di_f_uint128s_decimate_by_) - f_status_t private_f_uint128s_adjust(const f_array_length_t length, f_uint128s_t *uint128s) { + f_status_t private_f_uint128s_adjust(const f_number_unsigned_t length, f_uint128s_t *uint128s) { const f_status_t status = f_memory_adjust(uint128s->size, length, sizeof(f_uint128s_t), (void **) & uint128s->array); if (F_status_is_error(status)) return status; @@ -43,7 +43,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { destination->array[destination->used++] = source.array[i]; } // for @@ -52,7 +52,7 @@ extern "C" { #endif // !defined(_di_f_uint128s_append_) || !defined(_di_f_uint128s_append_all_) || !defined(_di_f_uint128ss_append_all_) #if !defined(_di_f_uint128s_resize_) || !defined(_di_f_uint128s_append_) || !defined(_di_f_uint128s_decrease_by_) || !defined(_di_f_uint128ss_append_) - f_status_t private_f_uint128s_resize(const f_array_length_t length, f_uint128s_t *uint128s) { + f_status_t private_f_uint128s_resize(const f_number_unsigned_t length, f_uint128s_t *uint128s) { const f_status_t status = f_memory_resize(uint128s->size, length, sizeof(f_uint128s_t), (void **) & uint128s->array); if (F_status_is_error(status)) return status; @@ -68,11 +68,11 @@ extern "C" { #endif // !defined(_di_f_uint128s_resize_) || !defined(_di_f_uint128s_append_) || !defined(_di_f_uint128s_decrease_by_) || !defined(_di_f_uint128ss_append_) #if !defined(_di_f_uint128ss_adjust_) || !defined(_di_f_uint128ss_decimate_by_) - f_status_t private_f_uint128ss_adjust(const f_array_length_t length, f_uint128ss_t *uint128ss) { + f_status_t private_f_uint128ss_adjust(const f_number_unsigned_t length, f_uint128ss_t *uint128ss) { f_status_t status = F_none; - for (f_array_length_t i = length; i < uint128ss->size; ++i) { + for (f_number_unsigned_t i = length; i < uint128ss->size; ++i) { status = f_memory_destroy(uint128ss->array[i].size, sizeof(f_uint128s_t), (void **) & uint128ss->array[i].array); if (F_status_is_error(status)) return status; @@ -95,11 +95,11 @@ extern "C" { #endif // !defined(_di_f_uint128ss_adjust_) || !defined(_di_f_uint128ss_decimate_by_) #if !defined(_di_f_uint128ss_decrease_by_) || !defined(_di_f_uint128ss_increase_) || !defined(_di_f_uint128ss_increase_by_) || !defined(_di_f_uint128ss_resize_) - f_status_t private_f_uint128ss_resize(const f_array_length_t length, f_uint128ss_t *uint128ss) { + f_status_t private_f_uint128ss_resize(const f_number_unsigned_t length, f_uint128ss_t *uint128ss) { f_status_t status = F_none; - for (f_array_length_t i = length; i < uint128ss->size; ++i) { + for (f_number_unsigned_t i = length; i < uint128ss->size; ++i) { status = f_memory_delete(uint128ss->array[i].size, sizeof(f_uint128s_t), (void **) & uint128ss->array[i].array); if (F_status_is_error(status)) return status; diff --git a/level_0/f_type_array/c/type_array/private-uint128.h b/level_0/f_type_array/c/type_array/private-uint128.h index a46216e..bf77ba8 100644 --- a/level_0/f_type_array/c/type_array/private-uint128.h +++ b/level_0/f_type_array/c/type_array/private-uint128.h @@ -35,7 +35,7 @@ extern "C" { * @see f_uint128s_decimate_by() */ #if !defined(_di_f_uint128s_adjust_) || !defined(_di_f_uint128s_decimate_by_) - extern f_status_t private_f_uint128s_adjust(const f_array_length_t length, f_uint128s_t *uint128s) F_attribute_visibility_internal_d; + extern f_status_t private_f_uint128s_adjust(const f_number_unsigned_t length, f_uint128s_t *uint128s) F_attribute_visibility_internal_d; #endif // !defined(_di_f_uint128s_adjust_) || !defined(_di_f_uint128s_decimate_by_) /** @@ -107,7 +107,7 @@ extern "C" { * @see f_uint128ss_append() */ #if !defined(_di_f_uint128s_resize_) || !defined(_di_f_uint128s_append_) || !defined(_di_f_uint128s_decrease_by_) || !defined(_di_f_uint128ss_append_) - extern f_status_t private_f_uint128s_resize(const f_array_length_t length, f_uint128s_t *uint128s) F_attribute_visibility_internal_d; + extern f_status_t private_f_uint128s_resize(const f_number_unsigned_t length, f_uint128s_t *uint128s) F_attribute_visibility_internal_d; #endif // !defined(_di_f_uint128s_resize_) || !defined(_di_f_uint128s_append_) || !defined(_di_f_uint128s_decrease_by_) || !defined(_di_f_uint128ss_append_) /** @@ -135,7 +135,7 @@ extern "C" { * @see f_uint128ss_decimate_by() */ #if !defined(_di_f_uint128ss_adjust_) || !defined(_di_f_uint128ss_decimate_by_) - extern f_status_t private_f_uint128ss_adjust(const f_array_length_t length, f_uint128ss_t *uint128ss) F_attribute_visibility_internal_d; + extern f_status_t private_f_uint128ss_adjust(const f_number_unsigned_t length, f_uint128ss_t *uint128ss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_uint128ss_adjust_) || !defined(_di_f_uint128ss_decimate_by_) /** @@ -165,7 +165,7 @@ extern "C" { * @see f_uint128ss_resize() */ #if !defined(_di_f_uint128ss_decrease_by_) || !defined(_di_f_uint128ss_increase_) || !defined(_di_f_uint128ss_increase_by_) || !defined(_di_f_uint128ss_resize_) - extern f_status_t private_f_uint128ss_resize(const f_array_length_t length, f_uint128ss_t *uint128ss) F_attribute_visibility_internal_d; + extern f_status_t private_f_uint128ss_resize(const f_number_unsigned_t length, f_uint128ss_t *uint128ss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_uint128ss_decrease_by_) || !defined(_di_f_uint128ss_increase_) || !defined(_di_f_uint128ss_increase_by_) || !defined(_di_f_uint128ss_resize_) #ifdef __cplusplus diff --git a/level_0/f_type_array/c/type_array/private-uint16.c b/level_0/f_type_array/c/type_array/private-uint16.c index 048d8b3..095c124 100644 --- a/level_0/f_type_array/c/type_array/private-uint16.c +++ b/level_0/f_type_array/c/type_array/private-uint16.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_f_uint16s_adjust_) || !defined(_di_f_uint16s_decimate_by_) - f_status_t private_f_uint16s_adjust(const f_array_length_t length, f_uint16s_t *uint16s) { + f_status_t private_f_uint16s_adjust(const f_number_unsigned_t length, f_uint16s_t *uint16s) { const f_status_t status = f_memory_adjust(uint16s->size, length, sizeof(uint16_t), (void **) & uint16s->array); if (F_status_is_error(status)) return status; @@ -43,7 +43,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { destination->array[destination->used++] = source.array[i]; } // for @@ -52,7 +52,7 @@ extern "C" { #endif // !defined(_di_f_uint16s_append_) || !defined(_di_f_uint16s_append_all_) || !defined(_di_f_uint16ss_append_all_) #if !defined(_di_f_uint16s_resize_) || !defined(_di_f_uint16s_append_) || !defined(_di_f_uint16s_decrease_by_) || !defined(_di_f_uint16ss_append_) - f_status_t private_f_uint16s_resize(const f_array_length_t length, f_uint16s_t *uint16s) { + f_status_t private_f_uint16s_resize(const f_number_unsigned_t length, f_uint16s_t *uint16s) { const f_status_t status = f_memory_resize(uint16s->size, length, sizeof(uint16_t), (void **) & uint16s->array); if (F_status_is_error(status)) return status; @@ -68,11 +68,11 @@ extern "C" { #endif // !defined(_di_f_uint16s_resize_) || !defined(_di_f_uint16s_append_) || !defined(_di_f_uint16s_decrease_by_) || !defined(_di_f_uint16ss_append_) #if !defined(_di_f_uint16ss_adjust_) || !defined(_di_f_uint16ss_decimate_by_) - f_status_t private_f_uint16ss_adjust(const f_array_length_t length, f_uint16ss_t *uint16ss) { + f_status_t private_f_uint16ss_adjust(const f_number_unsigned_t length, f_uint16ss_t *uint16ss) { f_status_t status = F_none; - for (f_array_length_t i = length; i < uint16ss->size; ++i) { + for (f_number_unsigned_t i = length; i < uint16ss->size; ++i) { status = f_memory_destroy(uint16ss->array[i].size, sizeof(f_uint16s_t), (void **) & uint16ss->array[i].array); if (F_status_is_error(status)) return status; @@ -95,11 +95,11 @@ extern "C" { #endif // !defined(_di_f_uint16ss_adjust_) || !defined(_di_f_uint16ss_decimate_by_) #if !defined(_di_f_uint16ss_decrease_by_) || !defined(_di_f_uint16ss_increase_) || !defined(_di_f_uint16ss_increase_by_) || !defined(_di_f_uint16ss_resize_) - f_status_t private_f_uint16ss_resize(const f_array_length_t length, f_uint16ss_t *uint16ss) { + f_status_t private_f_uint16ss_resize(const f_number_unsigned_t length, f_uint16ss_t *uint16ss) { f_status_t status = F_none; - for (f_array_length_t i = length; i < uint16ss->size; ++i) { + for (f_number_unsigned_t i = length; i < uint16ss->size; ++i) { status = f_memory_delete(uint16ss->array[i].size, sizeof(f_uint16s_t), (void **) & uint16ss->array[i].array); if (F_status_is_error(status)) return status; diff --git a/level_0/f_type_array/c/type_array/private-uint16.h b/level_0/f_type_array/c/type_array/private-uint16.h index 032485f..380254a 100644 --- a/level_0/f_type_array/c/type_array/private-uint16.h +++ b/level_0/f_type_array/c/type_array/private-uint16.h @@ -35,7 +35,7 @@ extern "C" { * @see f_uint16s_decimate_by() */ #if !defined(_di_f_uint16s_adjust_) || !defined(_di_f_uint16s_decimate_by_) - extern f_status_t private_f_uint16s_adjust(const f_array_length_t length, f_uint16s_t *uint16s) F_attribute_visibility_internal_d; + extern f_status_t private_f_uint16s_adjust(const f_number_unsigned_t length, f_uint16s_t *uint16s) F_attribute_visibility_internal_d; #endif // !defined(_di_f_uint16s_adjust_) || !defined(_di_f_uint16s_decimate_by_) /** @@ -107,7 +107,7 @@ extern "C" { * @see f_uint16ss_append() */ #if !defined(_di_f_uint16s_resize_) || !defined(_di_f_uint16s_append_) || !defined(_di_f_uint16s_decrease_by_) || !defined(_di_f_uint16ss_append_) - extern f_status_t private_f_uint16s_resize(const f_array_length_t length, f_uint16s_t *uint16s) F_attribute_visibility_internal_d; + extern f_status_t private_f_uint16s_resize(const f_number_unsigned_t length, f_uint16s_t *uint16s) F_attribute_visibility_internal_d; #endif // !defined(_di_f_uint16s_resize_) || !defined(_di_f_uint16s_append_) || !defined(_di_f_uint16s_decrease_by_) || !defined(_di_f_uint16ss_append_) /** @@ -135,7 +135,7 @@ extern "C" { * @see f_uint16ss_decimate_by() */ #if !defined(_di_f_uint16ss_adjust_) || !defined(_di_f_uint16ss_decimate_by_) - extern f_status_t private_f_uint16ss_adjust(const f_array_length_t length, f_uint16ss_t *uint16ss) F_attribute_visibility_internal_d; + extern f_status_t private_f_uint16ss_adjust(const f_number_unsigned_t length, f_uint16ss_t *uint16ss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_uint16ss_adjust_) || !defined(_di_f_uint16ss_decimate_by_) /** @@ -165,7 +165,7 @@ extern "C" { * @see f_uint16ss_resize() */ #if !defined(_di_f_uint16ss_decrease_by_) || !defined(_di_f_uint16ss_increase_) || !defined(_di_f_uint16ss_increase_by_) || !defined(_di_f_uint16ss_resize_) - extern f_status_t private_f_uint16ss_resize(const f_array_length_t length, f_uint16ss_t *uint16ss) F_attribute_visibility_internal_d; + extern f_status_t private_f_uint16ss_resize(const f_number_unsigned_t length, f_uint16ss_t *uint16ss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_uint16ss_decrease_by_) || !defined(_di_f_uint16ss_increase_) || !defined(_di_f_uint16ss_increase_by_) || !defined(_di_f_uint16ss_resize_) #ifdef __cplusplus diff --git a/level_0/f_type_array/c/type_array/private-uint32.c b/level_0/f_type_array/c/type_array/private-uint32.c index 5d18abc..cd09cbf 100644 --- a/level_0/f_type_array/c/type_array/private-uint32.c +++ b/level_0/f_type_array/c/type_array/private-uint32.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_f_uint32s_adjust_) || !defined(_di_f_uint32s_decimate_by_) - f_status_t private_f_uint32s_adjust(const f_array_length_t length, f_uint32s_t *uint32s) { + f_status_t private_f_uint32s_adjust(const f_number_unsigned_t length, f_uint32s_t *uint32s) { const f_status_t status = f_memory_adjust(uint32s->size, length, sizeof(uint32_t), (void **) & uint32s->array); if (F_status_is_error(status)) return status; @@ -43,7 +43,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { destination->array[destination->used++] = source.array[i]; } // for @@ -52,7 +52,7 @@ extern "C" { #endif // !defined(_di_f_uint32s_append_) || !defined(_di_f_uint32s_append_all_) || !defined(_di_f_uint32ss_append_all_) #if !defined(_di_f_uint32s_resize_) || !defined(_di_f_uint32s_append_) || !defined(_di_f_uint32s_decrease_by_) || !defined(_di_f_uint32ss_append_) - f_status_t private_f_uint32s_resize(const f_array_length_t length, f_uint32s_t *uint32s) { + f_status_t private_f_uint32s_resize(const f_number_unsigned_t length, f_uint32s_t *uint32s) { const f_status_t status = f_memory_resize(uint32s->size, length, sizeof(uint32_t), (void **) & uint32s->array); if (F_status_is_error(status)) return status; @@ -68,11 +68,11 @@ extern "C" { #endif // !defined(_di_f_uint32s_resize_) || !defined(_di_f_uint32s_append_) || !defined(_di_f_uint32s_decrease_by_) || !defined(_di_f_uint32ss_append_) #if !defined(_di_f_uint32ss_adjust_) || !defined(_di_f_uint32ss_decimate_by_) - f_status_t private_f_uint32ss_adjust(const f_array_length_t length, f_uint32ss_t *uint32ss) { + f_status_t private_f_uint32ss_adjust(const f_number_unsigned_t length, f_uint32ss_t *uint32ss) { f_status_t status = F_none; - for (f_array_length_t i = length; i < uint32ss->size; ++i) { + for (f_number_unsigned_t i = length; i < uint32ss->size; ++i) { status = f_memory_destroy(uint32ss->array[i].size, sizeof(f_uint32s_t), (void **) & uint32ss->array[i].array); if (F_status_is_error(status)) return status; @@ -95,11 +95,11 @@ extern "C" { #endif // !defined(_di_f_uint32ss_adjust_) || !defined(_di_f_uint32ss_decimate_by_) #if !defined(_di_f_uint32ss_decrease_by_) || !defined(_di_f_uint32ss_increase_) || !defined(_di_f_uint32ss_increase_by_) || !defined(_di_f_uint32ss_resize_) - f_status_t private_f_uint32ss_resize(const f_array_length_t length, f_uint32ss_t *uint32ss) { + f_status_t private_f_uint32ss_resize(const f_number_unsigned_t length, f_uint32ss_t *uint32ss) { f_status_t status = F_none; - for (f_array_length_t i = length; i < uint32ss->size; ++i) { + for (f_number_unsigned_t i = length; i < uint32ss->size; ++i) { status = f_memory_delete(uint32ss->array[i].size, sizeof(f_uint32s_t), (void **) & uint32ss->array[i].array); if (F_status_is_error(status)) return status; diff --git a/level_0/f_type_array/c/type_array/private-uint32.h b/level_0/f_type_array/c/type_array/private-uint32.h index 595b32c..41f4d9a 100644 --- a/level_0/f_type_array/c/type_array/private-uint32.h +++ b/level_0/f_type_array/c/type_array/private-uint32.h @@ -35,7 +35,7 @@ extern "C" { * @see f_uint32s_decimate_by() */ #if !defined(_di_f_uint32s_adjust_) || !defined(_di_f_uint32s_decimate_by_) - extern f_status_t private_f_uint32s_adjust(const f_array_length_t length, f_uint32s_t *uint32s) F_attribute_visibility_internal_d; + extern f_status_t private_f_uint32s_adjust(const f_number_unsigned_t length, f_uint32s_t *uint32s) F_attribute_visibility_internal_d; #endif // !defined(_di_f_uint32s_adjust_) || !defined(_di_f_uint32s_decimate_by_) /** @@ -107,7 +107,7 @@ extern "C" { * @see f_uint32ss_append() */ #if !defined(_di_f_uint32s_resize_) || !defined(_di_f_uint32s_append_) || !defined(_di_f_uint32s_decrease_by_) || !defined(_di_f_uint32ss_append_) - extern f_status_t private_f_uint32s_resize(const f_array_length_t length, f_uint32s_t *uint32s) F_attribute_visibility_internal_d; + extern f_status_t private_f_uint32s_resize(const f_number_unsigned_t length, f_uint32s_t *uint32s) F_attribute_visibility_internal_d; #endif // !defined(_di_f_uint32s_resize_) || !defined(_di_f_uint32s_append_) || !defined(_di_f_uint32s_decrease_by_) || !defined(_di_f_uint32ss_append_) /** @@ -135,7 +135,7 @@ extern "C" { * @see f_uint32ss_decimate_by() */ #if !defined(_di_f_uint32ss_adjust_) || !defined(_di_f_uint32ss_decimate_by_) - extern f_status_t private_f_uint32ss_adjust(const f_array_length_t length, f_uint32ss_t *uint32ss) F_attribute_visibility_internal_d; + extern f_status_t private_f_uint32ss_adjust(const f_number_unsigned_t length, f_uint32ss_t *uint32ss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_uint32ss_adjust_) || !defined(_di_f_uint32ss_decimate_by_) /** @@ -165,7 +165,7 @@ extern "C" { * @see f_uint32ss_resize() */ #if !defined(_di_f_uint32ss_decrease_by_) || !defined(_di_f_uint32ss_increase_) || !defined(_di_f_uint32ss_increase_by_) || !defined(_di_f_uint32ss_resize_) - extern f_status_t private_f_uint32ss_resize(const f_array_length_t length, f_uint32ss_t *uint32ss) F_attribute_visibility_internal_d; + extern f_status_t private_f_uint32ss_resize(const f_number_unsigned_t length, f_uint32ss_t *uint32ss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_uint32ss_decrease_by_) || !defined(_di_f_uint32ss_increase_) || !defined(_di_f_uint32ss_increase_by_) || !defined(_di_f_uint32ss_resize_) #ifdef __cplusplus diff --git a/level_0/f_type_array/c/type_array/private-uint64.c b/level_0/f_type_array/c/type_array/private-uint64.c index 28e23db..8f623e8 100644 --- a/level_0/f_type_array/c/type_array/private-uint64.c +++ b/level_0/f_type_array/c/type_array/private-uint64.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_f_uint64s_adjust_) || !defined(_di_f_uint64s_decimate_by_) - f_status_t private_f_uint64s_adjust(const f_array_length_t length, f_uint64s_t *uint64s) { + f_status_t private_f_uint64s_adjust(const f_number_unsigned_t length, f_uint64s_t *uint64s) { const f_status_t status = f_memory_adjust(uint64s->size, length, sizeof(uint64_t), (void **) & uint64s->array); if (F_status_is_error(status)) return status; @@ -43,7 +43,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { destination->array[destination->used++] = source.array[i]; } // for @@ -52,7 +52,7 @@ extern "C" { #endif // !defined(_di_f_uint64s_append_) || !defined(_di_f_uint64s_append_all_) || !defined(_di_f_uint64ss_append_all_) #if !defined(_di_f_uint64s_resize_) || !defined(_di_f_uint64s_append_) || !defined(_di_f_uint64s_decrease_by_) || !defined(_di_f_uint64ss_append_) - f_status_t private_f_uint64s_resize(const f_array_length_t length, f_uint64s_t *uint64s) { + f_status_t private_f_uint64s_resize(const f_number_unsigned_t length, f_uint64s_t *uint64s) { const f_status_t status = f_memory_resize(uint64s->size, length, sizeof(uint64_t), (void **) & uint64s->array); if (F_status_is_error(status)) return status; @@ -68,11 +68,11 @@ extern "C" { #endif // !defined(_di_f_uint64s_resize_) || !defined(_di_f_uint64s_append_) || !defined(_di_f_uint64s_decrease_by_) || !defined(_di_f_uint64ss_append_) #if !defined(_di_f_uint64ss_adjust_) || !defined(_di_f_uint64ss_decimate_by_) - f_status_t private_f_uint64ss_adjust(const f_array_length_t length, f_uint64ss_t *uint64ss) { + f_status_t private_f_uint64ss_adjust(const f_number_unsigned_t length, f_uint64ss_t *uint64ss) { f_status_t status = F_none; - for (f_array_length_t i = length; i < uint64ss->size; ++i) { + for (f_number_unsigned_t i = length; i < uint64ss->size; ++i) { status = f_memory_destroy(uint64ss->array[i].size, sizeof(f_uint64s_t), (void **) & uint64ss->array[i].array); if (F_status_is_error(status)) return status; @@ -95,11 +95,11 @@ extern "C" { #endif // !defined(_di_f_uint64ss_adjust_) || !defined(_di_f_uint64ss_decimate_by_) #if !defined(_di_f_uint64ss_decrease_by_) || !defined(_di_f_uint64ss_increase_) || !defined(_di_f_uint64ss_increase_by_) || !defined(_di_f_uint64ss_resize_) - f_status_t private_f_uint64ss_resize(const f_array_length_t length, f_uint64ss_t *uint64ss) { + f_status_t private_f_uint64ss_resize(const f_number_unsigned_t length, f_uint64ss_t *uint64ss) { f_status_t status = F_none; - for (f_array_length_t i = length; i < uint64ss->size; ++i) { + for (f_number_unsigned_t i = length; i < uint64ss->size; ++i) { status = f_memory_delete(uint64ss->array[i].size, sizeof(f_uint64s_t), (void **) & uint64ss->array[i].array); if (F_status_is_error(status)) return status; diff --git a/level_0/f_type_array/c/type_array/private-uint64.h b/level_0/f_type_array/c/type_array/private-uint64.h index 1848ea4..1eea75d 100644 --- a/level_0/f_type_array/c/type_array/private-uint64.h +++ b/level_0/f_type_array/c/type_array/private-uint64.h @@ -35,7 +35,7 @@ extern "C" { * @see f_uint64s_decimate_by() */ #if !defined(_di_f_uint64s_adjust_) || !defined(_di_f_uint64s_decimate_by_) - extern f_status_t private_f_uint64s_adjust(const f_array_length_t length, f_uint64s_t *uint64s) F_attribute_visibility_internal_d; + extern f_status_t private_f_uint64s_adjust(const f_number_unsigned_t length, f_uint64s_t *uint64s) F_attribute_visibility_internal_d; #endif // !defined(_di_f_uint64s_adjust_) || !defined(_di_f_uint64s_decimate_by_) /** @@ -107,7 +107,7 @@ extern "C" { * @see f_uint64ss_append() */ #if !defined(_di_f_uint64s_resize_) || !defined(_di_f_uint64s_append_) || !defined(_di_f_uint64s_decrease_by_) || !defined(_di_f_uint64ss_append_) - extern f_status_t private_f_uint64s_resize(const f_array_length_t length, f_uint64s_t *uint64s) F_attribute_visibility_internal_d; + extern f_status_t private_f_uint64s_resize(const f_number_unsigned_t length, f_uint64s_t *uint64s) F_attribute_visibility_internal_d; #endif // !defined(_di_f_uint64s_resize_) || !defined(_di_f_uint64s_append_) || !defined(_di_f_uint64s_decrease_by_) || !defined(_di_f_uint64ss_append_) /** @@ -135,7 +135,7 @@ extern "C" { * @see f_uint64ss_decimate_by() */ #if !defined(_di_f_uint64ss_adjust_) || !defined(_di_f_uint64ss_decimate_by_) - extern f_status_t private_f_uint64ss_adjust(const f_array_length_t length, f_uint64ss_t *uint64ss) F_attribute_visibility_internal_d; + extern f_status_t private_f_uint64ss_adjust(const f_number_unsigned_t length, f_uint64ss_t *uint64ss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_uint64ss_adjust_) || !defined(_di_f_uint64ss_decimate_by_) /** @@ -165,7 +165,7 @@ extern "C" { * @see f_uint64ss_resize() */ #if !defined(_di_f_uint64ss_decrease_by_) || !defined(_di_f_uint64ss_increase_) || !defined(_di_f_uint64ss_increase_by_) || !defined(_di_f_uint64ss_resize_) - extern f_status_t private_f_uint64ss_resize(const f_array_length_t length, f_uint64ss_t *uint64ss) F_attribute_visibility_internal_d; + extern f_status_t private_f_uint64ss_resize(const f_number_unsigned_t length, f_uint64ss_t *uint64ss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_uint64ss_decrease_by_) || !defined(_di_f_uint64ss_increase_) || !defined(_di_f_uint64ss_increase_by_) || !defined(_di_f_uint64ss_resize_) #ifdef __cplusplus diff --git a/level_0/f_type_array/c/type_array/private-uint8.c b/level_0/f_type_array/c/type_array/private-uint8.c index 3c20475..6350383 100644 --- a/level_0/f_type_array/c/type_array/private-uint8.c +++ b/level_0/f_type_array/c/type_array/private-uint8.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_f_uint8s_adjust_) || !defined(_di_f_uint8s_decimate_by_) - f_status_t private_f_uint8s_adjust(const f_array_length_t length, f_uint8s_t *uint8s) { + f_status_t private_f_uint8s_adjust(const f_number_unsigned_t length, f_uint8s_t *uint8s) { const f_status_t status = f_memory_adjust(uint8s->size, length, sizeof(uint8_t), (void **) & uint8s->array); if (F_status_is_error(status)) return status; @@ -43,7 +43,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { destination->array[destination->used++] = source.array[i]; } // for @@ -52,7 +52,7 @@ extern "C" { #endif // !defined(_di_f_uint8s_append_) || !defined(_di_f_uint8s_append_all_) || !defined(_di_f_uint8ss_append_all_) #if !defined(_di_f_uint8s_append_) || !defined(_di_f_uint8s_append_all_) || !defined(_di_f_uint8s_decrease_by_) || !defined(_di_f_uint8s_increase_) || !defined(_di_f_uint8s_increase_by_) || !defined(_di_f_uint8s_resize_) || !defined(_di_f_uint8ss_append_) || !defined(_di_f_uint8ss_append_all_) - f_status_t private_f_uint8s_resize(const f_array_length_t length, f_uint8s_t *uint8s) { + f_status_t private_f_uint8s_resize(const f_number_unsigned_t length, f_uint8s_t *uint8s) { const f_status_t status = f_memory_resize(uint8s->size, length, sizeof(uint8_t), (void **) & uint8s->array); if (F_status_is_error(status)) return status; @@ -68,11 +68,11 @@ extern "C" { #endif // !defined(_di_f_uint8s_append_) || !defined(_di_f_uint8s_append_all_) || !defined(_di_f_uint8s_decrease_by_) || !defined(_di_f_uint8s_increase_) || !defined(_di_f_uint8s_increase_by_) || !defined(_di_f_uint8s_resize_) || !defined(_di_f_uint8ss_append_) || !defined(_di_f_uint8ss_append_all_) #if !defined(_di_f_uint8ss_adjust_) || !defined(_di_f_uint8ss_decimate_by_) - f_status_t private_f_uint8ss_adjust(const f_array_length_t length, f_uint8ss_t *uint8ss) { + f_status_t private_f_uint8ss_adjust(const f_number_unsigned_t length, f_uint8ss_t *uint8ss) { f_status_t status = F_none; - for (f_array_length_t i = length; i < uint8ss->size; ++i) { + for (f_number_unsigned_t i = length; i < uint8ss->size; ++i) { status = f_memory_destroy(uint8ss->array[i].size, sizeof(f_uint8s_t), (void **) & uint8ss->array[i].array); if (F_status_is_error(status)) return status; @@ -95,11 +95,11 @@ extern "C" { #endif // !defined(_di_f_uint8ss_adjust_) || !defined(_di_f_uint8ss_decimate_by_) #if !defined(_di_f_uint8ss_decrease_by_) || !defined(_di_f_uint8ss_increase_) || !defined(_di_f_uint8ss_increase_by_) || !defined(_di_f_uint8ss_resize_) - f_status_t private_f_uint8ss_resize(const f_array_length_t length, f_uint8ss_t *uint8ss) { + f_status_t private_f_uint8ss_resize(const f_number_unsigned_t length, f_uint8ss_t *uint8ss) { f_status_t status = F_none; - for (f_array_length_t i = length; i < uint8ss->size; ++i) { + for (f_number_unsigned_t i = length; i < uint8ss->size; ++i) { status = f_memory_delete(uint8ss->array[i].size, sizeof(f_uint8s_t), (void **) & uint8ss->array[i].array); if (F_status_is_error(status)) return status; diff --git a/level_0/f_type_array/c/type_array/private-uint8.h b/level_0/f_type_array/c/type_array/private-uint8.h index 6dec9b1..ab6ad2d 100644 --- a/level_0/f_type_array/c/type_array/private-uint8.h +++ b/level_0/f_type_array/c/type_array/private-uint8.h @@ -35,7 +35,7 @@ extern "C" { * @see f_uint8s_decimate_by() */ #if !defined(_di_f_uint8s_adjust_) || !defined(_di_f_uint8s_decimate_by_) - extern f_status_t private_f_uint8s_adjust(const f_array_length_t length, f_uint8s_t *uint8s) F_attribute_visibility_internal_d; + extern f_status_t private_f_uint8s_adjust(const f_number_unsigned_t length, f_uint8s_t *uint8s) F_attribute_visibility_internal_d; #endif // !defined(_di_f_uint8s_adjust_) || !defined(_di_f_uint8s_decimate_by_) /** @@ -112,7 +112,7 @@ extern "C" { * */ #if !defined(_di_f_uint8s_append_) || !defined(_di_f_uint8s_append_all_) || !defined(_di_f_uint8s_decrease_by_) || !defined(_di_f_uint8s_increase_) || !defined(_di_f_uint8s_increase_by_) || !defined(_di_f_uint8s_resize_) || !defined(_di_f_uint8ss_append_) || !defined(_di_f_uint8ss_append_all_) - extern f_status_t private_f_uint8s_resize(const f_array_length_t length, f_uint8s_t *uint8s) F_attribute_visibility_internal_d; + extern f_status_t private_f_uint8s_resize(const f_number_unsigned_t length, f_uint8s_t *uint8s) F_attribute_visibility_internal_d; #endif // !defined(_di_f_uint8s_append_) || !defined(_di_f_uint8s_append_all_) || !defined(_di_f_uint8s_decrease_by_) || !defined(_di_f_uint8s_increase_) || !defined(_di_f_uint8s_increase_by_) || !defined(_di_f_uint8s_resize_) || !defined(_di_f_uint8ss_append_) || !defined(_di_f_uint8ss_append_all_) /** @@ -140,7 +140,7 @@ extern "C" { * @see f_uint8ss_decimate_by() */ #if !defined(_di_f_uint8ss_adjust_) || !defined(_di_f_uint8ss_decimate_by_) - extern f_status_t private_f_uint8ss_adjust(const f_array_length_t length, f_uint8ss_t *uint8ss) F_attribute_visibility_internal_d; + extern f_status_t private_f_uint8ss_adjust(const f_number_unsigned_t length, f_uint8ss_t *uint8ss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_uint8ss_adjust_) || !defined(_di_f_uint8ss_decimate_by_) /** @@ -170,7 +170,7 @@ extern "C" { * @see f_uint8ss_resize() */ #if !defined(_di_f_uint8ss_decrease_by_) || !defined(_di_f_uint8ss_increase_) || !defined(_di_f_uint8ss_increase_by_) || !defined(_di_f_uint8ss_resize_) - extern f_status_t private_f_uint8ss_resize(const f_array_length_t length, f_uint8ss_t *uint8ss) F_attribute_visibility_internal_d; + extern f_status_t private_f_uint8ss_resize(const f_number_unsigned_t length, f_uint8ss_t *uint8ss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_uint8ss_decrease_by_) || !defined(_di_f_uint8ss_increase_) || !defined(_di_f_uint8ss_increase_by_) || !defined(_di_f_uint8ss_resize_) #ifdef __cplusplus diff --git a/level_0/f_type_array/c/type_array/state.c b/level_0/f_type_array/c/type_array/state.c index 1799314..55c9ea7 100644 --- a/level_0/f_type_array/c/type_array/state.c +++ b/level_0/f_type_array/c/type_array/state.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_states_adjust_ - f_status_t f_states_adjust(const f_array_length_t length, f_states_t *states) { + f_status_t f_states_adjust(const f_number_unsigned_t length, f_states_t *states) { #ifndef _di_level_0_parameter_checking_ if (!states) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -39,7 +39,7 @@ extern "C" { #endif // _di_f_states_append_all_ #ifndef _di_f_states_decimate_by_ - f_status_t f_states_decimate_by(const f_array_length_t amount, f_states_t *states) { + f_status_t f_states_decimate_by(const f_number_unsigned_t amount, f_states_t *states) { #ifndef _di_level_0_parameter_checking_ if (!states) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -55,7 +55,7 @@ extern "C" { #endif // _di_f_states_decimate_by_ #ifndef _di_f_states_decrease_by_ - f_status_t f_states_decrease_by(const f_array_length_t amount, f_states_t *states) { + f_status_t f_states_decrease_by(const f_number_unsigned_t amount, f_states_t *states) { #ifndef _di_level_0_parameter_checking_ if (!states) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -71,20 +71,20 @@ extern "C" { #endif // _di_f_states_decrease_by_ #ifndef _di_f_states_increase_ - f_status_t f_states_increase(const f_array_length_t step, f_states_t *states) { + f_status_t f_states_increase(const f_number_unsigned_t step, f_states_t *states) { #ifndef _di_level_0_parameter_checking_ if (!states) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && states->used + 1 > states->size) { - f_array_length_t size = states->used + step; + f_number_unsigned_t size = states->used + step; - if (size > F_array_length_t_size_d) { - if (states->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (states->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_states_resize(size, states); @@ -95,7 +95,7 @@ extern "C" { #endif // _di_f_states_increase_ #ifndef _di_f_states_increase_by_ - f_status_t f_states_increase_by(const f_array_length_t amount, f_states_t *states) { + f_status_t f_states_increase_by(const f_number_unsigned_t amount, f_states_t *states) { #ifndef _di_level_0_parameter_checking_ if (!states) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -103,7 +103,7 @@ extern "C" { if (!amount) return F_data_not; if (states->used + amount > states->size) { - if (states->used + amount > F_array_length_t_size_d) { + if (states->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -115,7 +115,7 @@ extern "C" { #endif // _di_f_states_increase_by_ #ifndef _di_f_states_resize_ - f_status_t f_states_resize(const f_array_length_t length, f_states_t *states) { + f_status_t f_states_resize(const f_number_unsigned_t length, f_states_t *states) { #ifndef _di_level_0_parameter_checking_ if (!states) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -125,7 +125,7 @@ extern "C" { #endif // _di_f_states_resize_ #ifndef _di_f_statess_adjust_ - f_status_t f_statess_adjust(const f_array_length_t length, f_statess_t *statess) { + f_status_t f_statess_adjust(const f_number_unsigned_t length, f_statess_t *statess) { #ifndef _di_level_0_parameter_checking_ if (!statess) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -173,7 +173,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].used = 0; @@ -188,7 +188,7 @@ extern "C" { #endif // _di_f_statess_append_all_ #ifndef _di_f_statess_decimate_by_ - f_status_t f_statess_decimate_by(const f_array_length_t amount, f_statess_t *statess) { + f_status_t f_statess_decimate_by(const f_number_unsigned_t amount, f_statess_t *statess) { #ifndef _di_level_0_parameter_checking_ if (!statess) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -204,7 +204,7 @@ extern "C" { #endif // _di_f_statess_decimate_by_ #ifndef _di_f_statess_decrease_by_ - f_status_t f_statess_decrease_by(const f_array_length_t amount, f_statess_t *statess) { + f_status_t f_statess_decrease_by(const f_number_unsigned_t amount, f_statess_t *statess) { #ifndef _di_level_0_parameter_checking_ if (!statess) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -220,20 +220,20 @@ extern "C" { #endif // _di_f_statess_decrease_by_ #ifndef _di_f_statess_increase_ - f_status_t f_statess_increase(const f_array_length_t step, f_statess_t *statess) { + f_status_t f_statess_increase(const f_number_unsigned_t step, f_statess_t *statess) { #ifndef _di_level_0_parameter_checking_ if (!statess) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && statess->used + 1 > statess->size) { - f_array_length_t size = statess->used + step; + f_number_unsigned_t size = statess->used + step; - if (size > F_array_length_t_size_d) { - if (statess->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (statess->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_statess_resize(size, statess); @@ -244,7 +244,7 @@ extern "C" { #endif // _di_f_statess_increase_ #ifndef _di_f_statess_increase_by_ - f_status_t f_statess_increase_by(const f_array_length_t amount, f_statess_t *statess) { + f_status_t f_statess_increase_by(const f_number_unsigned_t amount, f_statess_t *statess) { #ifndef _di_level_0_parameter_checking_ if (!statess) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -252,7 +252,7 @@ extern "C" { if (!amount) return F_data_not; if (statess->used + amount > statess->size) { - if (statess->used + amount > F_array_length_t_size_d) { + if (statess->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -264,7 +264,7 @@ extern "C" { #endif // _di_f_statess_increase_by_ #ifndef _di_f_statess_resize_ - f_status_t f_statess_resize(const f_array_length_t length, f_statess_t *statess) { + f_status_t f_statess_resize(const f_number_unsigned_t length, f_statess_t *statess) { #ifndef _di_level_0_parameter_checking_ if (!statess) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_type_array/c/type_array/state.h b/level_0/f_type_array/c/type_array/state.h index 0a39664..b5df56d 100644 --- a/level_0/f_type_array/c/type_array/state.h +++ b/level_0/f_type_array/c/type_array/state.h @@ -32,7 +32,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_states_adjust_ - extern f_status_t f_states_adjust(const f_array_length_t length, f_states_t *states); + extern f_status_t f_states_adjust(const f_number_unsigned_t length, f_states_t *states); #endif // _di_f_states_adjust_ /** @@ -96,7 +96,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_states_decimate_by_ - extern f_status_t f_states_decimate_by(const f_array_length_t amount, f_states_t *states); + extern f_status_t f_states_decimate_by(const f_number_unsigned_t amount, f_states_t *states); #endif // _di_f_states_decimate_by_ /** @@ -120,13 +120,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_states_decrease_by_ - extern f_status_t f_states_decrease_by(const f_array_length_t amount, f_states_t *states); + extern f_status_t f_states_decrease_by(const f_number_unsigned_t amount, f_states_t *states); #endif // _di_f_states_decrease_by_ /** * Increase the size of the string states array, but only if necesary. * - * If the given length is too large for the buffer, then attempt to set max buffer size (F_array_length_t_size_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -145,14 +145,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_states_increase_ - extern f_status_t f_states_increase(const f_array_length_t step, f_states_t *states); + extern f_status_t f_states_increase(const f_number_unsigned_t step, f_states_t *states); #endif // _di_f_states_increase_ /** * Resize the string states 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -170,7 +170,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_states_increase_by_ - extern f_status_t f_states_increase_by(const f_array_length_t amount, f_states_t *states); + extern f_status_t f_states_increase_by(const f_number_unsigned_t amount, f_states_t *states); #endif // _di_f_states_increase_by_ /** @@ -189,7 +189,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_states_resize_ - extern f_status_t f_states_resize(const f_array_length_t length, f_states_t *states); + extern f_status_t f_states_resize(const f_number_unsigned_t length, f_states_t *states); #endif // _di_f_states_resize_ /** @@ -209,7 +209,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_statess_adjust_ - extern f_status_t f_statess_adjust(const f_array_length_t length, f_statess_t *statess); + extern f_status_t f_statess_adjust(const f_number_unsigned_t length, f_statess_t *statess); #endif // _di_f_statess_adjust_ /** @@ -274,7 +274,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_statess_decimate_by_ - extern f_status_t f_statess_decimate_by(const f_array_length_t amount, f_statess_t *statess); + extern f_status_t f_statess_decimate_by(const f_number_unsigned_t amount, f_statess_t *statess); #endif // _di_f_statess_decimate_by_ /** @@ -299,13 +299,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_statess_decrease_by_ - extern f_status_t f_statess_decrease_by(const f_array_length_t amount, f_statess_t *statess); + extern f_status_t f_statess_decrease_by(const f_number_unsigned_t amount, f_statess_t *statess); #endif // _di_f_statess_decrease_by_ /** * Increase the size of the string statess 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -324,14 +324,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_statess_increase_ - extern f_status_t f_statess_increase(const f_array_length_t step, f_statess_t *statess); + extern f_status_t f_statess_increase(const f_number_unsigned_t step, f_statess_t *statess); #endif // _di_f_statess_increase_ /** * Resize the string statess 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -349,7 +349,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_statess_increase_by_ - extern f_status_t f_statess_increase_by(const f_array_length_t amount, f_statess_t *statess); + extern f_status_t f_statess_increase_by(const f_number_unsigned_t amount, f_statess_t *statess); #endif // _di_f_statess_increase_by_ /** @@ -369,7 +369,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_statess_resize_ - extern f_status_t f_statess_resize(const f_array_length_t length, f_statess_t *statess); + extern f_status_t f_statess_resize(const f_number_unsigned_t length, f_statess_t *statess); #endif // _di_f_statess_resize_ #ifdef __cplusplus diff --git a/level_0/f_type_array/c/type_array/status.c b/level_0/f_type_array/c/type_array/status.c index cf45bb4..fff8cc0 100644 --- a/level_0/f_type_array/c/type_array/status.c +++ b/level_0/f_type_array/c/type_array/status.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_statuss_adjust_ - f_status_t f_statuss_adjust(const f_array_length_t length, f_statuss_t *statuss) { + f_status_t f_statuss_adjust(const f_number_unsigned_t length, f_statuss_t *statuss) { #ifndef _di_level_0_parameter_checking_ if (!statuss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -39,7 +39,7 @@ extern "C" { #endif // _di_f_statuss_append_all_ #ifndef _di_f_statuss_decimate_by_ - f_status_t f_statuss_decimate_by(const f_array_length_t amount, f_statuss_t *statuss) { + f_status_t f_statuss_decimate_by(const f_number_unsigned_t amount, f_statuss_t *statuss) { #ifndef _di_level_0_parameter_checking_ if (!statuss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -55,7 +55,7 @@ extern "C" { #endif // _di_f_statuss_decimate_by_ #ifndef _di_f_statuss_decrease_by_ - f_status_t f_statuss_decrease_by(const f_array_length_t amount, f_statuss_t *statuss) { + f_status_t f_statuss_decrease_by(const f_number_unsigned_t amount, f_statuss_t *statuss) { #ifndef _di_level_0_parameter_checking_ if (!statuss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -71,20 +71,20 @@ extern "C" { #endif // _di_f_statuss_decrease_by_ #ifndef _di_f_statuss_increase_ - f_status_t f_statuss_increase(const f_array_length_t step, f_statuss_t *statuss) { + f_status_t f_statuss_increase(const f_number_unsigned_t step, f_statuss_t *statuss) { #ifndef _di_level_0_parameter_checking_ if (!statuss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && statuss->used + 1 > statuss->size) { - f_array_length_t size = statuss->used + step; + f_number_unsigned_t size = statuss->used + step; - if (size > F_array_length_t_size_d) { - if (statuss->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (statuss->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_statuss_resize(size, statuss); @@ -95,7 +95,7 @@ extern "C" { #endif // _di_f_statuss_increase_ #ifndef _di_f_statuss_increase_by_ - f_status_t f_statuss_increase_by(const f_array_length_t amount, f_statuss_t *statuss) { + f_status_t f_statuss_increase_by(const f_number_unsigned_t amount, f_statuss_t *statuss) { #ifndef _di_level_0_parameter_checking_ if (!statuss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -103,7 +103,7 @@ extern "C" { if (!amount) return F_data_not; if (statuss->used + amount > statuss->size) { - if (statuss->used + amount > F_array_length_t_size_d) { + if (statuss->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -115,7 +115,7 @@ extern "C" { #endif // _di_f_statuss_increase_by_ #ifndef _di_f_statuss_resize_ - f_status_t f_statuss_resize(const f_array_length_t length, f_statuss_t *statuss) { + f_status_t f_statuss_resize(const f_number_unsigned_t length, f_statuss_t *statuss) { #ifndef _di_level_0_parameter_checking_ if (!statuss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -125,7 +125,7 @@ extern "C" { #endif // _di_f_statuss_resize_ #ifndef _di_f_statusss_adjust_ - f_status_t f_statusss_adjust(const f_array_length_t length, f_statusss_t *statusss) { + f_status_t f_statusss_adjust(const f_number_unsigned_t length, f_statusss_t *statusss) { #ifndef _di_level_0_parameter_checking_ if (!statusss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -173,7 +173,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].used = 0; @@ -188,7 +188,7 @@ extern "C" { #endif // _di_f_statusss_append_all_ #ifndef _di_f_statusss_decimate_by_ - f_status_t f_statusss_decimate_by(const f_array_length_t amount, f_statusss_t *statusss) { + f_status_t f_statusss_decimate_by(const f_number_unsigned_t amount, f_statusss_t *statusss) { #ifndef _di_level_0_parameter_checking_ if (!statusss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -204,7 +204,7 @@ extern "C" { #endif // _di_f_statusss_decimate_by_ #ifndef _di_f_statusss_decrease_by_ - f_status_t f_statusss_decrease_by(const f_array_length_t amount, f_statusss_t *statusss) { + f_status_t f_statusss_decrease_by(const f_number_unsigned_t amount, f_statusss_t *statusss) { #ifndef _di_level_0_parameter_checking_ if (!statusss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -220,20 +220,20 @@ extern "C" { #endif // _di_f_statusss_decrease_by_ #ifndef _di_f_statusss_increase_ - f_status_t f_statusss_increase(const f_array_length_t step, f_statusss_t *statusss) { + f_status_t f_statusss_increase(const f_number_unsigned_t step, f_statusss_t *statusss) { #ifndef _di_level_0_parameter_checking_ if (!statusss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && statusss->used + 1 > statusss->size) { - f_array_length_t size = statusss->used + step; + f_number_unsigned_t size = statusss->used + step; - if (size > F_array_length_t_size_d) { - if (statusss->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (statusss->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_statusss_resize(size, statusss); @@ -244,7 +244,7 @@ extern "C" { #endif // _di_f_statusss_increase_ #ifndef _di_f_statusss_increase_by_ - f_status_t f_statusss_increase_by(const f_array_length_t amount, f_statusss_t *statusss) { + f_status_t f_statusss_increase_by(const f_number_unsigned_t amount, f_statusss_t *statusss) { #ifndef _di_level_0_parameter_checking_ if (!statusss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -252,7 +252,7 @@ extern "C" { if (!amount) return F_data_not; if (statusss->used + amount > statusss->size) { - if (statusss->used + amount > F_array_length_t_size_d) { + if (statusss->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -264,7 +264,7 @@ extern "C" { #endif // _di_f_statusss_increase_by_ #ifndef _di_f_statusss_resize_ - f_status_t f_statusss_resize(const f_array_length_t length, f_statusss_t *statusss) { + f_status_t f_statusss_resize(const f_number_unsigned_t length, f_statusss_t *statusss) { #ifndef _di_level_0_parameter_checking_ if (!statusss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_type_array/c/type_array/status.h b/level_0/f_type_array/c/type_array/status.h index e9224d2..92ff80e 100644 --- a/level_0/f_type_array/c/type_array/status.h +++ b/level_0/f_type_array/c/type_array/status.h @@ -32,7 +32,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_statuss_adjust_ - extern f_status_t f_statuss_adjust(const f_array_length_t length, f_statuss_t *statuss); + extern f_status_t f_statuss_adjust(const f_number_unsigned_t length, f_statuss_t *statuss); #endif // _di_f_statuss_adjust_ /** @@ -96,7 +96,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_statuss_decimate_by_ - extern f_status_t f_statuss_decimate_by(const f_array_length_t amount, f_statuss_t *statuss); + extern f_status_t f_statuss_decimate_by(const f_number_unsigned_t amount, f_statuss_t *statuss); #endif // _di_f_statuss_decimate_by_ /** @@ -120,13 +120,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_statuss_decrease_by_ - extern f_status_t f_statuss_decrease_by(const f_array_length_t amount, f_statuss_t *statuss); + extern f_status_t f_statuss_decrease_by(const f_number_unsigned_t amount, f_statuss_t *statuss); #endif // _di_f_statuss_decrease_by_ /** * Increase the size of the string statuss array, but only if necesary. * - * If the given length is too large for the buffer, then attempt to set max buffer size (F_array_length_t_size_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -145,14 +145,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_statuss_increase_ - extern f_status_t f_statuss_increase(const f_array_length_t step, f_statuss_t *statuss); + extern f_status_t f_statuss_increase(const f_number_unsigned_t step, f_statuss_t *statuss); #endif // _di_f_statuss_increase_ /** * Resize the string statuss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -170,7 +170,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_statuss_increase_by_ - extern f_status_t f_statuss_increase_by(const f_array_length_t amount, f_statuss_t *statuss); + extern f_status_t f_statuss_increase_by(const f_number_unsigned_t amount, f_statuss_t *statuss); #endif // _di_f_statuss_increase_by_ /** @@ -189,7 +189,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_statuss_resize_ - extern f_status_t f_statuss_resize(const f_array_length_t length, f_statuss_t *statuss); + extern f_status_t f_statuss_resize(const f_number_unsigned_t length, f_statuss_t *statuss); #endif // _di_f_statuss_resize_ /** @@ -209,7 +209,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_statusss_adjust_ - extern f_status_t f_statusss_adjust(const f_array_length_t length, f_statusss_t *statusss); + extern f_status_t f_statusss_adjust(const f_number_unsigned_t length, f_statusss_t *statusss); #endif // _di_f_statusss_adjust_ /** @@ -274,7 +274,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_statusss_decimate_by_ - extern f_status_t f_statusss_decimate_by(const f_array_length_t amount, f_statusss_t *statusss); + extern f_status_t f_statusss_decimate_by(const f_number_unsigned_t amount, f_statusss_t *statusss); #endif // _di_f_statusss_decimate_by_ /** @@ -299,13 +299,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_statusss_decrease_by_ - extern f_status_t f_statusss_decrease_by(const f_array_length_t amount, f_statusss_t *statusss); + extern f_status_t f_statusss_decrease_by(const f_number_unsigned_t amount, f_statusss_t *statusss); #endif // _di_f_statusss_decrease_by_ /** * Increase the size of the string statusss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -324,14 +324,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_statusss_increase_ - extern f_status_t f_statusss_increase(const f_array_length_t step, f_statusss_t *statusss); + extern f_status_t f_statusss_increase(const f_number_unsigned_t step, f_statusss_t *statusss); #endif // _di_f_statusss_increase_ /** * Resize the string statusss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -349,7 +349,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_statusss_increase_by_ - extern f_status_t f_statusss_increase_by(const f_array_length_t amount, f_statusss_t *statusss); + extern f_status_t f_statusss_increase_by(const f_number_unsigned_t amount, f_statusss_t *statusss); #endif // _di_f_statusss_increase_by_ /** @@ -369,7 +369,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_statusss_resize_ - extern f_status_t f_statusss_resize(const f_array_length_t length, f_statusss_t *statusss); + extern f_status_t f_statusss_resize(const f_number_unsigned_t length, f_statusss_t *statusss); #endif // _di_f_statusss_resize_ #ifdef __cplusplus diff --git a/level_0/f_type_array/c/type_array/uint128.c b/level_0/f_type_array/c/type_array/uint128.c index ed8bfe5..31a80b0 100644 --- a/level_0/f_type_array/c/type_array/uint128.c +++ b/level_0/f_type_array/c/type_array/uint128.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_uint128s_adjust_ - f_status_t f_uint128s_adjust(const f_array_length_t length, f_uint128s_t *uint128s) { + f_status_t f_uint128s_adjust(const f_number_unsigned_t length, f_uint128s_t *uint128s) { #ifndef _di_level_0_parameter_checking_ if (!uint128s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -39,7 +39,7 @@ extern "C" { #endif // _di_f_uint128s_append_all_ #ifndef _di_f_uint128s_decimate_by_ - f_status_t f_uint128s_decimate_by(const f_array_length_t amount, f_uint128s_t *uint128s) { + f_status_t f_uint128s_decimate_by(const f_number_unsigned_t amount, f_uint128s_t *uint128s) { #ifndef _di_level_0_parameter_checking_ if (!uint128s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -55,7 +55,7 @@ extern "C" { #endif // _di_f_uint128s_decimate_by_ #ifndef _di_f_uint128s_decrease_by_ - f_status_t f_uint128s_decrease_by(const f_array_length_t amount, f_uint128s_t *uint128s) { + f_status_t f_uint128s_decrease_by(const f_number_unsigned_t amount, f_uint128s_t *uint128s) { #ifndef _di_level_0_parameter_checking_ if (!uint128s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -71,20 +71,20 @@ extern "C" { #endif // _di_f_uint128s_decrease_by_ #ifndef _di_f_uint128s_increase_ - f_status_t f_uint128s_increase(const f_array_length_t step, f_uint128s_t *uint128s) { + f_status_t f_uint128s_increase(const f_number_unsigned_t step, f_uint128s_t *uint128s) { #ifndef _di_level_0_parameter_checking_ if (!uint128s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && uint128s->used + 1 > uint128s->size) { - f_array_length_t size = uint128s->used + step; + f_number_unsigned_t size = uint128s->used + step; - if (size > F_array_length_t_size_d) { - if (uint128s->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (uint128s->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_uint128s_resize(size, uint128s); @@ -95,7 +95,7 @@ extern "C" { #endif // _di_f_uint128s_increase_ #ifndef _di_f_uint128s_increase_by_ - f_status_t f_uint128s_increase_by(const f_array_length_t amount, f_uint128s_t *uint128s) { + f_status_t f_uint128s_increase_by(const f_number_unsigned_t amount, f_uint128s_t *uint128s) { #ifndef _di_level_0_parameter_checking_ if (!uint128s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -103,7 +103,7 @@ extern "C" { if (!amount) return F_data_not; if (uint128s->used + amount > uint128s->size) { - if (uint128s->used + amount > F_array_length_t_size_d) { + if (uint128s->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -115,7 +115,7 @@ extern "C" { #endif // _di_f_uint128s_increase_by_ #ifndef _di_f_uint128s_resize_ - f_status_t f_uint128s_resize(const f_array_length_t length, f_uint128s_t *uint128s) { + f_status_t f_uint128s_resize(const f_number_unsigned_t length, f_uint128s_t *uint128s) { #ifndef _di_level_0_parameter_checking_ if (!uint128s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -125,7 +125,7 @@ extern "C" { #endif // _di_f_uint128s_resize_ #ifndef _di_f_uint128ss_adjust_ - f_status_t f_uint128ss_adjust(const f_array_length_t length, f_uint128ss_t *uint128ss) { + f_status_t f_uint128ss_adjust(const f_number_unsigned_t length, f_uint128ss_t *uint128ss) { #ifndef _di_level_0_parameter_checking_ if (!uint128ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -173,7 +173,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].used = 0; @@ -188,7 +188,7 @@ extern "C" { #endif // _di_f_uint128ss_append_all_ #ifndef _di_f_uint128ss_decimate_by_ - f_status_t f_uint128ss_decimate_by(const f_array_length_t amount, f_uint128ss_t *uint128ss) { + f_status_t f_uint128ss_decimate_by(const f_number_unsigned_t amount, f_uint128ss_t *uint128ss) { #ifndef _di_level_0_parameter_checking_ if (!uint128ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -204,7 +204,7 @@ extern "C" { #endif // _di_f_uint128ss_decimate_by_ #ifndef _di_f_uint128ss_decrease_by_ - f_status_t f_uint128ss_decrease_by(const f_array_length_t amount, f_uint128ss_t *uint128ss) { + f_status_t f_uint128ss_decrease_by(const f_number_unsigned_t amount, f_uint128ss_t *uint128ss) { #ifndef _di_level_0_parameter_checking_ if (!uint128ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -220,20 +220,20 @@ extern "C" { #endif // _di_f_uint128ss_decrease_by_ #ifndef _di_f_uint128ss_increase_ - f_status_t f_uint128ss_increase(const f_array_length_t step, f_uint128ss_t *uint128ss) { + f_status_t f_uint128ss_increase(const f_number_unsigned_t step, f_uint128ss_t *uint128ss) { #ifndef _di_level_0_parameter_checking_ if (!uint128ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && uint128ss->used + 1 > uint128ss->size) { - f_array_length_t size = uint128ss->used + step; + f_number_unsigned_t size = uint128ss->used + step; - if (size > F_array_length_t_size_d) { - if (uint128ss->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (uint128ss->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_uint128ss_resize(size, uint128ss); @@ -244,7 +244,7 @@ extern "C" { #endif // _di_f_uint128ss_increase_ #ifndef _di_f_uint128ss_increase_by_ - f_status_t f_uint128ss_increase_by(const f_array_length_t amount, f_uint128ss_t *uint128ss) { + f_status_t f_uint128ss_increase_by(const f_number_unsigned_t amount, f_uint128ss_t *uint128ss) { #ifndef _di_level_0_parameter_checking_ if (!uint128ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -252,7 +252,7 @@ extern "C" { if (!amount) return F_data_not; if (uint128ss->used + amount > uint128ss->size) { - if (uint128ss->used + amount > F_array_length_t_size_d) { + if (uint128ss->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -264,7 +264,7 @@ extern "C" { #endif // _di_f_uint128ss_increase_by_ #ifndef _di_f_uint128ss_resize_ - f_status_t f_uint128ss_resize(const f_array_length_t length, f_uint128ss_t *uint128ss) { + f_status_t f_uint128ss_resize(const f_number_unsigned_t length, f_uint128ss_t *uint128ss) { #ifndef _di_level_0_parameter_checking_ if (!uint128ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_type_array/c/type_array/uint128.h b/level_0/f_type_array/c/type_array/uint128.h index 9634605..828e3f0 100644 --- a/level_0/f_type_array/c/type_array/uint128.h +++ b/level_0/f_type_array/c/type_array/uint128.h @@ -32,7 +32,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_uint128s_adjust_ - extern f_status_t f_uint128s_adjust(const f_array_length_t length, f_uint128s_t *uint128s); + extern f_status_t f_uint128s_adjust(const f_number_unsigned_t length, f_uint128s_t *uint128s); #endif // _di_f_uint128s_adjust_ /** @@ -96,7 +96,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_uint128s_decimate_by_ - extern f_status_t f_uint128s_decimate_by(const f_array_length_t amount, f_uint128s_t *uint128s); + extern f_status_t f_uint128s_decimate_by(const f_number_unsigned_t amount, f_uint128s_t *uint128s); #endif // _di_f_uint128s_decimate_by_ /** @@ -120,13 +120,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint128s_decrease_by_ - extern f_status_t f_uint128s_decrease_by(const f_array_length_t amount, f_uint128s_t *uint128s); + extern f_status_t f_uint128s_decrease_by(const f_number_unsigned_t amount, f_uint128s_t *uint128s); #endif // _di_f_uint128s_decrease_by_ /** * Increase the size of the string uint128s array, but only if necesary. * - * If the given length is too large for the buffer, then attempt to set max buffer size (F_array_length_t_size_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -145,14 +145,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint128s_increase_ - extern f_status_t f_uint128s_increase(const f_array_length_t step, f_uint128s_t *uint128s); + extern f_status_t f_uint128s_increase(const f_number_unsigned_t step, f_uint128s_t *uint128s); #endif // _di_f_uint128s_increase_ /** * Resize the string uint128s 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -170,7 +170,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint128s_increase_by_ - extern f_status_t f_uint128s_increase_by(const f_array_length_t amount, f_uint128s_t *uint128s); + extern f_status_t f_uint128s_increase_by(const f_number_unsigned_t amount, f_uint128s_t *uint128s); #endif // _di_f_uint128s_increase_by_ /** @@ -189,7 +189,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint128s_resize_ - extern f_status_t f_uint128s_resize(const f_array_length_t length, f_uint128s_t *uint128s); + extern f_status_t f_uint128s_resize(const f_number_unsigned_t length, f_uint128s_t *uint128s); #endif // _di_f_uint128s_resize_ /** @@ -209,7 +209,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_uint128ss_adjust_ - extern f_status_t f_uint128ss_adjust(const f_array_length_t length, f_uint128ss_t *uint128ss); + extern f_status_t f_uint128ss_adjust(const f_number_unsigned_t length, f_uint128ss_t *uint128ss); #endif // _di_f_uint128ss_adjust_ /** @@ -273,7 +273,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_uint128ss_decimate_by_ - extern f_status_t f_uint128ss_decimate_by(const f_array_length_t amount, f_uint128ss_t *uint128ss); + extern f_status_t f_uint128ss_decimate_by(const f_number_unsigned_t amount, f_uint128ss_t *uint128ss); #endif // _di_f_uint128ss_decimate_by_ /** @@ -297,13 +297,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint128ss_decrease_by_ - extern f_status_t f_uint128ss_decrease_by(const f_array_length_t amount, f_uint128ss_t *uint128ss); + extern f_status_t f_uint128ss_decrease_by(const f_number_unsigned_t amount, f_uint128ss_t *uint128ss); #endif // _di_f_uint128ss_decrease_by_ /** * Increase the size of the string uint128ss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -322,14 +322,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint128ss_increase_ - extern f_status_t f_uint128ss_increase(const f_array_length_t step, f_uint128ss_t *uint128ss); + extern f_status_t f_uint128ss_increase(const f_number_unsigned_t step, f_uint128ss_t *uint128ss); #endif // _di_f_uint128ss_increase_ /** * Resize the string uint128ss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -347,7 +347,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint128ss_increase_by_ - extern f_status_t f_uint128ss_increase_by(const f_array_length_t amount, f_uint128ss_t *uint128ss); + extern f_status_t f_uint128ss_increase_by(const f_number_unsigned_t amount, f_uint128ss_t *uint128ss); #endif // _di_f_uint128ss_increase_by_ /** @@ -367,7 +367,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint128ss_resize_ - extern f_status_t f_uint128ss_resize(const f_array_length_t length, f_uint128ss_t *uint128ss); + extern f_status_t f_uint128ss_resize(const f_number_unsigned_t length, f_uint128ss_t *uint128ss); #endif // _di_f_uint128ss_resize_ #ifdef __cplusplus diff --git a/level_0/f_type_array/c/type_array/uint16.c b/level_0/f_type_array/c/type_array/uint16.c index aaf88c1..1cb7f5f 100644 --- a/level_0/f_type_array/c/type_array/uint16.c +++ b/level_0/f_type_array/c/type_array/uint16.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_uint16s_adjust_ - f_status_t f_uint16s_adjust(const f_array_length_t length, f_uint16s_t *uint16s) { + f_status_t f_uint16s_adjust(const f_number_unsigned_t length, f_uint16s_t *uint16s) { #ifndef _di_level_0_parameter_checking_ if (!uint16s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -39,7 +39,7 @@ extern "C" { #endif // _di_f_uint16s_append_all_ #ifndef _di_f_uint16s_decimate_by_ - f_status_t f_uint16s_decimate_by(const f_array_length_t amount, f_uint16s_t *uint16s) { + f_status_t f_uint16s_decimate_by(const f_number_unsigned_t amount, f_uint16s_t *uint16s) { #ifndef _di_level_0_parameter_checking_ if (!uint16s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -55,7 +55,7 @@ extern "C" { #endif // _di_f_uint16s_decimate_by_ #ifndef _di_f_uint16s_decrease_by_ - f_status_t f_uint16s_decrease_by(const f_array_length_t amount, f_uint16s_t *uint16s) { + f_status_t f_uint16s_decrease_by(const f_number_unsigned_t amount, f_uint16s_t *uint16s) { #ifndef _di_level_0_parameter_checking_ if (!uint16s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -71,20 +71,20 @@ extern "C" { #endif // _di_f_uint16s_decrease_by_ #ifndef _di_f_uint16s_increase_ - f_status_t f_uint16s_increase(const f_array_length_t step, f_uint16s_t *uint16s) { + f_status_t f_uint16s_increase(const f_number_unsigned_t step, f_uint16s_t *uint16s) { #ifndef _di_level_0_parameter_checking_ if (!uint16s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && uint16s->used + 1 > uint16s->size) { - f_array_length_t size = uint16s->used + step; + f_number_unsigned_t size = uint16s->used + step; - if (size > F_array_length_t_size_d) { - if (uint16s->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (uint16s->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_uint16s_resize(size, uint16s); @@ -95,7 +95,7 @@ extern "C" { #endif // _di_f_uint16s_increase_ #ifndef _di_f_uint16s_increase_by_ - f_status_t f_uint16s_increase_by(const f_array_length_t amount, f_uint16s_t *uint16s) { + f_status_t f_uint16s_increase_by(const f_number_unsigned_t amount, f_uint16s_t *uint16s) { #ifndef _di_level_0_parameter_checking_ if (!uint16s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -103,7 +103,7 @@ extern "C" { if (!amount) return F_data_not; if (uint16s->used + amount > uint16s->size) { - if (uint16s->used + amount > F_array_length_t_size_d) { + if (uint16s->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -115,7 +115,7 @@ extern "C" { #endif // _di_f_uint16s_increase_by_ #ifndef _di_f_uint16s_resize_ - f_status_t f_uint16s_resize(const f_array_length_t length, f_uint16s_t *uint16s) { + f_status_t f_uint16s_resize(const f_number_unsigned_t length, f_uint16s_t *uint16s) { #ifndef _di_level_0_parameter_checking_ if (!uint16s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -125,7 +125,7 @@ extern "C" { #endif // _di_f_uint16s_resize_ #ifndef _di_f_uint16ss_adjust_ - f_status_t f_uint16ss_adjust(const f_array_length_t length, f_uint16ss_t *uint16ss) { + f_status_t f_uint16ss_adjust(const f_number_unsigned_t length, f_uint16ss_t *uint16ss) { #ifndef _di_level_0_parameter_checking_ if (!uint16ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -173,7 +173,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].used = 0; @@ -188,7 +188,7 @@ extern "C" { #endif // _di_f_uint16ss_append_all_ #ifndef _di_f_uint16ss_decimate_by_ - f_status_t f_uint16ss_decimate_by(const f_array_length_t amount, f_uint16ss_t *uint16ss) { + f_status_t f_uint16ss_decimate_by(const f_number_unsigned_t amount, f_uint16ss_t *uint16ss) { #ifndef _di_level_0_parameter_checking_ if (!uint16ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -204,7 +204,7 @@ extern "C" { #endif // _di_f_uint16ss_decimate_by_ #ifndef _di_f_uint16ss_decrease_by_ - f_status_t f_uint16ss_decrease_by(const f_array_length_t amount, f_uint16ss_t *uint16ss) { + f_status_t f_uint16ss_decrease_by(const f_number_unsigned_t amount, f_uint16ss_t *uint16ss) { #ifndef _di_level_0_parameter_checking_ if (!uint16ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -220,20 +220,20 @@ extern "C" { #endif // _di_f_uint16ss_decrease_by_ #ifndef _di_f_uint16ss_increase_ - f_status_t f_uint16ss_increase(const f_array_length_t step, f_uint16ss_t *uint16ss) { + f_status_t f_uint16ss_increase(const f_number_unsigned_t step, f_uint16ss_t *uint16ss) { #ifndef _di_level_0_parameter_checking_ if (!uint16ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && uint16ss->used + 1 > uint16ss->size) { - f_array_length_t size = uint16ss->used + step; + f_number_unsigned_t size = uint16ss->used + step; - if (size > F_array_length_t_size_d) { - if (uint16ss->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (uint16ss->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_uint16ss_resize(size, uint16ss); @@ -244,7 +244,7 @@ extern "C" { #endif // _di_f_uint16ss_increase_ #ifndef _di_f_uint16ss_increase_by_ - f_status_t f_uint16ss_increase_by(const f_array_length_t amount, f_uint16ss_t *uint16ss) { + f_status_t f_uint16ss_increase_by(const f_number_unsigned_t amount, f_uint16ss_t *uint16ss) { #ifndef _di_level_0_parameter_checking_ if (!uint16ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -252,7 +252,7 @@ extern "C" { if (!amount) return F_data_not; if (uint16ss->used + amount > uint16ss->size) { - if (uint16ss->used + amount > F_array_length_t_size_d) { + if (uint16ss->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -264,7 +264,7 @@ extern "C" { #endif // _di_f_uint16ss_increase_by_ #ifndef _di_f_uint16ss_resize_ - f_status_t f_uint16ss_resize(const f_array_length_t length, f_uint16ss_t *uint16ss) { + f_status_t f_uint16ss_resize(const f_number_unsigned_t length, f_uint16ss_t *uint16ss) { #ifndef _di_level_0_parameter_checking_ if (!uint16ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_type_array/c/type_array/uint16.h b/level_0/f_type_array/c/type_array/uint16.h index 5d94b79..88ed031 100644 --- a/level_0/f_type_array/c/type_array/uint16.h +++ b/level_0/f_type_array/c/type_array/uint16.h @@ -32,7 +32,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_uint16s_adjust_ - extern f_status_t f_uint16s_adjust(const f_array_length_t length, f_uint16s_t *uint16s); + extern f_status_t f_uint16s_adjust(const f_number_unsigned_t length, f_uint16s_t *uint16s); #endif // _di_f_uint16s_adjust_ /** @@ -96,7 +96,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_uint16s_decimate_by_ - extern f_status_t f_uint16s_decimate_by(const f_array_length_t amount, f_uint16s_t *uint16s); + extern f_status_t f_uint16s_decimate_by(const f_number_unsigned_t amount, f_uint16s_t *uint16s); #endif // _di_f_uint16s_decimate_by_ /** @@ -119,13 +119,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint16s_decrease_by_ - extern f_status_t f_uint16s_decrease_by(const f_array_length_t amount, f_uint16s_t *uint16s); + extern f_status_t f_uint16s_decrease_by(const f_number_unsigned_t amount, f_uint16s_t *uint16s); #endif // _di_f_uint16s_decrease_by_ /** * Increase the size of the string uint16s array, but only if necesary. * - * If the given length is too large for the buffer, then attempt to set max buffer size (F_array_length_t_size_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -144,14 +144,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint16s_increase_ - extern f_status_t f_uint16s_increase(const f_array_length_t step, f_uint16s_t *uint16s); + extern f_status_t f_uint16s_increase(const f_number_unsigned_t step, f_uint16s_t *uint16s); #endif // _di_f_uint16s_increase_ /** * Resize the string uint16s 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -169,7 +169,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint16s_increase_by_ - extern f_status_t f_uint16s_increase_by(const f_array_length_t amount, f_uint16s_t *uint16s); + extern f_status_t f_uint16s_increase_by(const f_number_unsigned_t amount, f_uint16s_t *uint16s); #endif // _di_f_uint16s_increase_by_ /** @@ -188,7 +188,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint16s_resize_ - extern f_status_t f_uint16s_resize(const f_array_length_t length, f_uint16s_t *uint16s); + extern f_status_t f_uint16s_resize(const f_number_unsigned_t length, f_uint16s_t *uint16s); #endif // _di_f_uint16s_resize_ /** @@ -208,7 +208,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_uint16ss_adjust_ - extern f_status_t f_uint16ss_adjust(const f_array_length_t length, f_uint16ss_t *uint16ss); + extern f_status_t f_uint16ss_adjust(const f_number_unsigned_t length, f_uint16ss_t *uint16ss); #endif // _di_f_uint16ss_adjust_ /** @@ -273,7 +273,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_uint16ss_decimate_by_ - extern f_status_t f_uint16ss_decimate_by(const f_array_length_t amount, f_uint16ss_t *uint16ss); + extern f_status_t f_uint16ss_decimate_by(const f_number_unsigned_t amount, f_uint16ss_t *uint16ss); #endif // _di_f_uint16ss_decimate_by_ /** @@ -297,13 +297,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint16ss_decrease_by_ - extern f_status_t f_uint16ss_decrease_by(const f_array_length_t amount, f_uint16ss_t *uint16ss); + extern f_status_t f_uint16ss_decrease_by(const f_number_unsigned_t amount, f_uint16ss_t *uint16ss); #endif // _di_f_uint16ss_decrease_by_ /** * Increase the size of the string uint16ss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -322,14 +322,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint16ss_increase_ - extern f_status_t f_uint16ss_increase(const f_array_length_t step, f_uint16ss_t *uint16ss); + extern f_status_t f_uint16ss_increase(const f_number_unsigned_t step, f_uint16ss_t *uint16ss); #endif // _di_f_uint16ss_increase_ /** * Resize the string uint16ss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -347,7 +347,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint16ss_increase_by_ - extern f_status_t f_uint16ss_increase_by(const f_array_length_t amount, f_uint16ss_t *uint16ss); + extern f_status_t f_uint16ss_increase_by(const f_number_unsigned_t amount, f_uint16ss_t *uint16ss); #endif // _di_f_uint16ss_increase_by_ /** @@ -367,7 +367,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint16ss_resize_ - extern f_status_t f_uint16ss_resize(const f_array_length_t length, f_uint16ss_t *uint16ss); + extern f_status_t f_uint16ss_resize(const f_number_unsigned_t length, f_uint16ss_t *uint16ss); #endif // _di_f_uint16ss_resize_ #ifdef __cplusplus diff --git a/level_0/f_type_array/c/type_array/uint32.c b/level_0/f_type_array/c/type_array/uint32.c index 43eec95..a01f9dc 100644 --- a/level_0/f_type_array/c/type_array/uint32.c +++ b/level_0/f_type_array/c/type_array/uint32.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_uint32s_adjust_ - f_status_t f_uint32s_adjust(const f_array_length_t length, f_uint32s_t *uint32s) { + f_status_t f_uint32s_adjust(const f_number_unsigned_t length, f_uint32s_t *uint32s) { #ifndef _di_level_0_parameter_checking_ if (!uint32s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -39,7 +39,7 @@ extern "C" { #endif // _di_f_uint32s_append_all_ #ifndef _di_f_uint32s_decimate_by_ - f_status_t f_uint32s_decimate_by(const f_array_length_t amount, f_uint32s_t *uint32s) { + f_status_t f_uint32s_decimate_by(const f_number_unsigned_t amount, f_uint32s_t *uint32s) { #ifndef _di_level_0_parameter_checking_ if (!uint32s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -55,7 +55,7 @@ extern "C" { #endif // _di_f_uint32s_decimate_by_ #ifndef _di_f_uint32s_decrease_by_ - f_status_t f_uint32s_decrease_by(const f_array_length_t amount, f_uint32s_t *uint32s) { + f_status_t f_uint32s_decrease_by(const f_number_unsigned_t amount, f_uint32s_t *uint32s) { #ifndef _di_level_0_parameter_checking_ if (!uint32s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -71,20 +71,20 @@ extern "C" { #endif // _di_f_uint32s_decrease_by_ #ifndef _di_f_uint32s_increase_ - f_status_t f_uint32s_increase(const f_array_length_t step, f_uint32s_t *uint32s) { + f_status_t f_uint32s_increase(const f_number_unsigned_t step, f_uint32s_t *uint32s) { #ifndef _di_level_0_parameter_checking_ if (!uint32s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && uint32s->used + 1 > uint32s->size) { - f_array_length_t size = uint32s->used + step; + f_number_unsigned_t size = uint32s->used + step; - if (size > F_array_length_t_size_d) { - if (uint32s->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (uint32s->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_uint32s_resize(size, uint32s); @@ -95,7 +95,7 @@ extern "C" { #endif // _di_f_uint32s_increase_ #ifndef _di_f_uint32s_increase_by_ - f_status_t f_uint32s_increase_by(const f_array_length_t amount, f_uint32s_t *uint32s) { + f_status_t f_uint32s_increase_by(const f_number_unsigned_t amount, f_uint32s_t *uint32s) { #ifndef _di_level_0_parameter_checking_ if (!uint32s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -103,7 +103,7 @@ extern "C" { if (!amount) return F_data_not; if (uint32s->used + amount > uint32s->size) { - if (uint32s->used + amount > F_array_length_t_size_d) { + if (uint32s->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -115,7 +115,7 @@ extern "C" { #endif // _di_f_uint32s_increase_by_ #ifndef _di_f_uint32s_resize_ - f_status_t f_uint32s_resize(const f_array_length_t length, f_uint32s_t *uint32s) { + f_status_t f_uint32s_resize(const f_number_unsigned_t length, f_uint32s_t *uint32s) { #ifndef _di_level_0_parameter_checking_ if (!uint32s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -125,7 +125,7 @@ extern "C" { #endif // _di_f_uint32s_resize_ #ifndef _di_f_uint32ss_adjust_ - f_status_t f_uint32ss_adjust(const f_array_length_t length, f_uint32ss_t *uint32ss) { + f_status_t f_uint32ss_adjust(const f_number_unsigned_t length, f_uint32ss_t *uint32ss) { #ifndef _di_level_0_parameter_checking_ if (!uint32ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -173,7 +173,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].used = 0; @@ -188,7 +188,7 @@ extern "C" { #endif // _di_f_uint32ss_append_all_ #ifndef _di_f_uint32ss_decimate_by_ - f_status_t f_uint32ss_decimate_by(const f_array_length_t amount, f_uint32ss_t *uint32ss) { + f_status_t f_uint32ss_decimate_by(const f_number_unsigned_t amount, f_uint32ss_t *uint32ss) { #ifndef _di_level_0_parameter_checking_ if (!uint32ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -204,7 +204,7 @@ extern "C" { #endif // _di_f_uint32ss_decimate_by_ #ifndef _di_f_uint32ss_decrease_by_ - f_status_t f_uint32ss_decrease_by(const f_array_length_t amount, f_uint32ss_t *uint32ss) { + f_status_t f_uint32ss_decrease_by(const f_number_unsigned_t amount, f_uint32ss_t *uint32ss) { #ifndef _di_level_0_parameter_checking_ if (!uint32ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -220,20 +220,20 @@ extern "C" { #endif // _di_f_uint32ss_decrease_by_ #ifndef _di_f_uint32ss_increase_ - f_status_t f_uint32ss_increase(const f_array_length_t step, f_uint32ss_t *uint32ss) { + f_status_t f_uint32ss_increase(const f_number_unsigned_t step, f_uint32ss_t *uint32ss) { #ifndef _di_level_0_parameter_checking_ if (!uint32ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && uint32ss->used + 1 > uint32ss->size) { - f_array_length_t size = uint32ss->used + step; + f_number_unsigned_t size = uint32ss->used + step; - if (size > F_array_length_t_size_d) { - if (uint32ss->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (uint32ss->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_uint32ss_resize(size, uint32ss); @@ -244,7 +244,7 @@ extern "C" { #endif // _di_f_uint32ss_increase_ #ifndef _di_f_uint32ss_increase_by_ - f_status_t f_uint32ss_increase_by(const f_array_length_t amount, f_uint32ss_t *uint32ss) { + f_status_t f_uint32ss_increase_by(const f_number_unsigned_t amount, f_uint32ss_t *uint32ss) { #ifndef _di_level_0_parameter_checking_ if (!uint32ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -252,7 +252,7 @@ extern "C" { if (!amount) return F_data_not; if (uint32ss->used + amount > uint32ss->size) { - if (uint32ss->used + amount > F_array_length_t_size_d) { + if (uint32ss->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -264,7 +264,7 @@ extern "C" { #endif // _di_f_uint32ss_increase_by_ #ifndef _di_f_uint32ss_resize_ - f_status_t f_uint32ss_resize(const f_array_length_t length, f_uint32ss_t *uint32ss) { + f_status_t f_uint32ss_resize(const f_number_unsigned_t length, f_uint32ss_t *uint32ss) { #ifndef _di_level_0_parameter_checking_ if (!uint32ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_type_array/c/type_array/uint32.h b/level_0/f_type_array/c/type_array/uint32.h index c6d9c79..30c2bfc 100644 --- a/level_0/f_type_array/c/type_array/uint32.h +++ b/level_0/f_type_array/c/type_array/uint32.h @@ -32,7 +32,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_uint32s_adjust_ - extern f_status_t f_uint32s_adjust(const f_array_length_t length, f_uint32s_t *uint32s); + extern f_status_t f_uint32s_adjust(const f_number_unsigned_t length, f_uint32s_t *uint32s); #endif // _di_f_uint32s_adjust_ /** @@ -96,7 +96,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_uint32s_decimate_by_ - extern f_status_t f_uint32s_decimate_by(const f_array_length_t amount, f_uint32s_t *uint32s); + extern f_status_t f_uint32s_decimate_by(const f_number_unsigned_t amount, f_uint32s_t *uint32s); #endif // _di_f_uint32s_decimate_by_ /** @@ -119,13 +119,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint32s_decrease_by_ - extern f_status_t f_uint32s_decrease_by(const f_array_length_t amount, f_uint32s_t *uint32s); + extern f_status_t f_uint32s_decrease_by(const f_number_unsigned_t amount, f_uint32s_t *uint32s); #endif // _di_f_uint32s_decrease_by_ /** * Increase the size of the string uint32s array, but only if necesary. * - * If the given length is too large for the buffer, then attempt to set max buffer size (F_array_length_t_size_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -144,14 +144,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint32s_increase_ - extern f_status_t f_uint32s_increase(const f_array_length_t step, f_uint32s_t *uint32s); + extern f_status_t f_uint32s_increase(const f_number_unsigned_t step, f_uint32s_t *uint32s); #endif // _di_f_uint32s_increase_ /** * Resize the string uint32s 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -169,7 +169,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint32s_increase_by_ - extern f_status_t f_uint32s_increase_by(const f_array_length_t amount, f_uint32s_t *uint32s); + extern f_status_t f_uint32s_increase_by(const f_number_unsigned_t amount, f_uint32s_t *uint32s); #endif // _di_f_uint32s_increase_by_ /** @@ -188,7 +188,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint32s_resize_ - extern f_status_t f_uint32s_resize(const f_array_length_t length, f_uint32s_t *uint32s); + extern f_status_t f_uint32s_resize(const f_number_unsigned_t length, f_uint32s_t *uint32s); #endif // _di_f_uint32s_resize_ /** @@ -208,7 +208,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_uint32ss_adjust_ - extern f_status_t f_uint32ss_adjust(const f_array_length_t length, f_uint32ss_t *uint32ss); + extern f_status_t f_uint32ss_adjust(const f_number_unsigned_t length, f_uint32ss_t *uint32ss); #endif // _di_f_uint32ss_adjust_ /** @@ -273,7 +273,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_uint32ss_decimate_by_ - extern f_status_t f_uint32ss_decimate_by(const f_array_length_t amount, f_uint32ss_t *uint32ss); + extern f_status_t f_uint32ss_decimate_by(const f_number_unsigned_t amount, f_uint32ss_t *uint32ss); #endif // _di_f_uint32ss_decimate_by_ /** @@ -297,13 +297,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint32ss_decrease_by_ - extern f_status_t f_uint32ss_decrease_by(const f_array_length_t amount, f_uint32ss_t *uint32ss); + extern f_status_t f_uint32ss_decrease_by(const f_number_unsigned_t amount, f_uint32ss_t *uint32ss); #endif // _di_f_uint32ss_decrease_by_ /** * Increase the size of the string uint32ss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -322,14 +322,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint32ss_increase_ - extern f_status_t f_uint32ss_increase(const f_array_length_t step, f_uint32ss_t *uint32ss); + extern f_status_t f_uint32ss_increase(const f_number_unsigned_t step, f_uint32ss_t *uint32ss); #endif // _di_f_uint32ss_increase_ /** * Resize the string uint32ss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -347,7 +347,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint32ss_increase_by_ - extern f_status_t f_uint32ss_increase_by(const f_array_length_t amount, f_uint32ss_t *uint32ss); + extern f_status_t f_uint32ss_increase_by(const f_number_unsigned_t amount, f_uint32ss_t *uint32ss); #endif // _di_f_uint32ss_increase_by_ /** @@ -367,7 +367,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint32ss_resize_ - extern f_status_t f_uint32ss_resize(const f_array_length_t length, f_uint32ss_t *uint32ss); + extern f_status_t f_uint32ss_resize(const f_number_unsigned_t length, f_uint32ss_t *uint32ss); #endif // _di_f_uint32ss_resize_ #ifdef __cplusplus diff --git a/level_0/f_type_array/c/type_array/uint64.c b/level_0/f_type_array/c/type_array/uint64.c index fa08f97..797f53f 100644 --- a/level_0/f_type_array/c/type_array/uint64.c +++ b/level_0/f_type_array/c/type_array/uint64.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_uint64s_adjust_ - f_status_t f_uint64s_adjust(const f_array_length_t length, f_uint64s_t *uint64s) { + f_status_t f_uint64s_adjust(const f_number_unsigned_t length, f_uint64s_t *uint64s) { #ifndef _di_level_0_parameter_checking_ if (!uint64s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -39,7 +39,7 @@ extern "C" { #endif // _di_f_uint64s_append_all_ #ifndef _di_f_uint64s_decimate_by_ - f_status_t f_uint64s_decimate_by(const f_array_length_t amount, f_uint64s_t *uint64s) { + f_status_t f_uint64s_decimate_by(const f_number_unsigned_t amount, f_uint64s_t *uint64s) { #ifndef _di_level_0_parameter_checking_ if (!uint64s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -55,7 +55,7 @@ extern "C" { #endif // _di_f_uint64s_decimate_by_ #ifndef _di_f_uint64s_decrease_by_ - f_status_t f_uint64s_decrease_by(const f_array_length_t amount, f_uint64s_t *uint64s) { + f_status_t f_uint64s_decrease_by(const f_number_unsigned_t amount, f_uint64s_t *uint64s) { #ifndef _di_level_0_parameter_checking_ if (!uint64s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -71,20 +71,20 @@ extern "C" { #endif // _di_f_uint64s_decrease_by_ #ifndef _di_f_uint64s_increase_ - f_status_t f_uint64s_increase(const f_array_length_t step, f_uint64s_t *uint64s) { + f_status_t f_uint64s_increase(const f_number_unsigned_t step, f_uint64s_t *uint64s) { #ifndef _di_level_0_parameter_checking_ if (!uint64s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && uint64s->used + 1 > uint64s->size) { - f_array_length_t size = uint64s->used + step; + f_number_unsigned_t size = uint64s->used + step; - if (size > F_array_length_t_size_d) { - if (uint64s->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (uint64s->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_uint64s_resize(size, uint64s); @@ -95,7 +95,7 @@ extern "C" { #endif // _di_f_uint64s_increase_ #ifndef _di_f_uint64s_increase_by_ - f_status_t f_uint64s_increase_by(const f_array_length_t amount, f_uint64s_t *uint64s) { + f_status_t f_uint64s_increase_by(const f_number_unsigned_t amount, f_uint64s_t *uint64s) { #ifndef _di_level_0_parameter_checking_ if (!uint64s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -103,7 +103,7 @@ extern "C" { if (!amount) return F_data_not; if (uint64s->used + amount > uint64s->size) { - if (uint64s->used + amount > F_array_length_t_size_d) { + if (uint64s->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -115,7 +115,7 @@ extern "C" { #endif // _di_f_uint64s_increase_by_ #ifndef _di_f_uint64s_resize_ - f_status_t f_uint64s_resize(const f_array_length_t length, f_uint64s_t *uint64s) { + f_status_t f_uint64s_resize(const f_number_unsigned_t length, f_uint64s_t *uint64s) { #ifndef _di_level_0_parameter_checking_ if (!uint64s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -125,7 +125,7 @@ extern "C" { #endif // _di_f_uint64s_resize_ #ifndef _di_f_uint64ss_adjust_ - f_status_t f_uint64ss_adjust(const f_array_length_t length, f_uint64ss_t *uint64ss) { + f_status_t f_uint64ss_adjust(const f_number_unsigned_t length, f_uint64ss_t *uint64ss) { #ifndef _di_level_0_parameter_checking_ if (!uint64ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -173,7 +173,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].used = 0; @@ -188,7 +188,7 @@ extern "C" { #endif // _di_f_uint64ss_append_all_ #ifndef _di_f_uint64ss_decimate_by_ - f_status_t f_uint64ss_decimate_by(const f_array_length_t amount, f_uint64ss_t *uint64ss) { + f_status_t f_uint64ss_decimate_by(const f_number_unsigned_t amount, f_uint64ss_t *uint64ss) { #ifndef _di_level_0_parameter_checking_ if (!uint64ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -204,7 +204,7 @@ extern "C" { #endif // _di_f_uint64ss_decimate_by_ #ifndef _di_f_uint64ss_decrease_by_ - f_status_t f_uint64ss_decrease_by(const f_array_length_t amount, f_uint64ss_t *uint64ss) { + f_status_t f_uint64ss_decrease_by(const f_number_unsigned_t amount, f_uint64ss_t *uint64ss) { #ifndef _di_level_0_parameter_checking_ if (!uint64ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -220,20 +220,20 @@ extern "C" { #endif // _di_f_uint64ss_decrease_by_ #ifndef _di_f_uint64ss_increase_ - f_status_t f_uint64ss_increase(const f_array_length_t step, f_uint64ss_t *uint64ss) { + f_status_t f_uint64ss_increase(const f_number_unsigned_t step, f_uint64ss_t *uint64ss) { #ifndef _di_level_0_parameter_checking_ if (!uint64ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && uint64ss->used + 1 > uint64ss->size) { - f_array_length_t size = uint64ss->used + step; + f_number_unsigned_t size = uint64ss->used + step; - if (size > F_array_length_t_size_d) { - if (uint64ss->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (uint64ss->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_uint64ss_resize(size, uint64ss); @@ -244,7 +244,7 @@ extern "C" { #endif // _di_f_uint64ss_increase_ #ifndef _di_f_uint64ss_increase_by_ - f_status_t f_uint64ss_increase_by(const f_array_length_t amount, f_uint64ss_t *uint64ss) { + f_status_t f_uint64ss_increase_by(const f_number_unsigned_t amount, f_uint64ss_t *uint64ss) { #ifndef _di_level_0_parameter_checking_ if (!uint64ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -252,7 +252,7 @@ extern "C" { if (!amount) return F_data_not; if (uint64ss->used + amount > uint64ss->size) { - if (uint64ss->used + amount > F_array_length_t_size_d) { + if (uint64ss->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -264,7 +264,7 @@ extern "C" { #endif // _di_f_uint64ss_increase_by_ #ifndef _di_f_uint64ss_resize_ - f_status_t f_uint64ss_resize(const f_array_length_t length, f_uint64ss_t *uint64ss) { + f_status_t f_uint64ss_resize(const f_number_unsigned_t length, f_uint64ss_t *uint64ss) { #ifndef _di_level_0_parameter_checking_ if (!uint64ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_type_array/c/type_array/uint64.h b/level_0/f_type_array/c/type_array/uint64.h index a1fe5c4..125096d 100644 --- a/level_0/f_type_array/c/type_array/uint64.h +++ b/level_0/f_type_array/c/type_array/uint64.h @@ -32,7 +32,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_uint64s_adjust_ - extern f_status_t f_uint64s_adjust(const f_array_length_t length, f_uint64s_t *uint64s); + extern f_status_t f_uint64s_adjust(const f_number_unsigned_t length, f_uint64s_t *uint64s); #endif // _di_f_uint64s_adjust_ /** @@ -96,7 +96,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_uint64s_decimate_by_ - extern f_status_t f_uint64s_decimate_by(const f_array_length_t amount, f_uint64s_t *uint64s); + extern f_status_t f_uint64s_decimate_by(const f_number_unsigned_t amount, f_uint64s_t *uint64s); #endif // _di_f_uint64s_decimate_by_ /** @@ -120,13 +120,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint64s_decrease_by_ - extern f_status_t f_uint64s_decrease_by(const f_array_length_t amount, f_uint64s_t *uint64s); + extern f_status_t f_uint64s_decrease_by(const f_number_unsigned_t amount, f_uint64s_t *uint64s); #endif // _di_f_uint64s_decrease_by_ /** * Increase the size of the string uint64s array, but only if necesary. * - * If the given length is too large for the buffer, then attempt to set max buffer size (F_array_length_t_size_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -145,14 +145,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint64s_increase_ - extern f_status_t f_uint64s_increase(const f_array_length_t step, f_uint64s_t *uint64s); + extern f_status_t f_uint64s_increase(const f_number_unsigned_t step, f_uint64s_t *uint64s); #endif // _di_f_uint64s_increase_ /** * Resize the string uint64s 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -170,7 +170,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint64s_increase_by_ - extern f_status_t f_uint64s_increase_by(const f_array_length_t amount, f_uint64s_t *uint64s); + extern f_status_t f_uint64s_increase_by(const f_number_unsigned_t amount, f_uint64s_t *uint64s); #endif // _di_f_uint64s_increase_by_ /** @@ -189,7 +189,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint64s_resize_ - extern f_status_t f_uint64s_resize(const f_array_length_t length, f_uint64s_t *uint64s); + extern f_status_t f_uint64s_resize(const f_number_unsigned_t length, f_uint64s_t *uint64s); #endif // _di_f_uint64s_resize_ /** @@ -209,7 +209,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_uint64ss_adjust_ - extern f_status_t f_uint64ss_adjust(const f_array_length_t length, f_uint64ss_t *uint64ss); + extern f_status_t f_uint64ss_adjust(const f_number_unsigned_t length, f_uint64ss_t *uint64ss); #endif // _di_f_uint64ss_adjust_ /** @@ -274,7 +274,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_uint64ss_decimate_by_ - extern f_status_t f_uint64ss_decimate_by(const f_array_length_t amount, f_uint64ss_t *uint64ss); + extern f_status_t f_uint64ss_decimate_by(const f_number_unsigned_t amount, f_uint64ss_t *uint64ss); #endif // _di_f_uint64ss_decimate_by_ /** @@ -299,13 +299,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint64ss_decrease_by_ - extern f_status_t f_uint64ss_decrease_by(const f_array_length_t amount, f_uint64ss_t *uint64ss); + extern f_status_t f_uint64ss_decrease_by(const f_number_unsigned_t amount, f_uint64ss_t *uint64ss); #endif // _di_f_uint64ss_decrease_by_ /** * Increase the size of the string uint64ss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -324,14 +324,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint64ss_increase_ - extern f_status_t f_uint64ss_increase(const f_array_length_t step, f_uint64ss_t *uint64ss); + extern f_status_t f_uint64ss_increase(const f_number_unsigned_t step, f_uint64ss_t *uint64ss); #endif // _di_f_uint64ss_increase_ /** * Resize the string uint64ss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -349,7 +349,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint64ss_increase_by_ - extern f_status_t f_uint64ss_increase_by(const f_array_length_t amount, f_uint64ss_t *uint64ss); + extern f_status_t f_uint64ss_increase_by(const f_number_unsigned_t amount, f_uint64ss_t *uint64ss); #endif // _di_f_uint64ss_increase_by_ /** @@ -369,7 +369,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint64ss_resize_ - extern f_status_t f_uint64ss_resize(const f_array_length_t length, f_uint64ss_t *uint64ss); + extern f_status_t f_uint64ss_resize(const f_number_unsigned_t length, f_uint64ss_t *uint64ss); #endif // _di_f_uint64ss_resize_ #ifdef __cplusplus diff --git a/level_0/f_type_array/c/type_array/uint8.c b/level_0/f_type_array/c/type_array/uint8.c index 0a62f8b..abf935a 100644 --- a/level_0/f_type_array/c/type_array/uint8.c +++ b/level_0/f_type_array/c/type_array/uint8.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_uint8s_adjust_ - f_status_t f_uint8s_adjust(const f_array_length_t length, f_uint8s_t *uint8s) { + f_status_t f_uint8s_adjust(const f_number_unsigned_t length, f_uint8s_t *uint8s) { #ifndef _di_level_0_parameter_checking_ if (!uint8s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -39,7 +39,7 @@ extern "C" { #endif // _di_f_uint8s_append_all_ #ifndef _di_f_uint8s_decimate_by_ - f_status_t f_uint8s_decimate_by(const f_array_length_t amount, f_uint8s_t *uint8s) { + f_status_t f_uint8s_decimate_by(const f_number_unsigned_t amount, f_uint8s_t *uint8s) { #ifndef _di_level_0_parameter_checking_ if (!uint8s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -55,7 +55,7 @@ extern "C" { #endif // _di_f_uint8s_decimate_by_ #ifndef _di_f_uint8s_decrease_by_ - f_status_t f_uint8s_decrease_by(const f_array_length_t amount, f_uint8s_t *uint8s) { + f_status_t f_uint8s_decrease_by(const f_number_unsigned_t amount, f_uint8s_t *uint8s) { #ifndef _di_level_0_parameter_checking_ if (!uint8s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -71,20 +71,20 @@ extern "C" { #endif // _di_f_uint8s_decrease_by_ #ifndef _di_f_uint8s_increase_ - f_status_t f_uint8s_increase(const f_array_length_t step, f_uint8s_t *uint8s) { + f_status_t f_uint8s_increase(const f_number_unsigned_t step, f_uint8s_t *uint8s) { #ifndef _di_level_0_parameter_checking_ if (!uint8s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && uint8s->used + 1 > uint8s->size) { - f_array_length_t size = uint8s->used + step; + f_number_unsigned_t size = uint8s->used + step; - if (size > F_array_length_t_size_d) { - if (uint8s->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (uint8s->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_uint8s_resize(size, uint8s); @@ -95,7 +95,7 @@ extern "C" { #endif // _di_f_uint8s_increase_ #ifndef _di_f_uint8s_increase_by_ - f_status_t f_uint8s_increase_by(const f_array_length_t amount, f_uint8s_t *uint8s) { + f_status_t f_uint8s_increase_by(const f_number_unsigned_t amount, f_uint8s_t *uint8s) { #ifndef _di_level_0_parameter_checking_ if (!uint8s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -103,7 +103,7 @@ extern "C" { if (!amount) return F_data_not; if (uint8s->used + amount > uint8s->size) { - if (uint8s->used + amount > F_array_length_t_size_d) { + if (uint8s->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -115,7 +115,7 @@ extern "C" { #endif // _di_f_uint8s_increase_by_ #ifndef _di_f_uint8s_resize_ - f_status_t f_uint8s_resize(const f_array_length_t length, f_uint8s_t *uint8s) { + f_status_t f_uint8s_resize(const f_number_unsigned_t length, f_uint8s_t *uint8s) { #ifndef _di_level_0_parameter_checking_ if (!uint8s) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -125,7 +125,7 @@ extern "C" { #endif // _di_f_uint8s_resize_ #ifndef _di_f_uint8ss_adjust_ - f_status_t f_uint8ss_adjust(const f_array_length_t length, f_uint8ss_t *uint8ss) { + f_status_t f_uint8ss_adjust(const f_number_unsigned_t length, f_uint8ss_t *uint8ss) { #ifndef _di_level_0_parameter_checking_ if (!uint8ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -173,7 +173,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].used = 0; @@ -188,7 +188,7 @@ extern "C" { #endif // _di_f_uint8ss_append_all_ #ifndef _di_f_uint8ss_decimate_by_ - f_status_t f_uint8ss_decimate_by(const f_array_length_t amount, f_uint8ss_t *uint8ss) { + f_status_t f_uint8ss_decimate_by(const f_number_unsigned_t amount, f_uint8ss_t *uint8ss) { #ifndef _di_level_0_parameter_checking_ if (!uint8ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -204,7 +204,7 @@ extern "C" { #endif // _di_f_uint8ss_decimate_by_ #ifndef _di_f_uint8ss_decrease_by_ - f_status_t f_uint8ss_decrease_by(const f_array_length_t amount, f_uint8ss_t *uint8ss) { + f_status_t f_uint8ss_decrease_by(const f_number_unsigned_t amount, f_uint8ss_t *uint8ss) { #ifndef _di_level_0_parameter_checking_ if (!uint8ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -220,20 +220,20 @@ extern "C" { #endif // _di_f_uint8ss_decrease_by_ #ifndef _di_f_uint8ss_increase_ - f_status_t f_uint8ss_increase(const f_array_length_t step, f_uint8ss_t *uint8ss) { + f_status_t f_uint8ss_increase(const f_number_unsigned_t step, f_uint8ss_t *uint8ss) { #ifndef _di_level_0_parameter_checking_ if (!uint8ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && uint8ss->used + 1 > uint8ss->size) { - f_array_length_t size = uint8ss->used + step; + f_number_unsigned_t size = uint8ss->used + step; - if (size > F_array_length_t_size_d) { - if (uint8ss->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (uint8ss->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_uint8ss_resize(size, uint8ss); @@ -244,7 +244,7 @@ extern "C" { #endif // _di_f_uint8ss_increase_ #ifndef _di_f_uint8ss_increase_by_ - f_status_t f_uint8ss_increase_by(const f_array_length_t amount, f_uint8ss_t *uint8ss) { + f_status_t f_uint8ss_increase_by(const f_number_unsigned_t amount, f_uint8ss_t *uint8ss) { #ifndef _di_level_0_parameter_checking_ if (!uint8ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -252,7 +252,7 @@ extern "C" { if (!amount) return F_data_not; if (uint8ss->used + amount > uint8ss->size) { - if (uint8ss->used + amount > F_array_length_t_size_d) { + if (uint8ss->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -264,7 +264,7 @@ extern "C" { #endif // _di_f_uint8ss_increase_by_ #ifndef _di_f_uint8ss_resize_ - f_status_t f_uint8ss_resize(const f_array_length_t length, f_uint8ss_t *uint8ss) { + f_status_t f_uint8ss_resize(const f_number_unsigned_t length, f_uint8ss_t *uint8ss) { #ifndef _di_level_0_parameter_checking_ if (!uint8ss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_type_array/c/type_array/uint8.h b/level_0/f_type_array/c/type_array/uint8.h index b181d31..e46cdfc 100644 --- a/level_0/f_type_array/c/type_array/uint8.h +++ b/level_0/f_type_array/c/type_array/uint8.h @@ -32,7 +32,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_uint8s_adjust_ - extern f_status_t f_uint8s_adjust(const f_array_length_t length, f_uint8s_t *uint8s); + extern f_status_t f_uint8s_adjust(const f_number_unsigned_t length, f_uint8s_t *uint8s); #endif // _di_f_uint8s_adjust_ /** @@ -96,7 +96,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_uint8s_decimate_by_ - extern f_status_t f_uint8s_decimate_by(const f_array_length_t amount, f_uint8s_t *uint8s); + extern f_status_t f_uint8s_decimate_by(const f_number_unsigned_t amount, f_uint8s_t *uint8s); #endif // _di_f_uint8s_decimate_by_ /** @@ -120,13 +120,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint8s_decrease_by_ - extern f_status_t f_uint8s_decrease_by(const f_array_length_t amount, f_uint8s_t *uint8s); + extern f_status_t f_uint8s_decrease_by(const f_number_unsigned_t amount, f_uint8s_t *uint8s); #endif // _di_f_uint8s_decrease_by_ /** * Increase the size of the string uint8s array, but only if necesary. * - * If the given length is too large for the buffer, then attempt to set max buffer size (F_array_length_t_size_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -145,14 +145,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint8s_increase_ - extern f_status_t f_uint8s_increase(const f_array_length_t step, f_uint8s_t *uint8s); + extern f_status_t f_uint8s_increase(const f_number_unsigned_t step, f_uint8s_t *uint8s); #endif // _di_f_uint8s_increase_ /** * Resize the string uint8s 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -170,7 +170,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint8s_increase_by_ - extern f_status_t f_uint8s_increase_by(const f_array_length_t amount, f_uint8s_t *uint8s); + extern f_status_t f_uint8s_increase_by(const f_number_unsigned_t amount, f_uint8s_t *uint8s); #endif // _di_f_uint8s_increase_by_ /** @@ -189,7 +189,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint8s_resize_ - extern f_status_t f_uint8s_resize(const f_array_length_t length, f_uint8s_t *uint8s); + extern f_status_t f_uint8s_resize(const f_number_unsigned_t length, f_uint8s_t *uint8s); #endif // _di_f_uint8s_resize_ /** @@ -209,7 +209,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_uint8ss_adjust_ - extern f_status_t f_uint8ss_adjust(const f_array_length_t length, f_uint8ss_t *uint8ss); + extern f_status_t f_uint8ss_adjust(const f_number_unsigned_t length, f_uint8ss_t *uint8ss); #endif // _di_f_uint8ss_adjust_ /** @@ -274,7 +274,7 @@ extern "C" { * Errors (with error bit) from: f_memory_destroy(). */ #ifndef _di_f_uint8ss_decimate_by_ - extern f_status_t f_uint8ss_decimate_by(const f_array_length_t amount, f_uint8ss_t *uint8ss); + extern f_status_t f_uint8ss_decimate_by(const f_number_unsigned_t amount, f_uint8ss_t *uint8ss); #endif // _di_f_uint8ss_decimate_by_ /** @@ -299,13 +299,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint8ss_decrease_by_ - extern f_status_t f_uint8ss_decrease_by(const f_array_length_t amount, f_uint8ss_t *uint8ss); + extern f_status_t f_uint8ss_decrease_by(const f_number_unsigned_t amount, f_uint8ss_t *uint8ss); #endif // _di_f_uint8ss_decrease_by_ /** * Increase the size of the string uint8ss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -324,14 +324,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint8ss_increase_ - extern f_status_t f_uint8ss_increase(const f_array_length_t step, f_uint8ss_t *uint8ss); + extern f_status_t f_uint8ss_increase(const f_number_unsigned_t step, f_uint8ss_t *uint8ss); #endif // _di_f_uint8ss_increase_ /** * Resize the string uint8ss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -349,7 +349,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint8ss_increase_by_ - extern f_status_t f_uint8ss_increase_by(const f_array_length_t amount, f_uint8ss_t *uint8ss); + extern f_status_t f_uint8ss_increase_by(const f_number_unsigned_t amount, f_uint8ss_t *uint8ss); #endif // _di_f_uint8ss_increase_by_ /** @@ -369,7 +369,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_uint8ss_resize_ - extern f_status_t f_uint8ss_resize(const f_array_length_t length, f_uint8ss_t *uint8ss); + extern f_status_t f_uint8ss_resize(const f_number_unsigned_t length, f_uint8ss_t *uint8ss); #endif // _di_f_uint8ss_resize_ #ifdef __cplusplus diff --git a/level_0/f_type_array/data/build/settings b/level_0/f_type_array/data/build/settings index 50afb44..e69100e 100644 --- a/level_0/f_type_array/data/build/settings +++ b/level_0/f_type_array/data/build/settings @@ -32,10 +32,10 @@ build_language c build_libraries -lc build_libraries-individual -lf_memory -build_sources_library type_array/array_length.c type_array/cell.c type_array/fll_id.c type_array/int8.c type_array/int16.c type_array/int32.c type_array/int64.c type_array/int128.c type_array/state.c type_array/status.c type_array/uint8.c type_array/uint16.c type_array/uint32.c type_array/uint64.c type_array/uint128.c -build_sources_library type_array/private-array_length.c type_array/private-cell.c type_array/private-fll_id.c type_array/private-int8.c type_array/private-int16.c type_array/private-int32.c type_array/private-int64.c type_array/private-int128.c type_array/private-state.c type_array/private-status.c type_array/private-uint8.c type_array/private-uint16.c type_array/private-uint32.c type_array/private-uint64.c type_array/private-uint128.c +build_sources_library type_array/cell.c type_array/fll_id.c type_array/int8.c type_array/int16.c type_array/int32.c type_array/int64.c type_array/int128.c type_array/number_unsigned.c type_array/state.c type_array/status.c type_array/uint8.c type_array/uint16.c type_array/uint32.c type_array/uint64.c type_array/uint128.c +build_sources_library type_array/private-cell.c type_array/private-fll_id.c type_array/private-int8.c type_array/private-int16.c type_array/private-int32.c type_array/private-int64.c type_array/private-int128.c type_array/private-number_unsigned.c type_array/private-state.c type_array/private-status.c type_array/private-uint8.c type_array/private-uint16.c type_array/private-uint32.c type_array/private-uint64.c type_array/private-uint128.c -build_sources_headers type_array.h type_array/common.h type_array/array_length.h type_array/cell.h type_array/fll_id.h type_array/int8.h type_array/int16.h type_array/int32.h type_array/int64.h type_array/int128.h type_array/state.h type_array/status.h type_array/uint8.h type_array/uint16.h type_array/uint32.h type_array/uint64.h type_array/uint128.h +build_sources_headers type_array.h type_array/common.h type_array/cell.h type_array/fll_id.h type_array/int8.h type_array/int16.h type_array/int32.h type_array/int64.h type_array/int128.h type_array/number_unsigned.h type_array/state.h type_array/status.h type_array/uint8.h type_array/uint16.h type_array/uint32.h type_array/uint64.h type_array/uint128.h build_script yes build_shared yes diff --git a/level_0/f_type_array/data/build/settings-tests b/level_0/f_type_array/data/build/settings-tests index 2ed281a..046c2ad 100644 --- a/level_0/f_type_array/data/build/settings-tests +++ b/level_0/f_type_array/data/build/settings-tests @@ -23,8 +23,6 @@ build_language c build_libraries -lc -lcmocka build_libraries-individual -lf_memory -lf_type_array -build_sources_program test-type_array-array_lengths_adjust.c test-type_array-array_lengths_append.c test-type_array-array_lengths_append_all.c test-type_array-array_lengths_decimate_by.c test-type_array-array_lengths_decrease_by.c test-type_array-array_lengths_increase.c test-type_array-array_lengths_increase_by.c test-type_array-array_lengths_resize.c -build_sources_program test-type_array-array_lengthss_adjust.c test-type_array-array_lengthss_append.c test-type_array-array_lengthss_append_all.c test-type_array-array_lengthss_decimate_by.c test-type_array-array_lengthss_decrease_by.c test-type_array-array_lengthss_increase.c test-type_array-array_lengthss_increase_by.c test-type_array-array_lengthss_resize.c build_sources_program test-type_array-fll_ids_adjust.c test-type_array-fll_ids_append.c test-type_array-fll_ids_append_all.c test-type_array-fll_ids_decimate_by.c test-type_array-fll_ids_decrease_by.c test-type_array-fll_ids_increase.c test-type_array-fll_ids_increase_by.c test-type_array-fll_ids_resize.c build_sources_program test-type_array-fll_idss_adjust.c test-type_array-fll_idss_append.c test-type_array-fll_idss_append_all.c test-type_array-fll_idss_decimate_by.c test-type_array-fll_idss_decrease_by.c test-type_array-fll_idss_increase.c test-type_array-fll_idss_increase_by.c test-type_array-fll_idss_resize.c build_sources_program test-type_array-cells_adjust.c test-type_array-cells_append.c test-type_array-cells_append_all.c test-type_array-cells_decimate_by.c test-type_array-cells_decrease_by.c test-type_array-cells_increase.c test-type_array-cells_increase_by.c test-type_array-cells_resize.c @@ -39,6 +37,8 @@ build_sources_program test-type_array-int64s_adjust.c test-type_array-int64s_app build_sources_program test-type_array-int64ss_adjust.c test-type_array-int64ss_append.c test-type_array-int64ss_append_all.c test-type_array-int64ss_decimate_by.c test-type_array-int64ss_decrease_by.c test-type_array-int64ss_increase.c test-type_array-int64ss_increase_by.c test-type_array-int64ss_resize.c build_sources_program test-type_array-int128s_adjust.c test-type_array-int128s_append.c test-type_array-int128s_append_all.c test-type_array-int128s_decimate_by.c test-type_array-int128s_decrease_by.c test-type_array-int128s_increase.c test-type_array-int128s_increase_by.c test-type_array-int128s_resize.c build_sources_program test-type_array-int128ss_adjust.c test-type_array-int128ss_append.c test-type_array-int128ss_append_all.c test-type_array-int128ss_decimate_by.c test-type_array-int128ss_decrease_by.c test-type_array-int128ss_increase.c test-type_array-int128ss_increase_by.c test-type_array-int128ss_resize.c +build_sources_program test-type_array-number_unsigneds_adjust.c test-type_array-number_unsigneds_append.c test-type_array-number_unsigneds_append_all.c test-type_array-number_unsigneds_decimate_by.c test-type_array-number_unsigneds_decrease_by.c test-type_array-number_unsigneds_increase.c test-type_array-number_unsigneds_increase_by.c test-type_array-number_unsigneds_resize.c +build_sources_program test-type_array-number_unsignedss_adjust.c test-type_array-number_unsignedss_append.c test-type_array-number_unsignedss_append_all.c test-type_array-number_unsignedss_decimate_by.c test-type_array-number_unsignedss_decrease_by.c test-type_array-number_unsignedss_increase.c test-type_array-number_unsignedss_increase_by.c test-type_array-number_unsignedss_resize.c build_sources_program test-type_array-states_adjust.c test-type_array-states_append.c test-type_array-states_append_all.c test-type_array-states_decimate_by.c test-type_array-states_decrease_by.c test-type_array-states_increase.c test-type_array-states_increase_by.c test-type_array-states_resize.c build_sources_program test-type_array-statess_adjust.c test-type_array-statess_append.c test-type_array-statess_append_all.c test-type_array-statess_decimate_by.c test-type_array-statess_decrease_by.c test-type_array-statess_increase.c test-type_array-statess_increase_by.c test-type_array-statess_resize.c build_sources_program test-type_array-statuss_adjust.c test-type_array-statuss_append.c test-type_array-statuss_append_all.c test-type_array-statuss_decimate_by.c test-type_array-statuss_decrease_by.c test-type_array-statuss_increase.c test-type_array-statuss_increase_by.c test-type_array-statuss_resize.c diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_adjust.h b/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_adjust.h deleted file mode 100644 index d2cac7d..0000000 --- a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_adjust.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: Type - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Test the array types in the type project. - */ -#ifndef _TEST__F_type_array__array_lengths_adjust -#define _TEST__F_type_array__array_lengths_adjust - -/** - * Test that the function correctly fails on invalid parameter. - * - * @see f_array_lengths_adjust() - */ -extern void test__f_type_array_array_lengths_adjust__parameter_checking(void **state); - -/** - * Test that the function works. - * - * @see f_array_lengths_adjust() - */ -extern void test__f_type_array_array_lengths_adjust__works(void **state); - -#endif // _TEST__F_type_array__array_lengths_adjust diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_append.c b/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_append.c deleted file mode 100644 index b3bf49cf..0000000 --- a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_append.c +++ /dev/null @@ -1,37 +0,0 @@ -#include "test-type_array.h" -#include "test-type_array-array_lengths_append.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void test__f_type_array_array_lengths_append__parameter_checking(void **state) { - - const f_array_length_t data = f_array_length_t_initialize; - - { - const f_status_t status = f_array_lengths_append(data, 0); - - assert_int_equal(status, F_status_set_error(F_parameter)); - } -} - -void test__f_type_array_array_lengths_append__works(void **state) { - - const f_array_length_t source = 3; - f_array_lengths_t destination = f_array_lengths_t_initialize; - - { - const f_status_t status = f_array_lengths_append(source, &destination); - - assert_int_equal(status, F_none); - assert_int_equal(destination.used, 1); - assert_int_equal(destination.array[0], source); - } - - free((void *) destination.array); -} - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_append.h b/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_append.h deleted file mode 100644 index 258411d..0000000 --- a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_append.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: Type - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Test the array types in the type project. - */ -#ifndef _TEST__F_type_array__array_lengths_append -#define _TEST__F_type_array__array_lengths_append - -/** - * Test that the function correctly fails on invalid parameter. - * - * @see f_array_lengths_append() - */ -extern void test__f_type_array_array_lengths_append__parameter_checking(void **state); - -/** - * Test that the function works. - * - * @see f_array_lengths_append() - */ -extern void test__f_type_array_array_lengths_append__works(void **state); - -#endif // _TEST__F_type_array__array_lengths_append diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_append_all.h b/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_append_all.h deleted file mode 100644 index ce6f772..0000000 --- a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_append_all.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: Type - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Test the array types in the type project. - */ -#ifndef _TEST__F_type_array__array_lengths_append_all -#define _TEST__F_type_array__array_lengths_append_all - -/** - * Test that the function correctly fails on invalid parameter. - * - * @see f_array_lengths_append_all() - */ -extern void test__f_type_array_array_lengths_append_all__parameter_checking(void **state); - -/** - * Test that the function returns F_data_not. - * - * @see f_array_lengths_append_all() - */ -extern void test__f_type_array_array_lengths_append_all__returns_data_not(void **state); - -/** - * Test that the function works. - * - * @see f_array_lengths_append_all() - */ -extern void test__f_type_array_array_lengths_append_all__works(void **state); - -#endif // _TEST__F_type_array__array_lengths_append_all diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_decimate_by.h b/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_decimate_by.h deleted file mode 100644 index 7d931bb..0000000 --- a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_decimate_by.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: Type - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Test the array types in the type project. - */ -#ifndef _TEST__F_type_array__array_lengths_decimate_by -#define _TEST__F_type_array__array_lengths_decimate_by - -/** - * Test that the function correctly fails on invalid parameter. - * - * @see f_array_lengths_decimate_by() - */ -extern void test__f_type_array_array_lengths_decimate_by__parameter_checking(void **state); - -/** - * Test that the function returns F_data_not. - * - * @see f_array_lengths_decimate_by() - */ -extern void test__f_type_array_array_lengths_decimate_by__returns_data_not(void **state); - -/** - * Test that the function works. - * - * @see f_array_lengths_decimate_by() - */ -extern void test__f_type_array_array_lengths_decimate_by__works(void **state); - -#endif // _TEST__F_type_array__array_lengths_decimate_by diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_decrease_by.h b/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_decrease_by.h deleted file mode 100644 index afca704..0000000 --- a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_decrease_by.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: Type - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Test the array types in the type project. - */ -#ifndef _TEST__F_type_array__array_lengths_decrease_by -#define _TEST__F_type_array__array_lengths_decrease_by - -/** - * Test that the function correctly fails on invalid parameter. - * - * @see f_array_lengths_decrease_by() - */ -extern void test__f_type_array_array_lengths_decrease_by__parameter_checking(void **state); - -/** - * Test that the function returns F_data_not. - * - * @see f_array_lengths_decrease_by() - */ -extern void test__f_type_array_array_lengths_decrease_by__returns_data_not(void **state); - -/** - * Test that the function works. - * - * @see f_array_lengths_decrease_by() - */ -extern void test__f_type_array_array_lengths_decrease_by__works(void **state); - -#endif // _TEST__F_type_array__array_lengths_decrease_by diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_increase.h b/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_increase.h deleted file mode 100644 index d279421..0000000 --- a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_increase.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: Type - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Test the array types in the type project. - */ -#ifndef _TEST__F_type_array__array_lengths_increase -#define _TEST__F_type_array__array_lengths_increase - -/** - * Test that the function correctly fails on invalid parameter. - * - * @see f_array_lengths_increase() - */ -extern void test__f_type_array_array_lengths_increase__parameter_checking(void **state); - -/** - * Test that the function returns F_data_not. - * - * @see f_array_lengths_increase() - */ -extern void test__f_type_array_array_lengths_increase__returns_data_not(void **state); - -/** - * Test that the function works. - * - * @see f_array_lengths_increase() - */ -extern void test__f_type_array_array_lengths_increase__works(void **state); - -#endif // _TEST__F_type_array__array_lengths_increase diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_increase_by.h b/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_increase_by.h deleted file mode 100644 index cfd7e71..0000000 --- a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_increase_by.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: Type - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Test the array types in the type project. - */ -#ifndef _TEST__F_type_array__array_lengths_increase_by -#define _TEST__F_type_array__array_lengths_increase_by - -/** - * Test that the function correctly fails on invalid parameter. - * - * @see f_array_lengths_increase_by() - */ -extern void test__f_type_array_array_lengths_increase_by__parameter_checking(void **state); - -/** - * Test that the function returns F_data_not. - * - * @see f_array_lengths_increase_by() - */ -extern void test__f_type_array_array_lengths_increase_by__returns_data_not(void **state); - -/** - * Test that the function works. - * - * @see f_array_lengths_increase_by() - */ -extern void test__f_type_array_array_lengths_increase_by__works(void **state); - -#endif // _TEST__F_type_array__array_lengths_increase_by diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_resize.h b/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_resize.h deleted file mode 100644 index ac3c8fd..0000000 --- a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_resize.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: Type - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Test the array types in the type project. - */ -#ifndef _TEST__F_type_array__array_lengths_resize -#define _TEST__F_type_array__array_lengths_resize - -/** - * Test that the function correctly fails on invalid parameter. - * - * @see f_array_lengths_resize() - */ -extern void test__f_type_array_array_lengths_resize__parameter_checking(void **state); - -/** - * Test that the function works. - * - * @see f_array_lengths_resize() - */ -extern void test__f_type_array_array_lengths_resize__works(void **state); - -#endif // _TEST__F_type_array__array_lengths_resize diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_adjust.h b/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_adjust.h deleted file mode 100644 index 5eb61f0..0000000 --- a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_adjust.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: Type - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Test the array types in the type project. - */ -#ifndef _TEST__F_type_array__array_lengthss_adjust -#define _TEST__F_type_array__array_lengthss_adjust - -/** - * Test that the function correctly fails on invalid parameter. - * - * @see f_array_lengthss_adjust() - */ -extern void test__f_type_array_array_lengthss_adjust__parameter_checking(void **state); - -/** - * Test that the function works. - * - * @see f_array_lengthss_adjust() - */ -extern void test__f_type_array_array_lengthss_adjust__works(void **state); - -#endif // _TEST__F_type_array__array_lengthss_adjust diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_append.h b/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_append.h deleted file mode 100644 index 5719d8b..0000000 --- a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_append.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: Type - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Test the array types in the type project. - */ -#ifndef _TEST__F_type_array__array_lengthss_append -#define _TEST__F_type_array__array_lengthss_append - -/** - * Test that the function correctly fails on invalid parameter. - * - * @see f_array_lengthss_append() - */ -extern void test__f_type_array_array_lengthss_append__parameter_checking(void **state); - -/** - * Test that the function returns F_data_not. - * - * @see f_array_lengthss_append() - */ -extern void test__f_type_array_array_lengthss_append__returns_data_not(void **state); - -/** - * Test that the function works. - * - * @see f_array_lengthss_append() - */ -extern void test__f_type_array_array_lengthss_append__works(void **state); - -#endif // _TEST__F_type_array__array_lengthss_append diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_append_all.h b/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_append_all.h deleted file mode 100644 index 250bdb9..0000000 --- a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_append_all.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: Type - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Test the array types in the type project. - */ -#ifndef _TEST__F_type_array__array_lengthss_append_all -#define _TEST__F_type_array__array_lengthss_append_all - -/** - * Test that the function correctly fails on invalid parameter. - * - * @see f_array_lengthss_append_all() - */ -extern void test__f_type_array_array_lengthss_append_all__parameter_checking(void **state); - -/** - * Test that the function returns F_data_not. - * - * @see f_array_lengthss_append_all() - */ -extern void test__f_type_array_array_lengthss_append_all__returns_data_not(void **state); - -/** - * Test that the function works. - * - * @see f_array_lengthss_append_all() - */ -extern void test__f_type_array_array_lengthss_append_all__works(void **state); - -#endif // _TEST__F_type_array__array_lengthss_append_all diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_decimate_by.h b/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_decimate_by.h deleted file mode 100644 index df3ddd7..0000000 --- a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_decimate_by.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: Type - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Test the array types in the type project. - */ -#ifndef _TEST__F_type_array__array_lengthss_decimate_by -#define _TEST__F_type_array__array_lengthss_decimate_by - -/** - * Test that the function correctly fails on invalid parameter. - * - * @see f_array_lengthss_decimate_by() - */ -extern void test__f_type_array_array_lengthss_decimate_by__parameter_checking(void **state); - -/** - * Test that the function returns F_data_not. - * - * @see f_type_array_array_lengthss_decimate_by() - */ -extern void test__f_type_array_array_lengthss_decimate_by__returns_data_not(void **state); - -/** - * Test that the function works. - * - * @see f_array_lengthss_decimate_by() - */ -extern void test__f_type_array_array_lengthss_decimate_by__works(void **state); - -#endif // _TEST__F_type_array__array_lengthss_decimate_by diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_decrease_by.h b/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_decrease_by.h deleted file mode 100644 index f6378bc..0000000 --- a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_decrease_by.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: Type - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Test the array types in the type project. - */ -#ifndef _TEST__F_type_array__array_lengthss_decrease_by -#define _TEST__F_type_array__array_lengthss_decrease_by - -/** - * Test that the function correctly fails on invalid parameter. - * - * @see f_array_lengthss_decrease_by() - */ -extern void test__f_type_array_array_lengthss_decrease_by__parameter_checking(void **state); - -/** - * Test that the function returns F_data_not. - * - * @see f_array_lengthss_decrease_by() - */ -extern void test__f_type_array_array_lengthss_decrease_by__returns_data_not(void **state); - -/** - * Test that the function works. - * - * @see f_array_lengthss_decrease_by() - */ -extern void test__f_type_array_array_lengthss_decrease_by__works(void **state); - -#endif // _TEST__F_type_array__array_lengthss_decrease_by diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_increase.h b/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_increase.h deleted file mode 100644 index 35fbfd2..0000000 --- a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_increase.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: Type - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Test the array types in the type project. - */ -#ifndef _TEST__F_type_array__array_lengthss_increase -#define _TEST__F_type_array__array_lengthss_increase - -/** - * Test that the function correctly fails on invalid parameter. - * - * @see f_array_lengthss_increase() - */ -extern void test__f_type_array_array_lengthss_increase__parameter_checking(void **state); - -/** - * Test that the function returns F_data_not. - * - * @see f_array_lengthss_increase() - */ -extern void test__f_type_array_array_lengthss_increase__returns_data_not(void **state); - -/** - * Test that the function works. - * - * @see f_array_lengthss_increase() - */ -extern void test__f_type_array_array_lengthss_increase__works(void **state); - -#endif // _TEST__F_type_array__array_lengthss_increase diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_increase_by.h b/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_increase_by.h deleted file mode 100644 index e0e8e9d..0000000 --- a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_increase_by.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: Type - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Test the array types in the type project. - */ -#ifndef _TEST__F_type_array__array_lengthss_increase_by -#define _TEST__F_type_array__array_lengthss_increase_by - -/** - * Test that the function correctly fails on invalid parameter. - * - * @see f_array_lengthss_increase_by() - */ -extern void test__f_type_array_array_lengthss_increase_by__parameter_checking(void **state); - -/** - * Test that the function returns F_data_not. - * - * @see f_array_lengthss_increase_by() - */ -extern void test__f_type_array_array_lengthss_increase_by__returns_data_not(void **state); - -/** - * Test that the function works. - * - * @see f_array_lengthss_increase_by() - */ -extern void test__f_type_array_array_lengthss_increase_by__works(void **state); - -#endif // _TEST__F_type_array__array_lengthss_increase_by diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_resize.h b/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_resize.h deleted file mode 100644 index 5d6a6d5..0000000 --- a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_resize.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: Type - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Test the array types in the type project. - */ -#ifndef _TEST__F_type_array__array_lengthss_resize -#define _TEST__F_type_array__array_lengthss_resize - -/** - * Test that the function correctly fails on invalid parameter. - * - * @see f_array_lengthss_resize() - */ -extern void test__f_type_array_array_lengthss_resize__parameter_checking(void **state); - -/** - * Test that the function works. - * - * @see f_array_lengthss_resize() - */ -extern void test__f_type_array_array_lengthss_resize__works(void **state); - -#endif // _TEST__F_type_array__array_lengthss_resize diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-cellss_append.c b/level_0/f_type_array/tests/unit/c/test-type_array-cellss_append.c index 444dfec..27f6e0d 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-cellss_append.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-cellss_append.c @@ -70,14 +70,14 @@ void test__f_type_array_cellss_append__works(void **state) { assert_int_equal(destination.array[0].used, source.used); assert_int_equal(destination.array[0].size, source.used); - for (f_array_length_t i = 0; i < destination.array[0].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[0].used; ++i) { assert_int_equal(destination.array[0].array[i].row, cell.row); assert_int_equal(destination.array[0].array[i].column, cell.column); } // for } - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-cellss_append_all.c b/level_0/f_type_array/tests/unit/c/test-type_array-cellss_append_all.c index e219131..c76ebe9 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-cellss_append_all.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-cellss_append_all.c @@ -79,7 +79,7 @@ void test__f_type_array_cellss_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { assert_int_equal(destination.array[i].used, length_inner); assert_int_equal(destination.array[i].size, length_inner); @@ -92,11 +92,11 @@ void test__f_type_array_cellss_append_all__works(void **state) { } // for } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { free((void *) source.array[i].array); } // for - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-fll_idss_append.c b/level_0/f_type_array/tests/unit/c/test-type_array-fll_idss_append.c index 6f86af9..1429f9c 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-fll_idss_append.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-fll_idss_append.c @@ -70,7 +70,7 @@ void test__f_type_array_fll_idss_append__works(void **state) { assert_int_equal(destination.array[0].used, source.used); assert_int_equal(destination.array[0].size, source.used); - for (f_array_length_t i = 0; i < destination.array[0].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[0].used; ++i) { assert_string_equal(destination.array[0].array[i].name, fll_id.name); assert_int_equal(destination.array[0].array[i].type, fll_id.type); @@ -78,7 +78,7 @@ void test__f_type_array_fll_idss_append__works(void **state) { } // for } - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-fll_idss_append_all.c b/level_0/f_type_array/tests/unit/c/test-type_array-fll_idss_append_all.c index 868bdce..78a11df 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-fll_idss_append_all.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-fll_idss_append_all.c @@ -79,7 +79,7 @@ void test__f_type_array_fll_idss_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { assert_int_equal(destination.array[i].used, length_inner); assert_int_equal(destination.array[i].size, length_inner); @@ -94,11 +94,11 @@ void test__f_type_array_fll_idss_append_all__works(void **state) { } // for } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { free((void *) source.array[i].array); } // for - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-int128s_append_all.c b/level_0/f_type_array/tests/unit/c/test-type_array-int128s_append_all.c index 6bc5aa0..b8a3bcd 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-int128s_append_all.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-int128s_append_all.c @@ -68,7 +68,7 @@ void test__f_type_array_int128s_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.array[i], i + 1); } // for } diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-int128ss_append.c b/level_0/f_type_array/tests/unit/c/test-type_array-int128ss_append.c index 47f6e33..3ac1725 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-int128ss_append.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-int128ss_append.c @@ -68,12 +68,12 @@ void test__f_type_array_int128ss_append__works(void **state) { assert_int_equal(destination.array[0].used, source.used); assert_int_equal(destination.array[0].size, source.used); - for (f_array_length_t i = 0; i < destination.array[0].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[0].used; ++i) { assert_int_equal(destination.array[0].array[i], i + 1); } // for } - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-int128ss_append_all.c b/level_0/f_type_array/tests/unit/c/test-type_array-int128ss_append_all.c index f793a63..cf6b152 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-int128ss_append_all.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-int128ss_append_all.c @@ -64,7 +64,7 @@ void test__f_type_array_int128ss_append_all__works(void **state) { assert_int_equal(status, F_none); - for (f_array_length_t i = 0; i < length_inner; ++i) { + for (f_number_unsigned_t i = 0; i < length_inner; ++i) { source.array[source.used].array[source.array[source.used].used++] = i + 1; } // for } // for @@ -77,22 +77,22 @@ void test__f_type_array_int128ss_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { assert_int_equal(destination.array[i].used, length_inner); assert_int_equal(destination.array[i].size, length_inner); - for (f_array_length_t j = 0; j < length_inner; ++j) { + for (f_number_unsigned_t j = 0; j < length_inner; ++j) { assert_int_equal(destination.array[i].array[j], j + 1); } // for } // for } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { free((void *) source.array[i].array); } // for - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-int16s_append_all.c b/level_0/f_type_array/tests/unit/c/test-type_array-int16s_append_all.c index dd2ad4d..a6a82b8 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-int16s_append_all.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-int16s_append_all.c @@ -68,7 +68,7 @@ void test__f_type_array_int16s_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.array[i], i + 1); } // for } diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-int16ss_append.c b/level_0/f_type_array/tests/unit/c/test-type_array-int16ss_append.c index 15eada4..80cb2bc 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-int16ss_append.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-int16ss_append.c @@ -68,12 +68,12 @@ void test__f_type_array_int16ss_append__works(void **state) { assert_int_equal(destination.array[0].used, source.used); assert_int_equal(destination.array[0].size, source.used); - for (f_array_length_t i = 0; i < destination.array[0].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[0].used; ++i) { assert_int_equal(destination.array[0].array[i], i + 1); } // for } - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-int16ss_append_all.c b/level_0/f_type_array/tests/unit/c/test-type_array-int16ss_append_all.c index 272af4b..8a2c0fc 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-int16ss_append_all.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-int16ss_append_all.c @@ -64,7 +64,7 @@ void test__f_type_array_int16ss_append_all__works(void **state) { assert_int_equal(status, F_none); - for (f_array_length_t i = 0; i < length_inner; ++i) { + for (f_number_unsigned_t i = 0; i < length_inner; ++i) { source.array[source.used].array[source.array[source.used].used++] = i + 1; } // for } // for @@ -77,22 +77,22 @@ void test__f_type_array_int16ss_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { assert_int_equal(destination.array[i].used, length_inner); assert_int_equal(destination.array[i].size, length_inner); - for (f_array_length_t j = 0; j < length_inner; ++j) { + for (f_number_unsigned_t j = 0; j < length_inner; ++j) { assert_int_equal(destination.array[i].array[j], j + 1); } // for } // for } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { free((void *) source.array[i].array); } // for - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-int16ss_increase_by.c b/level_0/f_type_array/tests/unit/c/test-type_array-int16ss_increase_by.c index 290ac70..91cd889 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-int16ss_increase_by.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-int16ss_increase_by.c @@ -53,30 +53,6 @@ void test__f_type_array_int16ss_increase_by__returns_data_not(void **state) { free((void *) data.array); } -void test__f_type_array_array_length_decrease_by__returns_data_not(void **state) { - - const int length = 5; - f_array_lengthss_t data = f_array_lengthss_t_initialize; - - { - const f_status_t status = f_array_lengthss_resize(length, &data); - - assert_int_equal(status, F_none); - assert_int_equal(data.used, 0); - assert_int_equal(data.size, length); - } - - { - const f_status_t status = f_array_lengthss_decrease_by(0, &data); - - assert_int_equal(status, F_data_not); - assert_int_equal(data.used, 0); - assert_int_equal(data.size, length); - } - - free((void *) data.array); -} - void test__f_type_array_int16ss_increase_by__works(void **state) { const int length = 5; diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-int32s_append_all.c b/level_0/f_type_array/tests/unit/c/test-type_array-int32s_append_all.c index 6801fba..4ce3d34 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-int32s_append_all.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-int32s_append_all.c @@ -68,7 +68,7 @@ void test__f_type_array_int32s_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.array[i], i + 1); } // for } diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-int32ss_append.c b/level_0/f_type_array/tests/unit/c/test-type_array-int32ss_append.c index 6f1696b..777047a 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-int32ss_append.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-int32ss_append.c @@ -68,12 +68,12 @@ void test__f_type_array_int32ss_append__works(void **state) { assert_int_equal(destination.array[0].used, source.used); assert_int_equal(destination.array[0].size, source.used); - for (f_array_length_t i = 0; i < destination.array[0].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[0].used; ++i) { assert_int_equal(destination.array[0].array[i], i + 1); } // for } - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-int32ss_append_all.c b/level_0/f_type_array/tests/unit/c/test-type_array-int32ss_append_all.c index f7a5201..b2d364f 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-int32ss_append_all.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-int32ss_append_all.c @@ -64,7 +64,7 @@ void test__f_type_array_int32ss_append_all__works(void **state) { assert_int_equal(status, F_none); - for (f_array_length_t i = 0; i < length_inner; ++i) { + for (f_number_unsigned_t i = 0; i < length_inner; ++i) { source.array[source.used].array[source.array[source.used].used++] = i + 1; } // for } // for @@ -77,22 +77,22 @@ void test__f_type_array_int32ss_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { assert_int_equal(destination.array[i].used, length_inner); assert_int_equal(destination.array[i].size, length_inner); - for (f_array_length_t j = 0; j < length_inner; ++j) { + for (f_number_unsigned_t j = 0; j < length_inner; ++j) { assert_int_equal(destination.array[i].array[j], j + 1); } // for } // for } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { free((void *) source.array[i].array); } // for - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-int64s_append_all.c b/level_0/f_type_array/tests/unit/c/test-type_array-int64s_append_all.c index 90183c9..6480f46 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-int64s_append_all.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-int64s_append_all.c @@ -68,7 +68,7 @@ void test__f_type_array_int64s_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.array[i], i + 1); } // for } diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-int64ss_append.c b/level_0/f_type_array/tests/unit/c/test-type_array-int64ss_append.c index c69dc5a..42d8d69 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-int64ss_append.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-int64ss_append.c @@ -68,12 +68,12 @@ void test__f_type_array_int64ss_append__works(void **state) { assert_int_equal(destination.array[0].used, source.used); assert_int_equal(destination.array[0].size, source.used); - for (f_array_length_t i = 0; i < destination.array[0].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[0].used; ++i) { assert_int_equal(destination.array[0].array[i], i + 1); } // for } - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-int64ss_append_all.c b/level_0/f_type_array/tests/unit/c/test-type_array-int64ss_append_all.c index f2f53e6..915305b 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-int64ss_append_all.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-int64ss_append_all.c @@ -64,7 +64,7 @@ void test__f_type_array_int64ss_append_all__works(void **state) { assert_int_equal(status, F_none); - for (f_array_length_t i = 0; i < length_inner; ++i) { + for (f_number_unsigned_t i = 0; i < length_inner; ++i) { source.array[source.used].array[source.array[source.used].used++] = i + 1; } // for } // for @@ -77,22 +77,22 @@ void test__f_type_array_int64ss_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { assert_int_equal(destination.array[i].used, length_inner); assert_int_equal(destination.array[i].size, length_inner); - for (f_array_length_t j = 0; j < length_inner; ++j) { + for (f_number_unsigned_t j = 0; j < length_inner; ++j) { assert_int_equal(destination.array[i].array[j], j + 1); } // for } // for } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { free((void *) source.array[i].array); } // for - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-int8s_append_all.c b/level_0/f_type_array/tests/unit/c/test-type_array-int8s_append_all.c index 1246f59..d457011 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-int8s_append_all.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-int8s_append_all.c @@ -68,7 +68,7 @@ void test__f_type_array_int8s_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.array[i], i + 1); } // for } diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-int8ss_append.c b/level_0/f_type_array/tests/unit/c/test-type_array-int8ss_append.c index f97a83b..9402d63 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-int8ss_append.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-int8ss_append.c @@ -68,12 +68,12 @@ void test__f_type_array_int8ss_append__works(void **state) { assert_int_equal(destination.array[0].used, source.used); assert_int_equal(destination.array[0].size, source.used); - for (f_array_length_t i = 0; i < destination.array[0].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[0].used; ++i) { assert_int_equal(destination.array[0].array[i], i + 1); } // for } - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-int8ss_append_all.c b/level_0/f_type_array/tests/unit/c/test-type_array-int8ss_append_all.c index ea4b2db..c366846 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-int8ss_append_all.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-int8ss_append_all.c @@ -64,7 +64,7 @@ void test__f_type_array_int8ss_append_all__works(void **state) { assert_int_equal(status, F_none); - for (f_array_length_t i = 0; i < length_inner; ++i) { + for (f_number_unsigned_t i = 0; i < length_inner; ++i) { source.array[source.used].array[source.array[source.used].used++] = i + 1; } // for } // for @@ -77,22 +77,22 @@ void test__f_type_array_int8ss_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { assert_int_equal(destination.array[i].used, length_inner); assert_int_equal(destination.array[i].size, length_inner); - for (f_array_length_t j = 0; j < length_inner; ++j) { + for (f_number_unsigned_t j = 0; j < length_inner; ++j) { assert_int_equal(destination.array[i].array[j], j + 1); } // for } // for } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { free((void *) source.array[i].array); } // for - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_adjust.c b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_adjust.c similarity index 51% rename from level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_adjust.c rename to level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_adjust.c index d2fdf68..926c363 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_adjust.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_adjust.c @@ -1,17 +1,17 @@ #include "test-type_array.h" -#include "test-type_array-array_lengths_adjust.h" +#include "test-type_array-number_unsigneds_adjust.h" #ifdef __cplusplus extern "C" { #endif -void test__f_type_array_array_lengths_adjust__parameter_checking(void **state) { +void test__f_type_array_number_unsigneds_adjust__parameter_checking(void **state) { const int length = 5; - f_array_lengths_t data = f_array_lengths_t_initialize; + f_number_unsigneds_t data = f_number_unsigneds_t_initialize; { - const f_status_t status = f_array_lengths_adjust(length, 0); + const f_status_t status = f_number_unsigneds_adjust(length, 0); assert_int_equal(status, F_status_set_error(F_parameter)); assert_int_equal(data.used, 0); @@ -21,13 +21,13 @@ void test__f_type_array_array_lengths_adjust__parameter_checking(void **state) { assert_null(data.array); } -void test__f_type_array_array_lengths_adjust__works(void **state) { +void test__f_type_array_number_unsigneds_adjust__works(void **state) { const int length = 5; - f_array_lengths_t data = f_array_lengths_t_initialize; + f_number_unsigneds_t data = f_number_unsigneds_t_initialize; { - const f_status_t status = f_array_lengths_adjust(length, &data); + const f_status_t status = f_number_unsigneds_adjust(length, &data); assert_int_equal(status, F_none); assert_int_equal(data.used, 0); diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_adjust.h b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_adjust.h new file mode 100644 index 0000000..86813b3 --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_adjust.h @@ -0,0 +1,27 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__number_unsigneds_adjust +#define _TEST__F_type_array__number_unsigneds_adjust + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_number_unsigneds_adjust() + */ +extern void test__f_type_array_number_unsigneds_adjust__parameter_checking(void **state); + +/** + * Test that the function works. + * + * @see f_number_unsigneds_adjust() + */ +extern void test__f_type_array_number_unsigneds_adjust__works(void **state); + +#endif // _TEST__F_type_array__number_unsigneds_adjust diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_append.c b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_append.c new file mode 100644 index 0000000..2edbb7d --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_append.c @@ -0,0 +1,37 @@ +#include "test-type_array.h" +#include "test-type_array-number_unsigneds_append.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void test__f_type_array_number_unsigneds_append__parameter_checking(void **state) { + + const f_number_unsigned_t data = f_number_unsigned_t_initialize; + + { + const f_status_t status = f_number_unsigneds_append(data, 0); + + assert_int_equal(status, F_status_set_error(F_parameter)); + } +} + +void test__f_type_array_number_unsigneds_append__works(void **state) { + + const f_number_unsigned_t source = 3; + f_number_unsigneds_t destination = f_number_unsigneds_t_initialize; + + { + const f_status_t status = f_number_unsigneds_append(source, &destination); + + assert_int_equal(status, F_none); + assert_int_equal(destination.used, 1); + assert_int_equal(destination.array[0], source); + } + + free((void *) destination.array); +} + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_append.h b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_append.h new file mode 100644 index 0000000..22fffca --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_append.h @@ -0,0 +1,27 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__number_unsigneds_append +#define _TEST__F_type_array__number_unsigneds_append + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_number_unsigneds_append() + */ +extern void test__f_type_array_number_unsigneds_append__parameter_checking(void **state); + +/** + * Test that the function works. + * + * @see f_number_unsigneds_append() + */ +extern void test__f_type_array_number_unsigneds_append__works(void **state); + +#endif // _TEST__F_type_array__number_unsigneds_append diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_append_all.c b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_append_all.c similarity index 51% rename from level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_append_all.c rename to level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_append_all.c index fae08df..58bf1cb 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_append_all.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_append_all.c @@ -1,29 +1,29 @@ #include "test-type_array.h" -#include "test-type_array-array_lengths_append_all.h" +#include "test-type_array-number_unsigneds_append_all.h" #ifdef __cplusplus extern "C" { #endif -void test__f_type_array_array_lengths_append_all__parameter_checking(void **state) { +void test__f_type_array_number_unsigneds_append_all__parameter_checking(void **state) { - const f_array_lengths_t data = f_array_lengths_t_initialize; + const f_number_unsigneds_t data = f_number_unsigneds_t_initialize; { - const f_status_t status = f_array_lengths_append_all(data, 0); + const f_status_t status = f_number_unsigneds_append_all(data, 0); assert_int_equal(status, F_status_set_error(F_parameter)); } } -void test__f_type_array_array_lengths_append_all__returns_data_not(void **state) { +void test__f_type_array_number_unsigneds_append_all__returns_data_not(void **state) { const int length = 5; - f_array_lengths_t source = f_array_lengths_t_initialize; - f_array_lengths_t destination = f_array_lengths_t_initialize; + f_number_unsigneds_t source = f_number_unsigneds_t_initialize; + f_number_unsigneds_t destination = f_number_unsigneds_t_initialize; { - const f_status_t status = f_array_lengths_resize(length, &source); + const f_status_t status = f_number_unsigneds_resize(length, &source); assert_int_equal(status, F_none); assert_int_equal(source.used, 0); @@ -31,7 +31,7 @@ void test__f_type_array_array_lengths_append_all__returns_data_not(void **state) } { - const f_status_t status = f_array_lengths_append_all(source, &destination); + const f_status_t status = f_number_unsigneds_append_all(source, &destination); assert_int_equal(status, F_data_not); assert_int_equal(destination.used, 0); @@ -42,15 +42,15 @@ void test__f_type_array_array_lengths_append_all__returns_data_not(void **state) free((void *) source.array); } -void test__f_type_array_array_lengths_append_all__works(void **state) { +void test__f_type_array_number_unsigneds_append_all__works(void **state) { const int length = 5; const int length_used = 2; - f_array_lengths_t source = f_array_lengths_t_initialize; - f_array_lengths_t destination = f_array_lengths_t_initialize; + f_number_unsigneds_t source = f_number_unsigneds_t_initialize; + f_number_unsigneds_t destination = f_number_unsigneds_t_initialize; { - const f_status_t status = f_array_lengths_resize(length, &source); + const f_status_t status = f_number_unsigneds_resize(length, &source); assert_int_equal(status, F_none); assert_int_equal(source.used, 0); @@ -62,13 +62,13 @@ void test__f_type_array_array_lengths_append_all__works(void **state) { } // for { - const f_status_t status = f_array_lengths_append_all(source, &destination); + const f_status_t status = f_number_unsigneds_append_all(source, &destination); assert_int_equal(status, F_none); assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.array[i], i + 1); } // for } diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_append_all.h b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_append_all.h new file mode 100644 index 0000000..0bbb291 --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_append_all.h @@ -0,0 +1,34 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__number_unsigneds_append_all +#define _TEST__F_type_array__number_unsigneds_append_all + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_number_unsigneds_append_all() + */ +extern void test__f_type_array_number_unsigneds_append_all__parameter_checking(void **state); + +/** + * Test that the function returns F_data_not. + * + * @see f_number_unsigneds_append_all() + */ +extern void test__f_type_array_number_unsigneds_append_all__returns_data_not(void **state); + +/** + * Test that the function works. + * + * @see f_number_unsigneds_append_all() + */ +extern void test__f_type_array_number_unsigneds_append_all__works(void **state); + +#endif // _TEST__F_type_array__number_unsigneds_append_all diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_decrease_by.c b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_decimate_by.c similarity index 51% rename from level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_decrease_by.c rename to level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_decimate_by.c index 349cc1f..6c782a6 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_decrease_by.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_decimate_by.c @@ -1,17 +1,17 @@ #include "test-type_array.h" -#include "test-type_array-array_lengthss_decrease_by.h" +#include "test-type_array-number_unsigneds_decimate_by.h" #ifdef __cplusplus extern "C" { #endif -void test__f_type_array_array_lengthss_decrease_by__parameter_checking(void **state) { +void test__f_type_array_number_unsigneds_decimate_by__parameter_checking(void **state) { const int length = 5; - f_array_lengthss_t data = f_array_lengths_t_initialize; + f_number_unsigneds_t data = f_number_unsigneds_t_initialize; { - const f_status_t status = f_array_lengthss_decrease_by(length, 0); + const f_status_t status = f_number_unsigneds_decimate_by(length, 0); assert_int_equal(status, F_status_set_error(F_parameter)); assert_int_equal(data.used, 0); @@ -21,13 +21,13 @@ void test__f_type_array_array_lengthss_decrease_by__parameter_checking(void **st assert_null(data.array); } -void test__f_type_array_array_lengthss_decrease_by__returns_data_not(void **state) { +void test__f_type_array_number_unsigneds_decimate_by__returns_data_not(void **state) { const int length = 5; - f_array_lengthss_t data = f_array_lengthss_t_initialize; + f_number_unsigneds_t data = f_number_unsigneds_t_initialize; { - const f_status_t status = f_array_lengthss_resize(length, &data); + const f_status_t status = f_number_unsigneds_resize(length, &data); assert_int_equal(status, F_none); assert_int_equal(data.used, 0); @@ -35,7 +35,7 @@ void test__f_type_array_array_lengthss_decrease_by__returns_data_not(void **stat } { - const f_status_t status = f_array_lengthss_decrease_by(0, &data); + const f_status_t status = f_number_unsigneds_decimate_by(0, &data); assert_int_equal(status, F_data_not); assert_int_equal(data.used, 0); @@ -45,13 +45,13 @@ void test__f_type_array_array_lengthss_decrease_by__returns_data_not(void **stat free((void *) data.array); } -void test__f_type_array_array_lengthss_decrease_by__works(void **state) { +void test__f_type_array_number_unsigneds_decimate_by__works(void **state) { const int length = 5; - f_array_lengthss_t data = f_array_lengths_t_initialize; + f_number_unsigneds_t data = f_number_unsigneds_t_initialize; { - const f_status_t status = f_array_lengthss_resize(length, &data); + const f_status_t status = f_number_unsigneds_resize(length, &data); assert_int_equal(status, F_none); assert_int_equal(data.used, 0); @@ -59,7 +59,7 @@ void test__f_type_array_array_lengthss_decrease_by__works(void **state) { } { - const f_status_t status = f_array_lengthss_decrease_by(length, &data); + const f_status_t status = f_number_unsigneds_decimate_by(length, &data); assert_int_equal(status, F_none); assert_int_equal(data.used, 0); diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_decimate_by.h b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_decimate_by.h new file mode 100644 index 0000000..42c3cfc --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_decimate_by.h @@ -0,0 +1,34 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__number_unsigneds_decimate_by +#define _TEST__F_type_array__number_unsigneds_decimate_by + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_number_unsigneds_decimate_by() + */ +extern void test__f_type_array_number_unsigneds_decimate_by__parameter_checking(void **state); + +/** + * Test that the function returns F_data_not. + * + * @see f_number_unsigneds_decimate_by() + */ +extern void test__f_type_array_number_unsigneds_decimate_by__returns_data_not(void **state); + +/** + * Test that the function works. + * + * @see f_number_unsigneds_decimate_by() + */ +extern void test__f_type_array_number_unsigneds_decimate_by__works(void **state); + +#endif // _TEST__F_type_array__number_unsigneds_decimate_by diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_decimate_by.c b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_decrease_by.c similarity index 51% rename from level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_decimate_by.c rename to level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_decrease_by.c index b98d6f6..db1acd3 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_decimate_by.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_decrease_by.c @@ -1,17 +1,17 @@ #include "test-type_array.h" -#include "test-type_array-array_lengthss_decimate_by.h" +#include "test-type_array-number_unsigneds_decrease_by.h" #ifdef __cplusplus extern "C" { #endif -void test__f_type_array_array_lengthss_decimate_by__parameter_checking(void **state) { +void test__f_type_array_number_unsigneds_decrease_by__parameter_checking(void **state) { const int length = 5; - f_array_lengthss_t data = f_array_lengths_t_initialize; + f_number_unsigneds_t data = f_number_unsigneds_t_initialize; { - const f_status_t status = f_array_lengthss_decimate_by(length, 0); + const f_status_t status = f_number_unsigneds_decrease_by(length, 0); assert_int_equal(status, F_status_set_error(F_parameter)); assert_int_equal(data.used, 0); @@ -21,13 +21,13 @@ void test__f_type_array_array_lengthss_decimate_by__parameter_checking(void **st assert_null(data.array); } -void test__f_type_array_array_lengthss_decimate_by__returns_data_not(void **state) { +void test__f_type_array_number_unsigneds_decrease_by__returns_data_not(void **state) { const int length = 5; - f_array_lengthss_t data = f_array_lengthss_t_initialize; + f_number_unsigneds_t data = f_number_unsigneds_t_initialize; { - const f_status_t status = f_array_lengthss_resize(length, &data); + const f_status_t status = f_number_unsigneds_resize(length, &data); assert_int_equal(status, F_none); assert_int_equal(data.used, 0); @@ -35,7 +35,7 @@ void test__f_type_array_array_lengthss_decimate_by__returns_data_not(void **stat } { - const f_status_t status = f_array_lengthss_decimate_by(0, &data); + const f_status_t status = f_number_unsigneds_decrease_by(0, &data); assert_int_equal(status, F_data_not); assert_int_equal(data.used, 0); @@ -45,13 +45,13 @@ void test__f_type_array_array_lengthss_decimate_by__returns_data_not(void **stat free((void *) data.array); } -void test__f_type_array_array_lengthss_decimate_by__works(void **state) { +void test__f_type_array_number_unsigneds_decrease_by__works(void **state) { const int length = 5; - f_array_lengthss_t data = f_array_lengths_t_initialize; + f_number_unsigneds_t data = f_number_unsigneds_t_initialize; { - const f_status_t status = f_array_lengthss_resize(length, &data); + const f_status_t status = f_number_unsigneds_resize(length, &data); assert_int_equal(status, F_none); assert_int_equal(data.used, 0); @@ -59,7 +59,7 @@ void test__f_type_array_array_lengthss_decimate_by__works(void **state) { } { - const f_status_t status = f_array_lengthss_decimate_by(length, &data); + const f_status_t status = f_number_unsigneds_decrease_by(length, &data); assert_int_equal(status, F_none); assert_int_equal(data.used, 0); diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_decrease_by.h b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_decrease_by.h new file mode 100644 index 0000000..9b585d9 --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_decrease_by.h @@ -0,0 +1,34 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__number_unsigneds_decrease_by +#define _TEST__F_type_array__number_unsigneds_decrease_by + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_number_unsigneds_decrease_by() + */ +extern void test__f_type_array_number_unsigneds_decrease_by__parameter_checking(void **state); + +/** + * Test that the function returns F_data_not. + * + * @see f_number_unsigneds_decrease_by() + */ +extern void test__f_type_array_number_unsigneds_decrease_by__returns_data_not(void **state); + +/** + * Test that the function works. + * + * @see f_number_unsigneds_decrease_by() + */ +extern void test__f_type_array_number_unsigneds_decrease_by__works(void **state); + +#endif // _TEST__F_type_array__number_unsigneds_decrease_by diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_increase.c b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_increase.c similarity index 55% rename from level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_increase.c rename to level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_increase.c index 08be366..4f50ee1 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_increase.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_increase.c @@ -1,17 +1,17 @@ #include "test-type_array.h" -#include "test-type_array-array_lengthss_increase.h" +#include "test-type_array-number_unsigneds_increase.h" #ifdef __cplusplus extern "C" { #endif -void test__f_type_array_array_lengthss_increase__parameter_checking(void **state) { +void test__f_type_array_number_unsigneds_increase__parameter_checking(void **state) { const int length = 5; - f_array_lengthss_t data = f_array_lengths_t_initialize; + f_number_unsigneds_t data = f_number_unsigneds_t_initialize; { - const f_status_t status = f_array_lengthss_increase(length, 0); + const f_status_t status = f_number_unsigneds_increase(length, 0); assert_int_equal(status, F_status_set_error(F_parameter)); assert_int_equal(data.used, 0); @@ -21,13 +21,13 @@ void test__f_type_array_array_lengthss_increase__parameter_checking(void **state free((void *) data.array); } -void test__f_type_array_array_lengthss_increase__returns_data_not(void **state) { +void test__f_type_array_number_unsigneds_increase__returns_data_not(void **state) { const int length = 5; - f_array_lengthss_t data = f_array_lengths_t_initialize; + f_number_unsigneds_t data = f_number_unsigneds_t_initialize; { - const f_status_t status = f_array_lengthss_resize(length, &data); + const f_status_t status = f_number_unsigneds_resize(length, &data); assert_int_equal(status, F_none); assert_int_equal(data.used, 0); @@ -35,7 +35,7 @@ void test__f_type_array_array_lengthss_increase__returns_data_not(void **state) } { - const f_status_t status = f_array_lengthss_increase(length, &data); + const f_status_t status = f_number_unsigneds_increase(length, &data); assert_int_equal(status, F_data_not); assert_int_equal(data.used, 0); @@ -45,13 +45,13 @@ void test__f_type_array_array_lengthss_increase__returns_data_not(void **state) free((void *) data.array); } -void test__f_type_array_array_lengthss_increase__works(void **state) { +void test__f_type_array_number_unsigneds_increase__works(void **state) { const int length = 5; - f_array_lengthss_t data = f_array_lengths_t_initialize; + f_number_unsigneds_t data = f_number_unsigneds_t_initialize; { - const f_status_t status = f_array_lengthss_resize(length, &data); + const f_status_t status = f_number_unsigneds_resize(length, &data); assert_int_equal(status, F_none); assert_int_equal(data.used, 0); @@ -61,7 +61,7 @@ void test__f_type_array_array_lengthss_increase__works(void **state) { { data.used = length; - const f_status_t status = f_array_lengthss_increase(length, &data); + const f_status_t status = f_number_unsigneds_increase(length, &data); assert_int_equal(status, F_none); assert_int_equal(data.used, length); diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_increase.h b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_increase.h new file mode 100644 index 0000000..7d2cbca --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_increase.h @@ -0,0 +1,34 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__number_unsigneds_increase +#define _TEST__F_type_array__number_unsigneds_increase + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_number_unsigneds_increase() + */ +extern void test__f_type_array_number_unsigneds_increase__parameter_checking(void **state); + +/** + * Test that the function returns F_data_not. + * + * @see f_number_unsigneds_increase() + */ +extern void test__f_type_array_number_unsigneds_increase__returns_data_not(void **state); + +/** + * Test that the function works. + * + * @see f_number_unsigneds_increase() + */ +extern void test__f_type_array_number_unsigneds_increase__works(void **state); + +#endif // _TEST__F_type_array__number_unsigneds_increase diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_increase_by.c b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_increase_by.c similarity index 52% rename from level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_increase_by.c rename to level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_increase_by.c index 0eae483..2aef329 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_increase_by.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_increase_by.c @@ -1,17 +1,17 @@ #include "test-type_array.h" -#include "test-type_array-array_lengths_increase_by.h" +#include "test-type_array-number_unsigneds_increase_by.h" #ifdef __cplusplus extern "C" { #endif -void test__f_type_array_array_lengths_increase_by__parameter_checking(void **state) { +void test__f_type_array_number_unsigneds_increase_by__parameter_checking(void **state) { const int length = 5; - f_array_lengths_t data = f_array_lengths_t_initialize; + f_number_unsigneds_t data = f_number_unsigneds_t_initialize; { - const f_status_t status = f_array_lengths_increase_by(length, 0); + const f_status_t status = f_number_unsigneds_increase_by(length, 0); assert_int_equal(status, F_status_set_error(F_parameter)); assert_int_equal(data.used, 0); @@ -21,13 +21,13 @@ void test__f_type_array_array_lengths_increase_by__parameter_checking(void **sta assert_null(data.array); } -void test__f_type_array_array_lengths_increase_by__returns_data_not(void **state) { +void test__f_type_array_number_unsigneds_increase_by__returns_data_not(void **state) { const int length = 5; - f_array_lengths_t data = f_array_lengths_t_initialize; + f_number_unsigneds_t data = f_number_unsigneds_t_initialize; { - const f_status_t status = f_array_lengths_resize(length, &data); + const f_status_t status = f_number_unsigneds_resize(length, &data); assert_int_equal(status, F_none); assert_int_equal(data.used, 0); @@ -35,7 +35,7 @@ void test__f_type_array_array_lengths_increase_by__returns_data_not(void **state } { - const f_status_t status = f_array_lengths_increase_by(0, &data); + const f_status_t status = f_number_unsigneds_increase_by(0, &data); assert_int_equal(status, F_data_not); assert_int_equal(data.used, 0); @@ -45,13 +45,13 @@ void test__f_type_array_array_lengths_increase_by__returns_data_not(void **state free((void *) data.array); } -void test__f_type_array_array_lengths_increase_by__works(void **state) { +void test__f_type_array_number_unsigneds_increase_by__works(void **state) { const int length = 5; - f_array_lengths_t data = f_array_lengths_t_initialize; + f_number_unsigneds_t data = f_number_unsigneds_t_initialize; { - const f_status_t status = f_array_lengths_resize(length, &data); + const f_status_t status = f_number_unsigneds_resize(length, &data); assert_int_equal(status, F_none); assert_int_equal(data.used, 0); @@ -61,7 +61,7 @@ void test__f_type_array_array_lengths_increase_by__works(void **state) { { data.used = length; - const f_status_t status = f_array_lengths_increase_by(length, &data); + const f_status_t status = f_number_unsigneds_increase_by(length, &data); assert_int_equal(status, F_none); assert_int_equal(data.used, length); diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_increase_by.h b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_increase_by.h new file mode 100644 index 0000000..248f699 --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_increase_by.h @@ -0,0 +1,34 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__number_unsigneds_increase_by +#define _TEST__F_type_array__number_unsigneds_increase_by + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_number_unsigneds_increase_by() + */ +extern void test__f_type_array_number_unsigneds_increase_by__parameter_checking(void **state); + +/** + * Test that the function returns F_data_not. + * + * @see f_number_unsigneds_increase_by() + */ +extern void test__f_type_array_number_unsigneds_increase_by__returns_data_not(void **state); + +/** + * Test that the function works. + * + * @see f_number_unsigneds_increase_by() + */ +extern void test__f_type_array_number_unsigneds_increase_by__works(void **state); + +#endif // _TEST__F_type_array__number_unsigneds_increase_by diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_adjust.c b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_resize.c similarity index 51% rename from level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_adjust.c rename to level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_resize.c index 3b1733b..852d244 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_adjust.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_resize.c @@ -1,17 +1,17 @@ #include "test-type_array.h" -#include "test-type_array-array_lengthss_adjust.h" +#include "test-type_array-number_unsigneds_resize.h" #ifdef __cplusplus extern "C" { #endif -void test__f_type_array_array_lengthss_adjust__parameter_checking(void **state) { +void test__f_type_array_number_unsigneds_resize__parameter_checking(void **state) { const int length = 5; - f_array_lengthss_t data = f_array_lengthss_t_initialize; + f_number_unsigneds_t data = f_number_unsigneds_t_initialize; { - const f_status_t status = f_array_lengthss_adjust(length, 0); + const f_status_t status = f_number_unsigneds_resize(length, 0); assert_int_equal(status, F_status_set_error(F_parameter)); assert_int_equal(data.used, 0); @@ -21,13 +21,13 @@ void test__f_type_array_array_lengthss_adjust__parameter_checking(void **state) assert_null(data.array); } -void test__f_type_array_array_lengthss_adjust__works(void **state) { +void test__f_type_array_number_unsigneds_resize__works(void **state) { const int length = 5; - f_array_lengthss_t data = f_array_lengthss_t_initialize; + f_number_unsigneds_t data = f_number_unsigneds_t_initialize; { - const f_status_t status = f_array_lengthss_adjust(length, &data); + const f_status_t status = f_number_unsigneds_resize(length, &data); assert_int_equal(status, F_none); assert_int_equal(data.used, 0); diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_resize.h b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_resize.h new file mode 100644 index 0000000..274dabb --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsigneds_resize.h @@ -0,0 +1,27 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__number_unsigneds_resize +#define _TEST__F_type_array__number_unsigneds_resize + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_number_unsigneds_resize() + */ +extern void test__f_type_array_number_unsigneds_resize__parameter_checking(void **state); + +/** + * Test that the function works. + * + * @see f_number_unsigneds_resize() + */ +extern void test__f_type_array_number_unsigneds_resize__works(void **state); + +#endif // _TEST__F_type_array__number_unsigneds_resize diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_resize.c b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_adjust.c similarity index 50% rename from level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_resize.c rename to level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_adjust.c index 37232c2..7ece6de 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_resize.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_adjust.c @@ -1,17 +1,17 @@ #include "test-type_array.h" -#include "test-type_array-array_lengths_resize.h" +#include "test-type_array-number_unsignedss_adjust.h" #ifdef __cplusplus extern "C" { #endif -void test__f_type_array_array_lengths_resize__parameter_checking(void **state) { +void test__f_type_array_number_unsignedss_adjust__parameter_checking(void **state) { const int length = 5; - f_array_lengths_t data = f_array_lengths_t_initialize; + f_number_unsignedss_t data = f_number_unsignedss_t_initialize; { - const f_status_t status = f_array_lengths_resize(length, 0); + const f_status_t status = f_number_unsignedss_adjust(length, 0); assert_int_equal(status, F_status_set_error(F_parameter)); assert_int_equal(data.used, 0); @@ -21,13 +21,13 @@ void test__f_type_array_array_lengths_resize__parameter_checking(void **state) { assert_null(data.array); } -void test__f_type_array_array_lengths_resize__works(void **state) { +void test__f_type_array_number_unsignedss_adjust__works(void **state) { const int length = 5; - f_array_lengths_t data = f_array_lengths_t_initialize; + f_number_unsignedss_t data = f_number_unsignedss_t_initialize; { - const f_status_t status = f_array_lengths_resize(length, &data); + const f_status_t status = f_number_unsignedss_adjust(length, &data); assert_int_equal(status, F_none); assert_int_equal(data.used, 0); diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_adjust.h b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_adjust.h new file mode 100644 index 0000000..9aa4b18 --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_adjust.h @@ -0,0 +1,27 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__number_unsignedss_adjust +#define _TEST__F_type_array__number_unsignedss_adjust + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_number_unsignedss_adjust() + */ +extern void test__f_type_array_number_unsignedss_adjust__parameter_checking(void **state); + +/** + * Test that the function works. + * + * @see f_number_unsignedss_adjust() + */ +extern void test__f_type_array_number_unsignedss_adjust__works(void **state); + +#endif // _TEST__F_type_array__number_unsignedss_adjust diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_append.c b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_append.c similarity index 51% rename from level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_append.c rename to level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_append.c index d3cf215..6ba4a41 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_append.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_append.c @@ -1,29 +1,29 @@ #include "test-type_array.h" -#include "test-type_array-array_lengthss_append.h" +#include "test-type_array-number_unsignedss_append.h" #ifdef __cplusplus extern "C" { #endif -void test__f_type_array_array_lengthss_append__parameter_checking(void **state) { +void test__f_type_array_number_unsignedss_append__parameter_checking(void **state) { - const f_array_lengths_t data = f_array_lengths_t_initialize; + const f_number_unsigneds_t data = f_number_unsigneds_t_initialize; { - const f_status_t status = f_array_lengthss_append(data, 0); + const f_status_t status = f_number_unsignedss_append(data, 0); assert_int_equal(status, F_status_set_error(F_parameter)); } } -void test__f_type_array_array_lengthss_append__returns_data_not(void **state) { +void test__f_type_array_number_unsignedss_append__returns_data_not(void **state) { const int length = 5; - f_array_lengths_t source = f_array_lengths_t_initialize; - f_array_lengthss_t destination = f_array_lengthss_t_initialize; + f_number_unsigneds_t source = f_number_unsigneds_t_initialize; + f_number_unsignedss_t destination = f_number_unsignedss_t_initialize; { - const f_status_t status = f_array_lengths_resize(length, &source); + const f_status_t status = f_number_unsigneds_resize(length, &source); assert_int_equal(status, F_none); assert_int_equal(source.used, 0); @@ -31,7 +31,7 @@ void test__f_type_array_array_lengthss_append__returns_data_not(void **state) { } { - const f_status_t status = f_array_lengthss_append(source, &destination); + const f_status_t status = f_number_unsignedss_append(source, &destination); assert_int_equal(status, F_data_not); assert_int_equal(destination.used, 0); @@ -42,14 +42,14 @@ void test__f_type_array_array_lengthss_append__returns_data_not(void **state) { free((void *) source.array); } -void test__f_type_array_array_lengthss_append__works(void **state) { +void test__f_type_array_number_unsignedss_append__works(void **state) { const int length = 5; - f_array_lengths_t source = f_array_lengths_t_initialize; - f_array_lengthss_t destination = f_array_lengthss_t_initialize; + f_number_unsigneds_t source = f_number_unsigneds_t_initialize; + f_number_unsignedss_t destination = f_number_unsignedss_t_initialize; { - const f_status_t status = f_array_lengths_resize(length, &source); + const f_status_t status = f_number_unsigneds_resize(length, &source); assert_int_equal(status, F_none); assert_int_equal(source.used, 0); @@ -61,19 +61,19 @@ void test__f_type_array_array_lengthss_append__works(void **state) { } // for { - const f_status_t status = f_array_lengthss_append(source, &destination); + const f_status_t status = f_number_unsignedss_append(source, &destination); assert_int_equal(status, F_none); assert_int_equal(destination.used, 1); assert_int_equal(destination.array[0].used, source.used); assert_int_equal(destination.array[0].size, source.used); - for (f_array_length_t i = 0; i < destination.array[0].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[0].used; ++i) { assert_int_equal(destination.array[0].array[i], i + 1); } // for } - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_append.h b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_append.h new file mode 100644 index 0000000..c09eafa --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_append.h @@ -0,0 +1,34 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__number_unsignedss_append +#define _TEST__F_type_array__number_unsignedss_append + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_number_unsignedss_append() + */ +extern void test__f_type_array_number_unsignedss_append__parameter_checking(void **state); + +/** + * Test that the function returns F_data_not. + * + * @see f_number_unsignedss_append() + */ +extern void test__f_type_array_number_unsignedss_append__returns_data_not(void **state); + +/** + * Test that the function works. + * + * @see f_number_unsignedss_append() + */ +extern void test__f_type_array_number_unsignedss_append__works(void **state); + +#endif // _TEST__F_type_array__number_unsignedss_append diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_append_all.c b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_append_all.c similarity index 50% rename from level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_append_all.c rename to level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_append_all.c index 08e089d..3b29d4c 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_append_all.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_append_all.c @@ -1,29 +1,29 @@ #include "test-type_array.h" -#include "test-type_array-array_lengthss_append_all.h" +#include "test-type_array-number_unsignedss_append_all.h" #ifdef __cplusplus extern "C" { #endif -void test__f_type_array_array_lengthss_append_all__parameter_checking(void **state) { +void test__f_type_array_number_unsignedss_append_all__parameter_checking(void **state) { - const f_array_lengthss_t data = f_array_lengthss_t_initialize; + const f_number_unsignedss_t data = f_number_unsignedss_t_initialize; { - const f_status_t status = f_array_lengthss_append_all(data, 0); + const f_status_t status = f_number_unsignedss_append_all(data, 0); assert_int_equal(status, F_status_set_error(F_parameter)); } } -void test__f_type_array_array_lengthss_append_all__returns_data_not(void **state) { +void test__f_type_array_number_unsignedss_append_all__returns_data_not(void **state) { const int length = 5; - f_array_lengthss_t source = f_array_lengthss_t_initialize; - f_array_lengthss_t destination = f_array_lengthss_t_initialize; + f_number_unsignedss_t source = f_number_unsignedss_t_initialize; + f_number_unsignedss_t destination = f_number_unsignedss_t_initialize; { - const f_status_t status = f_array_lengthss_resize(length, &source); + const f_status_t status = f_number_unsignedss_resize(length, &source); assert_int_equal(status, F_none); assert_int_equal(source.used, 0); @@ -31,7 +31,7 @@ void test__f_type_array_array_lengthss_append_all__returns_data_not(void **state } { - const f_status_t status = f_array_lengthss_append_all(source, &destination); + const f_status_t status = f_number_unsignedss_append_all(source, &destination); assert_int_equal(status, F_data_not); assert_int_equal(destination.used, 0); @@ -42,15 +42,15 @@ void test__f_type_array_array_lengthss_append_all__returns_data_not(void **state free((void *) source.array); } -void test__f_type_array_array_lengthss_append_all__works(void **state) { +void test__f_type_array_number_unsignedss_append_all__works(void **state) { const int length = 5; const int length_inner = 2; - f_array_lengthss_t source = f_array_lengthss_t_initialize; - f_array_lengthss_t destination = f_array_lengthss_t_initialize; + f_number_unsignedss_t source = f_number_unsignedss_t_initialize; + f_number_unsignedss_t destination = f_number_unsignedss_t_initialize; { - const f_status_t status = f_array_lengthss_resize(length, &source); + const f_status_t status = f_number_unsignedss_resize(length, &source); assert_int_equal(status, F_none); assert_int_equal(source.used, 0); @@ -60,39 +60,39 @@ void test__f_type_array_array_lengthss_append_all__works(void **state) { { for (; source.used < length; ++source.used) { - const f_status_t status = f_array_lengths_resize(length_inner, &source.array[source.used]); + const f_status_t status = f_number_unsigneds_resize(length_inner, &source.array[source.used]); assert_int_equal(status, F_none); - for (f_array_length_t i = 0; i < length_inner; ++i) { + for (f_number_unsigned_t i = 0; i < length_inner; ++i) { source.array[source.used].array[source.array[source.used].used++] = i + 1; } // for } // for } { - const f_status_t status = f_array_lengthss_append_all(source, &destination); + const f_status_t status = f_number_unsignedss_append_all(source, &destination); assert_int_equal(status, F_none); assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { assert_int_equal(destination.array[i].used, length_inner); assert_int_equal(destination.array[i].size, length_inner); - for (f_array_length_t j = 0; j < length_inner; ++j) { + for (f_number_unsigned_t j = 0; j < length_inner; ++j) { assert_int_equal(destination.array[i].array[j], j + 1); } // for } // for } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { free((void *) source.array[i].array); } // for - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_append_all.h b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_append_all.h new file mode 100644 index 0000000..51eeb52 --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_append_all.h @@ -0,0 +1,34 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__number_unsignedss_append_all +#define _TEST__F_type_array__number_unsignedss_append_all + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_number_unsignedss_append_all() + */ +extern void test__f_type_array_number_unsignedss_append_all__parameter_checking(void **state); + +/** + * Test that the function returns F_data_not. + * + * @see f_number_unsignedss_append_all() + */ +extern void test__f_type_array_number_unsignedss_append_all__returns_data_not(void **state); + +/** + * Test that the function works. + * + * @see f_number_unsignedss_append_all() + */ +extern void test__f_type_array_number_unsignedss_append_all__works(void **state); + +#endif // _TEST__F_type_array__number_unsignedss_append_all diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_decimate_by.c b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_decimate_by.c similarity index 51% rename from level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_decimate_by.c rename to level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_decimate_by.c index 04d781e..9abf13b 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_decimate_by.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_decimate_by.c @@ -1,17 +1,17 @@ #include "test-type_array.h" -#include "test-type_array-array_lengths_decimate_by.h" +#include "test-type_array-number_unsignedss_decimate_by.h" #ifdef __cplusplus extern "C" { #endif -void test__f_type_array_array_lengths_decimate_by__parameter_checking(void **state) { +void test__f_type_array_number_unsignedss_decimate_by__parameter_checking(void **state) { const int length = 5; - f_array_lengths_t data = f_array_lengths_t_initialize; + f_number_unsignedss_t data = f_number_unsigneds_t_initialize; { - const f_status_t status = f_array_lengths_decimate_by(length, 0); + const f_status_t status = f_number_unsignedss_decimate_by(length, 0); assert_int_equal(status, F_status_set_error(F_parameter)); assert_int_equal(data.used, 0); @@ -21,13 +21,13 @@ void test__f_type_array_array_lengths_decimate_by__parameter_checking(void **sta assert_null(data.array); } -void test__f_type_array_array_lengths_decimate_by__returns_data_not(void **state) { +void test__f_type_array_number_unsignedss_decimate_by__returns_data_not(void **state) { const int length = 5; - f_array_lengths_t data = f_array_lengths_t_initialize; + f_number_unsignedss_t data = f_number_unsignedss_t_initialize; { - const f_status_t status = f_array_lengths_resize(length, &data); + const f_status_t status = f_number_unsignedss_resize(length, &data); assert_int_equal(status, F_none); assert_int_equal(data.used, 0); @@ -35,7 +35,7 @@ void test__f_type_array_array_lengths_decimate_by__returns_data_not(void **state } { - const f_status_t status = f_array_lengths_decimate_by(0, &data); + const f_status_t status = f_number_unsignedss_decimate_by(0, &data); assert_int_equal(status, F_data_not); assert_int_equal(data.used, 0); @@ -45,13 +45,13 @@ void test__f_type_array_array_lengths_decimate_by__returns_data_not(void **state free((void *) data.array); } -void test__f_type_array_array_lengths_decimate_by__works(void **state) { +void test__f_type_array_number_unsignedss_decimate_by__works(void **state) { const int length = 5; - f_array_lengths_t data = f_array_lengths_t_initialize; + f_number_unsignedss_t data = f_number_unsigneds_t_initialize; { - const f_status_t status = f_array_lengths_resize(length, &data); + const f_status_t status = f_number_unsignedss_resize(length, &data); assert_int_equal(status, F_none); assert_int_equal(data.used, 0); @@ -59,7 +59,7 @@ void test__f_type_array_array_lengths_decimate_by__works(void **state) { } { - const f_status_t status = f_array_lengths_decimate_by(length, &data); + const f_status_t status = f_number_unsignedss_decimate_by(length, &data); assert_int_equal(status, F_none); assert_int_equal(data.used, 0); diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_decimate_by.h b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_decimate_by.h new file mode 100644 index 0000000..00cd2b9 --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_decimate_by.h @@ -0,0 +1,34 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__number_unsignedss_decimate_by +#define _TEST__F_type_array__number_unsignedss_decimate_by + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_number_unsignedss_decimate_by() + */ +extern void test__f_type_array_number_unsignedss_decimate_by__parameter_checking(void **state); + +/** + * Test that the function returns F_data_not. + * + * @see f_type_array_number_unsignedss_decimate_by() + */ +extern void test__f_type_array_number_unsignedss_decimate_by__returns_data_not(void **state); + +/** + * Test that the function works. + * + * @see f_number_unsignedss_decimate_by() + */ +extern void test__f_type_array_number_unsignedss_decimate_by__works(void **state); + +#endif // _TEST__F_type_array__number_unsignedss_decimate_by diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_decrease_by.c b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_decrease_by.c similarity index 51% rename from level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_decrease_by.c rename to level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_decrease_by.c index 669eae9..e8e3fb1 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_decrease_by.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_decrease_by.c @@ -1,17 +1,17 @@ #include "test-type_array.h" -#include "test-type_array-array_lengths_decrease_by.h" +#include "test-type_array-number_unsignedss_decrease_by.h" #ifdef __cplusplus extern "C" { #endif -void test__f_type_array_array_lengths_decrease_by__parameter_checking(void **state) { +void test__f_type_array_number_unsignedss_decrease_by__parameter_checking(void **state) { const int length = 5; - f_array_lengths_t data = f_array_lengths_t_initialize; + f_number_unsignedss_t data = f_number_unsigneds_t_initialize; { - const f_status_t status = f_array_lengths_decrease_by(length, 0); + const f_status_t status = f_number_unsignedss_decrease_by(length, 0); assert_int_equal(status, F_status_set_error(F_parameter)); assert_int_equal(data.used, 0); @@ -21,13 +21,13 @@ void test__f_type_array_array_lengths_decrease_by__parameter_checking(void **sta assert_null(data.array); } -void test__f_type_array_array_lengths_decrease_by__returns_data_not(void **state) { +void test__f_type_array_number_unsignedss_decrease_by__returns_data_not(void **state) { const int length = 5; - f_array_lengths_t data = f_array_lengths_t_initialize; + f_number_unsignedss_t data = f_number_unsignedss_t_initialize; { - const f_status_t status = f_array_lengths_resize(length, &data); + const f_status_t status = f_number_unsignedss_resize(length, &data); assert_int_equal(status, F_none); assert_int_equal(data.used, 0); @@ -35,7 +35,7 @@ void test__f_type_array_array_lengths_decrease_by__returns_data_not(void **state } { - const f_status_t status = f_array_lengths_decrease_by(0, &data); + const f_status_t status = f_number_unsignedss_decrease_by(0, &data); assert_int_equal(status, F_data_not); assert_int_equal(data.used, 0); @@ -45,13 +45,13 @@ void test__f_type_array_array_lengths_decrease_by__returns_data_not(void **state free((void *) data.array); } -void test__f_type_array_array_lengths_decrease_by__works(void **state) { +void test__f_type_array_number_unsignedss_decrease_by__works(void **state) { const int length = 5; - f_array_lengths_t data = f_array_lengths_t_initialize; + f_number_unsignedss_t data = f_number_unsigneds_t_initialize; { - const f_status_t status = f_array_lengths_resize(length, &data); + const f_status_t status = f_number_unsignedss_resize(length, &data); assert_int_equal(status, F_none); assert_int_equal(data.used, 0); @@ -59,7 +59,7 @@ void test__f_type_array_array_lengths_decrease_by__works(void **state) { } { - const f_status_t status = f_array_lengths_decrease_by(length, &data); + const f_status_t status = f_number_unsignedss_decrease_by(length, &data); assert_int_equal(status, F_none); assert_int_equal(data.used, 0); diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_decrease_by.h b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_decrease_by.h new file mode 100644 index 0000000..de9d1dd --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_decrease_by.h @@ -0,0 +1,34 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__number_unsignedss_decrease_by +#define _TEST__F_type_array__number_unsignedss_decrease_by + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_number_unsignedss_decrease_by() + */ +extern void test__f_type_array_number_unsignedss_decrease_by__parameter_checking(void **state); + +/** + * Test that the function returns F_data_not. + * + * @see f_number_unsignedss_decrease_by() + */ +extern void test__f_type_array_number_unsignedss_decrease_by__returns_data_not(void **state); + +/** + * Test that the function works. + * + * @see f_number_unsignedss_decrease_by() + */ +extern void test__f_type_array_number_unsignedss_decrease_by__works(void **state); + +#endif // _TEST__F_type_array__number_unsignedss_decrease_by diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_increase.c b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_increase.c similarity index 54% rename from level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_increase.c rename to level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_increase.c index 02f2385..82fa657 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengths_increase.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_increase.c @@ -1,17 +1,17 @@ #include "test-type_array.h" -#include "test-type_array-array_lengths_increase.h" +#include "test-type_array-number_unsignedss_increase.h" #ifdef __cplusplus extern "C" { #endif -void test__f_type_array_array_lengths_increase__parameter_checking(void **state) { +void test__f_type_array_number_unsignedss_increase__parameter_checking(void **state) { const int length = 5; - f_array_lengths_t data = f_array_lengths_t_initialize; + f_number_unsignedss_t data = f_number_unsigneds_t_initialize; { - const f_status_t status = f_array_lengths_increase(length, 0); + const f_status_t status = f_number_unsignedss_increase(length, 0); assert_int_equal(status, F_status_set_error(F_parameter)); assert_int_equal(data.used, 0); @@ -21,13 +21,13 @@ void test__f_type_array_array_lengths_increase__parameter_checking(void **state) free((void *) data.array); } -void test__f_type_array_array_lengths_increase__returns_data_not(void **state) { +void test__f_type_array_number_unsignedss_increase__returns_data_not(void **state) { const int length = 5; - f_array_lengths_t data = f_array_lengths_t_initialize; + f_number_unsignedss_t data = f_number_unsigneds_t_initialize; { - const f_status_t status = f_array_lengths_resize(length, &data); + const f_status_t status = f_number_unsignedss_resize(length, &data); assert_int_equal(status, F_none); assert_int_equal(data.used, 0); @@ -35,7 +35,7 @@ void test__f_type_array_array_lengths_increase__returns_data_not(void **state) { } { - const f_status_t status = f_array_lengths_increase(length, &data); + const f_status_t status = f_number_unsignedss_increase(length, &data); assert_int_equal(status, F_data_not); assert_int_equal(data.used, 0); @@ -45,13 +45,13 @@ void test__f_type_array_array_lengths_increase__returns_data_not(void **state) { free((void *) data.array); } -void test__f_type_array_array_lengths_increase__works(void **state) { +void test__f_type_array_number_unsignedss_increase__works(void **state) { const int length = 5; - f_array_lengths_t data = f_array_lengths_t_initialize; + f_number_unsignedss_t data = f_number_unsigneds_t_initialize; { - const f_status_t status = f_array_lengths_resize(length, &data); + const f_status_t status = f_number_unsignedss_resize(length, &data); assert_int_equal(status, F_none); assert_int_equal(data.used, 0); @@ -61,7 +61,7 @@ void test__f_type_array_array_lengths_increase__works(void **state) { { data.used = length; - const f_status_t status = f_array_lengths_increase(length, &data); + const f_status_t status = f_number_unsignedss_increase(length, &data); assert_int_equal(status, F_none); assert_int_equal(data.used, length); diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_increase.h b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_increase.h new file mode 100644 index 0000000..31e7426 --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_increase.h @@ -0,0 +1,34 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__number_unsignedss_increase +#define _TEST__F_type_array__number_unsignedss_increase + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_number_unsignedss_increase() + */ +extern void test__f_type_array_number_unsignedss_increase__parameter_checking(void **state); + +/** + * Test that the function returns F_data_not. + * + * @see f_number_unsignedss_increase() + */ +extern void test__f_type_array_number_unsignedss_increase__returns_data_not(void **state); + +/** + * Test that the function works. + * + * @see f_number_unsignedss_increase() + */ +extern void test__f_type_array_number_unsignedss_increase__works(void **state); + +#endif // _TEST__F_type_array__number_unsignedss_increase diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_increase_by.c b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_increase_by.c similarity index 53% rename from level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_increase_by.c rename to level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_increase_by.c index fca240b..fb9fa4e 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_increase_by.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_increase_by.c @@ -1,17 +1,17 @@ #include "test-type_array.h" -#include "test-type_array-array_lengthss_increase_by.h" +#include "test-type_array-number_unsignedss_increase_by.h" #ifdef __cplusplus extern "C" { #endif -void test__f_type_array_array_lengthss_increase_by__parameter_checking(void **state) { +void test__f_type_array_number_unsignedss_increase_by__parameter_checking(void **state) { const int length = 5; - f_array_lengthss_t data = f_array_lengths_t_initialize; + f_number_unsignedss_t data = f_number_unsigneds_t_initialize; { - const f_status_t status = f_array_lengthss_increase_by(length, 0); + const f_status_t status = f_number_unsignedss_increase_by(length, 0); assert_int_equal(status, F_status_set_error(F_parameter)); assert_int_equal(data.used, 0); @@ -21,13 +21,13 @@ void test__f_type_array_array_lengthss_increase_by__parameter_checking(void **st assert_null(data.array); } -void test__f_type_array_array_lengthss_increase_by__returns_data_not(void **state) { +void test__f_type_array_number_unsignedss_increase_by__returns_data_not(void **state) { const int length = 5; - f_array_lengthss_t data = f_array_lengthss_t_initialize; + f_number_unsignedss_t data = f_number_unsignedss_t_initialize; { - const f_status_t status = f_array_lengthss_resize(length, &data); + const f_status_t status = f_number_unsignedss_resize(length, &data); assert_int_equal(status, F_none); assert_int_equal(data.used, 0); @@ -35,7 +35,7 @@ void test__f_type_array_array_lengthss_increase_by__returns_data_not(void **stat } { - const f_status_t status = f_array_lengthss_increase_by(0, &data); + const f_status_t status = f_number_unsignedss_increase_by(0, &data); assert_int_equal(status, F_data_not); assert_int_equal(data.used, 0); @@ -43,7 +43,7 @@ void test__f_type_array_array_lengthss_increase_by__returns_data_not(void **stat } { - const f_status_t status = f_array_lengthss_increase_by(length, &data); + const f_status_t status = f_number_unsignedss_increase_by(length, &data); assert_int_equal(status, F_data_not); assert_int_equal(data.used, 0); @@ -53,13 +53,13 @@ void test__f_type_array_array_lengthss_increase_by__returns_data_not(void **stat free((void *) data.array); } -void test__f_type_array_array_lengthss_increase_by__works(void **state) { +void test__f_type_array_number_unsignedss_increase_by__works(void **state) { const int length = 5; - f_array_lengthss_t data = f_array_lengths_t_initialize; + f_number_unsignedss_t data = f_number_unsigneds_t_initialize; { - const f_status_t status = f_array_lengthss_resize(length, &data); + const f_status_t status = f_number_unsignedss_resize(length, &data); assert_int_equal(status, F_none); assert_int_equal(data.used, 0); @@ -69,7 +69,7 @@ void test__f_type_array_array_lengthss_increase_by__works(void **state) { { data.used = length; - const f_status_t status = f_array_lengthss_increase_by(length, &data); + const f_status_t status = f_number_unsignedss_increase_by(length, &data); assert_int_equal(status, F_none); assert_int_equal(data.used, length); diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_increase_by.h b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_increase_by.h new file mode 100644 index 0000000..254b9fe --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_increase_by.h @@ -0,0 +1,34 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__number_unsignedss_increase_by +#define _TEST__F_type_array__number_unsignedss_increase_by + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_number_unsignedss_increase_by() + */ +extern void test__f_type_array_number_unsignedss_increase_by__parameter_checking(void **state); + +/** + * Test that the function returns F_data_not. + * + * @see f_number_unsignedss_increase_by() + */ +extern void test__f_type_array_number_unsignedss_increase_by__returns_data_not(void **state); + +/** + * Test that the function works. + * + * @see f_number_unsignedss_increase_by() + */ +extern void test__f_type_array_number_unsignedss_increase_by__works(void **state); + +#endif // _TEST__F_type_array__number_unsignedss_increase_by diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_resize.c b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_resize.c similarity index 50% rename from level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_resize.c rename to level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_resize.c index 2e8fdc8..e629438 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-array_lengthss_resize.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_resize.c @@ -1,17 +1,17 @@ #include "test-type_array.h" -#include "test-type_array-array_lengthss_resize.h" +#include "test-type_array-number_unsignedss_resize.h" #ifdef __cplusplus extern "C" { #endif -void test__f_type_array_array_lengthss_resize__parameter_checking(void **state) { +void test__f_type_array_number_unsignedss_resize__parameter_checking(void **state) { const int length = 5; - f_array_lengthss_t data = f_array_lengthss_t_initialize; + f_number_unsignedss_t data = f_number_unsignedss_t_initialize; { - const f_status_t status = f_array_lengthss_resize(length, 0); + const f_status_t status = f_number_unsignedss_resize(length, 0); assert_int_equal(status, F_status_set_error(F_parameter)); assert_int_equal(data.used, 0); @@ -21,13 +21,13 @@ void test__f_type_array_array_lengthss_resize__parameter_checking(void **state) assert_null(data.array); } -void test__f_type_array_array_lengthss_resize__works(void **state) { +void test__f_type_array_number_unsignedss_resize__works(void **state) { const int length = 5; - f_array_lengthss_t data = f_array_lengthss_t_initialize; + f_number_unsignedss_t data = f_number_unsignedss_t_initialize; { - const f_status_t status = f_array_lengthss_resize(length, &data); + const f_status_t status = f_number_unsignedss_resize(length, &data); assert_int_equal(status, F_none); assert_int_equal(data.used, 0); diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_resize.h b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_resize.h new file mode 100644 index 0000000..34395fc --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsignedss_resize.h @@ -0,0 +1,27 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__number_unsignedss_resize +#define _TEST__F_type_array__number_unsignedss_resize + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_number_unsignedss_resize() + */ +extern void test__f_type_array_number_unsignedss_resize__parameter_checking(void **state); + +/** + * Test that the function works. + * + * @see f_number_unsignedss_resize() + */ +extern void test__f_type_array_number_unsignedss_resize__works(void **state); + +#endif // _TEST__F_type_array__number_unsignedss_resize diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_adjust.c b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_adjust.c new file mode 100644 index 0000000..7ece6de --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_adjust.c @@ -0,0 +1,42 @@ +#include "test-type_array.h" +#include "test-type_array-number_unsignedss_adjust.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void test__f_type_array_number_unsignedss_adjust__parameter_checking(void **state) { + + const int length = 5; + f_number_unsignedss_t data = f_number_unsignedss_t_initialize; + + { + const f_status_t status = f_number_unsignedss_adjust(length, 0); + + assert_int_equal(status, F_status_set_error(F_parameter)); + assert_int_equal(data.used, 0); + assert_int_equal(data.size, 0); + } + + assert_null(data.array); +} + +void test__f_type_array_number_unsignedss_adjust__works(void **state) { + + const int length = 5; + f_number_unsignedss_t data = f_number_unsignedss_t_initialize; + + { + const f_status_t status = f_number_unsignedss_adjust(length, &data); + + assert_int_equal(status, F_none); + assert_int_equal(data.used, 0); + assert_int_equal(data.size, length); + } + + free((void *) data.array); +} + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_adjust.h b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_adjust.h new file mode 100644 index 0000000..9aa4b18 --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_adjust.h @@ -0,0 +1,27 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__number_unsignedss_adjust +#define _TEST__F_type_array__number_unsignedss_adjust + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_number_unsignedss_adjust() + */ +extern void test__f_type_array_number_unsignedss_adjust__parameter_checking(void **state); + +/** + * Test that the function works. + * + * @see f_number_unsignedss_adjust() + */ +extern void test__f_type_array_number_unsignedss_adjust__works(void **state); + +#endif // _TEST__F_type_array__number_unsignedss_adjust diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_append.c b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_append.c new file mode 100644 index 0000000..6ba4a41 --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_append.c @@ -0,0 +1,86 @@ +#include "test-type_array.h" +#include "test-type_array-number_unsignedss_append.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void test__f_type_array_number_unsignedss_append__parameter_checking(void **state) { + + const f_number_unsigneds_t data = f_number_unsigneds_t_initialize; + + { + const f_status_t status = f_number_unsignedss_append(data, 0); + + assert_int_equal(status, F_status_set_error(F_parameter)); + } +} + +void test__f_type_array_number_unsignedss_append__returns_data_not(void **state) { + + const int length = 5; + f_number_unsigneds_t source = f_number_unsigneds_t_initialize; + f_number_unsignedss_t destination = f_number_unsignedss_t_initialize; + + { + const f_status_t status = f_number_unsigneds_resize(length, &source); + + assert_int_equal(status, F_none); + assert_int_equal(source.used, 0); + assert_int_equal(source.size, length); + } + + { + const f_status_t status = f_number_unsignedss_append(source, &destination); + + assert_int_equal(status, F_data_not); + assert_int_equal(destination.used, 0); + assert_int_equal(destination.size, 0); + assert_null(destination.array); + } + + free((void *) source.array); +} + +void test__f_type_array_number_unsignedss_append__works(void **state) { + + const int length = 5; + f_number_unsigneds_t source = f_number_unsigneds_t_initialize; + f_number_unsignedss_t destination = f_number_unsignedss_t_initialize; + + { + const f_status_t status = f_number_unsigneds_resize(length, &source); + + assert_int_equal(status, F_none); + assert_int_equal(source.used, 0); + assert_int_equal(source.size, length); + } + + for (; source.used < length; ++source.used) { + source.array[source.used] = source.used + 1; + } // for + + { + const f_status_t status = f_number_unsignedss_append(source, &destination); + + assert_int_equal(status, F_none); + assert_int_equal(destination.used, 1); + assert_int_equal(destination.array[0].used, source.used); + assert_int_equal(destination.array[0].size, source.used); + + for (f_number_unsigned_t i = 0; i < destination.array[0].used; ++i) { + assert_int_equal(destination.array[0].array[i], i + 1); + } // for + } + + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { + free((void *) destination.array[i].array); + } // for + + free((void *) source.array); + free((void *) destination.array); +} + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_append.h b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_append.h new file mode 100644 index 0000000..c09eafa --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_append.h @@ -0,0 +1,34 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__number_unsignedss_append +#define _TEST__F_type_array__number_unsignedss_append + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_number_unsignedss_append() + */ +extern void test__f_type_array_number_unsignedss_append__parameter_checking(void **state); + +/** + * Test that the function returns F_data_not. + * + * @see f_number_unsignedss_append() + */ +extern void test__f_type_array_number_unsignedss_append__returns_data_not(void **state); + +/** + * Test that the function works. + * + * @see f_number_unsignedss_append() + */ +extern void test__f_type_array_number_unsignedss_append__works(void **state); + +#endif // _TEST__F_type_array__number_unsignedss_append diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_append_all.c b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_append_all.c new file mode 100644 index 0000000..3b29d4c --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_append_all.c @@ -0,0 +1,105 @@ +#include "test-type_array.h" +#include "test-type_array-number_unsignedss_append_all.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void test__f_type_array_number_unsignedss_append_all__parameter_checking(void **state) { + + const f_number_unsignedss_t data = f_number_unsignedss_t_initialize; + + { + const f_status_t status = f_number_unsignedss_append_all(data, 0); + + assert_int_equal(status, F_status_set_error(F_parameter)); + } +} + +void test__f_type_array_number_unsignedss_append_all__returns_data_not(void **state) { + + const int length = 5; + f_number_unsignedss_t source = f_number_unsignedss_t_initialize; + f_number_unsignedss_t destination = f_number_unsignedss_t_initialize; + + { + const f_status_t status = f_number_unsignedss_resize(length, &source); + + assert_int_equal(status, F_none); + assert_int_equal(source.used, 0); + assert_int_equal(source.size, length); + } + + { + const f_status_t status = f_number_unsignedss_append_all(source, &destination); + + assert_int_equal(status, F_data_not); + assert_int_equal(destination.used, 0); + assert_int_equal(destination.size, 0); + assert_null(destination.array); + } + + free((void *) source.array); +} + +void test__f_type_array_number_unsignedss_append_all__works(void **state) { + + const int length = 5; + const int length_inner = 2; + f_number_unsignedss_t source = f_number_unsignedss_t_initialize; + f_number_unsignedss_t destination = f_number_unsignedss_t_initialize; + + { + const f_status_t status = f_number_unsignedss_resize(length, &source); + + assert_int_equal(status, F_none); + assert_int_equal(source.used, 0); + assert_int_equal(source.size, length); + } + + { + for (; source.used < length; ++source.used) { + + const f_status_t status = f_number_unsigneds_resize(length_inner, &source.array[source.used]); + + assert_int_equal(status, F_none); + + for (f_number_unsigned_t i = 0; i < length_inner; ++i) { + source.array[source.used].array[source.array[source.used].used++] = i + 1; + } // for + } // for + } + + { + const f_status_t status = f_number_unsignedss_append_all(source, &destination); + + assert_int_equal(status, F_none); + assert_int_equal(destination.used, source.used); + assert_int_equal(destination.size, source.used); + + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { + + assert_int_equal(destination.array[i].used, length_inner); + assert_int_equal(destination.array[i].size, length_inner); + + for (f_number_unsigned_t j = 0; j < length_inner; ++j) { + assert_int_equal(destination.array[i].array[j], j + 1); + } // for + } // for + } + + for (f_number_unsigned_t i = 0; i < source.used; ++i) { + free((void *) source.array[i].array); + } // for + + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { + free((void *) destination.array[i].array); + } // for + + free((void *) source.array); + free((void *) destination.array); +} + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_append_all.h b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_append_all.h new file mode 100644 index 0000000..51eeb52 --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_append_all.h @@ -0,0 +1,34 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__number_unsignedss_append_all +#define _TEST__F_type_array__number_unsignedss_append_all + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_number_unsignedss_append_all() + */ +extern void test__f_type_array_number_unsignedss_append_all__parameter_checking(void **state); + +/** + * Test that the function returns F_data_not. + * + * @see f_number_unsignedss_append_all() + */ +extern void test__f_type_array_number_unsignedss_append_all__returns_data_not(void **state); + +/** + * Test that the function works. + * + * @see f_number_unsignedss_append_all() + */ +extern void test__f_type_array_number_unsignedss_append_all__works(void **state); + +#endif // _TEST__F_type_array__number_unsignedss_append_all diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_decimate_by.c b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_decimate_by.c new file mode 100644 index 0000000..9abf13b --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_decimate_by.c @@ -0,0 +1,74 @@ +#include "test-type_array.h" +#include "test-type_array-number_unsignedss_decimate_by.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void test__f_type_array_number_unsignedss_decimate_by__parameter_checking(void **state) { + + const int length = 5; + f_number_unsignedss_t data = f_number_unsigneds_t_initialize; + + { + const f_status_t status = f_number_unsignedss_decimate_by(length, 0); + + assert_int_equal(status, F_status_set_error(F_parameter)); + assert_int_equal(data.used, 0); + assert_int_equal(data.size, 0); + } + + assert_null(data.array); +} + +void test__f_type_array_number_unsignedss_decimate_by__returns_data_not(void **state) { + + const int length = 5; + f_number_unsignedss_t data = f_number_unsignedss_t_initialize; + + { + const f_status_t status = f_number_unsignedss_resize(length, &data); + + assert_int_equal(status, F_none); + assert_int_equal(data.used, 0); + assert_int_equal(data.size, length); + } + + { + const f_status_t status = f_number_unsignedss_decimate_by(0, &data); + + assert_int_equal(status, F_data_not); + assert_int_equal(data.used, 0); + assert_int_equal(data.size, length); + } + + free((void *) data.array); +} + +void test__f_type_array_number_unsignedss_decimate_by__works(void **state) { + + const int length = 5; + f_number_unsignedss_t data = f_number_unsigneds_t_initialize; + + { + const f_status_t status = f_number_unsignedss_resize(length, &data); + + assert_int_equal(status, F_none); + assert_int_equal(data.used, 0); + assert_int_equal(data.size, length); + } + + { + const f_status_t status = f_number_unsignedss_decimate_by(length, &data); + + assert_int_equal(status, F_none); + assert_int_equal(data.used, 0); + assert_int_equal(data.size, 0); + } + + assert_null(data.array); +} + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_decimate_by.h b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_decimate_by.h new file mode 100644 index 0000000..1f53c16 --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_decimate_by.h @@ -0,0 +1,34 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__number_unsignedss_decimate_by +#define _TEST__F_type_array__number_unsignedss_decimate_by + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_number_unsignedss_decimate_by() + */ +extern void test__f_type_array_number_unsignedss_decimate_by__parameter_checking(void **state); + +/** + * Test that the function returns F_data_not. + * + * @see f_number_unsignedss_decimate_by() + */ +extern void test__f_type_array_number_unsignedss_decimate_by__returns_data_not(void **state); + +/** + * Test that the function works. + * + * @see f_number_unsignedss_decimate_by() + */ +extern void test__f_type_array_number_unsignedss_decimate_by__works(void **state); + +#endif // _TEST__F_type_array__number_unsignedss_decimate_by diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_decrease_by.c b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_decrease_by.c new file mode 100644 index 0000000..e8e3fb1 --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_decrease_by.c @@ -0,0 +1,74 @@ +#include "test-type_array.h" +#include "test-type_array-number_unsignedss_decrease_by.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void test__f_type_array_number_unsignedss_decrease_by__parameter_checking(void **state) { + + const int length = 5; + f_number_unsignedss_t data = f_number_unsigneds_t_initialize; + + { + const f_status_t status = f_number_unsignedss_decrease_by(length, 0); + + assert_int_equal(status, F_status_set_error(F_parameter)); + assert_int_equal(data.used, 0); + assert_int_equal(data.size, 0); + } + + assert_null(data.array); +} + +void test__f_type_array_number_unsignedss_decrease_by__returns_data_not(void **state) { + + const int length = 5; + f_number_unsignedss_t data = f_number_unsignedss_t_initialize; + + { + const f_status_t status = f_number_unsignedss_resize(length, &data); + + assert_int_equal(status, F_none); + assert_int_equal(data.used, 0); + assert_int_equal(data.size, length); + } + + { + const f_status_t status = f_number_unsignedss_decrease_by(0, &data); + + assert_int_equal(status, F_data_not); + assert_int_equal(data.used, 0); + assert_int_equal(data.size, length); + } + + free((void *) data.array); +} + +void test__f_type_array_number_unsignedss_decrease_by__works(void **state) { + + const int length = 5; + f_number_unsignedss_t data = f_number_unsigneds_t_initialize; + + { + const f_status_t status = f_number_unsignedss_resize(length, &data); + + assert_int_equal(status, F_none); + assert_int_equal(data.used, 0); + assert_int_equal(data.size, length); + } + + { + const f_status_t status = f_number_unsignedss_decrease_by(length, &data); + + assert_int_equal(status, F_none); + assert_int_equal(data.used, 0); + assert_int_equal(data.size, 0); + } + + assert_null(data.array); +} + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_decrease_by.h b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_decrease_by.h new file mode 100644 index 0000000..de9d1dd --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_decrease_by.h @@ -0,0 +1,34 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__number_unsignedss_decrease_by +#define _TEST__F_type_array__number_unsignedss_decrease_by + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_number_unsignedss_decrease_by() + */ +extern void test__f_type_array_number_unsignedss_decrease_by__parameter_checking(void **state); + +/** + * Test that the function returns F_data_not. + * + * @see f_number_unsignedss_decrease_by() + */ +extern void test__f_type_array_number_unsignedss_decrease_by__returns_data_not(void **state); + +/** + * Test that the function works. + * + * @see f_number_unsignedss_decrease_by() + */ +extern void test__f_type_array_number_unsignedss_decrease_by__works(void **state); + +#endif // _TEST__F_type_array__number_unsignedss_decrease_by diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_increase.c b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_increase.c new file mode 100644 index 0000000..82fa657 --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_increase.c @@ -0,0 +1,76 @@ +#include "test-type_array.h" +#include "test-type_array-number_unsignedss_increase.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void test__f_type_array_number_unsignedss_increase__parameter_checking(void **state) { + + const int length = 5; + f_number_unsignedss_t data = f_number_unsigneds_t_initialize; + + { + const f_status_t status = f_number_unsignedss_increase(length, 0); + + assert_int_equal(status, F_status_set_error(F_parameter)); + assert_int_equal(data.used, 0); + assert_int_equal(data.size, 0); + } + + free((void *) data.array); +} + +void test__f_type_array_number_unsignedss_increase__returns_data_not(void **state) { + + const int length = 5; + f_number_unsignedss_t data = f_number_unsigneds_t_initialize; + + { + const f_status_t status = f_number_unsignedss_resize(length, &data); + + assert_int_equal(status, F_none); + assert_int_equal(data.used, 0); + assert_int_equal(data.size, length); + } + + { + const f_status_t status = f_number_unsignedss_increase(length, &data); + + assert_int_equal(status, F_data_not); + assert_int_equal(data.used, 0); + assert_int_equal(data.size, length); + } + + free((void *) data.array); +} + +void test__f_type_array_number_unsignedss_increase__works(void **state) { + + const int length = 5; + f_number_unsignedss_t data = f_number_unsigneds_t_initialize; + + { + const f_status_t status = f_number_unsignedss_resize(length, &data); + + assert_int_equal(status, F_none); + assert_int_equal(data.used, 0); + assert_int_equal(data.size, length); + } + + { + data.used = length; + + const f_status_t status = f_number_unsignedss_increase(length, &data); + + assert_int_equal(status, F_none); + assert_int_equal(data.used, length); + assert_in_range(data.size, length + 1, length + 1 + F_memory_default_allocation_small_d); + } + + free((void *) data.array); +} + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_increase.h b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_increase.h new file mode 100644 index 0000000..31e7426 --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_increase.h @@ -0,0 +1,34 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__number_unsignedss_increase +#define _TEST__F_type_array__number_unsignedss_increase + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_number_unsignedss_increase() + */ +extern void test__f_type_array_number_unsignedss_increase__parameter_checking(void **state); + +/** + * Test that the function returns F_data_not. + * + * @see f_number_unsignedss_increase() + */ +extern void test__f_type_array_number_unsignedss_increase__returns_data_not(void **state); + +/** + * Test that the function works. + * + * @see f_number_unsignedss_increase() + */ +extern void test__f_type_array_number_unsignedss_increase__works(void **state); + +#endif // _TEST__F_type_array__number_unsignedss_increase diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_increase_by.c b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_increase_by.c new file mode 100644 index 0000000..fb9fa4e --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_increase_by.c @@ -0,0 +1,84 @@ +#include "test-type_array.h" +#include "test-type_array-number_unsignedss_increase_by.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void test__f_type_array_number_unsignedss_increase_by__parameter_checking(void **state) { + + const int length = 5; + f_number_unsignedss_t data = f_number_unsigneds_t_initialize; + + { + const f_status_t status = f_number_unsignedss_increase_by(length, 0); + + assert_int_equal(status, F_status_set_error(F_parameter)); + assert_int_equal(data.used, 0); + assert_int_equal(data.size, 0); + } + + assert_null(data.array); +} + +void test__f_type_array_number_unsignedss_increase_by__returns_data_not(void **state) { + + const int length = 5; + f_number_unsignedss_t data = f_number_unsignedss_t_initialize; + + { + const f_status_t status = f_number_unsignedss_resize(length, &data); + + assert_int_equal(status, F_none); + assert_int_equal(data.used, 0); + assert_int_equal(data.size, length); + } + + { + const f_status_t status = f_number_unsignedss_increase_by(0, &data); + + assert_int_equal(status, F_data_not); + assert_int_equal(data.used, 0); + assert_int_equal(data.size, length); + } + + { + const f_status_t status = f_number_unsignedss_increase_by(length, &data); + + assert_int_equal(status, F_data_not); + assert_int_equal(data.used, 0); + assert_int_equal(data.size, length); + } + + free((void *) data.array); +} + +void test__f_type_array_number_unsignedss_increase_by__works(void **state) { + + const int length = 5; + f_number_unsignedss_t data = f_number_unsigneds_t_initialize; + + { + const f_status_t status = f_number_unsignedss_resize(length, &data); + + assert_int_equal(status, F_none); + assert_int_equal(data.used, 0); + assert_int_equal(data.size, length); + } + + { + data.used = length; + + const f_status_t status = f_number_unsignedss_increase_by(length, &data); + + assert_int_equal(status, F_none); + assert_int_equal(data.used, length); + assert_int_equal(data.size, length * 2); + } + + free((void *) data.array); +} + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_increase_by.h b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_increase_by.h new file mode 100644 index 0000000..254b9fe --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_increase_by.h @@ -0,0 +1,34 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__number_unsignedss_increase_by +#define _TEST__F_type_array__number_unsignedss_increase_by + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_number_unsignedss_increase_by() + */ +extern void test__f_type_array_number_unsignedss_increase_by__parameter_checking(void **state); + +/** + * Test that the function returns F_data_not. + * + * @see f_number_unsignedss_increase_by() + */ +extern void test__f_type_array_number_unsignedss_increase_by__returns_data_not(void **state); + +/** + * Test that the function works. + * + * @see f_number_unsignedss_increase_by() + */ +extern void test__f_type_array_number_unsignedss_increase_by__works(void **state); + +#endif // _TEST__F_type_array__number_unsignedss_increase_by diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_resize.c b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_resize.c new file mode 100644 index 0000000..e629438 --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_resize.c @@ -0,0 +1,42 @@ +#include "test-type_array.h" +#include "test-type_array-number_unsignedss_resize.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void test__f_type_array_number_unsignedss_resize__parameter_checking(void **state) { + + const int length = 5; + f_number_unsignedss_t data = f_number_unsignedss_t_initialize; + + { + const f_status_t status = f_number_unsignedss_resize(length, 0); + + assert_int_equal(status, F_status_set_error(F_parameter)); + assert_int_equal(data.used, 0); + assert_int_equal(data.size, 0); + } + + assert_null(data.array); +} + +void test__f_type_array_number_unsignedss_resize__works(void **state) { + + const int length = 5; + f_number_unsignedss_t data = f_number_unsignedss_t_initialize; + + { + const f_status_t status = f_number_unsignedss_resize(length, &data); + + assert_int_equal(status, F_none); + assert_int_equal(data.used, 0); + assert_int_equal(data.size, length); + } + + free((void *) data.array); +} + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_resize.h b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_resize.h new file mode 100644 index 0000000..34395fc --- /dev/null +++ b/level_0/f_type_array/tests/unit/c/test-type_array-number_unsingedss_resize.h @@ -0,0 +1,27 @@ +/** + * FLL - Level 0 + * + * Project: Type + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Test the array types in the type project. + */ +#ifndef _TEST__F_type_array__number_unsignedss_resize +#define _TEST__F_type_array__number_unsignedss_resize + +/** + * Test that the function correctly fails on invalid parameter. + * + * @see f_number_unsignedss_resize() + */ +extern void test__f_type_array_number_unsignedss_resize__parameter_checking(void **state); + +/** + * Test that the function works. + * + * @see f_number_unsignedss_resize() + */ +extern void test__f_type_array_number_unsignedss_resize__works(void **state); + +#endif // _TEST__F_type_array__number_unsignedss_resize diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-statess_append.c b/level_0/f_type_array/tests/unit/c/test-type_array-statess_append.c index d84f8ca..fc5d332 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-statess_append.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-statess_append.c @@ -74,7 +74,7 @@ void test__f_type_array_statess_append__works(void **state) { assert_int_equal(destination.array[0].used, source.used); assert_int_equal(destination.array[0].size, source.used); - for (f_array_length_t i = 0; i < destination.array[0].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[0].used; ++i) { assert_int_equal(destination.array[0].array[i].step_large, state_data.step_large); assert_int_equal(destination.array[0].array[i].step_small, state_data.step_small); @@ -86,7 +86,7 @@ void test__f_type_array_statess_append__works(void **state) { } // for } - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-statess_append_all.c b/level_0/f_type_array/tests/unit/c/test-type_array-statess_append_all.c index d78b522..497d7b9 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-statess_append_all.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-statess_append_all.c @@ -79,7 +79,7 @@ void test__f_type_array_statess_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { assert_int_equal(destination.array[i].used, length_inner); assert_int_equal(destination.array[i].size, length_inner); @@ -102,11 +102,11 @@ void test__f_type_array_statess_append_all__works(void **state) { } // for } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { free((void *) source.array[i].array); } // for - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-statuss_append_all.c b/level_0/f_type_array/tests/unit/c/test-type_array-statuss_append_all.c index 19e6fe1..bd97600 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-statuss_append_all.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-statuss_append_all.c @@ -68,7 +68,7 @@ void test__f_type_array_statuss_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.array[i], i + 1); } // for } diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-statusss_append.c b/level_0/f_type_array/tests/unit/c/test-type_array-statusss_append.c index a713c2c..cc035ff 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-statusss_append.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-statusss_append.c @@ -68,12 +68,12 @@ void test__f_type_array_statusss_append__works(void **state) { assert_int_equal(destination.array[0].used, source.used); assert_int_equal(destination.array[0].size, source.used); - for (f_array_length_t i = 0; i < destination.array[0].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[0].used; ++i) { assert_int_equal(destination.array[0].array[i], i + 1); } // for } - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-statusss_append_all.c b/level_0/f_type_array/tests/unit/c/test-type_array-statusss_append_all.c index 213074a..e37163a 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-statusss_append_all.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-statusss_append_all.c @@ -64,7 +64,7 @@ void test__f_type_array_statusss_append_all__works(void **state) { assert_int_equal(status, F_none); - for (f_array_length_t i = 0; i < length_inner; ++i) { + for (f_number_unsigned_t i = 0; i < length_inner; ++i) { source.array[source.used].array[source.array[source.used].used++] = i + 1; } // for } // for @@ -77,22 +77,22 @@ void test__f_type_array_statusss_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { assert_int_equal(destination.array[i].used, length_inner); assert_int_equal(destination.array[i].size, length_inner); - for (f_array_length_t j = 0; j < length_inner; ++j) { + for (f_number_unsigned_t j = 0; j < length_inner; ++j) { assert_int_equal(destination.array[i].array[j], j + 1); } // for } // for } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { free((void *) source.array[i].array); } // for - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-uint128s_append_all.c b/level_0/f_type_array/tests/unit/c/test-type_array-uint128s_append_all.c index 65226e5..abc897c 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-uint128s_append_all.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-uint128s_append_all.c @@ -68,7 +68,7 @@ void test__f_type_array_uint128s_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.array[i], i + 1); } // for } diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-uint128ss_append.c b/level_0/f_type_array/tests/unit/c/test-type_array-uint128ss_append.c index 3887a22..838f007 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-uint128ss_append.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-uint128ss_append.c @@ -68,12 +68,12 @@ void test__f_type_array_uint128ss_append__works(void **state) { assert_int_equal(destination.array[0].used, source.used); assert_int_equal(destination.array[0].size, source.used); - for (f_array_length_t i = 0; i < destination.array[0].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[0].used; ++i) { assert_int_equal(destination.array[0].array[i], i + 1); } // for } - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-uint128ss_append_all.c b/level_0/f_type_array/tests/unit/c/test-type_array-uint128ss_append_all.c index 7db1546..57ae7bc 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-uint128ss_append_all.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-uint128ss_append_all.c @@ -64,7 +64,7 @@ void test__f_type_array_uint128ss_append_all__works(void **state) { assert_int_equal(status, F_none); - for (f_array_length_t i = 0; i < length_inner; ++i) { + for (f_number_unsigned_t i = 0; i < length_inner; ++i) { source.array[source.used].array[source.array[source.used].used++] = i + 1; } // for } // for @@ -77,22 +77,22 @@ void test__f_type_array_uint128ss_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { assert_int_equal(destination.array[i].used, length_inner); assert_int_equal(destination.array[i].size, length_inner); - for (f_array_length_t j = 0; j < length_inner; ++j) { + for (f_number_unsigned_t j = 0; j < length_inner; ++j) { assert_int_equal(destination.array[i].array[j], j + 1); } // for } // for } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { free((void *) source.array[i].array); } // for - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-uint16s_append_all.c b/level_0/f_type_array/tests/unit/c/test-type_array-uint16s_append_all.c index a6d6339..669a453 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-uint16s_append_all.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-uint16s_append_all.c @@ -68,7 +68,7 @@ void test__f_type_array_uint16s_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.array[i], i + 1); } // for } diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-uint16ss_append.c b/level_0/f_type_array/tests/unit/c/test-type_array-uint16ss_append.c index e10b0ea..2a81be3 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-uint16ss_append.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-uint16ss_append.c @@ -68,12 +68,12 @@ void test__f_type_array_uint16ss_append__works(void **state) { assert_int_equal(destination.array[0].used, source.used); assert_int_equal(destination.array[0].size, source.used); - for (f_array_length_t i = 0; i < destination.array[0].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[0].used; ++i) { assert_int_equal(destination.array[0].array[i], i + 1); } // for } - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-uint16ss_append_all.c b/level_0/f_type_array/tests/unit/c/test-type_array-uint16ss_append_all.c index 7480db0..e643da8 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-uint16ss_append_all.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-uint16ss_append_all.c @@ -64,7 +64,7 @@ void test__f_type_array_uint16ss_append_all__works(void **state) { assert_int_equal(status, F_none); - for (f_array_length_t i = 0; i < length_inner; ++i) { + for (f_number_unsigned_t i = 0; i < length_inner; ++i) { source.array[source.used].array[source.array[source.used].used++] = i + 1; } // for } // for @@ -77,22 +77,22 @@ void test__f_type_array_uint16ss_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { assert_int_equal(destination.array[i].used, length_inner); assert_int_equal(destination.array[i].size, length_inner); - for (f_array_length_t j = 0; j < length_inner; ++j) { + for (f_number_unsigned_t j = 0; j < length_inner; ++j) { assert_int_equal(destination.array[i].array[j], j + 1); } // for } // for } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { free((void *) source.array[i].array); } // for - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-uint32s_append_all.c b/level_0/f_type_array/tests/unit/c/test-type_array-uint32s_append_all.c index 1caea4e..9e2807d 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-uint32s_append_all.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-uint32s_append_all.c @@ -68,7 +68,7 @@ void test__f_type_array_uint32s_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.array[i], i + 1); } // for } diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-uint32ss_append.c b/level_0/f_type_array/tests/unit/c/test-type_array-uint32ss_append.c index c88d473..9e8405a 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-uint32ss_append.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-uint32ss_append.c @@ -68,12 +68,12 @@ void test__f_type_array_uint32ss_append__works(void **state) { assert_int_equal(destination.array[0].used, source.used); assert_int_equal(destination.array[0].size, source.used); - for (f_array_length_t i = 0; i < destination.array[0].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[0].used; ++i) { assert_int_equal(destination.array[0].array[i], i + 1); } // for } - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-uint32ss_append_all.c b/level_0/f_type_array/tests/unit/c/test-type_array-uint32ss_append_all.c index 41b482f..91bc05e 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-uint32ss_append_all.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-uint32ss_append_all.c @@ -64,7 +64,7 @@ void test__f_type_array_uint32ss_append_all__works(void **state) { assert_int_equal(status, F_none); - for (f_array_length_t i = 0; i < length_inner; ++i) { + for (f_number_unsigned_t i = 0; i < length_inner; ++i) { source.array[source.used].array[source.array[source.used].used++] = i + 1; } // for } // for @@ -77,22 +77,22 @@ void test__f_type_array_uint32ss_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { assert_int_equal(destination.array[i].used, length_inner); assert_int_equal(destination.array[i].size, length_inner); - for (f_array_length_t j = 0; j < length_inner; ++j) { + for (f_number_unsigned_t j = 0; j < length_inner; ++j) { assert_int_equal(destination.array[i].array[j], j + 1); } // for } // for } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { free((void *) source.array[i].array); } // for - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-uint64s_append_all.c b/level_0/f_type_array/tests/unit/c/test-type_array-uint64s_append_all.c index 33db407..5af7533 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-uint64s_append_all.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-uint64s_append_all.c @@ -68,7 +68,7 @@ void test__f_type_array_uint64s_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.array[i], i + 1); } // for } diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-uint64ss_append.c b/level_0/f_type_array/tests/unit/c/test-type_array-uint64ss_append.c index 80a085c..23c83e0 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-uint64ss_append.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-uint64ss_append.c @@ -68,12 +68,12 @@ void test__f_type_array_uint64ss_append__works(void **state) { assert_int_equal(destination.array[0].used, source.used); assert_int_equal(destination.array[0].size, source.used); - for (f_array_length_t i = 0; i < destination.array[0].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[0].used; ++i) { assert_int_equal(destination.array[0].array[i], i + 1); } // for } - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-uint64ss_append_all.c b/level_0/f_type_array/tests/unit/c/test-type_array-uint64ss_append_all.c index 242c8e5..b910413 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-uint64ss_append_all.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-uint64ss_append_all.c @@ -64,7 +64,7 @@ void test__f_type_array_uint64ss_append_all__works(void **state) { assert_int_equal(status, F_none); - for (f_array_length_t i = 0; i < length_inner; ++i) { + for (f_number_unsigned_t i = 0; i < length_inner; ++i) { source.array[source.used].array[source.array[source.used].used++] = i + 1; } // for } // for @@ -77,22 +77,22 @@ void test__f_type_array_uint64ss_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { assert_int_equal(destination.array[i].used, length_inner); assert_int_equal(destination.array[i].size, length_inner); - for (f_array_length_t j = 0; j < length_inner; ++j) { + for (f_number_unsigned_t j = 0; j < length_inner; ++j) { assert_int_equal(destination.array[i].array[j], j + 1); } // for } // for } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { free((void *) source.array[i].array); } // for - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-uint8s_append_all.c b/level_0/f_type_array/tests/unit/c/test-type_array-uint8s_append_all.c index 2922008..168a179 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-uint8s_append_all.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-uint8s_append_all.c @@ -68,7 +68,7 @@ void test__f_type_array_uint8s_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.array[i], i + 1); } // for } diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-uint8ss_append.c b/level_0/f_type_array/tests/unit/c/test-type_array-uint8ss_append.c index 1db489a..3f603b6 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-uint8ss_append.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-uint8ss_append.c @@ -68,12 +68,12 @@ void test__f_type_array_uint8ss_append__works(void **state) { assert_int_equal(destination.array[0].used, source.used); assert_int_equal(destination.array[0].size, source.used); - for (f_array_length_t i = 0; i < destination.array[0].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[0].used; ++i) { assert_int_equal(destination.array[0].array[i], i + 1); } // for } - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_type_array/tests/unit/c/test-type_array-uint8ss_append_all.c b/level_0/f_type_array/tests/unit/c/test-type_array-uint8ss_append_all.c index ba70201..5f61c55 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array-uint8ss_append_all.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array-uint8ss_append_all.c @@ -64,7 +64,7 @@ void test__f_type_array_uint8ss_append_all__works(void **state) { assert_int_equal(status, F_none); - for (f_array_length_t i = 0; i < length_inner; ++i) { + for (f_number_unsigned_t i = 0; i < length_inner; ++i) { source.array[source.used].array[source.array[source.used].used++] = i + 1; } // for } // for @@ -77,22 +77,22 @@ void test__f_type_array_uint8ss_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { assert_int_equal(destination.array[i].used, length_inner); assert_int_equal(destination.array[i].size, length_inner); - for (f_array_length_t j = 0; j < length_inner; ++j) { + for (f_number_unsigned_t j = 0; j < length_inner; ++j) { assert_int_equal(destination.array[i].array[j], j + 1); } // for } // for } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { free((void *) source.array[i].array); } // for - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].array); } // for diff --git a/level_0/f_type_array/tests/unit/c/test-type_array.c b/level_0/f_type_array/tests/unit/c/test-type_array.c index 8e4b8bf..e8fbd28 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array.c +++ b/level_0/f_type_array/tests/unit/c/test-type_array.c @@ -17,37 +17,6 @@ int setdown(void **state) { int main(void) { const struct CMUnitTest tests[] = { - cmocka_unit_test(test__f_type_array_array_lengths_append_all__returns_data_not), - cmocka_unit_test(test__f_type_array_array_lengths_decimate_by__returns_data_not), - cmocka_unit_test(test__f_type_array_array_lengths_decrease_by__returns_data_not), - cmocka_unit_test(test__f_type_array_array_lengths_increase__returns_data_not), - cmocka_unit_test(test__f_type_array_array_lengths_increase_by__returns_data_not), - - cmocka_unit_test(test__f_type_array_array_lengths_adjust__works), - cmocka_unit_test(test__f_type_array_array_lengths_append__works), - cmocka_unit_test(test__f_type_array_array_lengths_append_all__works), - cmocka_unit_test(test__f_type_array_array_lengths_decimate_by__works), - cmocka_unit_test(test__f_type_array_array_lengths_decrease_by__works), - cmocka_unit_test(test__f_type_array_array_lengths_increase__works), - cmocka_unit_test(test__f_type_array_array_lengths_increase_by__works), - cmocka_unit_test(test__f_type_array_array_lengths_resize__works), - - cmocka_unit_test(test__f_type_array_array_lengthss_append__returns_data_not), - cmocka_unit_test(test__f_type_array_array_lengthss_append_all__returns_data_not), - cmocka_unit_test(test__f_type_array_array_lengthss_decimate_by__returns_data_not), - cmocka_unit_test(test__f_type_array_array_lengthss_decrease_by__returns_data_not), - cmocka_unit_test(test__f_type_array_array_lengthss_increase__returns_data_not), - cmocka_unit_test(test__f_type_array_array_lengthss_increase_by__returns_data_not), - - cmocka_unit_test(test__f_type_array_array_lengthss_adjust__works), - cmocka_unit_test(test__f_type_array_array_lengthss_append__works), - cmocka_unit_test(test__f_type_array_array_lengthss_append_all__works), - cmocka_unit_test(test__f_type_array_array_lengthss_decimate_by__works), - cmocka_unit_test(test__f_type_array_array_lengthss_decrease_by__works), - cmocka_unit_test(test__f_type_array_array_lengthss_increase__works), - cmocka_unit_test(test__f_type_array_array_lengthss_increase_by__works), - cmocka_unit_test(test__f_type_array_array_lengthss_resize__works), - cmocka_unit_test(test__f_type_array_cells_append_all__returns_data_not), cmocka_unit_test(test__f_type_array_cells_decimate_by__returns_data_not), cmocka_unit_test(test__f_type_array_cells_decrease_by__returns_data_not), @@ -256,6 +225,37 @@ int main(void) { cmocka_unit_test(test__f_type_array_int128ss_increase__returns_data_not), cmocka_unit_test(test__f_type_array_int128ss_increase_by__returns_data_not), + cmocka_unit_test(test__f_type_array_number_unsigneds_append_all__returns_data_not), + cmocka_unit_test(test__f_type_array_number_unsigneds_decimate_by__returns_data_not), + cmocka_unit_test(test__f_type_array_number_unsigneds_decrease_by__returns_data_not), + cmocka_unit_test(test__f_type_array_number_unsigneds_increase__returns_data_not), + cmocka_unit_test(test__f_type_array_number_unsigneds_increase_by__returns_data_not), + + cmocka_unit_test(test__f_type_array_number_unsigneds_adjust__works), + cmocka_unit_test(test__f_type_array_number_unsigneds_append__works), + cmocka_unit_test(test__f_type_array_number_unsigneds_append_all__works), + cmocka_unit_test(test__f_type_array_number_unsigneds_decimate_by__works), + cmocka_unit_test(test__f_type_array_number_unsigneds_decrease_by__works), + cmocka_unit_test(test__f_type_array_number_unsigneds_increase__works), + cmocka_unit_test(test__f_type_array_number_unsigneds_increase_by__works), + cmocka_unit_test(test__f_type_array_number_unsigneds_resize__works), + + cmocka_unit_test(test__f_type_array_number_unsignedss_append__returns_data_not), + cmocka_unit_test(test__f_type_array_number_unsignedss_append_all__returns_data_not), + cmocka_unit_test(test__f_type_array_number_unsignedss_decimate_by__returns_data_not), + cmocka_unit_test(test__f_type_array_number_unsignedss_decrease_by__returns_data_not), + cmocka_unit_test(test__f_type_array_number_unsignedss_increase__returns_data_not), + cmocka_unit_test(test__f_type_array_number_unsignedss_increase_by__returns_data_not), + + cmocka_unit_test(test__f_type_array_number_unsignedss_adjust__works), + cmocka_unit_test(test__f_type_array_number_unsignedss_append__works), + cmocka_unit_test(test__f_type_array_number_unsignedss_append_all__works), + cmocka_unit_test(test__f_type_array_number_unsignedss_decimate_by__works), + cmocka_unit_test(test__f_type_array_number_unsignedss_decrease_by__works), + cmocka_unit_test(test__f_type_array_number_unsignedss_increase__works), + cmocka_unit_test(test__f_type_array_number_unsignedss_increase_by__works), + cmocka_unit_test(test__f_type_array_number_unsignedss_resize__works), + cmocka_unit_test(test__f_type_array_int128ss_adjust__works), cmocka_unit_test(test__f_type_array_int128ss_append__works), cmocka_unit_test(test__f_type_array_int128ss_append_all__works), @@ -483,23 +483,23 @@ int main(void) { cmocka_unit_test(test__f_type_array_uint128ss_resize__works), #ifndef _di_level_0_parameter_checking_ - cmocka_unit_test(test__f_type_array_array_lengths_adjust__parameter_checking), - cmocka_unit_test(test__f_type_array_array_lengths_append__parameter_checking), - cmocka_unit_test(test__f_type_array_array_lengths_append_all__parameter_checking), - cmocka_unit_test(test__f_type_array_array_lengths_decimate_by__parameter_checking), - cmocka_unit_test(test__f_type_array_array_lengths_decrease_by__parameter_checking), - cmocka_unit_test(test__f_type_array_array_lengths_increase__parameter_checking), - cmocka_unit_test(test__f_type_array_array_lengths_increase_by__parameter_checking), - cmocka_unit_test(test__f_type_array_array_lengths_resize__parameter_checking), - - cmocka_unit_test(test__f_type_array_array_lengthss_adjust__parameter_checking), - cmocka_unit_test(test__f_type_array_array_lengthss_append__parameter_checking), - cmocka_unit_test(test__f_type_array_array_lengthss_append_all__parameter_checking), - cmocka_unit_test(test__f_type_array_array_lengthss_decimate_by__parameter_checking), - cmocka_unit_test(test__f_type_array_array_lengthss_decrease_by__parameter_checking), - cmocka_unit_test(test__f_type_array_array_lengthss_increase__parameter_checking), - cmocka_unit_test(test__f_type_array_array_lengthss_increase_by__parameter_checking), - cmocka_unit_test(test__f_type_array_array_lengthss_resize__parameter_checking), + cmocka_unit_test(test__f_type_array_number_unsigneds_adjust__parameter_checking), + cmocka_unit_test(test__f_type_array_number_unsigneds_append__parameter_checking), + cmocka_unit_test(test__f_type_array_number_unsigneds_append_all__parameter_checking), + cmocka_unit_test(test__f_type_array_number_unsigneds_decimate_by__parameter_checking), + cmocka_unit_test(test__f_type_array_number_unsigneds_decrease_by__parameter_checking), + cmocka_unit_test(test__f_type_array_number_unsigneds_increase__parameter_checking), + cmocka_unit_test(test__f_type_array_number_unsigneds_increase_by__parameter_checking), + cmocka_unit_test(test__f_type_array_number_unsigneds_resize__parameter_checking), + + cmocka_unit_test(test__f_type_array_number_unsignedss_adjust__parameter_checking), + cmocka_unit_test(test__f_type_array_number_unsignedss_append__parameter_checking), + cmocka_unit_test(test__f_type_array_number_unsignedss_append_all__parameter_checking), + cmocka_unit_test(test__f_type_array_number_unsignedss_decimate_by__parameter_checking), + cmocka_unit_test(test__f_type_array_number_unsignedss_decrease_by__parameter_checking), + cmocka_unit_test(test__f_type_array_number_unsignedss_increase__parameter_checking), + cmocka_unit_test(test__f_type_array_number_unsignedss_increase_by__parameter_checking), + cmocka_unit_test(test__f_type_array_number_unsignedss_resize__parameter_checking), cmocka_unit_test(test__f_type_array_cells_adjust__parameter_checking), cmocka_unit_test(test__f_type_array_cells_append__parameter_checking), diff --git a/level_0/f_type_array/tests/unit/c/test-type_array.h b/level_0/f_type_array/tests/unit/c/test-type_array.h index dfc4a9c..701e47d 100644 --- a/level_0/f_type_array/tests/unit/c/test-type_array.h +++ b/level_0/f_type_array/tests/unit/c/test-type_array.h @@ -25,22 +25,6 @@ #include // Test includes. -#include "test-type_array-array_lengths_adjust.h" -#include "test-type_array-array_lengths_append.h" -#include "test-type_array-array_lengths_append_all.h" -#include "test-type_array-array_lengths_decimate_by.h" -#include "test-type_array-array_lengths_decrease_by.h" -#include "test-type_array-array_lengths_increase.h" -#include "test-type_array-array_lengths_increase_by.h" -#include "test-type_array-array_lengths_resize.h" -#include "test-type_array-array_lengthss_adjust.h" -#include "test-type_array-array_lengthss_append.h" -#include "test-type_array-array_lengthss_append_all.h" -#include "test-type_array-array_lengthss_decimate_by.h" -#include "test-type_array-array_lengthss_decrease_by.h" -#include "test-type_array-array_lengthss_increase.h" -#include "test-type_array-array_lengthss_increase_by.h" -#include "test-type_array-array_lengthss_resize.h" #include "test-type_array-cells_adjust.h" #include "test-type_array-cells_append.h" #include "test-type_array-cells_append_all.h" @@ -153,6 +137,22 @@ #include "test-type_array-int128ss_increase.h" #include "test-type_array-int128ss_increase_by.h" #include "test-type_array-int128ss_resize.h" +#include "test-type_array-number_unsigneds_adjust.h" +#include "test-type_array-number_unsigneds_append.h" +#include "test-type_array-number_unsigneds_append_all.h" +#include "test-type_array-number_unsigneds_decimate_by.h" +#include "test-type_array-number_unsigneds_decrease_by.h" +#include "test-type_array-number_unsigneds_increase.h" +#include "test-type_array-number_unsigneds_increase_by.h" +#include "test-type_array-number_unsigneds_resize.h" +#include "test-type_array-number_unsignedss_adjust.h" +#include "test-type_array-number_unsignedss_append.h" +#include "test-type_array-number_unsignedss_append_all.h" +#include "test-type_array-number_unsignedss_decimate_by.h" +#include "test-type_array-number_unsignedss_decrease_by.h" +#include "test-type_array-number_unsignedss_increase.h" +#include "test-type_array-number_unsignedss_increase_by.h" +#include "test-type_array-number_unsignedss_resize.h" #include "test-type_array-states_adjust.h" #include "test-type_array-states_append.h" #include "test-type_array-states_append_all.h" diff --git a/level_0/f_utf/c/private-utf.c b/level_0/f_utf/c/private-utf.c index 8eb9ba5..4243883 100644 --- a/level_0/f_utf/c/private-utf.c +++ b/level_0/f_utf/c/private-utf.c @@ -7,7 +7,7 @@ extern "C" { #endif #if !defined(_di_f_utf_char_to_character_) || !defined(_di_f_utf_is_alphabetic_) || !defined(_di_f_utf_is_alphabetic_digit_) || !defined(_di_f_utf_is_alphabetic_numeric_) || !defined(_di_f_utf_is_ascii_) || !defined(_di_f_utf_is_combining_) || !defined(_di_f_utf_is_control_) || !defined(_di_f_utf_is_control_picture_) || !defined(_di_f_utf_is_digit_) || !defined(_di_f_utf_is_emoji_) || !defined(_di_f_utf_is_graph_) || !defined(_di_f_utf_is_numeric_) || !defined(_di_f_utf_is_phonetic_) || !defined(_di_f_utf_is_private_) || !defined(_di_f_utf_is_punctuation_) || !defined(_di_f_utf_is_symbol_) || !defined(_di_f_utf_is_unassigned_) || !defined(_di_f_utf_is_valid_) || !defined(_di_f_utf_is_whitespace_) || !defined(_di_f_utf_is_whitespace_modifier_) || !defined(_di_f_utf_is_whitespace_other_) || !defined(_di_f_utf_is_wide_) || !defined(_di_f_utf_is_word_) || !defined(_di_f_utf_is_word_dash_) || !defined(_di_f_utf_is_word_dash_plus_) || !defined(_di_f_utf_is_zero_width_) || !defined(_di_f_utf_unicode_to_) - f_status_t private_f_utf_char_to_character(const f_string_t sequence, const f_array_length_t width_max, f_utf_char_t *character_utf) { + f_status_t private_f_utf_char_to_character(const f_string_t sequence, const f_number_unsigned_t width_max, f_utf_char_t *character_utf) { if (!macro_f_utf_byte_width_is(*sequence)) { *character_utf = macro_f_utf_char_t_from_char_1(sequence[0]); diff --git a/level_0/f_utf/c/private-utf.h b/level_0/f_utf/c/private-utf.h index 5ab1a03..9df6623 100644 --- a/level_0/f_utf/c/private-utf.h +++ b/level_0/f_utf/c/private-utf.h @@ -71,7 +71,7 @@ extern "C" { * @see f_utf_unicode_to() */ #if !defined(_di_f_utf_char_to_character_) || !defined(_di_f_utf_is_alphabetic_) || !defined(_di_f_utf_is_alphabetic_digit_) || !defined(_di_f_utf_is_alphabetic_numeric_) || !defined(_di_f_utf_is_ascii_) || !defined(_di_f_utf_is_combining_) || !defined(_di_f_utf_is_control_) || !defined(_di_f_utf_is_control_picture_) || !defined(_di_f_utf_is_digit_) || !defined(_di_f_utf_is_emoji_) || !defined(_di_f_utf_is_graph_) || !defined(_di_f_utf_is_numeric_) || !defined(_di_f_utf_is_phonetic_) || !defined(_di_f_utf_is_private_) || !defined(_di_f_utf_is_punctuation_) || !defined(_di_f_utf_is_symbol_) || !defined(_di_f_utf_is_unassigned_) || !defined(_di_f_utf_is_valid_) || !defined(_di_f_utf_is_whitespace_) || !defined(_di_f_utf_is_whitespace_modifier_) || !defined(_di_f_utf_is_whitespace_other_) || !defined(_di_f_utf_is_wide_) || !defined(_di_f_utf_is_word_) || !defined(_di_f_utf_is_word_dash_) || !defined(_di_f_utf_is_word_dash_plus_) || !defined(_di_f_utf_is_zero_width_) || !defined(_di_f_utf_unicode_to_) - extern f_status_t private_f_utf_char_to_character(const f_string_t character, const f_array_length_t width_max, f_utf_char_t *character_utf) F_attribute_visibility_internal_d; + extern f_status_t private_f_utf_char_to_character(const f_string_t character, const f_number_unsigned_t width_max, f_utf_char_t *character_utf) F_attribute_visibility_internal_d; #endif // !defined(_di_f_utf_char_to_character_) || !defined(_di_f_utf_is_alphabetic_) || !defined(_di_f_utf_is_alphabetic_digit_) || !defined(_di_f_utf_is_alphabetic_numeric_) || !defined(_di_f_utf_is_ascii_) || !defined(_di_f_utf_is_combining_) || !defined(_di_f_utf_is_control_) || !defined(_di_f_utf_is_control_picture_) || !defined(_di_f_utf_is_digit_) || !defined(_di_f_utf_is_emoji_) || !defined(_di_f_utf_is_graph_) || !defined(_di_f_utf_is_numeric_) || !defined(_di_f_utf_is_phonetic_) || !defined(_di_f_utf_is_private_) || !defined(_di_f_utf_is_punctuation_) || !defined(_di_f_utf_is_symbol_) || !defined(_di_f_utf_is_unassigned_) || !defined(_di_f_utf_is_valid_) || !defined(_di_f_utf_is_whitespace_) || !defined(_di_f_utf_is_whitespace_modifier_) || !defined(_di_f_utf_is_whitespace_other_) || !defined(_di_f_utf_is_wide_) || !defined(_di_f_utf_is_word_) || !defined(_di_f_utf_is_word_dash_) || !defined(_di_f_utf_is_word_dash_plus_) || !defined(_di_f_utf_is_zero_width_) || !defined(_di_f_utf_unicode_to_) /** diff --git a/level_0/f_utf/c/utf.c b/level_0/f_utf/c/utf.c index 2b0ff58..8221afd 100644 --- a/level_0/f_utf/c/utf.c +++ b/level_0/f_utf/c/utf.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_utf_buffer_decrement_ - f_status_t f_utf_buffer_decrement(const f_string_static_t buffer, f_string_range_t *range, const f_array_length_t step) { + f_status_t f_utf_buffer_decrement(const f_string_static_t buffer, f_string_range_t *range, const f_number_unsigned_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); @@ -17,7 +17,7 @@ extern "C" { return F_data_not; } - f_array_length_t i = 0; + f_number_unsigned_t i = 0; uint8_t width = 0; do { @@ -41,7 +41,7 @@ extern "C" { #endif // _di_f_utf_buffer_decrement_ #ifndef _di_f_utf_buffer_increment_ - f_status_t f_utf_buffer_increment(const f_string_static_t buffer, f_string_range_t *range, const f_array_length_t step) { + f_status_t f_utf_buffer_increment(const f_string_static_t buffer, f_string_range_t *range, const f_number_unsigned_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); @@ -51,7 +51,7 @@ extern "C" { return F_data_not; } - f_array_length_t i = 0; + f_number_unsigned_t i = 0; uint8_t width = 0; do { diff --git a/level_0/f_utf/c/utf.h b/level_0/f_utf/c/utf.h index 9b320f5..ae66d15 100644 --- a/level_0/f_utf/c/utf.h +++ b/level_0/f_utf/c/utf.h @@ -100,7 +100,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_utf_buffer_decrement_ - extern f_status_t f_utf_buffer_decrement(const f_string_static_t buffer, f_string_range_t *range, const f_array_length_t step); + extern f_status_t f_utf_buffer_decrement(const f_string_static_t buffer, f_string_range_t *range, const f_number_unsigned_t step); #endif // _di_f_utf_buffer_decrement_ /** @@ -133,7 +133,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_utf_buffer_increment_ - extern f_status_t f_utf_buffer_increment(const f_string_static_t buffer, f_string_range_t *range, const f_array_length_t step); + extern f_status_t f_utf_buffer_increment(const f_string_static_t buffer, f_string_range_t *range, const f_number_unsigned_t step); #endif // _di_f_utf_buffer_increment_ #ifdef __cplusplus diff --git a/level_0/f_utf/c/utf/convert.c b/level_0/f_utf/c/utf/convert.c index 6aabab5..478aa24 100644 --- a/level_0/f_utf/c/utf/convert.c +++ b/level_0/f_utf/c/utf/convert.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_f_utf_char_to_character_ - f_status_t f_utf_char_to_character(const f_string_t character, const f_array_length_t width_max, f_utf_char_t *character_utf) { + f_status_t f_utf_char_to_character(const f_string_t character, const f_number_unsigned_t width_max, f_utf_char_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); @@ -20,7 +20,7 @@ extern "C" { #endif // _di_f_utf_char_to_character_ #ifndef _di_f_utf_char_to_char_ - f_status_t f_utf_char_to_char(const f_utf_char_t unicode, f_string_t *character, f_array_length_t *width_max) { + f_status_t f_utf_char_to_char(const f_utf_char_t unicode, f_string_t *character, f_number_unsigned_t *width_max) { #ifndef _di_level_0_parameter_checking_ if (!character) return F_status_set_error(F_parameter); if (!width_max) return F_status_set_error(F_parameter); @@ -129,12 +129,12 @@ extern "C" { #endif // _di_f_utf_character_unicode_from_ #ifndef _di_f_utf_character_unicode_string_to_ - f_status_t f_utf_character_unicode_string_to(const f_utf_string_t string, const f_array_length_t length, f_utf_char_t *codepoint) { + f_status_t f_utf_character_unicode_string_to(const f_utf_string_t string, const f_number_unsigned_t length, f_utf_char_t *codepoint) { #ifndef _di_level_0_parameter_checking_ if (!codepoint) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ - f_array_length_t i = 0; + f_number_unsigned_t i = 0; while (i < length && !string[i]) { ++i; @@ -201,7 +201,7 @@ extern "C" { #endif // _di_f_utf_character_unicode_string_to_ #ifndef _di_f_utf_unicode_from_ - f_status_t f_utf_unicode_from(const f_utf_char_t codepoint, const f_array_length_t width_max, f_string_t *character) { + f_status_t f_utf_unicode_from(const f_utf_char_t codepoint, const f_number_unsigned_t width_max, f_string_t *character) { #ifndef _di_level_0_parameter_checking_ if (width_max < 1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -267,7 +267,7 @@ extern "C" { #endif // _di_f_utf_unicode_from_ #ifndef _di_f_utf_unicode_to_ - f_status_t f_utf_unicode_to(const f_string_t character, const f_array_length_t width_max, uint32_t *unicode) { + f_status_t f_utf_unicode_to(const f_string_t character, const f_number_unsigned_t width_max, uint32_t *unicode) { #ifndef _di_level_0_parameter_checking_ if (width_max < 1) return F_status_set_error(F_parameter); if (!unicode) return F_status_set_error(F_parameter); @@ -285,12 +285,12 @@ extern "C" { #endif // _di_f_utf_unicode_to_ #ifndef _di_f_utf_unicode_string_to_ - f_status_t f_utf_unicode_string_to(const f_string_t string, const f_array_length_t length, uint32_t *unicode) { + f_status_t f_utf_unicode_string_to(const f_string_t string, const f_number_unsigned_t length, uint32_t *unicode) { #ifndef _di_level_0_parameter_checking_ if (!unicode) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ - f_array_length_t i = 0; + f_number_unsigned_t i = 0; while (i < length && !string[i]) { ++i; diff --git a/level_0/f_utf/c/utf/convert.h b/level_0/f_utf/c/utf/convert.h index 57227d8..d4f267b 100644 --- a/level_0/f_utf/c/utf/convert.h +++ b/level_0/f_utf/c/utf/convert.h @@ -40,7 +40,7 @@ extern "C" { * F_utf_not (with error bit) if unicode is an invalid Unicode character. */ #ifndef _di_f_utf_char_to_char_ - extern f_status_t f_utf_char_to_char(const f_utf_char_t utf_character, f_string_t *character, f_array_length_t *width_max); + extern f_status_t f_utf_char_to_char(const f_utf_char_t utf_character, f_string_t *character, f_number_unsigned_t *width_max); #endif // _di_f_utf_char_to_char_ /** @@ -115,7 +115,7 @@ extern "C" { * F_valid_not (with error bit) if string is not a valid Unicode string. */ #ifndef _di_f_utf_character_unicode_string_to_ - extern f_status_t f_utf_character_unicode_string_to(const f_utf_string_t string, const f_array_length_t length, f_utf_char_t *codepoint); + extern f_status_t f_utf_character_unicode_string_to(const f_utf_string_t string, const f_number_unsigned_t length, f_utf_char_t *codepoint); #endif // _di_f_utf_character_unicode_string_to_ /** @@ -140,7 +140,7 @@ extern "C" { * F_utf_not (with error bit) if unicode is an invalid Unicode character. */ #ifndef _di_f_utf_char_to_character_ - extern f_status_t f_utf_char_to_character(const f_string_t character, const f_array_length_t width_max, f_utf_char_t *character_utf); + extern f_status_t f_utf_char_to_character(const f_string_t character, const f_number_unsigned_t width_max, f_utf_char_t *character_utf); #endif // _di_f_utf_char_to_character_ /** @@ -167,7 +167,7 @@ extern "C" { * F_utf_not (with error bit) if unicode is an invalid Unicode character. */ #ifndef _di_f_utf_unicode_from_ - extern f_status_t f_utf_unicode_from(const uint32_t unicode, const f_array_length_t width_max, f_string_t *character); + extern f_status_t f_utf_unicode_from(const uint32_t unicode, const f_number_unsigned_t width_max, f_string_t *character); #endif // _di_f_utf_unicode_from_ /** @@ -195,7 +195,7 @@ extern "C" { * @see f_utf_character_is_valid() */ #ifndef _di_f_utf_unicode_to_ - extern f_status_t f_utf_unicode_to(const f_string_t character, const f_array_length_t width_max, uint32_t *unicode); + extern f_status_t f_utf_unicode_to(const f_string_t character, const f_number_unsigned_t width_max, uint32_t *unicode); #endif // _di_f_utf_unicode_to_ /** @@ -222,7 +222,7 @@ extern "C" { * F_valid_not (with error bit) if string is not a valid Unicode string. */ #ifndef _di_f_utf_unicode_string_to_ - extern f_status_t f_utf_unicode_string_to(const f_string_t string, const f_array_length_t length, uint32_t *unicode); + extern f_status_t f_utf_unicode_string_to(const f_string_t string, const f_number_unsigned_t length, uint32_t *unicode); #endif // _di_f_utf_unicode_string_to_ #ifdef __cplusplus diff --git a/level_0/f_utf/c/utf/dynamic.c b/level_0/f_utf/c/utf/dynamic.c index 5c873a8..7825141 100644 --- a/level_0/f_utf/c/utf/dynamic.c +++ b/level_0/f_utf/c/utf/dynamic.c @@ -9,7 +9,7 @@ extern "C" { #endif #ifndef _di_f_utf_string_dynamic_adjust_ - f_status_t f_utf_string_dynamic_adjust(const f_array_length_t length, f_utf_string_dynamic_t * const dynamic) { + f_status_t f_utf_string_dynamic_adjust(const f_number_unsigned_t length, f_utf_string_dynamic_t * const dynamic) { #ifndef _di_level_0_parameter_checking_ if (!dynamic) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -42,8 +42,8 @@ extern "C" { return private_f_utf_string_append(source.string, source.used, destination); } - f_array_length_t i = 1; - f_array_length_t j = 1; + f_number_unsigned_t i = 1; + f_number_unsigned_t j = 1; while (i <= source.used && j <= destination->used) { @@ -71,8 +71,8 @@ extern "C" { return private_f_utf_string_append_nulless(source.string, source.used, destination); } - f_array_length_t i = 1; - f_array_length_t j = 1; + f_number_unsigned_t i = 1; + f_number_unsigned_t j = 1; while (i <= source.used && j <= destination->used) { @@ -113,7 +113,7 @@ extern "C" { #endif // _di_f_utf_string_dynamic_append_nulless_ #ifndef _di_f_utf_string_dynamic_decimate_by_ - f_status_t f_utf_string_dynamic_decimate_by(const f_array_length_t amount, f_utf_string_dynamic_t * const dynamic) { + f_status_t f_utf_string_dynamic_decimate_by(const f_number_unsigned_t amount, f_utf_string_dynamic_t * const dynamic) { #ifndef _di_level_0_parameter_checking_ if (!dynamic) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -129,7 +129,7 @@ extern "C" { #endif // _di_f_utf_string_dynamic_decimate_by_ #ifndef _di_f_utf_string_dynamic_decrease_by_ - f_status_t f_utf_string_dynamic_decrease_by(const f_array_length_t amount, f_utf_string_dynamic_t * const dynamic) { + f_status_t f_utf_string_dynamic_decrease_by(const f_number_unsigned_t amount, f_utf_string_dynamic_t * const dynamic) { #ifndef _di_level_0_parameter_checking_ if (!dynamic) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -145,13 +145,13 @@ extern "C" { #endif // _di_f_utf_string_dynamic_decrease_by_ #ifndef _di_f_utf_string_dynamic_increase_ - f_status_t f_utf_string_dynamic_increase(const f_array_length_t step, f_utf_string_dynamic_t * const dynamic) { + f_status_t f_utf_string_dynamic_increase(const f_number_unsigned_t step, f_utf_string_dynamic_t * const dynamic) { #ifndef _di_level_0_parameter_checking_ if (!dynamic) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && dynamic->used + 1 > dynamic->size) { - f_array_length_t size = dynamic->used + step; + f_number_unsigned_t size = dynamic->used + step; if (size > F_string_t_size_d) { if (dynamic->used + 1 > F_string_t_size_d) { @@ -169,7 +169,7 @@ extern "C" { #endif // _di_f_utf_string_dynamic_increase_ #ifndef _di_f_utf_string_dynamic_increase_by_ - f_status_t f_utf_string_dynamic_increase_by(const f_array_length_t amount, f_utf_string_dynamic_t * const dynamic) { + f_status_t f_utf_string_dynamic_increase_by(const f_number_unsigned_t amount, f_utf_string_dynamic_t * const dynamic) { #ifndef _di_level_0_parameter_checking_ if (!dynamic) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -276,15 +276,15 @@ extern "C" { if (range.start > range.stop) return F_data_not_stop; if (range.start >= source.used) return F_data_not_eos; - const f_array_length_t length = range.stop >= source.used ? source.used - range.start : (range.stop - range.start) + 1; + const f_number_unsigned_t length = range.stop >= source.used ? source.used - range.start : (range.stop - range.start) + 1; if (destination->used < length) { return private_f_utf_string_append(source.string + range.start, length, destination); } - const f_array_length_t stop = range.stop >= source.used ? source.used : range.stop + 1; - f_array_length_t i = 1; - f_array_length_t j = 1; + const f_number_unsigned_t stop = range.stop >= source.used ? source.used : range.stop + 1; + f_number_unsigned_t i = 1; + f_number_unsigned_t j = 1; while (i <= length && j <= destination->used) { @@ -310,15 +310,15 @@ extern "C" { if (range.start > range.stop) return F_data_not_stop; if (range.start >= source.used) return F_data_not_eos; - const f_array_length_t length = range.stop >= source.used ? source.used - range.start : (range.stop - range.start) + 1; + const f_number_unsigned_t length = range.stop >= source.used ? source.used - range.start : (range.stop - range.start) + 1; if (!destination->used) { return private_f_utf_string_append_nulless(source.string + range.start, length, destination); } - const f_array_length_t stop = range.stop >= source.used ? source.used : range.stop + 1; - f_array_length_t i = 1; - f_array_length_t j = 1; + const f_number_unsigned_t stop = range.stop >= source.used ? source.used : range.stop + 1; + f_number_unsigned_t i = 1; + f_number_unsigned_t j = 1; while (i <= length && j <= destination->used) { @@ -484,14 +484,14 @@ extern "C" { if (range.start > range.stop) return F_data_not_stop; if (range.start >= source.used) return F_data_not_eos; - const f_array_length_t length = range.stop >= source.used ? source.used - range.start : (range.stop - range.start) + 1; + const f_number_unsigned_t length = range.stop >= source.used ? source.used - range.start : (range.stop - range.start) + 1; if (destination->used < length) { return private_f_utf_string_prepend(source.string + range.start, length, destination); } - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; while (i < length && j < destination->used) { @@ -517,14 +517,14 @@ extern "C" { if (range.start > range.stop) return F_data_not_stop; if (range.start >= source.used) return F_data_not_eos; - const f_array_length_t length = range.stop >= source.used ? source.used - range.start : (range.stop - range.start) + 1; + const f_number_unsigned_t length = range.stop >= source.used ? source.used - range.start : (range.stop - range.start) + 1; if (!destination->used) { return private_f_utf_string_prepend_nulless(source.string + range.start, length, destination); } - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; while (i < length && j < destination->used) { @@ -590,8 +590,8 @@ extern "C" { return private_f_utf_string_prepend(source.string, source.used, destination); } - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; while (i < source.used && j < destination->used) { @@ -619,8 +619,8 @@ extern "C" { return private_f_utf_string_prepend_nulless(source.string, source.used, destination); } - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; while (i < source.used && j < destination->used) { @@ -661,7 +661,7 @@ extern "C" { #endif // _di_f_utf_string_dynamic_prepend_nulless_ #ifndef _di_f_utf_string_dynamic_resize_ - f_status_t f_utf_string_dynamic_resize(const f_array_length_t length, f_utf_string_dynamic_t * const buffer) { + f_status_t f_utf_string_dynamic_resize(const f_number_unsigned_t length, f_utf_string_dynamic_t * const buffer) { #ifndef _di_level_0_parameter_checking_ if (!buffer) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_utf/c/utf/dynamic.h b/level_0/f_utf/c/utf/dynamic.h index 30dd921..f4888a3 100644 --- a/level_0/f_utf/c/utf/dynamic.h +++ b/level_0/f_utf/c/utf/dynamic.h @@ -65,7 +65,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_utf_string_dynamic_adjust_ - extern f_status_t f_utf_string_dynamic_adjust(const f_array_length_t length, f_utf_string_dynamic_t * const dynamic); + extern f_status_t f_utf_string_dynamic_adjust(const f_number_unsigned_t length, f_utf_string_dynamic_t * const dynamic); #endif // _di_f_utf_string_dynamic_adjust_ /** @@ -178,7 +178,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_dynamic_decimate_by_ - extern f_status_t f_utf_string_dynamic_decimate_by(const f_array_length_t amount, f_utf_string_dynamic_t * const dynamic); + extern f_status_t f_utf_string_dynamic_decimate_by(const f_number_unsigned_t amount, f_utf_string_dynamic_t * const dynamic); #endif // _di_f_utf_string_dynamic_decimate_by_ /** @@ -203,14 +203,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_dynamic_decrease_by_ - extern f_status_t f_utf_string_dynamic_decrease_by(const f_array_length_t amount, f_utf_string_dynamic_t * const dynamic); + extern f_status_t f_utf_string_dynamic_decrease_by(const f_number_unsigned_t amount, f_utf_string_dynamic_t * const dynamic); #endif // _di_f_utf_string_dynamic_decrease_by_ /** * Resize the dynamic string 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -229,14 +229,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_dynamic_increase_ - extern f_status_t f_utf_string_dynamic_increase(const f_array_length_t step, f_utf_string_dynamic_t * const dynamic); + extern f_status_t f_utf_string_dynamic_increase(const f_number_unsigned_t step, f_utf_string_dynamic_t * const dynamic); #endif // _di_f_utf_string_dynamic_increase_ /** * Resize the dynamic string 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -254,7 +254,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_dynamic_increase_by_ - extern f_status_t f_utf_string_dynamic_increase_by(const f_array_length_t amount, f_utf_string_dynamic_t * const dynamic); + extern f_status_t f_utf_string_dynamic_increase_by(const f_number_unsigned_t amount, f_utf_string_dynamic_t * const dynamic); #endif // _di_f_utf_string_dynamic_increase_by_ /** @@ -809,7 +809,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_dynamic_resize_ - extern f_status_t f_utf_string_dynamic_resize(const f_array_length_t length, f_utf_string_dynamic_t * const buffer); + extern f_status_t f_utf_string_dynamic_resize(const f_number_unsigned_t length, f_utf_string_dynamic_t * const buffer); #endif // _di_f_utf_string_dynamic_resize_ /** diff --git a/level_0/f_utf/c/utf/dynamics.c b/level_0/f_utf/c/utf/dynamics.c index f776ec8..e0f28b8 100644 --- a/level_0/f_utf/c/utf/dynamics.c +++ b/level_0/f_utf/c/utf/dynamics.c @@ -10,7 +10,7 @@ extern "C" { #endif #ifndef _di_f_utf_string_dynamics_adjust_ - f_status_t f_utf_string_dynamics_adjust(const f_array_length_t length, f_utf_string_dynamics_t * const dynamics) { + f_status_t f_utf_string_dynamics_adjust(const f_number_unsigned_t length, f_utf_string_dynamics_t * const dynamics) { #ifndef _di_level_0_parameter_checking_ if (!dynamics) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -44,7 +44,7 @@ extern "C" { #endif // _di_f_utf_string_dynamics_append_all_ #ifndef _di_f_utf_string_dynamics_decimate_by_ - f_status_t f_utf_string_dynamics_decimate_by(const f_array_length_t amount, f_utf_string_dynamics_t * const dynamics) { + f_status_t f_utf_string_dynamics_decimate_by(const f_number_unsigned_t amount, f_utf_string_dynamics_t * const dynamics) { #ifndef _di_level_0_parameter_checking_ if (!dynamics) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -60,7 +60,7 @@ extern "C" { #endif // _di_f_utf_string_dynamics_decimate_by_ #ifndef _di_f_utf_string_dynamics_decrease_by_ - f_status_t f_utf_string_dynamics_decrease_by(const f_array_length_t amount, f_utf_string_dynamics_t * const dynamics) { + f_status_t f_utf_string_dynamics_decrease_by(const f_number_unsigned_t amount, f_utf_string_dynamics_t * const dynamics) { #ifndef _di_level_0_parameter_checking_ if (!dynamics) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -76,7 +76,7 @@ extern "C" { #endif // _di_f_utf_string_dynamics_decrease_by_ #ifndef _di_f_utf_string_dynamics_increase_ - f_status_t f_utf_string_dynamics_increase(const f_array_length_t step, f_utf_string_dynamics_t * const dynamics) { + f_status_t f_utf_string_dynamics_increase(const f_number_unsigned_t step, f_utf_string_dynamics_t * const dynamics) { #ifndef _di_level_0_parameter_checking_ if (!dynamics) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -84,14 +84,14 @@ extern "C" { if (!step) return F_data_not; if (dynamics->used + 1 > dynamics->size) { - f_array_length_t size = dynamics->used + step; + f_number_unsigned_t size = dynamics->used + step; - if (size > F_array_length_t_size_d) { - if (dynamics->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (dynamics->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_utf_string_dynamics_resize(size, dynamics); @@ -102,13 +102,13 @@ extern "C" { #endif // _di_f_utf_string_dynamics_increase_ #ifndef _di_f_utf_string_dynamics_increase_by_ - f_status_t f_utf_string_dynamics_increase_by(const f_array_length_t amount, f_utf_string_dynamics_t * const dynamics) { + f_status_t f_utf_string_dynamics_increase_by(const f_number_unsigned_t amount, f_utf_string_dynamics_t * const dynamics) { #ifndef _di_level_0_parameter_checking_ if (!dynamics) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (dynamics->used + amount > dynamics->size) { - if (dynamics->used + amount > F_array_length_t_size_d) { + if (dynamics->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -120,7 +120,7 @@ extern "C" { #endif // _di_f_utf_string_dynamics_increase_by_ #ifndef _di_f_utf_string_dynamics_resize_ - f_status_t f_utf_string_dynamics_resize(const f_array_length_t length, f_utf_string_dynamics_t * const dynamics) { + f_status_t f_utf_string_dynamics_resize(const f_number_unsigned_t length, f_utf_string_dynamics_t * const dynamics) { #ifndef _di_level_0_parameter_checking_ if (!dynamics) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_utf/c/utf/dynamics.h b/level_0/f_utf/c/utf/dynamics.h index 39f00fd..2c3ab39 100644 --- a/level_0/f_utf/c/utf/dynamics.h +++ b/level_0/f_utf/c/utf/dynamics.h @@ -61,7 +61,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_utf_string_dynamics_adjust_ - extern f_status_t f_utf_string_dynamics_adjust(const f_array_length_t length, f_utf_string_dynamics_t * const dynamics); + extern f_status_t f_utf_string_dynamics_adjust(const f_number_unsigned_t length, f_utf_string_dynamics_t * const dynamics); #endif // _di_f_utf_string_dynamics_adjust_ /** @@ -127,7 +127,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_dynamics_decimate_by_ - extern f_status_t f_utf_string_dynamics_decimate_by(const f_array_length_t amount, f_utf_string_dynamics_t * const dynamics); + extern f_status_t f_utf_string_dynamics_decimate_by(const f_number_unsigned_t amount, f_utf_string_dynamics_t * const dynamics); #endif // _di_f_utf_string_dynamics_decimate_by_ /** @@ -151,13 +151,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_dynamics_decrease_by_ - extern f_status_t f_utf_string_dynamics_decrease_by(const f_array_length_t amount, f_utf_string_dynamics_t * const dynamics); + extern f_status_t f_utf_string_dynamics_decrease_by(const f_number_unsigned_t amount, f_utf_string_dynamics_t * const dynamics); #endif // _di_f_utf_string_dynamics_decrease_by_ /** * Increase the size of the dynamic string array, but only if necessary. * - * If the given length is too large for the buffer, then attempt to set max buffer size (F_array_length_t_size_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -176,14 +176,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_dynamics_increase_ - extern f_status_t f_utf_string_dynamics_increase(const f_array_length_t step, f_utf_string_dynamics_t * const dynamics); + extern f_status_t f_utf_string_dynamics_increase(const f_number_unsigned_t step, f_utf_string_dynamics_t * const dynamics); #endif // _di_f_utf_string_dynamics_increase_ /** * Resize the dynamic string 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -201,7 +201,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_dynamics_increase_by_ - extern f_status_t f_utf_string_dynamics_increase_by(const f_array_length_t amount, f_utf_string_dynamics_t * const dynamics); + extern f_status_t f_utf_string_dynamics_increase_by(const f_number_unsigned_t amount, f_utf_string_dynamics_t * const dynamics); #endif // _di_f_utf_string_dynamics_increase_by_ /** @@ -220,7 +220,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_dynamics_resize_ - extern f_status_t f_utf_string_dynamics_resize(const f_array_length_t length, f_utf_string_dynamics_t * const dynamics); + extern f_status_t f_utf_string_dynamics_resize(const f_number_unsigned_t length, f_utf_string_dynamics_t * const dynamics); #endif // _di_f_utf_string_dynamics_resize_ #ifdef __cplusplus diff --git a/level_0/f_utf/c/utf/dynamicss.c b/level_0/f_utf/c/utf/dynamicss.c index 79a62c2..db2a878 100644 --- a/level_0/f_utf/c/utf/dynamicss.c +++ b/level_0/f_utf/c/utf/dynamicss.c @@ -11,7 +11,7 @@ extern "C" { #endif #ifndef _di_f_utf_string_dynamicss_adjust_ - f_status_t f_utf_string_dynamicss_adjust(const f_array_length_t length, f_utf_string_dynamicss_t * const dynamicss) { + f_status_t f_utf_string_dynamicss_adjust(const f_number_unsigned_t length, f_utf_string_dynamicss_t * const dynamicss) { #ifndef _di_level_0_parameter_checking_ if (!dynamicss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -63,7 +63,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].used = 0; @@ -78,7 +78,7 @@ extern "C" { #endif // _di_f_utf_string_dynamicss_append_all_ #ifndef _di_f_utf_string_dynamicss_decimate_by_ - f_status_t f_utf_string_dynamicss_decimate_by(const f_array_length_t amount, f_utf_string_dynamicss_t * const dynamicss) { + f_status_t f_utf_string_dynamicss_decimate_by(const f_number_unsigned_t amount, f_utf_string_dynamicss_t * const dynamicss) { #ifndef _di_level_0_parameter_checking_ if (!dynamicss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -94,7 +94,7 @@ extern "C" { #endif // _di_f_utf_string_dynamicss_decimate_by_ #ifndef _di_f_utf_string_dynamicss_decrease_by_ - f_status_t f_utf_string_dynamicss_decrease_by(const f_array_length_t amount, f_utf_string_dynamicss_t * const dynamicss) { + f_status_t f_utf_string_dynamicss_decrease_by(const f_number_unsigned_t amount, f_utf_string_dynamicss_t * const dynamicss) { #ifndef _di_level_0_parameter_checking_ if (!dynamicss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -110,7 +110,7 @@ extern "C" { #endif // _di_f_utf_string_dynamicss_decrease_by_ #ifndef _di_f_utf_string_dynamicss_increase_ - f_status_t f_utf_string_dynamicss_increase(const f_array_length_t step, f_utf_string_dynamicss_t * const dynamicss) { + f_status_t f_utf_string_dynamicss_increase(const f_number_unsigned_t step, f_utf_string_dynamicss_t * const dynamicss) { #ifndef _di_level_0_parameter_checking_ if (!dynamicss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -118,14 +118,14 @@ extern "C" { if (!step) return F_data_not; if (dynamicss->used + 1 > dynamicss->size) { - f_array_length_t size = dynamicss->used + step; + f_number_unsigned_t size = dynamicss->used + step; - if (size > F_array_length_t_size_d) { - if (dynamicss->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (dynamicss->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_utf_string_dynamicss_resize(size, dynamicss); @@ -136,7 +136,7 @@ extern "C" { #endif // _di_f_utf_string_dynamicss_increase_ #ifndef _di_f_utf_string_dynamicss_increase_by_ - f_status_t f_utf_string_dynamicss_increase_by(const f_array_length_t amount, f_utf_string_dynamicss_t * const dynamicss) { + f_status_t f_utf_string_dynamicss_increase_by(const f_number_unsigned_t amount, f_utf_string_dynamicss_t * const dynamicss) { #ifndef _di_level_0_parameter_checking_ if (!dynamicss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -144,7 +144,7 @@ extern "C" { if (!amount) return F_data_not; if (dynamicss->used + amount > dynamicss->size) { - if (dynamicss->used + amount > F_array_length_t_size_d) { + if (dynamicss->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -156,7 +156,7 @@ extern "C" { #endif // _di_f_utf_string_dynamicss_increase_by_ #ifndef _di_f_utf_string_dynamicss_resize_ - f_status_t f_utf_string_dynamicss_resize(const f_array_length_t length, f_utf_string_dynamicss_t * const dynamicss) { + f_status_t f_utf_string_dynamicss_resize(const f_number_unsigned_t length, f_utf_string_dynamicss_t * const dynamicss) { #ifndef _di_level_0_parameter_checking_ if (!dynamicss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_utf/c/utf/dynamicss.h b/level_0/f_utf/c/utf/dynamicss.h index 4fd53b5..603745f 100644 --- a/level_0/f_utf/c/utf/dynamicss.h +++ b/level_0/f_utf/c/utf/dynamicss.h @@ -61,7 +61,7 @@ extern "C" { * Errors (with error bit) from: f_memory_adjust(). */ #ifndef _di_f_utf_string_dynamicss_adjust_ - extern f_status_t f_utf_string_dynamicss_adjust(const f_array_length_t length, f_utf_string_dynamicss_t * const dynamicss); + extern f_status_t f_utf_string_dynamicss_adjust(const f_number_unsigned_t length, f_utf_string_dynamicss_t * const dynamicss); #endif // _di_f_utf_string_dynamicss_adjust_ /** @@ -127,7 +127,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_dynamicss_decimate_by_ - extern f_status_t f_utf_string_dynamicss_decimate_by(const f_array_length_t amount, f_utf_string_dynamicss_t * const dynamicss); + extern f_status_t f_utf_string_dynamicss_decimate_by(const f_number_unsigned_t amount, f_utf_string_dynamicss_t * const dynamicss); #endif // _di_f_utf_string_dynamicss_decimate_by_ /** @@ -151,13 +151,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_dynamicss_decrease_by_ - extern f_status_t f_utf_string_dynamicss_decrease_by(const f_array_length_t amount, f_utf_string_dynamicss_t * const dynamicss); + extern f_status_t f_utf_string_dynamicss_decrease_by(const f_number_unsigned_t amount, f_utf_string_dynamicss_t * const dynamicss); #endif // _di_f_utf_string_dynamicss_decrease_by_ /** * Increase the size of the dynamics string array, but only if necessary. * - * If the given length is too large for the buffer, then attempt to set max buffer size (F_array_length_t_size_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -176,14 +176,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_dynamicss_increase_ - extern f_status_t f_utf_string_dynamicss_increase(const f_array_length_t step, f_utf_string_dynamicss_t * const dynamicss); + extern f_status_t f_utf_string_dynamicss_increase(const f_number_unsigned_t step, f_utf_string_dynamicss_t * const dynamicss); #endif // _di_f_utf_string_dynamicss_increase_ /** * Resize the dynamics string 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -201,7 +201,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_dynamicss_increase_by_ - extern f_status_t f_utf_string_dynamicss_increase_by(const f_array_length_t amount, f_utf_string_dynamicss_t * const dynamicss); + extern f_status_t f_utf_string_dynamicss_increase_by(const f_number_unsigned_t amount, f_utf_string_dynamicss_t * const dynamicss); #endif // _di_f_utf_string_dynamicss_increase_by_ /** @@ -220,7 +220,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_dynamicss_resize_ - extern f_status_t f_utf_string_dynamicss_resize(const f_array_length_t length, f_utf_string_dynamicss_t * const dynamicss); + extern f_status_t f_utf_string_dynamicss_resize(const f_number_unsigned_t length, f_utf_string_dynamicss_t * const dynamicss); #endif // _di_f_utf_string_dynamicss_resize_ #ifdef __cplusplus diff --git a/level_0/f_utf/c/utf/is.c b/level_0/f_utf/c/utf/is.c index b6bf5e8..15bc24d 100644 --- a/level_0/f_utf/c/utf/is.c +++ b/level_0/f_utf/c/utf/is.c @@ -31,7 +31,7 @@ extern "C" { #endif // _di_f_utf_is_ #ifndef _di_f_utf_is_alphabetic_ - f_status_t f_utf_is_alphabetic(const f_string_t sequence, const f_array_length_t width_max) { + f_status_t f_utf_is_alphabetic(const f_string_t sequence, const f_number_unsigned_t width_max) { if (width_max < 1) return F_data_not; @@ -56,7 +56,7 @@ extern "C" { #endif // _di_f_utf_is_alphabetic_ #ifndef _di_f_utf_is_alphabetic_digit_ - f_status_t f_utf_is_alphabetic_digit(const f_string_t sequence, const f_array_length_t width_max, uint64_t * const value) { + f_status_t f_utf_is_alphabetic_digit(const f_string_t sequence, const f_number_unsigned_t width_max, uint64_t * const value) { if (width_max < 1) return F_data_not; @@ -81,7 +81,7 @@ extern "C" { #endif // _di_f_utf_is_alphabetic_digit_ #ifndef _di_f_utf_is_alphabetic_numeric_ - f_status_t f_utf_is_alphabetic_numeric(const f_string_t sequence, const f_array_length_t width_max) { + f_status_t f_utf_is_alphabetic_numeric(const f_string_t sequence, const f_number_unsigned_t width_max) { if (width_max < 1) return F_data_not; @@ -106,7 +106,7 @@ extern "C" { #endif // _di_f_utf_is_alphabetic_numeric_ #ifndef _di_f_utf_is_ascii_ - f_status_t f_utf_is_ascii(const f_string_t sequence, const f_array_length_t width_max) { + f_status_t f_utf_is_ascii(const f_string_t sequence, const f_number_unsigned_t width_max) { if (width_max < 1) return F_data_not; @@ -122,7 +122,7 @@ extern "C" { #endif // _di_f_utf_is_ascii_ #ifndef _di_f_utf_is_combining_ - f_status_t f_utf_is_combining(const f_string_t sequence, const f_array_length_t width_max) { + f_status_t f_utf_is_combining(const f_string_t sequence, const f_number_unsigned_t width_max) { if (width_max < 1) return F_data_not; @@ -146,7 +146,7 @@ extern "C" { #endif // _di_f_utf_is_combining_ #ifndef _di_f_utf_is_control_ - f_status_t f_utf_is_control(const f_string_t sequence, const f_array_length_t width_max) { + f_status_t f_utf_is_control(const f_string_t sequence, const f_number_unsigned_t width_max) { if (width_max < 1) return F_data_not; @@ -171,7 +171,7 @@ extern "C" { #endif // _di_f_utf_is_control_ #ifndef _di_f_utf_is_control_code_ - f_status_t f_utf_is_control_code(const f_string_t sequence, const f_array_length_t width_max) { + f_status_t f_utf_is_control_code(const f_string_t sequence, const f_number_unsigned_t width_max) { if (width_max < 1) return F_data_not; @@ -196,7 +196,7 @@ extern "C" { #endif // _di_f_utf_is_control_code_ #ifndef _di_f_utf_is_control_format_ - f_status_t f_utf_is_control_format(const f_string_t sequence, const f_array_length_t width_max) { + f_status_t f_utf_is_control_format(const f_string_t sequence, const f_number_unsigned_t width_max) { if (width_max < 1) return F_data_not; @@ -220,7 +220,7 @@ extern "C" { #endif // _di_f_utf_is_control_format_ #ifndef _di_f_utf_is_control_picture_ - f_status_t f_utf_is_control_picture(const f_string_t sequence, const f_array_length_t width_max) { + f_status_t f_utf_is_control_picture(const f_string_t sequence, const f_number_unsigned_t width_max) { if (width_max < 1) return F_data_not; @@ -245,7 +245,7 @@ extern "C" { #endif // _di_f_utf_is_control_picture_ #ifndef _di_f_utf_is_digit_ - f_status_t f_utf_is_digit(const f_string_t sequence, const f_array_length_t width_max, uint64_t * const value) { + f_status_t f_utf_is_digit(const f_string_t sequence, const f_number_unsigned_t width_max, uint64_t * const value) { if (width_max < 1) return F_data_not; @@ -268,7 +268,7 @@ extern "C" { #endif // _di_f_utf_is_digit_ #ifndef _di_f_utf_is_emoji_ - f_status_t f_utf_is_emoji(const f_string_t sequence, const f_array_length_t width_max) { + f_status_t f_utf_is_emoji(const f_string_t sequence, const f_number_unsigned_t width_max) { if (width_max < 1) return F_data_not; @@ -300,7 +300,7 @@ extern "C" { #endif // _di_f_utf_is_fragment_ #ifndef _di_f_utf_is_graph_ - f_status_t f_utf_is_graph(const f_string_t sequence, const f_array_length_t width_max) { + f_status_t f_utf_is_graph(const f_string_t sequence, const f_number_unsigned_t width_max) { if (width_max < 1) return F_data_not; @@ -338,7 +338,7 @@ extern "C" { #endif // _di_f_utf_is_graph_ #ifndef _di_f_utf_is_numeric_ - f_status_t f_utf_is_numeric(const f_string_t sequence, const f_array_length_t width_max) { + f_status_t f_utf_is_numeric(const f_string_t sequence, const f_number_unsigned_t width_max) { if (width_max < 1) return F_data_not; @@ -363,7 +363,7 @@ extern "C" { #endif // _di_f_utf_is_numeric_ #ifndef _di_f_utf_is_phonetic_ - f_status_t f_utf_is_phonetic(const f_string_t sequence, const f_array_length_t width_max) { + f_status_t f_utf_is_phonetic(const f_string_t sequence, const f_number_unsigned_t width_max) { if (width_max < 1) return F_data_not; @@ -387,7 +387,7 @@ extern "C" { #endif // _di_f_utf_is_phonetic_ #ifndef _di_f_utf_is_private_ - f_status_t f_utf_is_private(const f_string_t sequence, const f_array_length_t width_max) { + f_status_t f_utf_is_private(const f_string_t sequence, const f_number_unsigned_t width_max) { if (width_max < 1) return F_data_not; @@ -411,7 +411,7 @@ extern "C" { #endif // _di_f_utf_is_private_ #ifndef _di_f_utf_is_punctuation_ - f_status_t f_utf_is_punctuation(const f_string_t sequence, const f_array_length_t width_max) { + f_status_t f_utf_is_punctuation(const f_string_t sequence, const f_number_unsigned_t width_max) { if (width_max < 1) return F_data_not; @@ -464,7 +464,7 @@ extern "C" { #endif // _di_f_utf_is_punctuation_ #ifndef _di_f_utf_is_subscript_ - f_status_t f_utf_is_subscript(const f_string_t sequence, const f_array_length_t width_max) { + f_status_t f_utf_is_subscript(const f_string_t sequence, const f_number_unsigned_t width_max) { if (width_max < 1) return F_data_not; @@ -487,7 +487,7 @@ extern "C" { #endif // _di_f_utf_is_subscript_ #ifndef _di_f_utf_is_superscript_ - f_status_t f_utf_is_superscript(const f_string_t sequence, const f_array_length_t width_max) { + f_status_t f_utf_is_superscript(const f_string_t sequence, const f_number_unsigned_t width_max) { if (width_max < 1) return F_data_not; @@ -510,7 +510,7 @@ extern "C" { #endif // _di_f_utf_is_superscript_ #ifndef _di_f_utf_is_symbol_ - f_status_t f_utf_is_symbol(const f_string_t sequence, const f_array_length_t width_max) { + f_status_t f_utf_is_symbol(const f_string_t sequence, const f_number_unsigned_t width_max) { if (width_max < 1) return F_data_not; @@ -548,7 +548,7 @@ extern "C" { #endif // _di_f_utf_is_symbol_ #ifndef _di_f_utf_is_unassigned_ - f_status_t f_utf_is_unassigned(const f_string_t sequence, const f_array_length_t width_max) { + f_status_t f_utf_is_unassigned(const f_string_t sequence, const f_number_unsigned_t width_max) { if (width_max < 1) return F_data_not; @@ -572,7 +572,7 @@ extern "C" { #endif // _di_f_utf_is_unassigned_ #ifndef _di_f_utf_is_valid_ - f_status_t f_utf_is_valid(const f_string_t sequence, const f_array_length_t width_max) { + f_status_t f_utf_is_valid(const f_string_t sequence, const f_number_unsigned_t width_max) { if (width_max < 1) return F_data_not; @@ -596,7 +596,7 @@ extern "C" { #endif // _di_f_utf_is_valid_ #ifndef _di_f_utf_is_whitespace_ - f_status_t f_utf_is_whitespace(const f_string_t sequence, const f_array_length_t width_max, const bool strict) { + f_status_t f_utf_is_whitespace(const f_string_t sequence, const f_number_unsigned_t width_max, const bool strict) { if (width_max < 1) return F_data_not; @@ -621,7 +621,7 @@ extern "C" { #endif // _di_f_utf_is_whitespace_ #ifndef _di_f_utf_is_whitespace_modifier_ - f_status_t f_utf_is_whitespace_modifier(const f_string_t sequence, const f_array_length_t width_max) { + f_status_t f_utf_is_whitespace_modifier(const f_string_t sequence, const f_number_unsigned_t width_max) { if (width_max < 1) return F_data_not; @@ -645,7 +645,7 @@ extern "C" { #endif // _di_f_utf_is_whitespace_modifier_ #ifndef _di_f_utf_is_whitespace_other_ - f_status_t f_utf_is_whitespace_other(const f_string_t sequence, const f_array_length_t width_max) { + f_status_t f_utf_is_whitespace_other(const f_string_t sequence, const f_number_unsigned_t width_max) { if (width_max < 1) return F_data_not; @@ -669,7 +669,7 @@ extern "C" { #endif // _di_f_utf_is_whitespace_other_ #ifndef _di_f_utf_is_whitespace_zero_width_ - f_status_t f_utf_is_whitespace_zero_width(const f_string_t sequence, const f_array_length_t width_max) { + f_status_t f_utf_is_whitespace_zero_width(const f_string_t sequence, const f_number_unsigned_t width_max) { if (width_max < 1) return F_data_not; @@ -693,7 +693,7 @@ extern "C" { #endif // _di_f_utf_is_whitespace_zero_width_ #ifndef _di_f_utf_is_wide_ - f_status_t f_utf_is_wide(const f_string_t sequence, const f_array_length_t width_max) { + f_status_t f_utf_is_wide(const f_string_t sequence, const f_number_unsigned_t width_max) { if (macro_f_utf_byte_width_is(*sequence)) { if (macro_f_utf_byte_width_is(*sequence) > width_max) return F_status_set_error(F_complete_not_utf); @@ -715,7 +715,7 @@ extern "C" { #endif // _di_f_utf_is_wide_ #ifndef _di_f_utf_is_word_ - f_status_t f_utf_is_word(const f_string_t sequence, const f_array_length_t width_max, const bool strict) { + f_status_t f_utf_is_word(const f_string_t sequence, const f_number_unsigned_t width_max, const bool strict) { if (width_max < 1) return F_data_not; @@ -742,7 +742,7 @@ extern "C" { #endif // _di_f_utf_is_word_ #ifndef _di_f_utf_is_word_dash_ - f_status_t f_utf_is_word_dash(const f_string_t sequence, const f_array_length_t width_max, const bool strict) { + f_status_t f_utf_is_word_dash(const f_string_t sequence, const f_number_unsigned_t width_max, const bool strict) { if (width_max < 1) return F_data_not; @@ -769,7 +769,7 @@ extern "C" { #endif // _di_f_utf_is_word_dash_ #ifndef _di_f_utf_is_word_dash_plus_ - f_status_t f_utf_is_word_dash_plus(const f_string_t sequence, const f_array_length_t width_max, const bool strict) { + f_status_t f_utf_is_word_dash_plus(const f_string_t sequence, const f_number_unsigned_t width_max, const bool strict) { if (width_max < 1) return F_data_not; @@ -796,7 +796,7 @@ extern "C" { #endif // _di_f_utf_is_word_dash_plus_ #ifndef _di_f_utf_is_zero_width_ - f_status_t f_utf_is_zero_width(const f_string_t sequence, const f_array_length_t width_max) { + f_status_t f_utf_is_zero_width(const f_string_t sequence, const f_number_unsigned_t width_max) { if (width_max < 1) return F_data_not; diff --git a/level_0/f_utf/c/utf/is.h b/level_0/f_utf/c/utf/is.h index 512fde5..84671cc 100644 --- a/level_0/f_utf/c/utf/is.h +++ b/level_0/f_utf/c/utf/is.h @@ -55,7 +55,7 @@ extern "C" { * @see isalpha() */ #ifndef _di_f_utf_is_alphabetic_ - extern f_status_t f_utf_is_alphabetic(const f_string_t sequence, const f_array_length_t width_max); + extern f_status_t f_utf_is_alphabetic(const f_string_t sequence, const f_number_unsigned_t width_max); #endif // _di_f_utf_is_alphabetic_ /** @@ -93,7 +93,7 @@ extern "C" { * @see isdigit() */ #ifndef _di_f_utf_is_alphabetic_digit_ - extern f_status_t f_utf_is_alphabetic_digit(const f_string_t sequence, const f_array_length_t width_max, uint64_t * const value); + extern f_status_t f_utf_is_alphabetic_digit(const f_string_t sequence, const f_number_unsigned_t width_max, uint64_t * const value); #endif // _di_f_utf_is_alphabetic_digit_ /** @@ -120,7 +120,7 @@ extern "C" { * @see isalnum() */ #ifndef _di_f_utf_is_alphabetic_numeric_ - extern f_status_t f_utf_is_alphabetic_numeric(const f_string_t sequence, const f_array_length_t width_max); + extern f_status_t f_utf_is_alphabetic_numeric(const f_string_t sequence, const f_number_unsigned_t width_max); #endif // _di_f_utf_is_alphabetic_numeric_ /** @@ -143,7 +143,7 @@ extern "C" { * F_utf_not (with error bit) if Unicode is an invalid Unicode character. */ #ifndef _di_f_utf_is_ascii_ - extern f_status_t f_utf_is_ascii(const f_string_t sequence, const f_array_length_t width_max); + extern f_status_t f_utf_is_ascii(const f_string_t sequence, const f_number_unsigned_t width_max); #endif // _di_f_utf_is_ascii_ /** @@ -166,7 +166,7 @@ extern "C" { * F_utf_not (with error bit) if Unicode is an invalid Unicode character. */ #ifndef _di_f_utf_is_combining_ - extern f_status_t f_utf_is_combining(const f_string_t sequence, const f_array_length_t width_max); + extern f_status_t f_utf_is_combining(const f_string_t sequence, const f_number_unsigned_t width_max); #endif // _di_f_utf_is_combining_ /** @@ -195,7 +195,7 @@ extern "C" { * @see iscntrl() */ #ifndef _di_f_utf_is_control_ - extern f_status_t f_utf_is_control(const f_string_t sequence, const f_array_length_t width_max); + extern f_status_t f_utf_is_control(const f_string_t sequence, const f_number_unsigned_t width_max); #endif // _di_f_utf_is_control_ /** @@ -220,7 +220,7 @@ extern "C" { * F_utf_not (with error bit) if Unicode is an invalid Unicode character. */ #ifndef _di_f_utf_is_control_code_ - extern f_status_t f_utf_is_control_code(const f_string_t sequence, const f_array_length_t width_max); + extern f_status_t f_utf_is_control_code(const f_string_t sequence, const f_number_unsigned_t width_max); #endif // _di_f_utf_is_control_code_ /** @@ -246,7 +246,7 @@ extern "C" { * F_utf_not (with error bit) if Unicode is an invalid Unicode character. */ #ifndef _di_f_utf_is_control_format_ - extern f_status_t f_utf_is_control_format(const f_string_t sequence, const f_array_length_t width_max); + extern f_status_t f_utf_is_control_format(const f_string_t sequence, const f_number_unsigned_t width_max); #endif // _di_f_utf_is_control_format_ /** @@ -271,7 +271,7 @@ extern "C" { * F_utf_not (with error bit) if Unicode is an invalid Unicode character. */ #ifndef _di_f_utf_is_control_picture_ - extern f_status_t f_utf_is_control_picture(const f_string_t sequence, const f_array_length_t width_max); + extern f_status_t f_utf_is_control_picture(const f_string_t sequence, const f_number_unsigned_t width_max); #endif // _di_f_utf_is_control_picture_ /** @@ -308,7 +308,7 @@ extern "C" { * @see isdigit() */ #ifndef _di_f_utf_is_digit_ - extern f_status_t f_utf_is_digit(const f_string_t sequence, const f_array_length_t width_max, uint64_t * const value); + extern f_status_t f_utf_is_digit(const f_string_t sequence, const f_number_unsigned_t width_max, uint64_t * const value); #endif // _di_f_utf_is_digit_ /** @@ -331,7 +331,7 @@ extern "C" { * F_utf_not (with error bit) if Unicode is an invalid Unicode character. */ #ifndef _di_f_utf_is_emoji_ - extern f_status_t f_utf_is_emoji(const f_string_t sequence, const f_array_length_t width_max); + extern f_status_t f_utf_is_emoji(const f_string_t sequence, const f_number_unsigned_t width_max); #endif // _di_f_utf_is_emoji_ /** @@ -389,7 +389,7 @@ extern "C" { * @see isgraph() */ #ifndef _di_f_utf_is_graph_ - extern f_status_t f_utf_is_graph(const f_string_t sequence, const f_array_length_t width_max); + extern f_status_t f_utf_is_graph(const f_string_t sequence, const f_number_unsigned_t width_max); #endif // _di_f_utf_is_graph_ /** @@ -416,7 +416,7 @@ extern "C" { * @see isdigit() */ #ifndef _di_f_utf_is_numeric_ - extern f_status_t f_utf_is_numeric(const f_string_t sequence, const f_array_length_t width_max); + extern f_status_t f_utf_is_numeric(const f_string_t sequence, const f_number_unsigned_t width_max); #endif // _di_f_utf_is_numeric_ /** @@ -439,7 +439,7 @@ extern "C" { * F_utf_not (with error bit) if Unicode is an invalid Unicode character. */ #ifndef _di_f_utf_is_phonetic_ - extern f_status_t f_utf_is_phonetic(const f_string_t sequence, const f_array_length_t width_max); + extern f_status_t f_utf_is_phonetic(const f_string_t sequence, const f_number_unsigned_t width_max); #endif // _di_f_utf_is_phonetic_ /** @@ -462,7 +462,7 @@ extern "C" { * F_utf_not (with error bit) if Unicode is an invalid Unicode character. */ #ifndef _di_f_utf_is_private_ - extern f_status_t f_utf_is_private(const f_string_t sequence, const f_array_length_t width_max); + extern f_status_t f_utf_is_private(const f_string_t sequence, const f_number_unsigned_t width_max); #endif // _di_f_utf_is_private_ /** @@ -485,7 +485,7 @@ extern "C" { * F_utf_not (with error bit) if Unicode is an invalid Unicode character. */ #ifndef _di_f_utf_is_punctuation_ - extern f_status_t f_utf_is_punctuation(const f_string_t sequence, const f_array_length_t width_max); + extern f_status_t f_utf_is_punctuation(const f_string_t sequence, const f_number_unsigned_t width_max); #endif // _di_f_utf_is_punctuation_ /** @@ -508,7 +508,7 @@ extern "C" { * F_utf_not (with error bit) if Unicode is an invalid Unicode character. */ #ifndef _di_f_utf_is_subscript_ - extern f_status_t f_utf_is_subscript(const f_string_t sequence, const f_array_length_t width_max); + extern f_status_t f_utf_is_subscript(const f_string_t sequence, const f_number_unsigned_t width_max); #endif // _di_f_utf_is_subscript_ /** @@ -531,7 +531,7 @@ extern "C" { * F_utf_not (with error bit) if Unicode is an invalid Unicode character. */ #ifndef _di_f_utf_is_superscript_ - extern f_status_t f_utf_is_superscript(const f_string_t sequence, const f_array_length_t width_max); + extern f_status_t f_utf_is_superscript(const f_string_t sequence, const f_number_unsigned_t width_max); #endif // _di_f_utf_is_superscript_ /** @@ -554,7 +554,7 @@ extern "C" { * F_utf_not (with error bit) if Unicode is an invalid Unicode character. */ #ifndef _di_f_utf_is_symbol_ - extern f_status_t f_utf_is_symbol(const f_string_t sequence, const f_array_length_t width_max); + extern f_status_t f_utf_is_symbol(const f_string_t sequence, const f_number_unsigned_t width_max); #endif // _di_f_utf_is_symbol_ /** @@ -578,7 +578,7 @@ extern "C" { * F_utf_not (with error bit) if Unicode is an invalid Unicode character. */ #ifndef _di_f_utf_is_unassigned_ - extern f_status_t f_utf_is_unassigned(const f_string_t sequence, const f_array_length_t width_max); + extern f_status_t f_utf_is_unassigned(const f_string_t sequence, const f_number_unsigned_t width_max); #endif // _di_f_utf_is_unassigned_ /** @@ -609,7 +609,7 @@ extern "C" { * F_utf_fragment (with error bit) if character is a UTF-8 fragment. */ #ifndef _di_f_utf_is_valid_ - extern f_status_t f_utf_is_valid(const f_string_t sequence, const f_array_length_t width_max); + extern f_status_t f_utf_is_valid(const f_string_t sequence, const f_number_unsigned_t width_max); #endif // _di_f_utf_is_valid_ /** @@ -647,7 +647,7 @@ extern "C" { * @see isspace() */ #ifndef _di_f_utf_is_whitespace_ - extern f_status_t f_utf_is_whitespace(const f_string_t sequence, const f_array_length_t width_max, const bool strict); + extern f_status_t f_utf_is_whitespace(const f_string_t sequence, const f_number_unsigned_t width_max, const bool strict); #endif // _di_f_utf_is_whitespace_ /** @@ -677,7 +677,7 @@ extern "C" { * F_utf_not (with error bit) if Unicode is an invalid Unicode character. */ #ifndef _di_f_utf_is_whitespace_modifier_ - extern f_status_t f_utf_is_whitespace_modifier(const f_string_t sequence, const f_array_length_t width_max); + extern f_status_t f_utf_is_whitespace_modifier(const f_string_t sequence, const f_number_unsigned_t width_max); #endif // _di_f_utf_is_whitespace_modifier_ /** @@ -704,7 +704,7 @@ extern "C" { * F_utf_not (with error bit) if Unicode is an invalid Unicode character. */ #ifndef _di_f_utf_is_whitespace_other_ - extern f_status_t f_utf_is_whitespace_other(const f_string_t sequence, const f_array_length_t width_max); + extern f_status_t f_utf_is_whitespace_other(const f_string_t sequence, const f_number_unsigned_t width_max); #endif // _di_f_utf_is_whitespace_other_ /** @@ -731,7 +731,7 @@ extern "C" { * F_utf_not (with error bit) if Unicode is an invalid Unicode character. */ #ifndef _di_f_utf_is_whitespace_zero_width_ - extern f_status_t f_utf_is_whitespace_zero_width(const f_string_t sequence, const f_array_length_t width_max); + extern f_status_t f_utf_is_whitespace_zero_width(const f_string_t sequence, const f_number_unsigned_t width_max); #endif // _di_f_utf_is_whitespace_zero_width_ /** @@ -760,7 +760,7 @@ extern "C" { * F_utf_not (with error bit) if Unicode is an invalid Unicode character. */ #ifndef _di_f_utf_is_wide_ - extern f_status_t f_utf_is_wide(const f_string_t sequence, const f_array_length_t width_max); + extern f_status_t f_utf_is_wide(const f_string_t sequence, const f_number_unsigned_t width_max); #endif // _di_f_utf_is_wide_ /** @@ -791,7 +791,7 @@ extern "C" { * @see isalnum() */ #ifndef _di_f_utf_is_word_ - extern f_status_t f_utf_is_word(const f_string_t sequence, const f_array_length_t width_max, const bool strict); + extern f_status_t f_utf_is_word(const f_string_t sequence, const f_number_unsigned_t width_max, const bool strict); #endif // _di_f_utf_is_word_ /** @@ -827,7 +827,7 @@ extern "C" { * @see isalnum() */ #ifndef _di_f_utf_is_word_dash_ - extern f_status_t f_utf_is_word_dash(const f_string_t sequence, const f_array_length_t width_max, const bool strict); + extern f_status_t f_utf_is_word_dash(const f_string_t sequence, const f_number_unsigned_t width_max, const bool strict); #endif // _di_f_utf_is_word_dash_ /** @@ -865,7 +865,7 @@ extern "C" { * @see isalnum() */ #ifndef _di_f_utf_is_word_dash_plus_ - extern f_status_t f_utf_is_word_dash_plus(const f_string_t sequence, const f_array_length_t width_max, const bool strict); + extern f_status_t f_utf_is_word_dash_plus(const f_string_t sequence, const f_number_unsigned_t width_max, const bool strict); #endif // _di_f_utf_is_word_dash_plus_ /** @@ -892,7 +892,7 @@ extern "C" { * F_utf_not (with error bit) if Unicode is an invalid Unicode character. */ #ifndef _di_f_utf_is_zero_width_ - extern f_status_t f_utf_is_zero_width(const f_string_t sequence, const f_array_length_t width_max); + extern f_status_t f_utf_is_zero_width(const f_string_t sequence, const f_number_unsigned_t width_max); #endif // _di_f_utf_is_zero_width_ #ifdef __cplusplus diff --git a/level_0/f_utf/c/utf/map_multis.c b/level_0/f_utf/c/utf/map_multis.c index b881b2f..b77a899 100644 --- a/level_0/f_utf/c/utf/map_multis.c +++ b/level_0/f_utf/c/utf/map_multis.c @@ -10,7 +10,7 @@ extern "C" { #endif #ifndef _di_f_utf_string_map_multis_adjust_ - f_status_t f_utf_string_map_multis_adjust(const f_array_length_t length, f_utf_string_map_multis_t * const map_multis) { + f_status_t f_utf_string_map_multis_adjust(const f_number_unsigned_t length, f_utf_string_map_multis_t * const map_multis) { #ifndef _di_level_0_parameter_checking_ if (!map_multis) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -64,7 +64,7 @@ extern "C" { #endif // _di_f_utf_string_map_multis_append_all_ #ifndef _di_f_utf_string_map_multis_decimate_by_ - f_status_t f_utf_string_map_multis_decimate_by(const f_array_length_t amount, f_utf_string_map_multis_t * const map_multis) { + f_status_t f_utf_string_map_multis_decimate_by(const f_number_unsigned_t amount, f_utf_string_map_multis_t * const map_multis) { #ifndef _di_level_0_parameter_checking_ if (!map_multis) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -80,7 +80,7 @@ extern "C" { #endif // _di_f_utf_string_map_multis_decimate_by_ #ifndef _di_f_utf_string_map_multis_decrease_by_ - f_status_t f_utf_string_map_multis_decrease_by(const f_array_length_t amount, f_utf_string_map_multis_t * const map_multis) { + f_status_t f_utf_string_map_multis_decrease_by(const f_number_unsigned_t amount, f_utf_string_map_multis_t * const map_multis) { #ifndef _di_level_0_parameter_checking_ if (!map_multis) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -96,20 +96,20 @@ extern "C" { #endif // _di_f_utf_string_map_multis_decrease_by_ #ifndef _di_f_utf_string_map_multis_increase_ - f_status_t f_utf_string_map_multis_increase(const f_array_length_t step, f_utf_string_map_multis_t * const map_multis) { + f_status_t f_utf_string_map_multis_increase(const f_number_unsigned_t step, f_utf_string_map_multis_t * const map_multis) { #ifndef _di_level_0_parameter_checking_ if (!map_multis) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && map_multis->used + 1 > map_multis->size) { - f_array_length_t size = map_multis->used + step; + f_number_unsigned_t size = map_multis->used + step; - if (size > F_array_length_t_size_d) { - if (map_multis->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (map_multis->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_utf_string_map_multis_resize(size, map_multis); @@ -120,7 +120,7 @@ extern "C" { #endif // _di_f_utf_string_map_multis_increase_ #ifndef _di_f_utf_string_map_multis_increase_by_ - f_status_t f_utf_string_map_multis_increase_by(const f_array_length_t amount, f_utf_string_map_multis_t * const map_multis) { + f_status_t f_utf_string_map_multis_increase_by(const f_number_unsigned_t amount, f_utf_string_map_multis_t * const map_multis) { #ifndef _di_level_0_parameter_checking_ if (!map_multis) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -128,7 +128,7 @@ extern "C" { if (!amount) return F_data_not; if (map_multis->used + amount > map_multis->size) { - if (map_multis->used + amount > F_array_length_t_size_d) { + if (map_multis->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -140,7 +140,7 @@ extern "C" { #endif // _di_f_utf_string_map_multis_increase_by_ #ifndef _di_f_utf_string_map_multis_resize_ - f_status_t f_utf_string_map_multis_resize(const f_array_length_t length, f_utf_string_map_multis_t * const map_multis) { + f_status_t f_utf_string_map_multis_resize(const f_number_unsigned_t length, f_utf_string_map_multis_t * const map_multis) { #ifndef _di_level_0_parameter_checking_ if (!map_multis) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_utf/c/utf/map_multis.h b/level_0/f_utf/c/utf/map_multis.h index 0ffd48a..5ec9fdd 100644 --- a/level_0/f_utf/c/utf/map_multis.h +++ b/level_0/f_utf/c/utf/map_multis.h @@ -27,8 +27,8 @@ extern "C" { typedef struct { f_utf_string_map_multi_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_utf_string_map_multis_t; #define f_utf_string_map_multis_t_initialize f_utf_string_statics_t_initialize @@ -66,7 +66,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_map_multis_adjust_ - extern f_status_t f_utf_string_map_multis_adjust(const f_array_length_t length, f_utf_string_map_multis_t * const map_multis); + extern f_status_t f_utf_string_map_multis_adjust(const f_number_unsigned_t length, f_utf_string_map_multis_t * const map_multis); #endif // _di_f_utf_string_map_multis_adjust_ /** @@ -131,7 +131,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_map_multis_decimate_by_ - extern f_status_t f_utf_string_map_multis_decimate_by(const f_array_length_t amount, f_utf_string_map_multis_t * const map_multis); + extern f_status_t f_utf_string_map_multis_decimate_by(const f_number_unsigned_t amount, f_utf_string_map_multis_t * const map_multis); #endif // _di_f_utf_string_map_multis_decimate_by_ /** @@ -154,13 +154,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_map_multis_decrease_by_ - extern f_status_t f_utf_string_map_multis_decrease_by(const f_array_length_t amount, f_utf_string_map_multis_t * const map_multis); + extern f_status_t f_utf_string_map_multis_decrease_by(const f_number_unsigned_t amount, f_utf_string_map_multis_t * const map_multis); #endif // _di_f_utf_string_map_multis_decrease_by_ /** * Increase the size of the map_multis 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -179,14 +179,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_map_multis_increase_ - extern f_status_t f_utf_string_map_multis_increase(const f_array_length_t step, f_utf_string_map_multis_t * const map_multis); + extern f_status_t f_utf_string_map_multis_increase(const f_number_unsigned_t step, f_utf_string_map_multis_t * const map_multis); #endif // _di_f_utf_string_map_multis_increase_ /** * Resize the map_multis 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -204,7 +204,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_map_multis_increase_by_ - extern f_status_t f_utf_string_map_multis_increase_by(const f_array_length_t amount, f_utf_string_map_multis_t * const map_multis); + extern f_status_t f_utf_string_map_multis_increase_by(const f_number_unsigned_t amount, f_utf_string_map_multis_t * const map_multis); #endif // _di_f_utf_string_map_multis_increase_by_ /** @@ -223,7 +223,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_map_multis_resize_ - extern f_status_t f_utf_string_map_multis_resize(const f_array_length_t length, f_utf_string_map_multis_t * const map_multis); + extern f_status_t f_utf_string_map_multis_resize(const f_number_unsigned_t length, f_utf_string_map_multis_t * const map_multis); #endif // _di_f_utf_string_map_multis_resize_ #ifdef __cplusplus diff --git a/level_0/f_utf/c/utf/map_multiss.c b/level_0/f_utf/c/utf/map_multiss.c index 5fa5eae..76598b2 100644 --- a/level_0/f_utf/c/utf/map_multiss.c +++ b/level_0/f_utf/c/utf/map_multiss.c @@ -12,7 +12,7 @@ extern "C" { #endif #ifndef _di_f_utf_string_map_multiss_adjust_ - f_status_t f_utf_string_map_multiss_adjust(const f_array_length_t length, f_utf_string_map_multiss_t * const map_multiss) { + f_status_t f_utf_string_map_multiss_adjust(const f_number_unsigned_t length, f_utf_string_map_multiss_t * const map_multiss) { #ifndef _di_level_0_parameter_checking_ if (!map_multiss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -64,7 +64,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].used = 0; @@ -79,7 +79,7 @@ extern "C" { #endif // _di_f_utf_string_map_multiss_append_all_ #ifndef _di_f_utf_string_map_multiss_decimate_by_ - f_status_t f_utf_string_map_multiss_decimate_by(const f_array_length_t amount, f_utf_string_map_multiss_t * const map_multiss) { + f_status_t f_utf_string_map_multiss_decimate_by(const f_number_unsigned_t amount, f_utf_string_map_multiss_t * const map_multiss) { #ifndef _di_level_0_parameter_checking_ if (!map_multiss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -95,7 +95,7 @@ extern "C" { #endif // _di_f_utf_string_map_multiss_decimate_by_ #ifndef _di_f_utf_string_map_multiss_decrease_by_ - f_status_t f_utf_string_map_multiss_decrease_by(const f_array_length_t amount, f_utf_string_map_multiss_t * const map_multiss) { + f_status_t f_utf_string_map_multiss_decrease_by(const f_number_unsigned_t amount, f_utf_string_map_multiss_t * const map_multiss) { #ifndef _di_level_0_parameter_checking_ if (!map_multiss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -111,20 +111,20 @@ extern "C" { #endif // _di_f_utf_string_map_multiss_decrease_by_ #ifndef _di_f_utf_string_map_multiss_increase_ - f_status_t f_utf_string_map_multiss_increase(const f_array_length_t step, f_utf_string_map_multiss_t * const map_multiss) { + f_status_t f_utf_string_map_multiss_increase(const f_number_unsigned_t step, f_utf_string_map_multiss_t * const map_multiss) { #ifndef _di_level_0_parameter_checking_ if (!map_multiss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && map_multiss->used + 1 > map_multiss->size) { - f_array_length_t size = map_multiss->used + step; + f_number_unsigned_t size = map_multiss->used + step; - if (size > F_array_length_t_size_d) { - if (map_multiss->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (map_multiss->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_utf_string_map_multiss_resize(size, map_multiss); @@ -135,7 +135,7 @@ extern "C" { #endif // _di_f_utf_string_map_multiss_increase_ #ifndef _di_f_utf_string_map_multiss_increase_by_ - f_status_t f_utf_string_map_multiss_increase_by(const f_array_length_t amount, f_utf_string_map_multiss_t * const map_multiss) { + f_status_t f_utf_string_map_multiss_increase_by(const f_number_unsigned_t amount, f_utf_string_map_multiss_t * const map_multiss) { #ifndef _di_level_0_parameter_checking_ if (!map_multiss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -143,7 +143,7 @@ extern "C" { if (!amount) return F_data_not; if (map_multiss->used + amount > map_multiss->size) { - if (map_multiss->used + amount > F_array_length_t_size_d) { + if (map_multiss->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -155,7 +155,7 @@ extern "C" { #endif // _di_f_utf_string_map_multiss_increase_by_ #ifndef _di_f_utf_string_map_multiss_resize_ - f_status_t f_utf_string_map_multiss_resize(const f_array_length_t length, f_utf_string_map_multiss_t * const map_multiss) { + f_status_t f_utf_string_map_multiss_resize(const f_number_unsigned_t length, f_utf_string_map_multiss_t * const map_multiss) { #ifndef _di_level_0_parameter_checking_ if (!map_multiss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_utf/c/utf/map_multiss.h b/level_0/f_utf/c/utf/map_multiss.h index 5e3cd58..f64a397 100644 --- a/level_0/f_utf/c/utf/map_multiss.h +++ b/level_0/f_utf/c/utf/map_multiss.h @@ -27,8 +27,8 @@ extern "C" { typedef struct { f_utf_string_map_multis_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_utf_string_map_multiss_t; #define f_utf_string_map_multiss_t_initialize f_utf_string_statics_t_initialize @@ -66,7 +66,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_map_multiss_adjust_ - extern f_status_t f_utf_string_map_multiss_adjust(const f_array_length_t length, f_utf_string_map_multiss_t * const map_multiss); + extern f_status_t f_utf_string_map_multiss_adjust(const f_number_unsigned_t length, f_utf_string_map_multiss_t * const map_multiss); #endif // _di_f_utf_string_map_multiss_adjust_ /** @@ -131,7 +131,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_map_multiss_decimate_by_ - extern f_status_t f_utf_string_map_multiss_decimate_by(const f_array_length_t amount, f_utf_string_map_multiss_t * const map_multiss); + extern f_status_t f_utf_string_map_multiss_decimate_by(const f_number_unsigned_t amount, f_utf_string_map_multiss_t * const map_multiss); #endif // _di_f_utf_string_map_multiss_decimate_by_ /** @@ -154,13 +154,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_map_multiss_decrease_by_ - extern f_status_t f_utf_string_map_multiss_decrease_by(const f_array_length_t amount, f_utf_string_map_multiss_t * const map_multiss); + extern f_status_t f_utf_string_map_multiss_decrease_by(const f_number_unsigned_t amount, f_utf_string_map_multiss_t * const map_multiss); #endif // _di_f_utf_string_map_multiss_decrease_by_ /** * Increase the size of the map_multiss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -179,14 +179,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_map_multiss_increase_ - extern f_status_t f_utf_string_map_multiss_increase(const f_array_length_t step, f_utf_string_map_multiss_t * const map_multiss); + extern f_status_t f_utf_string_map_multiss_increase(const f_number_unsigned_t step, f_utf_string_map_multiss_t * const map_multiss); #endif // _di_f_utf_string_map_multiss_increase_ /** * Resize the map_multiss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -204,7 +204,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_map_multiss_increase_by_ - extern f_status_t f_utf_string_map_multiss_increase_by(const f_array_length_t amount, f_utf_string_map_multiss_t * const map_multiss); + extern f_status_t f_utf_string_map_multiss_increase_by(const f_number_unsigned_t amount, f_utf_string_map_multiss_t * const map_multiss); #endif // _di_f_utf_string_map_multiss_increase_by_ /** @@ -223,7 +223,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_map_multiss_resize_ - extern f_status_t f_utf_string_map_multiss_resize(const f_array_length_t length, f_utf_string_map_multiss_t * const map_multiss); + extern f_status_t f_utf_string_map_multiss_resize(const f_number_unsigned_t length, f_utf_string_map_multiss_t * const map_multiss); #endif // _di_f_utf_string_map_multiss_resize_ #ifdef __cplusplus diff --git a/level_0/f_utf/c/utf/maps.c b/level_0/f_utf/c/utf/maps.c index 0435192..5829d62 100644 --- a/level_0/f_utf/c/utf/maps.c +++ b/level_0/f_utf/c/utf/maps.c @@ -8,7 +8,7 @@ extern "C" { #endif #ifndef _di_f_utf_string_maps_adjust_ - f_status_t f_utf_string_maps_adjust(const f_array_length_t length, f_utf_string_maps_t * const maps) { + f_status_t f_utf_string_maps_adjust(const f_number_unsigned_t length, f_utf_string_maps_t * const maps) { #ifndef _di_level_0_parameter_checking_ if (!maps) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -62,7 +62,7 @@ extern "C" { #endif // _di_f_utf_string_maps_append_all_ #ifndef _di_f_utf_string_maps_decimate_by_ - f_status_t f_utf_string_maps_decimate_by(const f_array_length_t amount, f_utf_string_maps_t * const maps) { + f_status_t f_utf_string_maps_decimate_by(const f_number_unsigned_t amount, f_utf_string_maps_t * const maps) { #ifndef _di_level_0_parameter_checking_ if (!maps) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -78,7 +78,7 @@ extern "C" { #endif // _di_f_utf_string_maps_decimate_by_ #ifndef _di_f_utf_string_maps_decrease_by_ - f_status_t f_utf_string_maps_decrease_by(const f_array_length_t amount, f_utf_string_maps_t * const maps) { + f_status_t f_utf_string_maps_decrease_by(const f_number_unsigned_t amount, f_utf_string_maps_t * const maps) { #ifndef _di_level_0_parameter_checking_ if (!maps) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -94,20 +94,20 @@ extern "C" { #endif // _di_f_utf_string_maps_decrease_by_ #ifndef _di_f_utf_string_maps_increase_ - f_status_t f_utf_string_maps_increase(const f_array_length_t step, f_utf_string_maps_t * const maps) { + f_status_t f_utf_string_maps_increase(const f_number_unsigned_t step, f_utf_string_maps_t * const maps) { #ifndef _di_level_0_parameter_checking_ if (!maps) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && maps->used + 1 > maps->size) { - f_array_length_t size = maps->used + step; + f_number_unsigned_t size = maps->used + step; - if (size > F_array_length_t_size_d) { - if (maps->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (maps->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_utf_string_maps_resize(size, maps); @@ -118,7 +118,7 @@ extern "C" { #endif // _di_f_utf_string_maps_increase_ #ifndef _di_f_utf_string_maps_increase_by_ - f_status_t f_utf_string_maps_increase_by(const f_array_length_t amount, f_utf_string_maps_t * const maps) { + f_status_t f_utf_string_maps_increase_by(const f_number_unsigned_t amount, f_utf_string_maps_t * const maps) { #ifndef _di_level_0_parameter_checking_ if (!maps) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -126,7 +126,7 @@ extern "C" { if (!amount) return F_data_not; if (maps->used + amount > maps->size) { - if (maps->used + amount > F_array_length_t_size_d) { + if (maps->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -138,7 +138,7 @@ extern "C" { #endif // _di_f_utf_string_maps_increase_by_ #ifndef _di_f_utf_string_maps_resize_ - f_status_t f_utf_string_maps_resize(const f_array_length_t length, f_utf_string_maps_t * const maps) { + f_status_t f_utf_string_maps_resize(const f_number_unsigned_t length, f_utf_string_maps_t * const maps) { #ifndef _di_level_0_parameter_checking_ if (!maps) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_utf/c/utf/maps.h b/level_0/f_utf/c/utf/maps.h index 39486e0..693a53a 100644 --- a/level_0/f_utf/c/utf/maps.h +++ b/level_0/f_utf/c/utf/maps.h @@ -27,8 +27,8 @@ extern "C" { typedef struct { f_utf_string_map_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_utf_string_maps_t; #define f_utf_string_maps_t_initialize f_utf_string_statics_t_initialize @@ -66,7 +66,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_maps_adjust_ - extern f_status_t f_utf_string_maps_adjust(const f_array_length_t length, f_utf_string_maps_t * const maps); + extern f_status_t f_utf_string_maps_adjust(const f_number_unsigned_t length, f_utf_string_maps_t * const maps); #endif // _di_f_utf_string_maps_adjust_ /** @@ -131,7 +131,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_maps_decimate_by_ - extern f_status_t f_utf_string_maps_decimate_by(const f_array_length_t amount, f_utf_string_maps_t * const maps); + extern f_status_t f_utf_string_maps_decimate_by(const f_number_unsigned_t amount, f_utf_string_maps_t * const maps); #endif // _di_f_utf_string_maps_decimate_by_ /** @@ -154,13 +154,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_maps_decrease_by_ - extern f_status_t f_utf_string_maps_decrease_by(const f_array_length_t amount, f_utf_string_maps_t * const maps); + extern f_status_t f_utf_string_maps_decrease_by(const f_number_unsigned_t amount, f_utf_string_maps_t * const maps); #endif // _di_f_utf_string_maps_decrease_by_ /** * Increase the size of the string maps array, but only if necessary. * - * If the given length is too large for the buffer, then attempt to set max buffer size (F_array_length_t_size_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -179,14 +179,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_maps_increase_ - extern f_status_t f_utf_string_maps_increase(const f_array_length_t step, f_utf_string_maps_t * const maps); + extern f_status_t f_utf_string_maps_increase(const f_number_unsigned_t step, f_utf_string_maps_t * const maps); #endif // _di_f_utf_string_maps_increase_ /** * Resize the string maps 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -204,7 +204,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_maps_increase_by_ - extern f_status_t f_utf_string_maps_increase_by(const f_array_length_t amount, f_utf_string_maps_t * const maps); + extern f_status_t f_utf_string_maps_increase_by(const f_number_unsigned_t amount, f_utf_string_maps_t * const maps); #endif // _di_f_utf_string_maps_increase_by_ /** @@ -223,7 +223,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_maps_resize_ - extern f_status_t f_utf_string_maps_resize(const f_array_length_t length, f_utf_string_maps_t * const maps); + extern f_status_t f_utf_string_maps_resize(const f_number_unsigned_t length, f_utf_string_maps_t * const maps); #endif // _di_f_utf_string_maps_resize_ #ifdef __cplusplus diff --git a/level_0/f_utf/c/utf/mapss.c b/level_0/f_utf/c/utf/mapss.c index 43cf24a..10c52bb 100644 --- a/level_0/f_utf/c/utf/mapss.c +++ b/level_0/f_utf/c/utf/mapss.c @@ -9,7 +9,7 @@ extern "C" { #endif #ifndef _di_f_utf_string_mapss_adjust_ - f_status_t f_utf_string_mapss_adjust(const f_array_length_t length, f_utf_string_mapss_t * const mapss) { + f_status_t f_utf_string_mapss_adjust(const f_number_unsigned_t length, f_utf_string_mapss_t * const mapss) { #ifndef _di_level_0_parameter_checking_ if (!mapss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -61,7 +61,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].used = 0; @@ -76,7 +76,7 @@ extern "C" { #endif // _di_f_utf_string_mapss_append_all_ #ifndef _di_f_utf_string_mapss_decimate_by_ - f_status_t f_utf_string_mapss_decimate_by(const f_array_length_t amount, f_utf_string_mapss_t * const mapss) { + f_status_t f_utf_string_mapss_decimate_by(const f_number_unsigned_t amount, f_utf_string_mapss_t * const mapss) { #ifndef _di_level_0_parameter_checking_ if (!mapss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -92,7 +92,7 @@ extern "C" { #endif // _di_f_utf_string_mapss_decimate_by_ #ifndef _di_f_utf_string_mapss_decrease_by_ - f_status_t f_utf_string_mapss_decrease_by(const f_array_length_t amount, f_utf_string_mapss_t * const mapss) { + f_status_t f_utf_string_mapss_decrease_by(const f_number_unsigned_t amount, f_utf_string_mapss_t * const mapss) { #ifndef _di_level_0_parameter_checking_ if (!mapss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -108,20 +108,20 @@ extern "C" { #endif // _di_f_utf_string_mapss_decrease_by_ #ifndef _di_f_utf_string_mapss_increase_ - f_status_t f_utf_string_mapss_increase(const f_array_length_t step, f_utf_string_mapss_t * const mapss) { + f_status_t f_utf_string_mapss_increase(const f_number_unsigned_t step, f_utf_string_mapss_t * const mapss) { #ifndef _di_level_0_parameter_checking_ if (!mapss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && mapss->used + 1 > mapss->size) { - f_array_length_t size = mapss->used + step; + f_number_unsigned_t size = mapss->used + step; - if (size > F_array_length_t_size_d) { - if (mapss->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (mapss->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_utf_string_mapss_resize(size, mapss); @@ -132,7 +132,7 @@ extern "C" { #endif // _di_f_utf_string_mapss_increase_ #ifndef _di_f_utf_string_mapss_increase_by_ - f_status_t f_utf_string_mapss_increase_by(const f_array_length_t amount, f_utf_string_mapss_t * const mapss) { + f_status_t f_utf_string_mapss_increase_by(const f_number_unsigned_t amount, f_utf_string_mapss_t * const mapss) { #ifndef _di_level_0_parameter_checking_ if (!mapss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -140,7 +140,7 @@ extern "C" { if (!amount) return F_data_not; if (mapss->used + amount > mapss->size) { - if (mapss->used + amount > F_array_length_t_size_d) { + if (mapss->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -152,7 +152,7 @@ extern "C" { #endif // _di_f_utf_string_mapss_increase_by_ #ifndef _di_f_utf_string_mapss_resize_ - f_status_t f_utf_string_mapss_resize(const f_array_length_t length, f_utf_string_mapss_t * const mapss) { + f_status_t f_utf_string_mapss_resize(const f_number_unsigned_t length, f_utf_string_mapss_t * const mapss) { #ifndef _di_level_0_parameter_checking_ if (!mapss) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_utf/c/utf/mapss.h b/level_0/f_utf/c/utf/mapss.h index 4282a89..f34ecec 100644 --- a/level_0/f_utf/c/utf/mapss.h +++ b/level_0/f_utf/c/utf/mapss.h @@ -27,8 +27,8 @@ extern "C" { typedef struct { f_utf_string_maps_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_utf_string_mapss_t; #define f_utf_string_mapss_t_initialize f_utf_string_statics_t_initialize @@ -66,7 +66,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_mapss_adjust_ - extern f_status_t f_utf_string_mapss_adjust(const f_array_length_t length, f_utf_string_mapss_t * const mapss); + extern f_status_t f_utf_string_mapss_adjust(const f_number_unsigned_t length, f_utf_string_mapss_t * const mapss); #endif // _di_f_utf_string_mapss_adjust_ /** @@ -131,7 +131,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_mapss_decimate_by_ - extern f_status_t f_utf_string_mapss_decimate_by(const f_array_length_t amount, f_utf_string_mapss_t * const mapss); + extern f_status_t f_utf_string_mapss_decimate_by(const f_number_unsigned_t amount, f_utf_string_mapss_t * const mapss); #endif // _di_f_utf_string_mapss_decimate_by_ /** @@ -155,13 +155,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_mapss_decrease_by_ - extern f_status_t f_utf_string_mapss_decrease_by(const f_array_length_t amount, f_utf_string_mapss_t * const mapss); + extern f_status_t f_utf_string_mapss_decrease_by(const f_number_unsigned_t amount, f_utf_string_mapss_t * const mapss); #endif // _di_f_utf_string_mapss_decrease_by_ /** * Increase the size of the string mapss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -180,14 +180,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_mapss_increase_ - extern f_status_t f_utf_string_mapss_increase(const f_array_length_t step, f_utf_string_mapss_t * const mapss); + extern f_status_t f_utf_string_mapss_increase(const f_number_unsigned_t step, f_utf_string_mapss_t * const mapss); #endif // _di_f_utf_string_mapss_increase_ /** * Resize the string mapss 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -205,7 +205,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_mapss_increase_by_ - extern f_status_t f_utf_string_mapss_increase_by(const f_array_length_t amount, f_utf_string_mapss_t * const mapss); + extern f_status_t f_utf_string_mapss_increase_by(const f_number_unsigned_t amount, f_utf_string_mapss_t * const mapss); #endif // _di_f_utf_string_mapss_increase_by_ /** @@ -224,7 +224,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_mapss_resize_ - extern f_status_t f_utf_string_mapss_resize(const f_array_length_t length, f_utf_string_mapss_t * const mapss); + extern f_status_t f_utf_string_mapss_resize(const f_number_unsigned_t length, f_utf_string_mapss_t * const mapss); #endif // _di_f_utf_string_mapss_resize_ #ifdef __cplusplus diff --git a/level_0/f_utf/c/utf/private-dynamic.c b/level_0/f_utf/c/utf/private-dynamic.c index 0ef2a6b..556bd1e 100644 --- a/level_0/f_utf/c/utf/private-dynamic.c +++ b/level_0/f_utf/c/utf/private-dynamic.c @@ -8,7 +8,7 @@ extern "C" { #endif #if !defined(_di_f_utf_string_dynamic_adjust_) || !defined(_di_f_utf_string_dynamic_decimate_by_) || !defined(_di_f_utf_string_dynamics_adjust_) || !defined(_di_f_utf_string_dynamics_append_) || !defined(_di_f_utf_string_dynamics_decimate_by_) || !defined(_di_f_utf_string_map_multis_adjust_) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_triples_adjust_) || !defined(_di_f_utf_string_triples_decimate_by_) - f_status_t private_f_utf_string_dynamic_adjust(const f_array_length_t length, f_utf_string_dynamic_t * const dynamic) { + f_status_t private_f_utf_string_dynamic_adjust(const f_number_unsigned_t length, f_utf_string_dynamic_t * const dynamic) { const f_status_t status = f_memory_adjust(dynamic->size, length, sizeof(f_utf_char_t), (void **) & dynamic->string); if (F_status_is_error(status)) return status; @@ -24,7 +24,7 @@ extern "C" { #endif // !defined(_di_f_utf_string_dynamic_adjust_) || !defined(_di_f_utf_string_dynamic_decimate_by_) || !defined(_di_f_utf_string_dynamics_adjust_) || !defined(_di_f_utf_string_dynamics_append_) || !defined(_di_f_utf_string_dynamics_decimate_by_) || !defined(_di_f_utf_string_map_multis_adjust_) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_triples_adjust_) || !defined(_di_f_utf_string_triples_decimate_by_) #if !defined(_di_f_utf_string_append_) || !defined(_di_f_utf_string_append_assure_) || !defined(_di_f_utf_string_append_assure_nulless_) || !defined(_di_f_utf_string_append_nulless_) || !defined(_di_f_utf_string_dynamic_append_) || !defined(_di_f_utf_string_dynamic_append_assure_) || !defined(_di_f_utf_string_dynamic_append_assure_nulless_) || !defined(_di_f_utf_string_dynamic_append_nulless_) || !defined(_di_f_utf_string_dynamic_increase_by_) || !defined(_di_f_utf_string_dynamic_mash_) || !defined(_di_f_utf_string_dynamic_mash_nulless_) || !defined(_di_f_utf_string_dynamic_mish_) || !defined(_di_f_utf_string_dynamic_mish_nulless_) || !defined(_di_f_utf_string_dynamic_partial_append_) || !defined(_di_f_utf_string_dynamic_partial_append_assure_) || !defined(_di_f_utf_string_dynamic_partial_append_assure_nulless_) || !defined(_di_f_utf_string_dynamic_partial_append_nulless_) || !defined(_di_f_utf_string_dynamic_partial_mash_) || !defined(_di_f_utf_string_dynamic_partial_mash_nulless_) || !defined(_di_f_utf_string_dynamic_partial_mish_) || !defined(_di_f_utf_string_dynamic_partial_mish_nulless_) || !defined(_di_f_utf_string_dynamic_partial_prepend_) || !defined(_di_f_utf_string_dynamic_partial_prepend_assure_) || !defined(_di_f_utf_string_dynamic_partial_prepend_assure_nulless_) || !defined(_di_f_utf_string_dynamic_partial_prepend_nulless_) || !defined(_di_f_utf_string_dynamic_prepend_) || !defined(_di_f_utf_string_dynamic_prepend_assure_) || !defined(_di_f_utf_string_dynamic_prepend_assure_nulless_) || !defined(_di_f_utf_string_dynamic_prepend_nulless_) || !defined(_di_f_utf_string_dynamics_append_) || !defined(_di_f_utf_string_dynamics_append_all_) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_map_multis_append_all_) || !defined(_di_f_utf_string_map_multiss_append_) || !defined(_di_f_utf_string_map_multiss_append_all_) || !defined(_di_f_utf_string_maps_append_) || !defined(_di_f_utf_string_maps_append_all_) || !defined(_di_f_utf_string_mapss_append_) || !defined(_di_f_utf_string_mapss_append_all_) || !defined(_di_f_utf_string_mash_) || !defined(_di_f_utf_string_mash_nulless_) || !defined(_di_f_utf_string_mish_) || !defined(_di_f_utf_string_mish_nulless_) || !defined(_di_f_utf_string_prepend_) || !defined(_di_f_utf_string_prepend_assure_) || !defined(_di_f_utf_string_prepend_assure_nulless_) || !defined(_di_f_utf_string_prepend_nulless_) || !defined(_di_f_utf_string_triples_append_) || !defined(_di_f_utf_string_triples_append_all_) || !defined(_di_f_utf_string_tripless_append_) || !defined(_di_f_utf_string_tripless_append_all_) - f_status_t private_f_utf_string_dynamic_increase_by(const f_array_length_t amount, f_utf_string_dynamic_t * const dynamic) { + f_status_t private_f_utf_string_dynamic_increase_by(const f_number_unsigned_t amount, f_utf_string_dynamic_t * const dynamic) { if (dynamic->used + amount > dynamic->size) { if (dynamic->used + amount > F_string_t_size_d) { @@ -39,7 +39,7 @@ extern "C" { #endif // !defined(_di_f_utf_string_append_) || !defined(_di_f_utf_string_append_assure_) || !defined(_di_f_utf_string_append_assure_nulless_) || !defined(_di_f_utf_string_append_nulless_) || !defined(_di_f_utf_string_dynamic_append_) || !defined(_di_f_utf_string_dynamic_append_assure_) || !defined(_di_f_utf_string_dynamic_append_assure_nulless_) || !defined(_di_f_utf_string_dynamic_append_nulless_) || !defined(_di_f_utf_string_dynamic_increase_by_) || !defined(_di_f_utf_string_dynamic_mash_) || !defined(_di_f_utf_string_dynamic_mash_nulless_) || !defined(_di_f_utf_string_dynamic_mish_) || !defined(_di_f_utf_string_dynamic_mish_nulless_) || !defined(_di_f_utf_string_dynamic_partial_append_) || !defined(_di_f_utf_string_dynamic_partial_append_assure_) || !defined(_di_f_utf_string_dynamic_partial_append_assure_nulless_) || !defined(_di_f_utf_string_dynamic_partial_append_nulless_) || !defined(_di_f_utf_string_dynamic_partial_mash_) || !defined(_di_f_utf_string_dynamic_partial_mash_nulless_) || !defined(_di_f_utf_string_dynamic_partial_mish_) || !defined(_di_f_utf_string_dynamic_partial_mish_nulless_) || !defined(_di_f_utf_string_dynamic_partial_prepend_) || !defined(_di_f_utf_string_dynamic_partial_prepend_assure_) || !defined(_di_f_utf_string_dynamic_partial_prepend_assure_nulless_) || !defined(_di_f_utf_string_dynamic_partial_prepend_nulless_) || !defined(_di_f_utf_string_dynamic_prepend_) || !defined(_di_f_utf_string_dynamic_prepend_assure_) || !defined(_di_f_utf_string_dynamic_prepend_assure_nulless_) || !defined(_di_f_utf_string_dynamic_prepend_nulless_) || !defined(_di_f_utf_string_dynamics_append_) || !defined(_di_f_utf_string_dynamics_append_all_) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_map_multis_append_all_) || !defined(_di_f_utf_string_map_multiss_append_) || !defined(_di_f_utf_string_map_multiss_append_all_) || !defined(_di_f_utf_string_maps_append_) || !defined(_di_f_utf_string_maps_append_all_) || !defined(_di_f_utf_string_mapss_append_) || !defined(_di_f_utf_string_mapss_append_all_) || !defined(_di_f_utf_string_mash_) || !defined(_di_f_utf_string_mash_nulless_) || !defined(_di_f_utf_string_mish_) || !defined(_di_f_utf_string_mish_nulless_) || !defined(_di_f_utf_string_prepend_) || !defined(_di_f_utf_string_prepend_assure_) || !defined(_di_f_utf_string_prepend_assure_nulless_) || !defined(_di_f_utf_string_prepend_nulless_) || !defined(_di_f_utf_string_triples_append_) || !defined(_di_f_utf_string_triples_append_all_) || !defined(_di_f_utf_string_tripless_append_) || !defined(_di_f_utf_string_tripless_append_all_) #if !defined(_di_f_utf_string_append_) || !defined(_di_f_utf_string_append_assure_) || !defined(_di_f_utf_string_append_mash_) || !defined(_di_f_utf_string_append_nulless_) || !defined(_di_f_utf_string_dynamic_append_) || !defined(_di_f_utf_string_dynamic_append_assure_) || !defined(_di_f_utf_string_dynamic_append_nulless_) || !defined(_di_f_utf_string_dynamic_decrease_by_) || !defined(_di_f_utf_string_dynamic_increase_) || !defined(_di_f_utf_string_dynamic_increase_by_) || !defined(_di_f_utf_string_dynamic_mash_) || !defined(_di_f_utf_string_dynamic_mash_nulless_) || !defined(_di_f_utf_string_dynamic_partial_append_) || !defined(_di_f_utf_string_dynamic_partial_append_assure_) || !defined(_di_f_utf_string_dynamic_partial_mash_) || !defined(_di_f_utf_string_dynamic_prepend_) || !defined(_di_f_utf_string_dynamic_prepend_nulless_) || !defined(_di_f_utf_string_dynamic_terminate_) || !defined(_di_f_utf_string_dynamic_terminate_after_) || !defined(_di_f_utf_string_dynamics_append_) || !defined(_di_f_utf_string_dynamics_decrease_by) || !defined(_di_f_utf_string_dynamics_increase) || !defined(_di_f_utf_string_dynamics_increase_by) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_map_multis_decrease_by) || !defined(_di_f_utf_string_map_multis_increase) || !defined(_di_f_utf_string_map_multis_increase_by) || !defined(_di_f_utf_string_mash_nulless_) || !defined(_di_f_utf_string_mash_) || !defined(_di_f_utf_string_maps_append_) || !defined(_di_f_utf_string_prepend_) || !defined(_di_f_utf_string_prepend_nulless_) || !defined(_di_f_utf_string_triples_append_) - f_status_t private_f_utf_string_dynamic_resize(const f_array_length_t length, f_utf_string_dynamic_t * const dynamic) { + f_status_t private_f_utf_string_dynamic_resize(const f_number_unsigned_t length, f_utf_string_dynamic_t * const dynamic) { const f_status_t status = f_memory_resize(dynamic->size, length, sizeof(f_utf_char_t), (void **) & dynamic->string); if (F_status_is_error(status)) return status; diff --git a/level_0/f_utf/c/utf/private-dynamic.h b/level_0/f_utf/c/utf/private-dynamic.h index 2075440..9ea3a38 100644 --- a/level_0/f_utf/c/utf/private-dynamic.h +++ b/level_0/f_utf/c/utf/private-dynamic.h @@ -42,7 +42,7 @@ extern "C" { * @see f_utf_string_triples_decimate_by() */ #if !defined(_di_f_utf_string_dynamic_adjust_) || !defined(_di_f_utf_string_dynamic_decimate_by_) || !defined(_di_f_utf_string_dynamics_adjust_) || !defined(_di_f_utf_string_dynamics_append_) || !defined(_di_f_utf_string_dynamics_decimate_by_) || !defined(_di_f_utf_string_map_multis_adjust_) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_triples_adjust_) || !defined(_di_f_utf_string_triples_decimate_by_) - extern f_status_t private_f_utf_string_dynamic_adjust(const f_array_length_t length, f_utf_string_dynamic_t * const dynamic) F_attribute_visibility_internal_d; + extern f_status_t private_f_utf_string_dynamic_adjust(const f_number_unsigned_t length, f_utf_string_dynamic_t * const dynamic) F_attribute_visibility_internal_d; #endif // !defined(_di_f_utf_string_dynamic_adjust_) || !defined(_di_f_utf_string_dynamic_decimate_by_) || !defined(_di_f_utf_string_dynamics_adjust_) || !defined(_di_f_utf_string_dynamics_append_) || !defined(_di_f_utf_string_dynamics_decimate_by_) || !defined(_di_f_utf_string_map_multis_adjust_) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_triples_adjust_) || !defined(_di_f_utf_string_triples_decimate_by_) /** @@ -119,7 +119,7 @@ extern "C" { * @see f_utf_string_tripless_append_all() */ #if !defined(_di_f_utf_string_append_) || !defined(_di_f_utf_string_append_assure_) || !defined(_di_f_utf_string_append_assure_nulless_) || !defined(_di_f_utf_string_append_nulless_) || !defined(_di_f_utf_string_dynamic_append_) || !defined(_di_f_utf_string_dynamic_append_assure_) || !defined(_di_f_utf_string_dynamic_append_assure_nulless_) || !defined(_di_f_utf_string_dynamic_append_nulless_) || !defined(_di_f_utf_string_dynamic_increase_by_) || !defined(_di_f_utf_string_dynamic_mash_) || !defined(_di_f_utf_string_dynamic_mash_nulless_) || !defined(_di_f_utf_string_dynamic_mish_) || !defined(_di_f_utf_string_dynamic_mish_nulless_) || !defined(_di_f_utf_string_dynamic_partial_append_) || !defined(_di_f_utf_string_dynamic_partial_append_assure_) || !defined(_di_f_utf_string_dynamic_partial_append_assure_nulless_) || !defined(_di_f_utf_string_dynamic_partial_append_nulless_) || !defined(_di_f_utf_string_dynamic_partial_mash_) || !defined(_di_f_utf_string_dynamic_partial_mash_nulless_) || !defined(_di_f_utf_string_dynamic_partial_mish_) || !defined(_di_f_utf_string_dynamic_partial_mish_nulless_) || !defined(_di_f_utf_string_dynamic_partial_prepend_) || !defined(_di_f_utf_string_dynamic_partial_prepend_assure_) || !defined(_di_f_utf_string_dynamic_partial_prepend_assure_nulless_) || !defined(_di_f_utf_string_dynamic_partial_prepend_nulless_) || !defined(_di_f_utf_string_dynamic_prepend_) || !defined(_di_f_utf_string_dynamic_prepend_assure_) || !defined(_di_f_utf_string_dynamic_prepend_assure_nulless_) || !defined(_di_f_utf_string_dynamic_prepend_nulless_) || !defined(_di_f_utf_string_dynamics_append_) || !defined(_di_f_utf_string_dynamics_append_all_) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_map_multis_append_all_) || !defined(_di_f_utf_string_map_multiss_append_) || !defined(_di_f_utf_string_map_multiss_append_all_) || !defined(_di_f_utf_string_maps_append_) || !defined(_di_f_utf_string_maps_append_all_) || !defined(_di_f_utf_string_mapss_append_) || !defined(_di_f_utf_string_mapss_append_all_) || !defined(_di_f_utf_string_mash_) || !defined(_di_f_utf_string_mash_nulless_) || !defined(_di_f_utf_string_mish_) || !defined(_di_f_utf_string_mish_nulless_) || !defined(_di_f_utf_string_prepend_) || !defined(_di_f_utf_string_prepend_assure_) || !defined(_di_f_utf_string_prepend_assure_nulless_) || !defined(_di_f_utf_string_prepend_nulless_) || !defined(_di_f_utf_string_triples_append_) || !defined(_di_f_utf_string_triples_append_all_) || !defined(_di_f_utf_string_tripless_append_) || !defined(_di_f_utf_string_tripless_append_all_) - extern f_status_t private_f_utf_string_dynamic_increase_by(const f_array_length_t amount, f_utf_string_dynamic_t * const dynamic) F_attribute_visibility_internal_d; + extern f_status_t private_f_utf_string_dynamic_increase_by(const f_number_unsigned_t amount, f_utf_string_dynamic_t * const dynamic) F_attribute_visibility_internal_d; #endif // !defined(_di_f_utf_string_append_) || !defined(_di_f_utf_string_append_assure_) || !defined(_di_f_utf_string_append_assure_nulless_) || !defined(_di_f_utf_string_append_nulless_) || !defined(_di_f_utf_string_dynamic_append_) || !defined(_di_f_utf_string_dynamic_append_assure_) || !defined(_di_f_utf_string_dynamic_append_assure_nulless_) || !defined(_di_f_utf_string_dynamic_append_nulless_) || !defined(_di_f_utf_string_dynamic_increase_by_) || !defined(_di_f_utf_string_dynamic_mash_) || !defined(_di_f_utf_string_dynamic_mash_nulless_) || !defined(_di_f_utf_string_dynamic_mish_) || !defined(_di_f_utf_string_dynamic_mish_nulless_) || !defined(_di_f_utf_string_dynamic_partial_append_) || !defined(_di_f_utf_string_dynamic_partial_append_assure_) || !defined(_di_f_utf_string_dynamic_partial_append_assure_nulless_) || !defined(_di_f_utf_string_dynamic_partial_append_nulless_) || !defined(_di_f_utf_string_dynamic_partial_mash_) || !defined(_di_f_utf_string_dynamic_partial_mash_nulless_) || !defined(_di_f_utf_string_dynamic_partial_mish_) || !defined(_di_f_utf_string_dynamic_partial_mish_nulless_) || !defined(_di_f_utf_string_dynamic_partial_prepend_) || !defined(_di_f_utf_string_dynamic_partial_prepend_assure_) || !defined(_di_f_utf_string_dynamic_partial_prepend_assure_nulless_) || !defined(_di_f_utf_string_dynamic_partial_prepend_nulless_) || !defined(_di_f_utf_string_dynamic_prepend_) || !defined(_di_f_utf_string_dynamic_prepend_assure_) || !defined(_di_f_utf_string_dynamic_prepend_assure_nulless_) || !defined(_di_f_utf_string_dynamic_prepend_nulless_) || !defined(_di_f_utf_string_dynamics_append_) || !defined(_di_f_utf_string_dynamics_append_all_) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_map_multis_append_all_) || !defined(_di_f_utf_string_map_multiss_append_) || !defined(_di_f_utf_string_map_multiss_append_all_) || !defined(_di_f_utf_string_maps_append_) || !defined(_di_f_utf_string_maps_append_all_) || !defined(_di_f_utf_string_mapss_append_) || !defined(_di_f_utf_string_mapss_append_all_) || !defined(_di_f_utf_string_mash_) || !defined(_di_f_utf_string_mash_nulless_) || !defined(_di_f_utf_string_mish_) || !defined(_di_f_utf_string_mish_nulless_) || !defined(_di_f_utf_string_prepend_) || !defined(_di_f_utf_string_prepend_assure_) || !defined(_di_f_utf_string_prepend_assure_nulless_) || !defined(_di_f_utf_string_prepend_nulless_) || !defined(_di_f_utf_string_triples_append_) || !defined(_di_f_utf_string_triples_append_all_) || !defined(_di_f_utf_string_tripless_append_) || !defined(_di_f_utf_string_tripless_append_all_) /** @@ -174,7 +174,7 @@ extern "C" { * @see f_utf_string_triples_append() */ #if !defined(_di_f_utf_string_append_) || !defined(_di_f_utf_string_append_assure_) || !defined(_di_f_utf_string_append_mash_) || !defined(_di_f_utf_string_append_nulless_) || !defined(_di_f_utf_string_dynamic_append_) || !defined(_di_f_utf_string_dynamic_append_assure_) || !defined(_di_f_utf_string_dynamic_append_nulless_) || !defined(_di_f_utf_string_dynamic_decrease_by_) || !defined(_di_f_utf_string_dynamic_increase_) || !defined(_di_f_utf_string_dynamic_increase_by_) || !defined(_di_f_utf_string_dynamic_mash_) || !defined(_di_f_utf_string_dynamic_mash_nulless_) || !defined(_di_f_utf_string_dynamic_partial_append_) || !defined(_di_f_utf_string_dynamic_partial_append_assure_) || !defined(_di_f_utf_string_dynamic_partial_mash_) || !defined(_di_f_utf_string_dynamic_prepend_) || !defined(_di_f_utf_string_dynamic_prepend_nulless_) || !defined(_di_f_utf_string_dynamic_terminate_) || !defined(_di_f_utf_string_dynamic_terminate_after_) || !defined(_di_f_utf_string_dynamics_append_) || !defined(_di_f_utf_string_dynamics_decrease_by) || !defined(_di_f_utf_string_dynamics_increase) || !defined(_di_f_utf_string_dynamics_increase_by) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_map_multis_decrease_by) || !defined(_di_f_utf_string_map_multis_increase) || !defined(_di_f_utf_string_map_multis_increase_by) || !defined(_di_f_utf_string_mash_nulless_) || !defined(_di_f_utf_string_mash_) || !defined(_di_f_utf_string_maps_append_) || !defined(_di_f_utf_string_prepend_) || !defined(_di_f_utf_string_prepend_nulless_) || !defined(_di_f_utf_string_triples_append_) - extern f_status_t private_f_utf_string_dynamic_resize(const f_array_length_t length, f_utf_string_dynamic_t * const dynamic) F_attribute_visibility_internal_d; + extern f_status_t private_f_utf_string_dynamic_resize(const f_number_unsigned_t length, f_utf_string_dynamic_t * const dynamic) F_attribute_visibility_internal_d; #endif // !defined(_di_f_utf_string_append_) || !defined(_di_f_utf_string_append_assure_) || !defined(_di_f_utf_string_append_mash_) || !defined(_di_f_utf_string_append_nulless_) || !defined(_di_f_utf_string_dynamic_append_) || !defined(_di_f_utf_string_dynamic_append_assure_) || !defined(_di_f_utf_string_dynamic_append_nulless_) || !defined(_di_f_utf_string_dynamic_decrease_by_) || !defined(_di_f_utf_string_dynamic_increase_) || !defined(_di_f_utf_string_dynamic_increase_by_) || !defined(_di_f_utf_string_dynamic_mash_) || !defined(_di_f_utf_string_dynamic_mash_nulless_) || !defined(_di_f_utf_string_dynamic_partial_append_) || !defined(_di_f_utf_string_dynamic_partial_append_assure_) || !defined(_di_f_utf_string_dynamic_partial_mash_) || !defined(_di_f_utf_string_dynamic_prepend_) || !defined(_di_f_utf_string_dynamic_prepend_nulless_) || !defined(_di_f_utf_string_dynamic_terminate_) || !defined(_di_f_utf_string_dynamic_terminate_after_) || !defined(_di_f_utf_string_dynamics_append_) || !defined(_di_f_utf_string_dynamics_decrease_by) || !defined(_di_f_utf_string_dynamics_increase) || !defined(_di_f_utf_string_dynamics_increase_by) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_map_multis_decrease_by) || !defined(_di_f_utf_string_map_multis_increase) || !defined(_di_f_utf_string_map_multis_increase_by) || !defined(_di_f_utf_string_mash_nulless_) || !defined(_di_f_utf_string_mash_) || !defined(_di_f_utf_string_maps_append_) || !defined(_di_f_utf_string_prepend_) || !defined(_di_f_utf_string_prepend_nulless_) || !defined(_di_f_utf_string_triples_append_) #ifdef __cplusplus diff --git a/level_0/f_utf/c/utf/private-dynamics.c b/level_0/f_utf/c/utf/private-dynamics.c index 6c8c1ae..fa1f69c 100644 --- a/level_0/f_utf/c/utf/private-dynamics.c +++ b/level_0/f_utf/c/utf/private-dynamics.c @@ -9,15 +9,15 @@ extern "C" { #endif #if !defined(_di_f_utf_string_dynamics_adjust_) || !defined(_di_f_utf_string_dynamics_append_) || !defined(_di_f_utf_string_dynamics_decimate_by_) || !defined(_di_f_utf_string_map_multis_adjust_) || !defined(_di_f_utf_string_map_multis_append_) - f_status_t private_f_utf_string_dynamics_adjust(const f_array_length_t length, f_utf_string_dynamics_t * const dynamics) { + f_status_t private_f_utf_string_dynamics_adjust(const f_number_unsigned_t length, f_utf_string_dynamics_t * const dynamics) { - if (dynamics->used + length > F_array_length_t_size_d) { + if (dynamics->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < dynamics->size; ++i) { + for (f_number_unsigned_t i = length; i < dynamics->size; ++i) { status = private_f_utf_string_dynamic_adjust(0, &dynamics->array[i]); if (F_status_is_error(status)) return status; @@ -70,7 +70,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].used = 0; @@ -85,15 +85,15 @@ extern "C" { #endif // !defined(_di_f_utf_string_dynamics_append_all_) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_map_multis_append_all_) #if !defined(_di_f_utf_string_dynamics_decrease_by_) || !defined(_di_f_utf_string_dynamics_increase_) || !defined(_di_f_utf_string_dynamics_increase_by_) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_map_multis_decrease_by_) || !defined(_di_f_utf_string_map_multis_increase_) || !defined(_di_f_utf_string_map_multis_increase_by_) || !defined(_di_f_utf_string_map_multis_terminate_) || !defined(_di_f_utf_string_map_multis_terminate_after_) - f_status_t private_f_utf_string_dynamics_resize(const f_array_length_t length, f_utf_string_dynamics_t * const dynamics) { + f_status_t private_f_utf_string_dynamics_resize(const f_number_unsigned_t length, f_utf_string_dynamics_t * const dynamics) { - if (dynamics->used + length > F_array_length_t_size_d) { + if (dynamics->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < dynamics->size; ++i) { + for (f_number_unsigned_t i = length; i < dynamics->size; ++i) { status = private_f_utf_string_dynamic_resize(0, &dynamics->array[i]); if (F_status_is_error(status)) return status; diff --git a/level_0/f_utf/c/utf/private-dynamics.h b/level_0/f_utf/c/utf/private-dynamics.h index fbe1fe6..44f8a96 100644 --- a/level_0/f_utf/c/utf/private-dynamics.h +++ b/level_0/f_utf/c/utf/private-dynamics.h @@ -41,7 +41,7 @@ extern "C" { * @see f_utf_string_map_multis_append() */ #if !defined(_di_f_utf_string_dynamics_adjust_) || !defined(_di_f_utf_string_dynamics_append_) || !defined(_di_f_utf_string_dynamics_decimate_by_) || !defined(_di_f_utf_string_map_multis_adjust_) || !defined(_di_f_utf_string_map_multis_append_) - extern f_status_t private_f_utf_string_dynamics_adjust(const f_array_length_t length, f_utf_string_dynamics_t * const dynamics) F_attribute_visibility_internal_d; + extern f_status_t private_f_utf_string_dynamics_adjust(const f_number_unsigned_t length, f_utf_string_dynamics_t * const dynamics) F_attribute_visibility_internal_d; #endif // !defined(_di_f_utf_string_dynamics_adjust_) || !defined(_di_f_utf_string_dynamics_append_) || !defined(_di_f_utf_string_dynamics_decimate_by_) || !defined(_di_f_utf_string_map_multis_adjust_) || !defined(_di_f_utf_string_map_multis_append_) /** @@ -133,7 +133,7 @@ extern "C" { * @see f_utf_string_map_multiss_increase_by() */ #if !defined(_di_f_utf_string_dynamics_decrease_by_) || !defined(_di_f_utf_string_dynamics_increase_) || !defined(_di_f_utf_string_dynamics_increase_by_) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_map_multis_append_all_) || !defined(_di_f_utf_string_map_multis_decrease_by_) || !defined(_di_f_utf_string_map_multis_increase_) || !defined(_di_f_utf_string_map_multis_increase_by_) || !defined(_di_f_utf_string_map_multis_resize_) || !defined(_di_f_utf_string_map_multiss_append_) || !defined(_di_f_utf_string_map_multiss_append_all_) || !defined(_di_f_utf_string_map_multiss_decrease_by_) || !defined(_di_f_utf_string_map_multiss_increase_) || !defined(_di_f_utf_string_map_multiss_increase_by_) - extern f_status_t private_f_utf_string_dynamics_resize(const f_array_length_t length, f_utf_string_dynamics_t * const dynamics) F_attribute_visibility_internal_d; + extern f_status_t private_f_utf_string_dynamics_resize(const f_number_unsigned_t length, f_utf_string_dynamics_t * const dynamics) F_attribute_visibility_internal_d; #endif // !defined(_di_f_utf_string_dynamics_decrease_by_) || !defined(_di_f_utf_string_dynamics_increase_) || !defined(_di_f_utf_string_dynamics_increase_by_) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_map_multis_append_all_) || !defined(_di_f_utf_string_map_multis_decrease_by_) || !defined(_di_f_utf_string_map_multis_increase_) || !defined(_di_f_utf_string_map_multis_increase_by_) || !defined(_di_f_utf_string_map_multis_resize_) || !defined(_di_f_utf_string_map_multiss_append_) || !defined(_di_f_utf_string_map_multiss_append_all_) || !defined(_di_f_utf_string_map_multiss_decrease_by_) || !defined(_di_f_utf_string_map_multiss_increase_) || !defined(_di_f_utf_string_map_multiss_increase_by_) #ifdef __cplusplus diff --git a/level_0/f_utf/c/utf/private-dynamicss.c b/level_0/f_utf/c/utf/private-dynamicss.c index fa33b57..fefdf40 100644 --- a/level_0/f_utf/c/utf/private-dynamicss.c +++ b/level_0/f_utf/c/utf/private-dynamicss.c @@ -10,15 +10,15 @@ extern "C" { #endif #if !defined(_di_f_utf_string_dynamicss_adjust_) || !defined(_di_f_utf_string_dynamicss_append_) || !defined(_di_f_utf_string_dynamicss_decimate_by_) || !defined(_di_f_utf_string_map_multis_adjust_) || !defined(_di_f_utf_string_map_multis_append_) - f_status_t private_f_utf_string_dynamicss_adjust(const f_array_length_t length, f_utf_string_dynamicss_t * const dynamicss) { + f_status_t private_f_utf_string_dynamicss_adjust(const f_number_unsigned_t length, f_utf_string_dynamicss_t * const dynamicss) { - if (dynamicss->used + length > F_array_length_t_size_d) { + if (dynamicss->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < dynamicss->size; ++i) { + for (f_number_unsigned_t i = length; i < dynamicss->size; ++i) { status = private_f_utf_string_dynamics_adjust(0, &dynamicss->array[i]); if (F_status_is_error(status)) return status; @@ -38,15 +38,15 @@ extern "C" { #endif // !defined(_di_f_utf_string_dynamicss_adjust_) || !defined(_di_f_utf_string_dynamicss_append_) || !defined(_di_f_utf_string_dynamicss_decimate_by_) || !defined(_di_f_utf_string_map_multis_adjust_) || !defined(_di_f_utf_string_map_multis_append_) #if !defined(_di_f_utf_string_dynamicss_decrease_by_) || !defined(_di_f_utf_string_dynamicss_increase_) || !defined(_di_f_utf_string_dynamicss_increase_by_) || !defined(_di_f_utf_string_dynamicss_append_all_) || !defined(_di_f_utf_string_map_multis_append_all_) - f_status_t private_f_utf_string_dynamicss_resize(const f_array_length_t length, f_utf_string_dynamicss_t * const dynamicss) { + f_status_t private_f_utf_string_dynamicss_resize(const f_number_unsigned_t length, f_utf_string_dynamicss_t * const dynamicss) { - if (dynamicss->used + length > F_array_length_t_size_d) { + if (dynamicss->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < dynamicss->size; ++i) { + for (f_number_unsigned_t i = length; i < dynamicss->size; ++i) { status = private_f_utf_string_dynamics_resize(0, &dynamicss->array[i]); if (F_status_is_error(status)) return status; diff --git a/level_0/f_utf/c/utf/private-dynamicss.h b/level_0/f_utf/c/utf/private-dynamicss.h index 44de6e0..c30fdd3 100644 --- a/level_0/f_utf/c/utf/private-dynamicss.h +++ b/level_0/f_utf/c/utf/private-dynamicss.h @@ -40,7 +40,7 @@ extern "C" { * @see f_utf_string_map_multis_append() */ #if !defined(_di_f_utf_string_dynamicss_adjust_) || !defined(_di_f_utf_string_dynamicss_append_) || !defined(_di_f_utf_string_dynamicss_decimate_by_) || !defined(_di_f_utf_string_map_multis_adjust_) || !defined(_di_f_utf_string_map_multis_append_) - extern f_status_t private_f_utf_string_dynamicss_adjust(const f_array_length_t length, f_utf_string_dynamicss_t * const dynamicss) F_attribute_visibility_internal_d; + extern f_status_t private_f_utf_string_dynamicss_adjust(const f_number_unsigned_t length, f_utf_string_dynamicss_t * const dynamicss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_utf_string_dynamicss_adjust_) || !defined(_di_f_utf_string_dynamicss_append_) || !defined(_di_f_utf_string_dynamicss_decimate_by_) || !defined(_di_f_utf_string_map_multis_adjust_) || !defined(_di_f_utf_string_map_multis_append_) /** @@ -68,7 +68,7 @@ extern "C" { * @see f_utf_string_map_multis_append_all() */ #if !defined(_di_f_utf_string_dynamicss_decrease_by_) || !defined(_di_f_utf_string_dynamicss_increase_) || !defined(_di_f_utf_string_dynamicss_increase_by_) || !defined(_di_f_utf_string_dynamicss_append_all_) || !defined(_di_f_utf_string_map_multis_append_all_) - extern f_status_t private_f_utf_string_dynamicss_resize(const f_array_length_t length, f_utf_string_dynamicss_t * const dynamicss) F_attribute_visibility_internal_d; + extern f_status_t private_f_utf_string_dynamicss_resize(const f_number_unsigned_t length, f_utf_string_dynamicss_t * const dynamicss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_utf_string_dynamicss_decrease_by_) || !defined(_di_f_utf_string_dynamicss_increase_) || !defined(_di_f_utf_string_dynamicss_increase_by_) || !defined(_di_f_utf_string_dynamicss_append_all_) || !defined(_di_f_utf_string_map_multis_append_all_) #ifdef __cplusplus diff --git a/level_0/f_utf/c/utf/private-map_multis.c b/level_0/f_utf/c/utf/private-map_multis.c index bf56ba8..a20eb1f 100644 --- a/level_0/f_utf/c/utf/private-map_multis.c +++ b/level_0/f_utf/c/utf/private-map_multis.c @@ -10,15 +10,15 @@ extern "C" { #endif #if !defined(_di_f_utf_string_map_multis_adjust_) || !defined(_di_f_utf_string_map_multis_decimate_by_) - f_status_t private_f_utf_string_map_multis_adjust(const f_array_length_t length, f_utf_string_map_multis_t * const map_multis) { + f_status_t private_f_utf_string_map_multis_adjust(const f_number_unsigned_t length, f_utf_string_map_multis_t * const map_multis) { - if (map_multis->used + length > F_array_length_t_size_d) { + if (map_multis->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < map_multis->size; ++i) { + for (f_number_unsigned_t i = length; i < map_multis->size; ++i) { status = private_f_utf_string_dynamic_adjust(0, &map_multis->array[i].name); if (F_status_is_error(status)) return status; @@ -50,7 +50,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].name.used = 0; destination->array[destination->used].value.used = 0; @@ -71,15 +71,15 @@ extern "C" { #endif // !defined(_di_f_utf_string_map_multis_append_all_) || !defined(_di_f_utf_string_map_multiss_append_) || !defined(_di_f_utf_string_map_multiss_append_all_) #if !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_map_multis_append_all_) || !defined(_di_f_utf_string_map_multis_decrease_by_) || !defined(_di_f_utf_string_map_multis_increase_) || !defined(_di_f_utf_string_map_multis_increase_by_) || !defined(_di_f_utf_string_map_multis_resize_) || !defined(_di_f_utf_string_map_multiss_append_) || !defined(_di_f_utf_string_map_multiss_append_all_) || !defined(_di_f_utf_string_map_multiss_decrease_by_) || !defined(_di_f_utf_string_map_multiss_increase_) || !defined(_di_f_utf_string_map_multiss_increase_by_) - f_status_t private_f_utf_string_map_multis_resize(const f_array_length_t length, f_utf_string_map_multis_t * const map_multis) { + f_status_t private_f_utf_string_map_multis_resize(const f_number_unsigned_t length, f_utf_string_map_multis_t * const map_multis) { - if (map_multis->used + length > F_array_length_t_size_d) { + if (map_multis->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < map_multis->size; ++i) { + for (f_number_unsigned_t i = length; i < map_multis->size; ++i) { status = private_f_utf_string_dynamic_resize(0, &map_multis->array[i].name); if (F_status_is_error(status)) return status; diff --git a/level_0/f_utf/c/utf/private-map_multis.h b/level_0/f_utf/c/utf/private-map_multis.h index 8f07159..12b612e 100644 --- a/level_0/f_utf/c/utf/private-map_multis.h +++ b/level_0/f_utf/c/utf/private-map_multis.h @@ -37,7 +37,7 @@ extern "C" { * @see f_utf_string_map_multis_adjust() */ #if !defined(_di_f_utf_string_map_multis_adjust_) || !defined(_di_f_utf_string_map_multis_decimate_by_) - extern f_status_t private_f_utf_string_map_multis_adjust(const f_array_length_t length, f_utf_string_map_multis_t * const map_multis) F_attribute_visibility_internal_d; + extern f_status_t private_f_utf_string_map_multis_adjust(const f_number_unsigned_t length, f_utf_string_map_multis_t * const map_multis) F_attribute_visibility_internal_d; #endif // !defined(_di_f_utf_string_map_multis_adjust_) || !defined(_di_f_utf_string_map_multis_decimate_by_) /** @@ -99,7 +99,7 @@ extern "C" { * @see f_utf_string_map_multiss_increase_by() */ #if !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_map_multis_append_all_) || !defined(_di_f_utf_string_map_multis_decrease_by_) || !defined(_di_f_utf_string_map_multis_increase_) || !defined(_di_f_utf_string_map_multis_increase_by_) || !defined(_di_f_utf_string_map_multis_resize_) || !defined(_di_f_utf_string_map_multiss_append_) || !defined(_di_f_utf_string_map_multiss_append_all_) || !defined(_di_f_utf_string_map_multiss_decrease_by_) || !defined(_di_f_utf_string_map_multiss_increase_) || !defined(_di_f_utf_string_map_multiss_increase_by_) - extern f_status_t private_f_utf_string_map_multis_resize(const f_array_length_t length, f_utf_string_map_multis_t * const map_multis) F_attribute_visibility_internal_d; + extern f_status_t private_f_utf_string_map_multis_resize(const f_number_unsigned_t length, f_utf_string_map_multis_t * const map_multis) F_attribute_visibility_internal_d; #endif // !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_map_multis_append_all_) || !defined(_di_f_utf_string_map_multis_decrease_by_) || !defined(_di_f_utf_string_map_multis_increase_) || !defined(_di_f_utf_string_map_multis_increase_by_) || !defined(_di_f_utf_string_map_multis_resize_) || !defined(_di_f_utf_string_map_multiss_append_) || !defined(_di_f_utf_string_map_multiss_append_all_) || !defined(_di_f_utf_string_map_multiss_decrease_by_) || !defined(_di_f_utf_string_map_multiss_increase_) || !defined(_di_f_utf_string_map_multiss_increase_by_) #ifdef __cplusplus diff --git a/level_0/f_utf/c/utf/private-map_multiss.c b/level_0/f_utf/c/utf/private-map_multiss.c index b29cfd4..3eb961b 100644 --- a/level_0/f_utf/c/utf/private-map_multiss.c +++ b/level_0/f_utf/c/utf/private-map_multiss.c @@ -10,15 +10,15 @@ extern "C" { #endif #if !defined(_di_f_utf_string_map_multiss_adjust_) || !defined(_di_f_utf_string_map_multiss_decimate_by_) - f_status_t private_f_utf_string_map_multiss_adjust(const f_array_length_t length, f_utf_string_map_multiss_t * const map_multiss) { + f_status_t private_f_utf_string_map_multiss_adjust(const f_number_unsigned_t length, f_utf_string_map_multiss_t * const map_multiss) { - if (map_multiss->used + length > F_array_length_t_size_d) { + if (map_multiss->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < map_multiss->size; ++i) { + for (f_number_unsigned_t i = length; i < map_multiss->size; ++i) { status = private_f_utf_string_map_multis_adjust(0, &map_multiss->array[i]); if (F_status_is_error(status)) return status; @@ -38,15 +38,15 @@ extern "C" { #endif // !defined(_di_f_utf_string_map_multiss_adjust_) || !defined(_di_f_utf_string_map_multiss_decimate_by_) #if !defined(_di_f_utf_string_map_multiss_decrease_by_) || !defined(_di_f_utf_string_map_multiss_increase_) || !defined(_di_f_utf_string_map_multiss_increase_by_) - f_status_t private_f_utf_string_map_multiss_resize(const f_array_length_t length, f_utf_string_map_multiss_t * const map_multiss) { + f_status_t private_f_utf_string_map_multiss_resize(const f_number_unsigned_t length, f_utf_string_map_multiss_t * const map_multiss) { - if (map_multiss->used + length > F_array_length_t_size_d) { + if (map_multiss->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < map_multiss->size; ++i) { + for (f_number_unsigned_t i = length; i < map_multiss->size; ++i) { status = private_f_utf_string_map_multis_resize(0, &map_multiss->array[i]); if (F_status_is_error(status)) return status; diff --git a/level_0/f_utf/c/utf/private-map_multiss.h b/level_0/f_utf/c/utf/private-map_multiss.h index a78cf88..fd26495 100644 --- a/level_0/f_utf/c/utf/private-map_multiss.h +++ b/level_0/f_utf/c/utf/private-map_multiss.h @@ -37,7 +37,7 @@ extern "C" { * @see f_utf_string_map_multiss_adjust() */ #if !defined(_di_f_utf_string_map_multiss_adjust_) || !defined(_di_f_utf_string_map_multiss_decimate_by_) - extern f_status_t private_f_utf_string_map_multiss_adjust(const f_array_length_t length, f_utf_string_map_multiss_t * const map_multiss) F_attribute_visibility_internal_d; + extern f_status_t private_f_utf_string_map_multiss_adjust(const f_number_unsigned_t length, f_utf_string_map_multiss_t * const map_multiss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_utf_string_map_multiss_adjust_) || !defined(_di_f_utf_string_map_multiss_decimate_by_) /** @@ -64,7 +64,7 @@ extern "C" { * @see f_utf_string_map_multiss_increase_by() */ #if !defined(_di_f_utf_string_map_multiss_decrease_by_) || !defined(_di_f_utf_string_map_multiss_increase_) || !defined(_di_f_utf_string_map_multiss_increase_by_) - extern f_status_t private_f_utf_string_map_multiss_resize(const f_array_length_t length, f_utf_string_map_multiss_t * const map_multiss) F_attribute_visibility_internal_d; + extern f_status_t private_f_utf_string_map_multiss_resize(const f_number_unsigned_t length, f_utf_string_map_multiss_t * const map_multiss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_utf_string_map_multiss_decrease_by_) || !defined(_di_f_utf_string_map_multiss_increase_) || !defined(_di_f_utf_string_map_multiss_increase_by_) #ifdef __cplusplus diff --git a/level_0/f_utf/c/utf/private-maps.c b/level_0/f_utf/c/utf/private-maps.c index 74486b1..8886dab 100644 --- a/level_0/f_utf/c/utf/private-maps.c +++ b/level_0/f_utf/c/utf/private-maps.c @@ -9,15 +9,15 @@ extern "C" { #endif #if !defined(_di_f_utf_string_maps_adjust_) || !defined(_di_f_utf_string_maps_decimate_by_) - f_status_t private_f_utf_string_maps_adjust(const f_array_length_t length, f_utf_string_maps_t * const maps) { + f_status_t private_f_utf_string_maps_adjust(const f_number_unsigned_t length, f_utf_string_maps_t * const maps) { - if (maps->used + length > F_array_length_t_size_d) { + if (maps->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < maps->size; ++i) { + for (f_number_unsigned_t i = length; i < maps->size; ++i) { status = private_f_utf_string_dynamic_adjust(0, &maps->array[i].name); if (F_status_is_error(status)) return status; @@ -49,7 +49,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].name.used = 0; destination->array[destination->used].value.used = 0; @@ -70,15 +70,15 @@ extern "C" { #endif // !defined(_di_f_utf_string_maps_append_all_) || !defined(_di_f_utf_string_mapss_append_) || !defined(_di_f_utf_string_mapss_append_all_) #if !defined(_di_f_utf_string_maps_append_) || !defined(_di_f_utf_string_maps_append_all_) || !defined(_di_f_utf_string_maps_decrease_by_) || !defined(_di_f_utf_string_maps_increase_) || !defined(_di_f_utf_string_maps_increase_by_) || !defined(_di_f_utf_string_maps_resize_) || !defined(_di_f_utf_string_mapss_append_) || !defined(_di_f_utf_string_mapss_append_all_) || !defined(_di_f_utf_string_mapss_decrease_by_) || !defined(_di_f_utf_string_mapss_increase_) || !defined(_di_f_utf_string_mapss_increase_by_) - f_status_t private_f_utf_string_maps_resize(const f_array_length_t length, f_utf_string_maps_t * const maps) { + f_status_t private_f_utf_string_maps_resize(const f_number_unsigned_t length, f_utf_string_maps_t * const maps) { - if (maps->used + length > F_array_length_t_size_d) { + if (maps->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < maps->size; ++i) { + for (f_number_unsigned_t i = length; i < maps->size; ++i) { status = private_f_utf_string_dynamic_resize(0, &maps->array[i].name); if (F_status_is_error(status)) return status; diff --git a/level_0/f_utf/c/utf/private-maps.h b/level_0/f_utf/c/utf/private-maps.h index 1b61b2e..a342a9c 100644 --- a/level_0/f_utf/c/utf/private-maps.h +++ b/level_0/f_utf/c/utf/private-maps.h @@ -37,7 +37,7 @@ extern "C" { * @see f_utf_string_maps_adjust() */ #if !defined(_di_f_utf_string_maps_adjust_) || !defined(_di_f_utf_string_maps_decimate_by_) - extern f_status_t private_f_utf_string_maps_adjust(const f_array_length_t length, f_utf_string_maps_t * const maps) F_attribute_visibility_internal_d; + extern f_status_t private_f_utf_string_maps_adjust(const f_number_unsigned_t length, f_utf_string_maps_t * const maps) F_attribute_visibility_internal_d; #endif // !defined(_di_f_utf_string_maps_adjust_) || !defined(_di_f_utf_string_maps_decimate_by_) /** @@ -99,7 +99,7 @@ extern "C" { * @see f_utf_string_mapss_increase_by() */ #if !defined(_di_f_utf_string_maps_append_) || !defined(_di_f_utf_string_maps_append_all_) || !defined(_di_f_utf_string_maps_decrease_by_) || !defined(_di_f_utf_string_maps_increase_) || !defined(_di_f_utf_string_maps_increase_by_) || !defined(_di_f_utf_string_maps_resize_) || !defined(_di_f_utf_string_mapss_append_) || !defined(_di_f_utf_string_mapss_append_all_) || !defined(_di_f_utf_string_mapss_decrease_by_) || !defined(_di_f_utf_string_mapss_increase_) || !defined(_di_f_utf_string_mapss_increase_by_) - extern f_status_t private_f_utf_string_maps_resize(const f_array_length_t length, f_utf_string_maps_t * const maps) F_attribute_visibility_internal_d; + extern f_status_t private_f_utf_string_maps_resize(const f_number_unsigned_t length, f_utf_string_maps_t * const maps) F_attribute_visibility_internal_d; #endif // !defined(_di_f_utf_string_maps_append_) || !defined(_di_f_utf_string_maps_append_all_) || !defined(_di_f_utf_string_maps_decrease_by_) || !defined(_di_f_utf_string_maps_increase_) || !defined(_di_f_utf_string_maps_increase_by_) || !defined(_di_f_utf_string_maps_resize_) || !defined(_di_f_utf_string_mapss_append_) || !defined(_di_f_utf_string_mapss_append_all_) || !defined(_di_f_utf_string_mapss_decrease_by_) || !defined(_di_f_utf_string_mapss_increase_) || !defined(_di_f_utf_string_mapss_increase_by_) #ifdef __cplusplus diff --git a/level_0/f_utf/c/utf/private-mapss.c b/level_0/f_utf/c/utf/private-mapss.c index ace08a1..bf28ef3 100644 --- a/level_0/f_utf/c/utf/private-mapss.c +++ b/level_0/f_utf/c/utf/private-mapss.c @@ -10,15 +10,15 @@ extern "C" { #endif #if !defined(_di_f_utf_string_mapss_adjust_) || !defined(_di_f_utf_string_mapss_decimate_by_) - f_status_t private_f_utf_string_mapss_adjust(const f_array_length_t length, f_utf_string_mapss_t * const mapss) { + f_status_t private_f_utf_string_mapss_adjust(const f_number_unsigned_t length, f_utf_string_mapss_t * const mapss) { - if (mapss->used + length > F_array_length_t_size_d) { + if (mapss->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < mapss->size; ++i) { + for (f_number_unsigned_t i = length; i < mapss->size; ++i) { status = private_f_utf_string_maps_adjust(0, &mapss->array[i]); if (F_status_is_error(status)) return status; @@ -38,15 +38,15 @@ extern "C" { #endif // !defined(_di_f_utf_string_mapss_adjust_) || !defined(_di_f_utf_string_mapss_decimate_by_) #if !defined(_di_f_utf_string_mapss_decrease_by_) || !defined(_di_f_utf_string_mapss_increase_) || !defined(_di_f_utf_string_mapss_increase_by_) - f_status_t private_f_utf_string_mapss_resize(const f_array_length_t length, f_utf_string_mapss_t * const mapss) { + f_status_t private_f_utf_string_mapss_resize(const f_number_unsigned_t length, f_utf_string_mapss_t * const mapss) { - if (mapss->used + length > F_array_length_t_size_d) { + if (mapss->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < mapss->size; ++i) { + for (f_number_unsigned_t i = length; i < mapss->size; ++i) { status = private_f_utf_string_maps_resize(0, &mapss->array[i]); if (F_status_is_error(status)) return status; diff --git a/level_0/f_utf/c/utf/private-mapss.h b/level_0/f_utf/c/utf/private-mapss.h index 1964af8..aaf2d66 100644 --- a/level_0/f_utf/c/utf/private-mapss.h +++ b/level_0/f_utf/c/utf/private-mapss.h @@ -37,7 +37,7 @@ extern "C" { * @see f_utf_string_mapss_adjust() */ #if !defined(_di_f_utf_string_mapss_adjust_) || !defined(_di_f_utf_string_mapss_decimate_by_) - extern f_status_t private_f_utf_string_mapss_adjust(const f_array_length_t length, f_utf_string_mapss_t * const mapss) F_attribute_visibility_internal_d; + extern f_status_t private_f_utf_string_mapss_adjust(const f_number_unsigned_t length, f_utf_string_mapss_t * const mapss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_utf_string_mapss_adjust_) || !defined(_di_f_utf_string_mapss_decimate_by_) /** @@ -64,7 +64,7 @@ extern "C" { * @see f_utf_string_mapss_increase_by() */ #if !defined(_di_f_utf_string_mapss_decrease_by_) || !defined(_di_f_utf_string_mapss_increase_) || !defined(_di_f_utf_string_mapss_increase_by_) - extern f_status_t private_f_utf_string_mapss_resize(const f_array_length_t length, f_utf_string_mapss_t * const mapss) F_attribute_visibility_internal_d; + extern f_status_t private_f_utf_string_mapss_resize(const f_number_unsigned_t length, f_utf_string_mapss_t * const mapss) F_attribute_visibility_internal_d; #endif // !defined(_di_f_utf_string_mapss_decrease_by_) || !defined(_di_f_utf_string_mapss_increase_) || !defined(_di_f_utf_string_mapss_increase_by_) #ifdef __cplusplus diff --git a/level_0/f_utf/c/utf/private-string.c b/level_0/f_utf/c/utf/private-string.c index 0a75fea..7fc16d2 100644 --- a/level_0/f_utf/c/utf/private-string.c +++ b/level_0/f_utf/c/utf/private-string.c @@ -7,7 +7,7 @@ extern "C" { #endif #if !defined(_di_f_utf_string_append_) || !defined(_di_f_utf_string_append_assure_) || !defined(_di_f_utf_string_dynamic_append_) || !defined(_di_f_utf_string_dynamic_append_assure_) || !defined(_di_f_utf_string_dynamic_mash_) || !defined(_di_f_utf_string_dynamic_partial_append_) || !defined(_di_f_utf_string_dynamic_partial_append_assure_) || !defined(_di_f_utf_string_dynamic_partial_mash_) || !defined(_di_f_utf_string_dynamics_append_) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_mash_) || !defined(_di_f_utf_string_maps_append_) || !defined(_di_f_utf_string_triples_append_) - f_status_t private_f_utf_string_append(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t private_f_utf_string_append(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { if (destination->used + length + 1 > destination->size) { const f_status_t status = private_f_utf_string_dynamic_increase_by(length + 1, destination); @@ -23,12 +23,12 @@ extern "C" { #endif // !defined(_di_f_utf_string_append_) || !defined(_di_f_utf_string_append_assure_) || !defined(_di_f_utf_string_dynamic_append_) || !defined(_di_f_utf_string_dynamic_append_assure_) || !defined(_di_f_utf_string_dynamic_mash_) || !defined(_di_f_utf_string_dynamic_partial_append_) || !defined(_di_f_utf_string_dynamic_partial_append_assure_) || !defined(_di_f_utf_string_dynamic_partial_mash_) || !defined(_di_f_utf_string_dynamics_append_) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_mash_) || !defined(_di_f_utf_string_maps_append_) || !defined(_di_f_utf_string_triples_append_) #if !defined(_di_f_utf_string_append_assure_nulless_) || !defined(_di_f_utf_string_append_nulless_) || !defined(_di_f_utf_string_dynamic_append_assure_nulless_) || !defined(_di_f_utf_string_dynamic_append_nulless_) || !defined(_di_f_utf_string_dynamic_mash_nulless_) || !defined(_di_f_utf_string_dynamic_partial_append_assure_nulless_) || !defined(_di_f_utf_string_dynamic_partial_append_nulless_) || !defined(_di_f_utf_string_dynamic_partial_mash_nulless_) || !defined(_di_f_utf_string_mash_nulless_) - f_status_t private_f_utf_string_append_nulless(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t private_f_utf_string_append_nulless(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { f_status_t status = F_none; - f_array_length_t i = 0; - f_array_length_t size = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t size = 0; // Count all of the NULLs and subtract them from the total size. for (; i < length; ++i) { @@ -40,7 +40,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - f_array_length_t first = 0; + f_number_unsigned_t first = 0; for (i = 0, size = 0; i < length; ++i) { @@ -74,7 +74,7 @@ extern "C" { #endif // !defined(_di_f_utf_string_append_assure_nulless_) || !defined(_di_f_utf_string_append_nulless_) || !defined(_di_f_utf_string_dynamic_append_assure_nulless_) || !defined(_di_f_utf_string_dynamic_append_nulless_) || !defined(_di_f_utf_string_dynamic_mash_nulless_) || !defined(_di_f_utf_string_dynamic_partial_append_assure_nulless_) || !defined(_di_f_utf_string_dynamic_partial_append_nulless_) || !defined(_di_f_utf_string_dynamic_partial_mash_nulless_) || !defined(_di_f_utf_string_mash_nulless_) #if !defined(_di_f_utf_string_dynamic_mish_) || !defined(_di_f_utf_string_dynamic_partial_mish_) || !defined(_di_f_utf_string_dynamic_partial_prepend_assure_) || !defined(_di_f_utf_string_dynamic_partial_prepend_) || !defined(_di_f_utf_string_dynamic_prepend_assure_) || !defined(_di_f_utf_string_dynamic_prepend_) || !defined(_di_f_utf_string_mish_) || !defined(_di_f_utf_string_prepend_assure_) || !defined(_di_f_utf_string_prepend_) - f_status_t private_f_utf_string_prepend(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t private_f_utf_string_prepend(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { if (destination->used + length > F_string_t_size_d) { return F_status_set_error(F_string_too_large); @@ -100,7 +100,7 @@ extern "C" { #endif // !defined(_di_f_utf_string_dynamic_mish_) || !defined(_di_f_utf_string_dynamic_partial_mish_) || !defined(_di_f_utf_string_dynamic_partial_prepend_assure_) || !defined(_di_f_utf_string_dynamic_partial_prepend_) || !defined(_di_f_utf_string_dynamic_prepend_assure_) || !defined(_di_f_utf_string_dynamic_prepend_) || !defined(_di_f_utf_string_mish_) || !defined(_di_f_utf_string_prepend_assure_) || !defined(_di_f_utf_string_prepend_) #if !defined(_di_f_utf_string_dynamic_mish_nulless_) || !defined(_di_f_utf_string_dynamic_partial_mish_nulless_) || !defined(_di_f_utf_string_dynamic_partial_prepend_assure_nulless_) || !defined(_di_f_utf_string_dynamic_partial_prepend_nulless_) || !defined(_di_f_utf_string_dynamic_prepend_assure_nulless_) || !defined(_di_f_utf_string_dynamic_prepend_nulless_) || !defined(_di_f_utf_string_mish_nulless_) || !defined(_di_f_utf_string_prepend_assure_nulless_) || !defined(_di_f_utf_string_prepend_nulless_) - f_status_t private_f_utf_string_prepend_nulless(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t private_f_utf_string_prepend_nulless(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { if (destination->used + length > F_string_t_size_d) { return F_status_set_error(F_string_too_large); @@ -108,12 +108,12 @@ extern "C" { f_status_t status = F_none; - f_array_length_t first = 0; - f_array_length_t offset = 0; + f_number_unsigned_t first = 0; + f_number_unsigned_t offset = 0; - f_array_length_t size = 0; + f_number_unsigned_t size = 0; - for (f_array_length_t i = 0; i <= length; ++i) { + for (f_number_unsigned_t i = 0; i <= length; ++i) { if (i == length) { if (i > first) { diff --git a/level_0/f_utf/c/utf/private-string.h b/level_0/f_utf/c/utf/private-string.h index ded73f5..ee67f10 100644 --- a/level_0/f_utf/c/utf/private-string.h +++ b/level_0/f_utf/c/utf/private-string.h @@ -55,7 +55,7 @@ extern "C" { * @see f_utf_string_triples_append() */ #if !defined(_di_f_utf_string_append_) || !defined(_di_f_utf_string_append_assure_) || !defined(_di_f_utf_string_dynamic_append_) || !defined(_di_f_utf_string_dynamic_append_assure_) || !defined(_di_f_utf_string_dynamic_mash_) || !defined(_di_f_utf_string_dynamic_partial_append_) || !defined(_di_f_utf_string_dynamic_partial_append_assure_) || !defined(_di_f_utf_string_dynamic_partial_mash_) || !defined(_di_f_utf_string_dynamics_append_) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_mash_) || !defined(_di_f_utf_string_maps_append_) || !defined(_di_f_utf_string_triples_append_) - extern f_status_t private_f_utf_string_append(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) F_attribute_visibility_internal_d; + extern f_status_t private_f_utf_string_append(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) F_attribute_visibility_internal_d; #endif // !defined(_di_f_utf_string_append_) || !defined(_di_f_utf_string_append_assure_) || !defined(_di_f_utf_string_dynamic_append_) || !defined(_di_f_utf_string_dynamic_append_assure_) || !defined(_di_f_utf_string_dynamic_mash_) || !defined(_di_f_utf_string_dynamic_partial_append_) || !defined(_di_f_utf_string_dynamic_partial_append_assure_) || !defined(_di_f_utf_string_dynamic_partial_mash_) || !defined(_di_f_utf_string_dynamics_append_) || !defined(_di_f_utf_string_map_multis_append_) || !defined(_di_f_utf_string_mash_) || !defined(_di_f_utf_string_maps_append_) || !defined(_di_f_utf_string_triples_append_) /** @@ -92,7 +92,7 @@ extern "C" { * @see f_utf_string_mash_nulless() */ #if !defined(_di_f_utf_string_append_assure_nulless_) || !defined(_di_f_utf_string_append_nulless_) || !defined(_di_f_utf_string_dynamic_append_assure_nulless_) || !defined(_di_f_utf_string_dynamic_append_nulless_) || !defined(_di_f_utf_string_dynamic_mash_nulless_) || !defined(_di_f_utf_string_dynamic_partial_append_assure_nulless_) || !defined(_di_f_utf_string_dynamic_partial_append_nulless_) || !defined(_di_f_utf_string_dynamic_partial_mash_nulless_) || !defined(_di_f_utf_string_mash_nulless_) - extern f_status_t private_f_utf_string_append_nulless(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) F_attribute_visibility_internal_d; + extern f_status_t private_f_utf_string_append_nulless(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) F_attribute_visibility_internal_d; #endif // !defined(_di_f_utf_string_append_assure_nulless_) || !defined(_di_f_utf_string_append_nulless_) || !defined(_di_f_utf_string_dynamic_append_assure_nulless_) || !defined(_di_f_utf_string_dynamic_append_nulless_) || !defined(_di_f_utf_string_dynamic_mash_nulless_) || !defined(_di_f_utf_string_dynamic_partial_append_assure_nulless_) || !defined(_di_f_utf_string_dynamic_partial_append_nulless_) || !defined(_di_f_utf_string_dynamic_partial_mash_nulless_) || !defined(_di_f_utf_string_mash_nulless_) /** @@ -130,7 +130,7 @@ extern "C" { * @see f_utf_string_prepend() */ #if !defined(_di_f_utf_string_dynamic_mish_) || !defined(_di_f_utf_string_dynamic_partial_mish_) || !defined(_di_f_utf_string_dynamic_partial_prepend_assure_) || !defined(_di_f_utf_string_dynamic_partial_prepend_) || !defined(_di_f_utf_string_dynamic_prepend_assure_) || !defined(_di_f_utf_string_dynamic_prepend_) || !defined(_di_f_utf_string_mish_) || !defined(_di_f_utf_string_prepend_assure_) || !defined(_di_f_utf_string_prepend_) - extern f_status_t private_f_utf_string_prepend(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) F_attribute_visibility_internal_d; + extern f_status_t private_f_utf_string_prepend(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) F_attribute_visibility_internal_d; #endif // !defined(_di_f_utf_string_dynamic_mish_) || !defined(_di_f_utf_string_dynamic_partial_mish_) || !defined(_di_f_utf_string_dynamic_partial_prepend_assure_) || !defined(_di_f_utf_string_dynamic_partial_prepend_) || !defined(_di_f_utf_string_dynamic_prepend_assure_) || !defined(_di_f_utf_string_dynamic_prepend_) || !defined(_di_f_utf_string_mish_) || !defined(_di_f_utf_string_prepend_assure_) || !defined(_di_f_utf_string_prepend_) /** @@ -168,7 +168,7 @@ extern "C" { * @see f_utf_string_prepend_nulless() */ #if !defined(_di_f_utf_string_dynamic_mish_nulless_) || !defined(_di_f_utf_string_dynamic_partial_mish_nulless_) || !defined(_di_f_utf_string_dynamic_partial_prepend_assure_nulless_) || !defined(_di_f_utf_string_dynamic_partial_prepend_nulless_) || !defined(_di_f_utf_string_dynamic_prepend_assure_nulless_) || !defined(_di_f_utf_string_dynamic_prepend_nulless_) || !defined(_di_f_utf_string_mish_nulless_) || !defined(_di_f_utf_string_prepend_assure_nulless_) || !defined(_di_f_utf_string_prepend_nulless_) - extern f_status_t private_f_utf_string_prepend_nulless(const f_utf_string_t source, f_array_length_t length, f_utf_string_dynamic_t * const destination) F_attribute_visibility_internal_d; + extern f_status_t private_f_utf_string_prepend_nulless(const f_utf_string_t source, f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) F_attribute_visibility_internal_d; #endif // !defined(_di_f_utf_string_dynamic_mish_nulless_) || !defined(_di_f_utf_string_dynamic_partial_mish_nulless_) || !defined(_di_f_utf_string_dynamic_partial_prepend_assure_nulless_) || !defined(_di_f_utf_string_dynamic_partial_prepend_nulless_) || !defined(_di_f_utf_string_dynamic_prepend_assure_nulless_) || !defined(_di_f_utf_string_dynamic_prepend_nulless_) || !defined(_di_f_utf_string_mish_nulless_) || !defined(_di_f_utf_string_prepend_assure_nulless_) || !defined(_di_f_utf_string_prepend_nulless_) #ifdef __cplusplus diff --git a/level_0/f_utf/c/utf/private-triples.c b/level_0/f_utf/c/utf/private-triples.c index 20ba88c..0cbed96 100644 --- a/level_0/f_utf/c/utf/private-triples.c +++ b/level_0/f_utf/c/utf/private-triples.c @@ -9,15 +9,15 @@ extern "C" { #endif #if !defined(_di_f_utf_string_triples_adjust_) || !defined(_di_f_utf_string_triples_decimate_by_) - f_status_t private_f_utf_string_triples_adjust(const f_array_length_t length, f_utf_string_triples_t * const triples) { + f_status_t private_f_utf_string_triples_adjust(const f_number_unsigned_t length, f_utf_string_triples_t * const triples) { - if (triples->used + length > F_array_length_t_size_d) { + if (triples->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < triples->size; ++i) { + for (f_number_unsigned_t i = length; i < triples->size; ++i) { status = private_f_utf_string_dynamic_adjust(0, &triples->array[i].a); if (F_status_is_error(status)) return status; @@ -52,7 +52,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].a.used = 0; destination->array[destination->used].b.used = 0; @@ -79,15 +79,15 @@ extern "C" { #endif // !defined(_di_f_utf_string_triples_append_all_) || !defined(_di_f_utf_string_tripless_append_) || !defined(_di_f_utf_string_tripless_append_all_) #if !defined(_di_f_utf_string_triples_decrease_by_) || !defined(_di_f_utf_string_triples_increase_) || !defined(_di_f_utf_string_triples_increase_by_) - f_status_t private_f_utf_string_triples_resize(const f_array_length_t length, f_utf_string_triples_t * const triples) { + f_status_t private_f_utf_string_triples_resize(const f_number_unsigned_t length, f_utf_string_triples_t * const triples) { - if (triples->used + length > F_array_length_t_size_d) { + if (triples->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < triples->size; ++i) { + for (f_number_unsigned_t i = length; i < triples->size; ++i) { status = private_f_utf_string_dynamic_resize(0, &triples->array[i].a); if (F_status_is_error(status)) return status; diff --git a/level_0/f_utf/c/utf/private-triples.h b/level_0/f_utf/c/utf/private-triples.h index eb81ea2..d8d7c65 100644 --- a/level_0/f_utf/c/utf/private-triples.h +++ b/level_0/f_utf/c/utf/private-triples.h @@ -37,7 +37,7 @@ extern "C" { * @see f_utf_string_triples_adjust() */ #if !defined(_di_f_utf_string_triples_adjust_) || !defined(_di_f_utf_string_triples_decimate_by_) - extern f_status_t private_f_utf_string_triples_adjust(const f_array_length_t length, f_utf_string_triples_t * const triples) F_attribute_visibility_internal_d; + extern f_status_t private_f_utf_string_triples_adjust(const f_number_unsigned_t length, f_utf_string_triples_t * const triples) F_attribute_visibility_internal_d; #endif // !defined(_di_f_utf_string_triples_adjust_) || !defined(_di_f_utf_string_triples_decimate_by_) /** @@ -91,7 +91,7 @@ extern "C" { * @see f_utf_string_triples_increase_by() */ #if !defined(_di_f_utf_string_triples_decrease_by_) || !defined(_di_f_utf_string_triples_increase_) || !defined(_di_f_utf_string_triples_increase_by_) - extern f_status_t private_f_utf_string_triples_resize(const f_array_length_t length, f_utf_string_triples_t * const triples) F_attribute_visibility_internal_d; + extern f_status_t private_f_utf_string_triples_resize(const f_number_unsigned_t length, f_utf_string_triples_t * const triples) F_attribute_visibility_internal_d; #endif // !defined(_di_f_utf_string_triples_decrease_by_) || !defined(_di_f_utf_string_triples_increase_) || !defined(_di_f_utf_string_triples_increase_by_) #ifdef __cplusplus diff --git a/level_0/f_utf/c/utf/private-tripless.c b/level_0/f_utf/c/utf/private-tripless.c index ec81358..8e4d407 100644 --- a/level_0/f_utf/c/utf/private-tripless.c +++ b/level_0/f_utf/c/utf/private-tripless.c @@ -10,15 +10,15 @@ extern "C" { #endif #if !defined(_di_f_utf_string_tripless_adjust_) || !defined(_di_f_utf_string_tripless_decimate_by_) - f_status_t private_f_utf_string_tripless_adjust(const f_array_length_t length, f_utf_string_tripless_t * const tripless) { + f_status_t private_f_utf_string_tripless_adjust(const f_number_unsigned_t length, f_utf_string_tripless_t * const tripless) { - if (tripless->used + length > F_array_length_t_size_d) { + if (tripless->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < tripless->size; ++i) { + for (f_number_unsigned_t i = length; i < tripless->size; ++i) { status = private_f_utf_string_triples_adjust(0, &tripless->array[i]); if (F_status_is_error(status)) return status; @@ -38,15 +38,15 @@ extern "C" { #endif // !defined(_di_f_utf_string_tripless_adjust_) || !defined(_di_f_utf_string_tripless_decimate_by_) #if !defined(_di_f_utf_string_tripless_decrease_by_) || !defined(_di_f_utf_string_tripless_increase_) || !defined(_di_f_utf_string_tripless_increase_by_) - f_status_t private_f_utf_string_tripless_resize(const f_array_length_t length, f_utf_string_tripless_t * const tripless) { + f_status_t private_f_utf_string_tripless_resize(const f_number_unsigned_t length, f_utf_string_tripless_t * const tripless) { - if (tripless->used + length > F_array_length_t_size_d) { + if (tripless->used + length > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } f_status_t status = F_none; - for (f_array_length_t i = length; i < tripless->size; ++i) { + for (f_number_unsigned_t i = length; i < tripless->size; ++i) { status = private_f_utf_string_triples_resize(0, &tripless->array[i]); if (F_status_is_error(status)) return status; diff --git a/level_0/f_utf/c/utf/private-tripless.h b/level_0/f_utf/c/utf/private-tripless.h index 5c1cdc0..19b6d9c 100644 --- a/level_0/f_utf/c/utf/private-tripless.h +++ b/level_0/f_utf/c/utf/private-tripless.h @@ -37,7 +37,7 @@ extern "C" { * @see f_utf_string_tripless_adjust() */ #if !defined(_di_f_utf_string_tripless_adjust_) || !defined(_di_f_utf_string_tripless_decimate_by_) - extern f_status_t private_f_utf_string_tripless_adjust(const f_array_length_t length, f_utf_string_tripless_t * const tripless) F_attribute_visibility_internal_d; + extern f_status_t private_f_utf_string_tripless_adjust(const f_number_unsigned_t length, f_utf_string_tripless_t * const tripless) F_attribute_visibility_internal_d; #endif // !defined(_di_f_utf_string_tripless_adjust_) || !defined(_di_f_utf_string_tripless_decimate_by_) /** @@ -64,7 +64,7 @@ extern "C" { * @see f_utf_string_tripless_increase_by() */ #if !defined(_di_f_utf_string_tripless_decrease_by_) || !defined(_di_f_utf_string_tripless_increase_) || !defined(_di_f_utf_string_tripless_increase_by_) - extern f_status_t private_f_utf_string_tripless_resize(const f_array_length_t length, f_utf_string_tripless_t * const tripless) F_attribute_visibility_internal_d; + extern f_status_t private_f_utf_string_tripless_resize(const f_number_unsigned_t length, f_utf_string_tripless_t * const tripless) F_attribute_visibility_internal_d; #endif // !defined(_di_f_utf_string_tripless_decrease_by_) || !defined(_di_f_utf_string_tripless_increase_) || !defined(_di_f_utf_string_tripless_increase_by_) #ifdef __cplusplus diff --git a/level_0/f_utf/c/utf/static.h b/level_0/f_utf/c/utf/static.h index 075fe9e..d616a7c 100644 --- a/level_0/f_utf/c/utf/static.h +++ b/level_0/f_utf/c/utf/static.h @@ -32,8 +32,8 @@ extern "C" { typedef struct { f_utf_string_t string; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_utf_string_static_t; #define f_utf_string_static_t_initialize { 0, 0, 0 } diff --git a/level_0/f_utf/c/utf/statics.h b/level_0/f_utf/c/utf/statics.h index f155bf1..e90aee8 100644 --- a/level_0/f_utf/c/utf/statics.h +++ b/level_0/f_utf/c/utf/statics.h @@ -27,8 +27,8 @@ extern "C" { typedef struct { f_utf_string_static_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_utf_string_statics_t; #define f_utf_string_statics_t_initialize { 0, 0, 0 } diff --git a/level_0/f_utf/c/utf/staticss.h b/level_0/f_utf/c/utf/staticss.h index 0e3301b..51f878f 100644 --- a/level_0/f_utf/c/utf/staticss.h +++ b/level_0/f_utf/c/utf/staticss.h @@ -27,8 +27,8 @@ extern "C" { typedef struct { f_utf_string_statics_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_utf_string_staticss_t; #define f_utf_string_staticss_t_initialize { 0, 0, 0 } diff --git a/level_0/f_utf/c/utf/string.c b/level_0/f_utf/c/utf/string.c index 1beceb3..88ef2ba 100644 --- a/level_0/f_utf/c/utf/string.c +++ b/level_0/f_utf/c/utf/string.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_utf_string_append_ - f_status_t f_utf_string_append(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_append(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -19,7 +19,7 @@ extern "C" { #endif // _di_f_utf_string_append_ #ifndef _di_f_utf_string_append_assure_ - f_status_t f_utf_string_append_assure(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_append_assure(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -30,8 +30,8 @@ extern "C" { return private_f_utf_string_append(source, length, destination); } - f_array_length_t i = 1; - f_array_length_t j = 1; + f_number_unsigned_t i = 1; + f_number_unsigned_t j = 1; while (i <= length && j <= destination->used) { @@ -60,7 +60,7 @@ extern "C" { #endif // _di_f_utf_string_append_assure_ #ifndef _di_f_utf_string_append_assure_nulless_ - f_status_t f_utf_string_append_assure_nulless(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_append_assure_nulless(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -71,8 +71,8 @@ extern "C" { return private_f_utf_string_append_nulless(source, length, destination); } - f_array_length_t i = 1; - f_array_length_t j = 1; + f_number_unsigned_t i = 1; + f_number_unsigned_t j = 1; while (i <= length && j <= destination->used) { @@ -101,7 +101,7 @@ extern "C" { #endif // _di_f_utf_string_append_assure_nulless_ #ifndef _di_f_utf_string_append_nulless_ - f_status_t f_utf_string_append_nulless(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_append_nulless(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -113,7 +113,7 @@ extern "C" { #endif // _di_f_utf_string_append_nulless_ #ifndef _di_f_utf_string_mash_ - f_status_t f_utf_string_mash(const f_utf_string_t glue, const f_array_length_t glue_length, const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_mash(const f_utf_string_t glue, const f_number_unsigned_t glue_length, const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -132,7 +132,7 @@ extern "C" { #endif // _di_f_utf_string_mash_ #ifndef _di_f_utf_string_mash_nulless_ - f_status_t f_utf_string_mash_nulless(const f_utf_string_t glue, const f_array_length_t glue_length, const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_mash_nulless(const f_utf_string_t glue, const f_number_unsigned_t glue_length, const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -149,7 +149,7 @@ extern "C" { #endif // _di_f_utf_string_mash_nulless_ #ifndef _di_f_utf_string_mish_ - f_status_t f_utf_string_mish(const f_utf_string_t glue, const f_array_length_t glue_length, const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_mish(const f_utf_string_t glue, const f_number_unsigned_t glue_length, const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -166,7 +166,7 @@ extern "C" { #endif // _di_f_utf_string_mish_ #ifndef _di_f_utf_string_mish_nulless_ - f_status_t f_utf_string_mish_nulless(const f_utf_string_t glue, const f_array_length_t glue_length, const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_mish_nulless(const f_utf_string_t glue, const f_number_unsigned_t glue_length, const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -183,7 +183,7 @@ extern "C" { #endif // _di_f_utf_string_mish_nulless_ #ifndef _di_f_utf_string_prepend_ - f_status_t f_utf_string_prepend(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_prepend(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -195,7 +195,7 @@ extern "C" { #endif // _di_f_utf_string_prepend_ #ifndef _di_f_utf_string_prepend_assure_ - f_status_t f_utf_string_prepend_assure(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_prepend_assure(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -206,8 +206,8 @@ extern "C" { return private_f_utf_string_prepend(source, length, destination); } - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; while (i < length && j < destination->used) { @@ -236,7 +236,7 @@ extern "C" { #endif // _di_f_utf_string_prepend_assure_ #ifndef _di_f_utf_string_prepend_assure_nulless_ - f_status_t f_utf_string_prepend_assure_nulless(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_prepend_assure_nulless(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -247,8 +247,8 @@ extern "C" { return private_f_utf_string_prepend_nulless(source, length, destination); } - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; while (i < length && j < destination->used) { @@ -277,7 +277,7 @@ extern "C" { #endif // _di_f_utf_string_prepend_assure_nulless_ #ifndef _di_f_utf_string_prepend_nulless_ - f_status_t f_utf_string_prepend_nulless(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_prepend_nulless(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_utf/c/utf/string.h b/level_0/f_utf/c/utf/string.h index 82fce63..27bfcf7 100644 --- a/level_0/f_utf/c/utf/string.h +++ b/level_0/f_utf/c/utf/string.h @@ -38,7 +38,7 @@ extern "C" { * @see f_memory_resize() */ #ifndef _di_f_utf_string_append_ - extern f_status_t f_utf_string_append(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_append(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_append_ /** @@ -65,7 +65,7 @@ extern "C" { * @see f_memory_resize() */ #ifndef _di_f_utf_string_append_assure_ - extern f_status_t f_utf_string_append_assure(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_append_assure(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_append_assure_ /** @@ -91,7 +91,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_append_assure_nulless_ - extern f_status_t f_utf_string_append_assure_nulless(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_append_assure_nulless(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_append_assure_nulless_ /** @@ -116,7 +116,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_append_nulless_ - extern f_status_t f_utf_string_append_nulless(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_append_nulless(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_append_nulless_ /** @@ -145,7 +145,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_mash_ - extern f_status_t f_utf_string_mash(const f_utf_string_t glue, const f_array_length_t glue_length, const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_mash(const f_utf_string_t glue, const f_number_unsigned_t glue_length, const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_mash_ /** @@ -176,7 +176,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_mash_nulless_ - extern f_status_t f_utf_string_mash_nulless(const f_utf_string_t glue, const f_array_length_t glue_length, const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_mash_nulless(const f_utf_string_t glue, const f_number_unsigned_t glue_length, const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_mash_nulless_ /** @@ -205,7 +205,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_mish_ - extern f_status_t f_utf_string_mish(const f_utf_string_t glue, const f_array_length_t glue_length, const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_mish(const f_utf_string_t glue, const f_number_unsigned_t glue_length, const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_mish_ /** @@ -236,7 +236,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_mish_nulless_ - extern f_status_t f_utf_string_mish_nulless(const f_utf_string_t glue, const f_array_length_t glue_length, const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_mish_nulless(const f_utf_string_t glue, const f_number_unsigned_t glue_length, const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_mish_nulless_ /** @@ -261,7 +261,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_prepend_ - extern f_status_t f_utf_string_prepend(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_prepend(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_prepend_ /** @@ -288,7 +288,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_prepend_assure_ - extern f_status_t f_utf_string_prepend_assure(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_prepend_assure(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_prepend_assure_ /** @@ -316,7 +316,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_prepend_assure_nulless_ - extern f_status_t f_utf_string_prepend_assure_nulless(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_prepend_assure_nulless(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_prepend_assure_nulless_ /** @@ -344,7 +344,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_prepend_nulless_ - extern f_status_t f_utf_string_prepend_nulless(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_prepend_nulless(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_prepend_nulless_ /** diff --git a/level_0/f_utf/c/utf/strings.c b/level_0/f_utf/c/utf/strings.c index cb40e7b..80b23b5 100644 --- a/level_0/f_utf/c/utf/strings.c +++ b/level_0/f_utf/c/utf/strings.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_utf_string_append_ - f_status_t f_utf_string_append(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_append(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -19,7 +19,7 @@ extern "C" { #endif // _di_f_utf_string_append_ #ifndef _di_f_utf_string_append_assure_ - f_status_t f_utf_string_append_assure(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_append_assure(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -30,8 +30,8 @@ extern "C" { return private_f_utf_string_append(source, length, destination); } - f_array_length_t i = 1; - f_array_length_t j = 1; + f_number_unsigned_t i = 1; + f_number_unsigned_t j = 1; while (i <= length && j <= destination->used) { @@ -60,7 +60,7 @@ extern "C" { #endif // _di_f_utf_string_append_assure_ #ifndef _di_f_utf_string_append_assure_nulless_ - f_status_t f_utf_string_append_assure_nulless(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_append_assure_nulless(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -71,8 +71,8 @@ extern "C" { return private_f_utf_string_append_nulless(source, length, destination); } - f_array_length_t i = 1; - f_array_length_t j = 1; + f_number_unsigned_t i = 1; + f_number_unsigned_t j = 1; while (i <= length && j <= destination->used) { @@ -101,7 +101,7 @@ extern "C" { #endif // _di_f_utf_string_append_assure_nulless_ #ifndef _di_f_utf_string_append_nulless_ - f_status_t f_utf_string_append_nulless(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_append_nulless(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -113,7 +113,7 @@ extern "C" { #endif // _di_f_utf_string_append_nulless_ #ifndef _di_f_utf_string_mash_ - f_status_t f_utf_string_mash(const f_utf_string_t glue, const f_array_length_t glue_length, const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_mash(const f_utf_string_t glue, const f_number_unsigned_t glue_length, const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -132,7 +132,7 @@ extern "C" { #endif // _di_f_utf_string_mash_ #ifndef _di_f_utf_string_mash_nulless_ - f_status_t f_utf_string_mash_nulless(const f_utf_string_t glue, const f_array_length_t glue_length, const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_mash_nulless(const f_utf_string_t glue, const f_number_unsigned_t glue_length, const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -149,7 +149,7 @@ extern "C" { #endif // _di_f_utf_string_mash_nulless_ #ifndef _di_f_utf_string_mish_ - f_status_t f_utf_string_mish(const f_utf_string_t glue, const f_array_length_t glue_length, const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_mish(const f_utf_string_t glue, const f_number_unsigned_t glue_length, const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -166,7 +166,7 @@ extern "C" { #endif // _di_f_utf_string_mish_ #ifndef _di_f_utf_string_mish_nulless_ - f_status_t f_utf_string_mish_nulless(const f_utf_string_t glue, const f_array_length_t glue_length, const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_mish_nulless(const f_utf_string_t glue, const f_number_unsigned_t glue_length, const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -183,7 +183,7 @@ extern "C" { #endif // _di_f_utf_string_mish_nulless_ #ifndef _di_f_utf_string_prepend_ - f_status_t f_utf_string_prepend(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_prepend(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -195,7 +195,7 @@ extern "C" { #endif // _di_f_utf_string_prepend_ #ifndef _di_f_utf_string_prepend_assure_ - f_status_t f_utf_string_prepend_assure(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_prepend_assure(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -206,8 +206,8 @@ extern "C" { return private_f_utf_string_prepend(source, length, destination); } - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; while (i < length && j < destination->used) { @@ -236,7 +236,7 @@ extern "C" { #endif // _di_f_utf_string_prepend_assure_ #ifndef _di_f_utf_string_prepend_assure_nulless_ - f_status_t f_utf_string_prepend_assure_nulless(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_prepend_assure_nulless(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -247,8 +247,8 @@ extern "C" { return private_f_utf_string_prepend_nulless(source, length, destination); } - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; while (i < length && j < destination->used) { @@ -277,7 +277,7 @@ extern "C" { #endif // _di_f_utf_string_prepend_assure_nulless_ #ifndef _di_f_utf_string_prepend_nulless_ - f_status_t f_utf_string_prepend_nulless(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_prepend_nulless(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_utf/c/utf/strings.h b/level_0/f_utf/c/utf/strings.h index 82fce63..27bfcf7 100644 --- a/level_0/f_utf/c/utf/strings.h +++ b/level_0/f_utf/c/utf/strings.h @@ -38,7 +38,7 @@ extern "C" { * @see f_memory_resize() */ #ifndef _di_f_utf_string_append_ - extern f_status_t f_utf_string_append(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_append(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_append_ /** @@ -65,7 +65,7 @@ extern "C" { * @see f_memory_resize() */ #ifndef _di_f_utf_string_append_assure_ - extern f_status_t f_utf_string_append_assure(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_append_assure(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_append_assure_ /** @@ -91,7 +91,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_append_assure_nulless_ - extern f_status_t f_utf_string_append_assure_nulless(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_append_assure_nulless(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_append_assure_nulless_ /** @@ -116,7 +116,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_append_nulless_ - extern f_status_t f_utf_string_append_nulless(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_append_nulless(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_append_nulless_ /** @@ -145,7 +145,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_mash_ - extern f_status_t f_utf_string_mash(const f_utf_string_t glue, const f_array_length_t glue_length, const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_mash(const f_utf_string_t glue, const f_number_unsigned_t glue_length, const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_mash_ /** @@ -176,7 +176,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_mash_nulless_ - extern f_status_t f_utf_string_mash_nulless(const f_utf_string_t glue, const f_array_length_t glue_length, const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_mash_nulless(const f_utf_string_t glue, const f_number_unsigned_t glue_length, const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_mash_nulless_ /** @@ -205,7 +205,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_mish_ - extern f_status_t f_utf_string_mish(const f_utf_string_t glue, const f_array_length_t glue_length, const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_mish(const f_utf_string_t glue, const f_number_unsigned_t glue_length, const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_mish_ /** @@ -236,7 +236,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_mish_nulless_ - extern f_status_t f_utf_string_mish_nulless(const f_utf_string_t glue, const f_array_length_t glue_length, const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_mish_nulless(const f_utf_string_t glue, const f_number_unsigned_t glue_length, const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_mish_nulless_ /** @@ -261,7 +261,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_prepend_ - extern f_status_t f_utf_string_prepend(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_prepend(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_prepend_ /** @@ -288,7 +288,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_prepend_assure_ - extern f_status_t f_utf_string_prepend_assure(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_prepend_assure(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_prepend_assure_ /** @@ -316,7 +316,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_prepend_assure_nulless_ - extern f_status_t f_utf_string_prepend_assure_nulless(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_prepend_assure_nulless(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_prepend_assure_nulless_ /** @@ -344,7 +344,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_prepend_nulless_ - extern f_status_t f_utf_string_prepend_nulless(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_prepend_nulless(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_prepend_nulless_ /** diff --git a/level_0/f_utf/c/utf/stringss.c b/level_0/f_utf/c/utf/stringss.c index cb40e7b..80b23b5 100644 --- a/level_0/f_utf/c/utf/stringss.c +++ b/level_0/f_utf/c/utf/stringss.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_f_utf_string_append_ - f_status_t f_utf_string_append(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_append(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -19,7 +19,7 @@ extern "C" { #endif // _di_f_utf_string_append_ #ifndef _di_f_utf_string_append_assure_ - f_status_t f_utf_string_append_assure(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_append_assure(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -30,8 +30,8 @@ extern "C" { return private_f_utf_string_append(source, length, destination); } - f_array_length_t i = 1; - f_array_length_t j = 1; + f_number_unsigned_t i = 1; + f_number_unsigned_t j = 1; while (i <= length && j <= destination->used) { @@ -60,7 +60,7 @@ extern "C" { #endif // _di_f_utf_string_append_assure_ #ifndef _di_f_utf_string_append_assure_nulless_ - f_status_t f_utf_string_append_assure_nulless(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_append_assure_nulless(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -71,8 +71,8 @@ extern "C" { return private_f_utf_string_append_nulless(source, length, destination); } - f_array_length_t i = 1; - f_array_length_t j = 1; + f_number_unsigned_t i = 1; + f_number_unsigned_t j = 1; while (i <= length && j <= destination->used) { @@ -101,7 +101,7 @@ extern "C" { #endif // _di_f_utf_string_append_assure_nulless_ #ifndef _di_f_utf_string_append_nulless_ - f_status_t f_utf_string_append_nulless(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_append_nulless(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -113,7 +113,7 @@ extern "C" { #endif // _di_f_utf_string_append_nulless_ #ifndef _di_f_utf_string_mash_ - f_status_t f_utf_string_mash(const f_utf_string_t glue, const f_array_length_t glue_length, const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_mash(const f_utf_string_t glue, const f_number_unsigned_t glue_length, const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -132,7 +132,7 @@ extern "C" { #endif // _di_f_utf_string_mash_ #ifndef _di_f_utf_string_mash_nulless_ - f_status_t f_utf_string_mash_nulless(const f_utf_string_t glue, const f_array_length_t glue_length, const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_mash_nulless(const f_utf_string_t glue, const f_number_unsigned_t glue_length, const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -149,7 +149,7 @@ extern "C" { #endif // _di_f_utf_string_mash_nulless_ #ifndef _di_f_utf_string_mish_ - f_status_t f_utf_string_mish(const f_utf_string_t glue, const f_array_length_t glue_length, const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_mish(const f_utf_string_t glue, const f_number_unsigned_t glue_length, const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -166,7 +166,7 @@ extern "C" { #endif // _di_f_utf_string_mish_ #ifndef _di_f_utf_string_mish_nulless_ - f_status_t f_utf_string_mish_nulless(const f_utf_string_t glue, const f_array_length_t glue_length, const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_mish_nulless(const f_utf_string_t glue, const f_number_unsigned_t glue_length, const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -183,7 +183,7 @@ extern "C" { #endif // _di_f_utf_string_mish_nulless_ #ifndef _di_f_utf_string_prepend_ - f_status_t f_utf_string_prepend(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_prepend(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -195,7 +195,7 @@ extern "C" { #endif // _di_f_utf_string_prepend_ #ifndef _di_f_utf_string_prepend_assure_ - f_status_t f_utf_string_prepend_assure(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_prepend_assure(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -206,8 +206,8 @@ extern "C" { return private_f_utf_string_prepend(source, length, destination); } - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; while (i < length && j < destination->used) { @@ -236,7 +236,7 @@ extern "C" { #endif // _di_f_utf_string_prepend_assure_ #ifndef _di_f_utf_string_prepend_assure_nulless_ - f_status_t f_utf_string_prepend_assure_nulless(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_prepend_assure_nulless(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -247,8 +247,8 @@ extern "C" { return private_f_utf_string_prepend_nulless(source, length, destination); } - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; while (i < length && j < destination->used) { @@ -277,7 +277,7 @@ extern "C" { #endif // _di_f_utf_string_prepend_assure_nulless_ #ifndef _di_f_utf_string_prepend_nulless_ - f_status_t f_utf_string_prepend_nulless(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination) { + f_status_t f_utf_string_prepend_nulless(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_utf/c/utf/stringss.h b/level_0/f_utf/c/utf/stringss.h index 82fce63..27bfcf7 100644 --- a/level_0/f_utf/c/utf/stringss.h +++ b/level_0/f_utf/c/utf/stringss.h @@ -38,7 +38,7 @@ extern "C" { * @see f_memory_resize() */ #ifndef _di_f_utf_string_append_ - extern f_status_t f_utf_string_append(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_append(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_append_ /** @@ -65,7 +65,7 @@ extern "C" { * @see f_memory_resize() */ #ifndef _di_f_utf_string_append_assure_ - extern f_status_t f_utf_string_append_assure(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_append_assure(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_append_assure_ /** @@ -91,7 +91,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_append_assure_nulless_ - extern f_status_t f_utf_string_append_assure_nulless(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_append_assure_nulless(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_append_assure_nulless_ /** @@ -116,7 +116,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_append_nulless_ - extern f_status_t f_utf_string_append_nulless(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_append_nulless(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_append_nulless_ /** @@ -145,7 +145,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_mash_ - extern f_status_t f_utf_string_mash(const f_utf_string_t glue, const f_array_length_t glue_length, const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_mash(const f_utf_string_t glue, const f_number_unsigned_t glue_length, const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_mash_ /** @@ -176,7 +176,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_mash_nulless_ - extern f_status_t f_utf_string_mash_nulless(const f_utf_string_t glue, const f_array_length_t glue_length, const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_mash_nulless(const f_utf_string_t glue, const f_number_unsigned_t glue_length, const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_mash_nulless_ /** @@ -205,7 +205,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_mish_ - extern f_status_t f_utf_string_mish(const f_utf_string_t glue, const f_array_length_t glue_length, const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_mish(const f_utf_string_t glue, const f_number_unsigned_t glue_length, const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_mish_ /** @@ -236,7 +236,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_mish_nulless_ - extern f_status_t f_utf_string_mish_nulless(const f_utf_string_t glue, const f_array_length_t glue_length, const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_mish_nulless(const f_utf_string_t glue, const f_number_unsigned_t glue_length, const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_mish_nulless_ /** @@ -261,7 +261,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_prepend_ - extern f_status_t f_utf_string_prepend(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_prepend(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_prepend_ /** @@ -288,7 +288,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_prepend_assure_ - extern f_status_t f_utf_string_prepend_assure(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_prepend_assure(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_prepend_assure_ /** @@ -316,7 +316,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_prepend_assure_nulless_ - extern f_status_t f_utf_string_prepend_assure_nulless(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_prepend_assure_nulless(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_prepend_assure_nulless_ /** @@ -344,7 +344,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_prepend_nulless_ - extern f_status_t f_utf_string_prepend_nulless(const f_utf_string_t source, const f_array_length_t length, f_utf_string_dynamic_t * const destination); + extern f_status_t f_utf_string_prepend_nulless(const f_utf_string_t source, const f_number_unsigned_t length, f_utf_string_dynamic_t * const destination); #endif // _di_f_utf_string_prepend_nulless_ /** diff --git a/level_0/f_utf/c/utf/triples.c b/level_0/f_utf/c/utf/triples.c index 946307e..ed1797d 100644 --- a/level_0/f_utf/c/utf/triples.c +++ b/level_0/f_utf/c/utf/triples.c @@ -8,7 +8,7 @@ extern "C" { #endif #ifndef _di_f_utf_string_triples_adjust_ - f_status_t f_utf_string_triples_adjust(const f_array_length_t length, f_utf_string_triples_t * const triples) { + f_status_t f_utf_string_triples_adjust(const f_number_unsigned_t length, f_utf_string_triples_t * const triples) { #ifndef _di_level_0_parameter_checking_ if (!triples) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -70,7 +70,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].a.used = 0; destination->array[destination->used].b.used = 0; @@ -97,7 +97,7 @@ extern "C" { #endif // _di_f_utf_string_triples_append_all_ #ifndef _di_f_utf_string_triples_decimate_by_ - f_status_t f_utf_string_triples_decimate_by(const f_array_length_t amount, f_utf_string_triples_t * const triples) { + f_status_t f_utf_string_triples_decimate_by(const f_number_unsigned_t amount, f_utf_string_triples_t * const triples) { #ifndef _di_level_0_parameter_checking_ if (!triples) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -111,7 +111,7 @@ extern "C" { #endif // _di_f_utf_string_triples_decimate_by_ #ifndef _di_f_utf_string_triples_decrease_by_ - f_status_t f_utf_string_triples_decrease_by(const f_array_length_t amount, f_utf_string_triples_t * const triples) { + f_status_t f_utf_string_triples_decrease_by(const f_number_unsigned_t amount, f_utf_string_triples_t * const triples) { #ifndef _di_level_0_parameter_checking_ if (!triples) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -127,20 +127,20 @@ extern "C" { #endif // _di_f_utf_string_triples_decrease_by_ #ifndef _di_f_utf_string_triples_increase_ - f_status_t f_utf_string_triples_increase(const f_array_length_t step, f_utf_string_triples_t * const triples) { + f_status_t f_utf_string_triples_increase(const f_number_unsigned_t step, f_utf_string_triples_t * const triples) { #ifndef _di_level_0_parameter_checking_ if (!triples) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && triples->used + 1 > triples->size) { - f_array_length_t size = triples->used + F_memory_default_allocation_small_d; + f_number_unsigned_t size = triples->used + F_memory_default_allocation_small_d; - if (size > F_array_length_t_size_d) { - if (triples->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (triples->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_utf_string_triples_resize(size, triples); @@ -151,7 +151,7 @@ extern "C" { #endif // _di_f_utf_string_triples_increase_ #ifndef _di_f_utf_string_triples_increase_by_ - f_status_t f_utf_string_triples_increase_by(const f_array_length_t amount, f_utf_string_triples_t * const triples) { + f_status_t f_utf_string_triples_increase_by(const f_number_unsigned_t amount, f_utf_string_triples_t * const triples) { #ifndef _di_level_0_parameter_checking_ if (!triples) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -159,7 +159,7 @@ extern "C" { if (!amount) return F_data_not; if (triples->used + amount > triples->size) { - if (triples->used + amount > F_array_length_t_size_d) { + if (triples->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -171,7 +171,7 @@ extern "C" { #endif // _di_f_utf_string_triples_increase_by_ #ifndef _di_f_utf_string_triples_resize_ - f_status_t f_utf_string_triples_resize(const f_array_length_t length, f_utf_string_triples_t * const triples) { + f_status_t f_utf_string_triples_resize(const f_number_unsigned_t length, f_utf_string_triples_t * const triples) { #ifndef _di_level_0_parameter_checking_ if (!triples) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_utf/c/utf/triples.h b/level_0/f_utf/c/utf/triples.h index aa0f3f3..d50a808 100644 --- a/level_0/f_utf/c/utf/triples.h +++ b/level_0/f_utf/c/utf/triples.h @@ -27,8 +27,8 @@ extern "C" { typedef struct { f_utf_string_triple_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_utf_string_triples_t; #define f_utf_string_triples_t_initialize f_utf_string_statics_t_initialize @@ -65,7 +65,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_utf_string_triples_adjust_ - extern f_status_t f_utf_string_triples_adjust(const f_array_length_t length, f_utf_string_triples_t * const triples); + extern f_status_t f_utf_string_triples_adjust(const f_number_unsigned_t length, f_utf_string_triples_t * const triples); #endif // _di_f_utf_string_triples_adjust_ /** @@ -131,7 +131,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_triples_decimate_by_ - extern f_status_t f_utf_string_triples_decimate_by(const f_array_length_t amount, f_utf_string_triples_t * const triples); + extern f_status_t f_utf_string_triples_decimate_by(const f_number_unsigned_t amount, f_utf_string_triples_t * const triples); #endif // _di_f_utf_string_triples_decimate_by_ /** @@ -155,13 +155,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_triples_decrease_by_ - extern f_status_t f_utf_string_triples_decrease_by(const f_array_length_t amount, f_utf_string_triples_t * const triples); + extern f_status_t f_utf_string_triples_decrease_by(const f_number_unsigned_t amount, f_utf_string_triples_t * const triples); #endif // _di_f_utf_string_triples_decrease_by_ /** * Increase the size of the string triples 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -180,14 +180,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_triples_increase_ - extern f_status_t f_utf_string_triples_increase(const f_array_length_t step, f_utf_string_triples_t * const triples); + extern f_status_t f_utf_string_triples_increase(const f_number_unsigned_t step, f_utf_string_triples_t * const triples); #endif // _di_f_utf_string_triples_increase_ /** * Resize the string triples 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -205,7 +205,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_triples_increase_by_ - extern f_status_t f_utf_string_triples_increase_by(const f_array_length_t amount, f_utf_string_triples_t * const triples); + extern f_status_t f_utf_string_triples_increase_by(const f_number_unsigned_t amount, f_utf_string_triples_t * const triples); #endif // _di_f_utf_string_triples_increase_by_ /** @@ -224,7 +224,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_triples_resize_ - extern f_status_t f_utf_string_triples_resize(const f_array_length_t length, f_utf_string_triples_t * const triples); + extern f_status_t f_utf_string_triples_resize(const f_number_unsigned_t length, f_utf_string_triples_t * const triples); #endif // _di_f_utf_string_triples_resize_ #ifdef __cplusplus diff --git a/level_0/f_utf/c/utf/tripless.c b/level_0/f_utf/c/utf/tripless.c index 9d0b475..1eb04ae 100644 --- a/level_0/f_utf/c/utf/tripless.c +++ b/level_0/f_utf/c/utf/tripless.c @@ -51,7 +51,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - for (f_array_length_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { destination->array[destination->used].used = 0; @@ -66,7 +66,7 @@ extern "C" { #endif // _di_f_utf_string_tripless_append_all_ #ifndef _di_f_utf_string_tripless_adjust_ - f_status_t f_utf_string_tripless_adjust(const f_array_length_t length, f_utf_string_tripless_t * const tripless) { + f_status_t f_utf_string_tripless_adjust(const f_number_unsigned_t length, f_utf_string_tripless_t * const tripless) { #ifndef _di_level_0_parameter_checking_ if (!tripless) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -76,7 +76,7 @@ extern "C" { #endif // _di_f_utf_string_tripless_adjust_ #ifndef _di_f_utf_string_tripless_decimate_by_ - f_status_t f_utf_string_tripless_decimate_by(const f_array_length_t amount, f_utf_string_tripless_t * const tripless) { + f_status_t f_utf_string_tripless_decimate_by(const f_number_unsigned_t amount, f_utf_string_tripless_t * const tripless) { #ifndef _di_level_0_parameter_checking_ if (!tripless) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -92,7 +92,7 @@ extern "C" { #endif // _di_f_utf_string_tripless_decimate_by_ #ifndef _di_f_utf_string_tripless_decrease_by_ - f_status_t f_utf_string_tripless_decrease_by(const f_array_length_t amount, f_utf_string_tripless_t * const tripless) { + f_status_t f_utf_string_tripless_decrease_by(const f_number_unsigned_t amount, f_utf_string_tripless_t * const tripless) { #ifndef _di_level_0_parameter_checking_ if (!tripless) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -108,20 +108,20 @@ extern "C" { #endif // _di_f_utf_string_tripless_decrease_by_ #ifndef _di_f_utf_string_tripless_increase_ - f_status_t f_utf_string_tripless_increase(const f_array_length_t step, f_utf_string_tripless_t * const tripless) { + f_status_t f_utf_string_tripless_increase(const f_number_unsigned_t step, f_utf_string_tripless_t * const tripless) { #ifndef _di_level_0_parameter_checking_ if (!tripless) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ if (step && tripless->used + 1 > tripless->size) { - f_array_length_t size = tripless->used + step; + f_number_unsigned_t size = tripless->used + step; - if (size > F_array_length_t_size_d) { - if (tripless->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (tripless->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return private_f_utf_string_tripless_resize(size, tripless); @@ -132,7 +132,7 @@ extern "C" { #endif // _di_f_utf_string_tripless_increase_ #ifndef _di_f_utf_string_tripless_increase_by_ - f_status_t f_utf_string_tripless_increase_by(const f_array_length_t amount, f_utf_string_tripless_t * const tripless) { + f_status_t f_utf_string_tripless_increase_by(const f_number_unsigned_t amount, f_utf_string_tripless_t * const tripless) { #ifndef _di_level_0_parameter_checking_ if (!tripless) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -140,7 +140,7 @@ extern "C" { if (!amount) return F_data_not; if (tripless->used + amount > tripless->size) { - if (tripless->used + amount > F_array_length_t_size_d) { + if (tripless->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -152,7 +152,7 @@ extern "C" { #endif // _di_f_utf_string_tripless_increase_by_ #ifndef _di_f_utf_string_tripless_resize_ - f_status_t f_utf_string_tripless_resize(const f_array_length_t length, f_utf_string_tripless_t * const tripless) { + f_status_t f_utf_string_tripless_resize(const f_number_unsigned_t length, f_utf_string_tripless_t * const tripless) { #ifndef _di_level_0_parameter_checking_ if (!tripless) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_utf/c/utf/tripless.h b/level_0/f_utf/c/utf/tripless.h index ec2db14..a92615c 100644 --- a/level_0/f_utf/c/utf/tripless.h +++ b/level_0/f_utf/c/utf/tripless.h @@ -27,8 +27,8 @@ extern "C" { typedef struct { f_utf_string_triples_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } f_utf_string_tripless_t; #define f_utf_string_tripless_t_initialize f_utf_string_statics_t_initialize @@ -65,7 +65,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_utf_string_tripless_adjust_ - extern f_status_t f_utf_string_tripless_adjust(const f_array_length_t length, f_utf_string_tripless_t * const tripless); + extern f_status_t f_utf_string_tripless_adjust(const f_number_unsigned_t length, f_utf_string_tripless_t * const tripless); #endif // _di_f_utf_string_tripless_adjust_ /** @@ -131,7 +131,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_tripless_decimate_by_ - extern f_status_t f_utf_string_tripless_decimate_by(const f_array_length_t amount, f_utf_string_tripless_t * const tripless); + extern f_status_t f_utf_string_tripless_decimate_by(const f_number_unsigned_t amount, f_utf_string_tripless_t * const tripless); #endif // _di_f_utf_string_tripless_decimate_by_ /** @@ -155,13 +155,13 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_tripless_decrease_by_ - extern f_status_t f_utf_string_tripless_decrease_by(const f_array_length_t amount, f_utf_string_tripless_t * const tripless); + extern f_status_t f_utf_string_tripless_decrease_by(const f_number_unsigned_t amount, f_utf_string_tripless_t * const tripless); #endif // _di_f_utf_string_tripless_decrease_by_ /** * Increase the size of the string tripless 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param step @@ -180,14 +180,14 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_tripless_increase_ - extern f_status_t f_utf_string_tripless_increase(const f_array_length_t step, f_utf_string_tripless_t * const tripless); + extern f_status_t f_utf_string_tripless_increase(const f_number_unsigned_t step, f_utf_string_tripless_t * const tripless); #endif // _di_f_utf_string_tripless_increase_ /** * Resize the string tripless 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param amount @@ -205,7 +205,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_tripless_increase_by_ - extern f_status_t f_utf_string_tripless_increase_by(const f_array_length_t amount, f_utf_string_tripless_t * const tripless); + extern f_status_t f_utf_string_tripless_increase_by(const f_number_unsigned_t amount, f_utf_string_tripless_t * const tripless); #endif // _di_f_utf_string_tripless_increase_by_ /** @@ -224,7 +224,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_utf_string_tripless_resize_ - extern f_status_t f_utf_string_tripless_resize(const f_array_length_t length, f_utf_string_tripless_t * const tripless); + extern f_status_t f_utf_string_tripless_resize(const f_number_unsigned_t length, f_utf_string_tripless_t * const tripless); #endif // _di_f_utf_string_tripless_resize_ #ifdef __cplusplus diff --git a/level_0/f_utf/tests/unit/c/test-utf-append.c b/level_0/f_utf/tests/unit/c/test-utf-append.c index ba8e9e2..acc1e1b 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-append.c +++ b/level_0/f_utf/tests/unit/c/test-utf-append.c @@ -16,7 +16,7 @@ void test__f_utf_append__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, source.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.string[i], source.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-append_assure.c b/level_0/f_utf/tests/unit/c/test-utf-append_assure.c index 106cc5f..701ed62 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-append_assure.c +++ b/level_0/f_utf/tests/unit/c/test-utf-append_assure.c @@ -16,7 +16,7 @@ void test__f_utf_append_assure__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, source.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.string[i], source.string[i]); } // for } @@ -28,7 +28,7 @@ void test__f_utf_append_assure__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, source.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.string[i], source.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-append_assure_nulless.c b/level_0/f_utf/tests/unit/c/test-utf-append_assure_nulless.c index 1a28c83..51b7690 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-append_assure_nulless.c +++ b/level_0/f_utf/tests/unit/c/test-utf-append_assure_nulless.c @@ -17,7 +17,7 @@ void test__f_utf_append_assure_nulless__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected.used); - for (f_array_length_t i = 0; i < expected.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected.used; ++i) { assert_int_equal(destination.string[i], expected.string[i]); } // for } @@ -29,7 +29,7 @@ void test__f_utf_append_assure_nulless__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected.used); - for (f_array_length_t i = 0; i < expected.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected.used; ++i) { assert_int_equal(destination.string[i], expected.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-append_nulless.c b/level_0/f_utf/tests/unit/c/test-utf-append_nulless.c index 4696765..46550ff 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-append_nulless.c +++ b/level_0/f_utf/tests/unit/c/test-utf-append_nulless.c @@ -17,7 +17,7 @@ void test__f_utf_append_nulless__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected.used); - for (f_array_length_t i = 0; i < expected.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected.used; ++i) { assert_int_equal(destination.string[i], expected.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-character_is_combining.c b/level_0/f_utf/tests/unit/c/test-utf-character_is_combining.c index 6862757..37a465e 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-character_is_combining.c +++ b/level_0/f_utf/tests/unit/c/test-utf-character_is_combining.c @@ -15,7 +15,7 @@ void test__f_utf_character_is_combining__works(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-character_is_control.c b/level_0/f_utf/tests/unit/c/test-utf-character_is_control.c index 093dfca..65618d3 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-character_is_control.c +++ b/level_0/f_utf/tests/unit/c/test-utf-character_is_control.c @@ -15,7 +15,7 @@ void test__f_utf_character_is_control__works(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-character_is_digit.c b/level_0/f_utf/tests/unit/c/test-utf-character_is_digit.c index e00cae8..2f795d2 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-character_is_digit.c +++ b/level_0/f_utf/tests/unit/c/test-utf-character_is_digit.c @@ -18,7 +18,7 @@ void test__f_utf_character_is_digit__works(void **state) { ssize_t bytes = 0; ssize_t bytes_number = 0; uint64_t number = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-character_is_emoji.c b/level_0/f_utf/tests/unit/c/test-utf-character_is_emoji.c index f12a764..ca4f250 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-character_is_emoji.c +++ b/level_0/f_utf/tests/unit/c/test-utf-character_is_emoji.c @@ -15,7 +15,7 @@ void test__f_utf_character_is_emoji__works(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-character_is_numeric.c b/level_0/f_utf/tests/unit/c/test-utf-character_is_numeric.c index b260134..1d2069c 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-character_is_numeric.c +++ b/level_0/f_utf/tests/unit/c/test-utf-character_is_numeric.c @@ -15,7 +15,7 @@ void test__f_utf_character_is_numeric__works(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-character_is_phonetic.c b/level_0/f_utf/tests/unit/c/test-utf-character_is_phonetic.c index 44b0fdc..fa0ca33 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-character_is_phonetic.c +++ b/level_0/f_utf/tests/unit/c/test-utf-character_is_phonetic.c @@ -15,7 +15,7 @@ void test__f_utf_character_is_phonetic__works(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-character_is_private.c b/level_0/f_utf/tests/unit/c/test-utf-character_is_private.c index 3b75033..e8b35f3 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-character_is_private.c +++ b/level_0/f_utf/tests/unit/c/test-utf-character_is_private.c @@ -15,7 +15,7 @@ void test__f_utf_character_is_private__works(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-character_is_punctuation.c b/level_0/f_utf/tests/unit/c/test-utf-character_is_punctuation.c index 75ea00d..516a0b5 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-character_is_punctuation.c +++ b/level_0/f_utf/tests/unit/c/test-utf-character_is_punctuation.c @@ -15,7 +15,7 @@ void test__f_utf_character_is_punctuation__works(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-character_is_subscript.c b/level_0/f_utf/tests/unit/c/test-utf-character_is_subscript.c index dbf2cef..3b7364d 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-character_is_subscript.c +++ b/level_0/f_utf/tests/unit/c/test-utf-character_is_subscript.c @@ -15,7 +15,7 @@ void test__f_utf_character_is_subscript__works(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-character_is_superscript.c b/level_0/f_utf/tests/unit/c/test-utf-character_is_superscript.c index 7c22ad1..38d048a 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-character_is_superscript.c +++ b/level_0/f_utf/tests/unit/c/test-utf-character_is_superscript.c @@ -15,7 +15,7 @@ void test__f_utf_character_is_superscript__works(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-character_is_symbol.c b/level_0/f_utf/tests/unit/c/test-utf-character_is_symbol.c index 5ee9b20..405e811 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-character_is_symbol.c +++ b/level_0/f_utf/tests/unit/c/test-utf-character_is_symbol.c @@ -15,7 +15,7 @@ void test__f_utf_character_is_symbol__works(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-character_is_whitespace.c b/level_0/f_utf/tests/unit/c/test-utf-character_is_whitespace.c index 801d43d..97c7aef 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-character_is_whitespace.c +++ b/level_0/f_utf/tests/unit/c/test-utf-character_is_whitespace.c @@ -15,7 +15,7 @@ void test__f_utf_character_is_whitespace__works(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-character_is_whitespace_modifier.c b/level_0/f_utf/tests/unit/c/test-utf-character_is_whitespace_modifier.c index 47c6308..ed47077 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-character_is_whitespace_modifier.c +++ b/level_0/f_utf/tests/unit/c/test-utf-character_is_whitespace_modifier.c @@ -15,7 +15,7 @@ void test__f_utf_character_is_whitespace_modifier__works(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-character_is_whitespace_other.c b/level_0/f_utf/tests/unit/c/test-utf-character_is_whitespace_other.c index de038a1..d96712f 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-character_is_whitespace_other.c +++ b/level_0/f_utf/tests/unit/c/test-utf-character_is_whitespace_other.c @@ -15,7 +15,7 @@ void test__f_utf_character_is_whitespace_other__works(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-character_is_whitespace_zero_width.c b/level_0/f_utf/tests/unit/c/test-utf-character_is_whitespace_zero_width.c index dca1919..9714a55 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-character_is_whitespace_zero_width.c +++ b/level_0/f_utf/tests/unit/c/test-utf-character_is_whitespace_zero_width.c @@ -15,7 +15,7 @@ void test__f_utf_character_is_whitespace_zero_width__works(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-character_is_wide.c b/level_0/f_utf/tests/unit/c/test-utf-character_is_wide.c index 6f937a5..b3d0c59 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-character_is_wide.c +++ b/level_0/f_utf/tests/unit/c/test-utf-character_is_wide.c @@ -15,7 +15,7 @@ void test__f_utf_character_is_wide__works(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-character_is_word.c b/level_0/f_utf/tests/unit/c/test-utf-character_is_word.c index c433a15..01b715a 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-character_is_word.c +++ b/level_0/f_utf/tests/unit/c/test-utf-character_is_word.c @@ -15,7 +15,7 @@ void test__f_utf_character_is_word__strict_is_false(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); @@ -44,7 +44,7 @@ void test__f_utf_character_is_word__strict_is_true(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-character_is_word_dash.c b/level_0/f_utf/tests/unit/c/test-utf-character_is_word_dash.c index 580cf92..7cacda5 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-character_is_word_dash.c +++ b/level_0/f_utf/tests/unit/c/test-utf-character_is_word_dash.c @@ -15,7 +15,7 @@ void test__f_utf_character_is_word_dash__strict_is_false(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); @@ -44,7 +44,7 @@ void test__f_utf_character_is_word_dash__strict_is_true(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-character_is_word_dash_plus.c b/level_0/f_utf/tests/unit/c/test-utf-character_is_word_dash_plus.c index 6d2a76f..6879bda 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-character_is_word_dash_plus.c +++ b/level_0/f_utf/tests/unit/c/test-utf-character_is_word_dash_plus.c @@ -15,7 +15,7 @@ void test__f_utf_character_is_word_dash_plus__strict_is_false(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); @@ -44,7 +44,7 @@ void test__f_utf_character_is_word_dash_plus__strict_is_true(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-character_is_zero_width.c b/level_0/f_utf/tests/unit/c/test-utf-character_is_zero_width.c index a1d8f6c..2cc36cb 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-character_is_zero_width.c +++ b/level_0/f_utf/tests/unit/c/test-utf-character_is_zero_width.c @@ -15,7 +15,7 @@ void test__f_utf_character_is_zero_width__works(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_append.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_append.c index a0e7604..61d6321 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_append.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_append.c @@ -16,7 +16,7 @@ void test__f_utf_dynamic_append__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, source.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.string[i], source.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_append_assure.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_append_assure.c index 503e1ec..31cca70 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_append_assure.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_append_assure.c @@ -16,7 +16,7 @@ void test__f_utf_dynamic_append_assure__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, source.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.string[i], source.string[i]); } // for } @@ -28,7 +28,7 @@ void test__f_utf_dynamic_append_assure__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, source.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.string[i], source.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_append_assure_nulless.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_append_assure_nulless.c index 30fa46b..25a79f0 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_append_assure_nulless.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_append_assure_nulless.c @@ -17,7 +17,7 @@ void test__f_utf_dynamic_append_assure_nulless__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected.used); - for (f_array_length_t i = 0; i < expected.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected.used; ++i) { assert_int_equal(destination.string[i], expected.string[i]); } // for } @@ -29,7 +29,7 @@ void test__f_utf_dynamic_append_assure_nulless__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected.used); - for (f_array_length_t i = 0; i < expected.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected.used; ++i) { assert_int_equal(destination.string[i], expected.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_append_nulless.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_append_nulless.c index 7b39115..84961cd 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_append_nulless.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_append_nulless.c @@ -17,7 +17,7 @@ void test__f_utf_dynamic_append_nulless__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected.used); - for (f_array_length_t i = 0; i < expected.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected.used; ++i) { assert_int_equal(destination.string[i], expected.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_mash.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_mash.c index 1f0cbc0..f39a90b 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_mash.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_mash.c @@ -18,7 +18,7 @@ void test__f_utf_dynamic_mash__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, source.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.string[i], source.string[i]); } // for } @@ -30,7 +30,7 @@ void test__f_utf_dynamic_mash__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected.used); - for (f_array_length_t i = 0; i < expected.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected.used; ++i) { assert_int_equal(destination.string[i], expected.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_mash_nulless.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_mash_nulless.c index fa0f4fd..c81df1b 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_mash_nulless.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_mash_nulless.c @@ -19,7 +19,7 @@ void test__f_utf_dynamic_mash_nulless__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected1.used); - for (f_array_length_t i = 0; i < expected1.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected1.used; ++i) { assert_int_equal(destination.string[i], expected1.string[i]); } // for } @@ -31,7 +31,7 @@ void test__f_utf_dynamic_mash_nulless__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected2.used); - for (f_array_length_t i = 0; i < expected2.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected2.used; ++i) { assert_int_equal(destination.string[i], expected2.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_mish.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_mish.c index 6037e7b..032dea6 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_mish.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_mish.c @@ -18,7 +18,7 @@ void test__f_utf_dynamic_mish__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, source.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.string[i], source.string[i]); } // for } @@ -30,7 +30,7 @@ void test__f_utf_dynamic_mish__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected.used); - for (f_array_length_t i = 0; i < expected.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected.used; ++i) { assert_int_equal(destination.string[i], expected.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_mish_nulless.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_mish_nulless.c index af5482b..9521a8d 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_mish_nulless.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_mish_nulless.c @@ -19,7 +19,7 @@ void test__f_utf_dynamic_mish_nulless__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected1.used); - for (f_array_length_t i = 0; i < expected1.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected1.used; ++i) { assert_int_equal(destination.string[i], expected1.string[i]); } // for } @@ -31,7 +31,7 @@ void test__f_utf_dynamic_mish_nulless__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected2.used); - for (f_array_length_t i = 0; i < expected2.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected2.used; ++i) { assert_int_equal(destination.string[i], expected2.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_append.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_append.c index 8e5222b..2df9367 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_append.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_append.c @@ -18,7 +18,7 @@ void test__f_utf_dynamic_partial_append__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected.used); - for (f_array_length_t i = 0; i < expected.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected.used; ++i) { assert_int_equal(destination.string[i], expected.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_append_assure.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_append_assure.c index b1bd2de..a45e8c9 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_append_assure.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_append_assure.c @@ -18,7 +18,7 @@ void test__f_utf_dynamic_partial_append_assure__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected.used); - for (f_array_length_t i = 0; i < expected.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected.used; ++i) { assert_int_equal(destination.string[i], expected.string[i]); } // for } @@ -30,7 +30,7 @@ void test__f_utf_dynamic_partial_append_assure__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected.used); - for (f_array_length_t i = 0; i < expected.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected.used; ++i) { assert_int_equal(destination.string[i], expected.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_append_assure_nulless.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_append_assure_nulless.c index 5355b0e..ba8ac88 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_append_assure_nulless.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_append_assure_nulless.c @@ -18,7 +18,7 @@ void test__f_utf_dynamic_partial_append_assure_nulless__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected.used); - for (f_array_length_t i = 0; i < expected.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected.used; ++i) { assert_int_equal(destination.string[i], expected.string[i]); } // for } @@ -30,7 +30,7 @@ void test__f_utf_dynamic_partial_append_assure_nulless__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected.used); - for (f_array_length_t i = 0; i < expected.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected.used; ++i) { assert_int_equal(destination.string[i], expected.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_append_nulless.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_append_nulless.c index 680a25b..428a79c 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_append_nulless.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_append_nulless.c @@ -18,7 +18,7 @@ void test__f_utf_dynamic_partial_append_nulless__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected.used); - for (f_array_length_t i = 0; i < expected.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected.used; ++i) { assert_int_equal(destination.string[i], expected.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_mash.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_mash.c index 7ddc3a3..74f810f 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_mash.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_mash.c @@ -20,7 +20,7 @@ void test__f_utf_dynamic_partial_mash__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected1.used); - for (f_array_length_t i = 0; i < expected1.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected1.used; ++i) { assert_int_equal(destination.string[i], expected1.string[i]); } // for } @@ -32,7 +32,7 @@ void test__f_utf_dynamic_partial_mash__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected2.used); - for (f_array_length_t i = 0; i < expected2.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected2.used; ++i) { assert_int_equal(destination.string[i], expected2.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_mash_nulless.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_mash_nulless.c index f8bfdd0..bdffe2a 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_mash_nulless.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_mash_nulless.c @@ -20,7 +20,7 @@ void test__f_utf_dynamic_partial_mash_nulless__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected1.used); - for (f_array_length_t i = 0; i < expected1.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected1.used; ++i) { assert_int_equal(destination.string[i], expected1.string[i]); } // for } @@ -32,7 +32,7 @@ void test__f_utf_dynamic_partial_mash_nulless__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected2.used); - for (f_array_length_t i = 0; i < expected2.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected2.used; ++i) { assert_int_equal(destination.string[i], expected2.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_mish.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_mish.c index a57a43b..4cc99dd 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_mish.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_mish.c @@ -20,7 +20,7 @@ void test__f_utf_dynamic_partial_mish__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected1.used); - for (f_array_length_t i = 0; i < expected1.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected1.used; ++i) { assert_int_equal(destination.string[i], expected1.string[i]); } // for } @@ -32,7 +32,7 @@ void test__f_utf_dynamic_partial_mish__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected2.used); - for (f_array_length_t i = 0; i < expected2.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected2.used; ++i) { assert_int_equal(destination.string[i], expected2.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_mish_nulless.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_mish_nulless.c index 8dabf98..8697a95 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_mish_nulless.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_mish_nulless.c @@ -20,7 +20,7 @@ void test__f_utf_dynamic_partial_mish_nulless__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected1.used); - for (f_array_length_t i = 0; i < expected1.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected1.used; ++i) { assert_int_equal(destination.string[i], expected1.string[i]); } // for } @@ -32,7 +32,7 @@ void test__f_utf_dynamic_partial_mish_nulless__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected2.used); - for (f_array_length_t i = 0; i < expected2.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected2.used; ++i) { assert_int_equal(destination.string[i], expected2.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_prepend.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_prepend.c index c218eb7..2a25cc0 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_prepend.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_prepend.c @@ -18,7 +18,7 @@ void test__f_utf_dynamic_partial_prepend__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected.used); - for (f_array_length_t i = 0; i < expected.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected.used; ++i) { assert_int_equal(destination.string[i], expected.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_prepend_assure.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_prepend_assure.c index 04eb751..8aab875 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_prepend_assure.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_prepend_assure.c @@ -18,7 +18,7 @@ void test__f_utf_dynamic_partial_prepend_assure__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected.used); - for (f_array_length_t i = 0; i < expected.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected.used; ++i) { assert_int_equal(destination.string[i], expected.string[i]); } // for } @@ -30,7 +30,7 @@ void test__f_utf_dynamic_partial_prepend_assure__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected.used); - for (f_array_length_t i = 0; i < expected.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected.used; ++i) { assert_int_equal(destination.string[i], expected.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_prepend_assure_nulless.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_prepend_assure_nulless.c index fccd268..ff55d32 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_prepend_assure_nulless.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_prepend_assure_nulless.c @@ -18,7 +18,7 @@ void test__f_utf_dynamic_partial_prepend_assure_nulless__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected.used); - for (f_array_length_t i = 0; i < expected.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected.used; ++i) { assert_int_equal(destination.string[i], expected.string[i]); } // for } @@ -30,7 +30,7 @@ void test__f_utf_dynamic_partial_prepend_assure_nulless__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected.used); - for (f_array_length_t i = 0; i < expected.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected.used; ++i) { assert_int_equal(destination.string[i], expected.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_prepend_nulless.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_prepend_nulless.c index 03602e3..514e6bb 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_prepend_nulless.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_partial_prepend_nulless.c @@ -18,7 +18,7 @@ void test__f_utf_dynamic_partial_prepend_nulless__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected.used); - for (f_array_length_t i = 0; i < expected.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected.used; ++i) { assert_int_equal(destination.string[i], expected.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_prepend.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_prepend.c index a8b045a..155cf38 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_prepend.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_prepend.c @@ -16,7 +16,7 @@ void test__f_utf_dynamic_prepend__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, source.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.string[i], source.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_prepend_assure.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_prepend_assure.c index 98f0705..ebdf6ae 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_prepend_assure.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_prepend_assure.c @@ -16,7 +16,7 @@ void test__f_utf_dynamic_prepend_assure__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, source.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.string[i], source.string[i]); } // for } @@ -28,7 +28,7 @@ void test__f_utf_dynamic_prepend_assure__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, source.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.string[i], source.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_prepend_assure_nulless.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_prepend_assure_nulless.c index 047e5f9..80cf5bb 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_prepend_assure_nulless.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_prepend_assure_nulless.c @@ -17,7 +17,7 @@ void test__f_utf_dynamic_prepend_assure_nulless__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected.used); - for (f_array_length_t i = 0; i < expected.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected.used; ++i) { assert_int_equal(destination.string[i], expected.string[i]); } // for } @@ -29,7 +29,7 @@ void test__f_utf_dynamic_prepend_assure_nulless__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected.used); - for (f_array_length_t i = 0; i < expected.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected.used; ++i) { assert_int_equal(destination.string[i], expected.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_prepend_nulless.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_prepend_nulless.c index 6fd40a4..eed2182 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_prepend_nulless.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_prepend_nulless.c @@ -17,7 +17,7 @@ void test__f_utf_dynamic_prepend_nulless__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected.used); - for (f_array_length_t i = 0; i < expected.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected.used; ++i) { assert_int_equal(destination.string[i], expected.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_terminate.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_terminate.c index 5cbb469..4be036b 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_terminate.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_terminate.c @@ -7,7 +7,7 @@ extern "C" { void test__f_utf_dynamic_terminate__appends_null(void **state) { - const f_array_length_t length = 2; + const f_number_unsigned_t length = 2; f_utf_string_dynamic_t data = f_utf_string_dynamic_t_initialize; // Put some value in the unused section at the end so that it gets overridden. @@ -32,7 +32,7 @@ void test__f_utf_dynamic_terminate__appends_null(void **state) { void test__f_utf_dynamic_terminate__doesnt_append_null(void **state) { - const f_array_length_t length = 2; + const f_number_unsigned_t length = 2; f_utf_string_dynamic_t data = f_utf_string_dynamic_t_initialize; // Ensure a NULL already exists so that the test can confirm that another NULL is not appended. diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamic_terminate_after.c b/level_0/f_utf/tests/unit/c/test-utf-dynamic_terminate_after.c index 42d8ce9..5e36f3d 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamic_terminate_after.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamic_terminate_after.c @@ -6,7 +6,7 @@ extern "C" { #endif void test__f_utf_dynamic_terminate_after__appends_null(void **state) { - const f_array_length_t length = 2; + const f_number_unsigned_t length = 2; f_utf_string_dynamic_t data = f_utf_string_dynamic_t_initialize; // Put some value in the unused section at the end so that it gets overridden. @@ -33,7 +33,7 @@ void test__f_utf_dynamic_terminate_after__appends_null(void **state) { void test__f_utf_dynamic_terminate_after__doesnt_append_null(void **state) { - const f_array_length_t length = 2; + const f_number_unsigned_t length = 2; f_utf_string_dynamic_t data = f_utf_string_dynamic_t_initialize; // Ensure a NULL already exists so that the test can confirm that another NULL is not appended. diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamics_append.c b/level_0/f_utf/tests/unit/c/test-utf-dynamics_append.c index ae2a1ee..9ab35e1 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamics_append.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamics_append.c @@ -17,7 +17,7 @@ void test__f_utf_dynamics_append__works(void **state) { assert_int_equal(destination.used, 1); assert_int_equal(destination.array[0].used, source.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.array[0].string[i], source.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamics_append_all.c b/level_0/f_utf/tests/unit/c/test-utf-dynamics_append_all.c index bbb570d..bab2e30 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamics_append_all.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamics_append_all.c @@ -29,7 +29,7 @@ void test__f_utf_dynamics_append_all__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(source.array[source.used].used, test_sources[source.used].used); - for (f_array_length_t i = 0; i < source.array[source.used].used; ++i) { + for (f_number_unsigned_t i = 0; i < source.array[source.used].used; ++i) { assert_int_equal(source.array[source.used].string[i], test_sources[source.used].string[i]); } // for } // for @@ -42,21 +42,21 @@ void test__f_utf_dynamics_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.array[i].used, source.array[i].used); - for (f_array_length_t j = 0; j < destination.array[i].used; ++j) { + for (f_number_unsigned_t j = 0; j < destination.array[i].used; ++j) { assert_int_equal(destination.array[i].string[j], source.array[i].string[j]); } // for } // for } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { free((void *) source.array[i].string); } // for - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].string); } // for diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamicss_append.c b/level_0/f_utf/tests/unit/c/test-utf-dynamicss_append.c index 48c3b4d..9967075 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamicss_append.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamicss_append.c @@ -29,7 +29,7 @@ void test__f_utf_dynamicss_append__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(source.array[source.used].used, test_names[source.used].used); - for (f_array_length_t i = 0; i < source.array[source.used].used; ++i) { + for (f_number_unsigned_t i = 0; i < source.array[source.used].used; ++i) { assert_int_equal(source.array[source.used].string[i], test_names[source.used].string[i]); } // for } // for @@ -41,21 +41,21 @@ void test__f_utf_dynamicss_append__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.array[0].used, length_inner); - for (f_array_length_t i = 0; i < length_inner; ++i) { + for (f_number_unsigned_t i = 0; i < length_inner; ++i) { assert_int_equal(destination.array[0].array[i].used, test_names[i].used); - for (f_array_length_t j = 0; j < destination.array[0].array[i].used; ++j) { + for (f_number_unsigned_t j = 0; j < destination.array[0].array[i].used; ++j) { assert_int_equal(destination.array[0].array[i].string[j], test_names[i].string[j]); } // for } // for } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { free((void *) source.array[i].string); } // for - for (f_array_length_t i = 0; i < destination.array[0].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[0].used; ++i) { free((void *) destination.array[0].array[i].string); } // for diff --git a/level_0/f_utf/tests/unit/c/test-utf-dynamicss_append_all.c b/level_0/f_utf/tests/unit/c/test-utf-dynamicss_append_all.c index f5e3789..d6cf571 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-dynamicss_append_all.c +++ b/level_0/f_utf/tests/unit/c/test-utf-dynamicss_append_all.c @@ -24,7 +24,7 @@ void test__f_utf_dynamicss_append_all__works(void **state) { assert_int_equal(source.used, 0); assert_int_equal(source.size, length_outer); - f_array_length_t i = 0; + f_number_unsigned_t i = 0; for (; source.used < length_outer; ++source.used) { @@ -41,7 +41,7 @@ void test__f_utf_dynamicss_append_all__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(source.array[source.used].array[i].used, test_names[i].used); - for (f_array_length_t j = 0; j < source.array[source.used].array[i].used; ++j) { + for (f_number_unsigned_t j = 0; j < source.array[source.used].array[i].used; ++j) { assert_int_equal(source.array[source.used].array[i].string[j], test_names[i].string[j]); } // for } // for @@ -56,31 +56,31 @@ void test__f_utf_dynamicss_append_all__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, source.used); - for (f_array_length_t j = 0; j < length_outer; ++j) { + for (f_number_unsigned_t j = 0; j < length_outer; ++j) { - for (f_array_length_t i = 0; i < length_inner; ++i) { + for (f_number_unsigned_t i = 0; i < length_inner; ++i) { assert_int_equal(destination.array[j].array[i].used, test_names[i].used); - for (f_array_length_t k = 0; k < destination.array[j].array[i].used; ++k) { + for (f_number_unsigned_t k = 0; k < destination.array[j].array[i].used; ++k) { assert_int_equal(destination.array[j].array[i].string[k], test_names[i].string[k]); } // for } // for } // for } - for (f_array_length_t j = 0; j < source.used; ++j) { + for (f_number_unsigned_t j = 0; j < source.used; ++j) { - for (f_array_length_t i = 0; i < source.array[j].used; ++i) { + for (f_number_unsigned_t i = 0; i < source.array[j].used; ++i) { free((void *) source.array[j].array[i].string); } // for free((void *) source.array[j].array); } // for - for (f_array_length_t j = 0; j < destination.used; ++j) { + for (f_number_unsigned_t j = 0; j < destination.used; ++j) { - for (f_array_length_t i = 0; i < destination.array[j].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[j].used; ++i) { free((void *) destination.array[j].array[i].string); } // for diff --git a/level_0/f_utf/tests/unit/c/test-utf-is_combining.c b/level_0/f_utf/tests/unit/c/test-utf-is_combining.c index 0c0a63a..8a477c1 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-is_combining.c +++ b/level_0/f_utf/tests/unit/c/test-utf-is_combining.c @@ -15,7 +15,7 @@ void test__f_utf_is_combining__works(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-is_control.c b/level_0/f_utf/tests/unit/c/test-utf-is_control.c index 43087b8..ff4e40f 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-is_control.c +++ b/level_0/f_utf/tests/unit/c/test-utf-is_control.c @@ -15,7 +15,7 @@ void test__f_utf_is_control__works(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-is_digit.c b/level_0/f_utf/tests/unit/c/test-utf-is_digit.c index 9a7852e..419a184 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-is_digit.c +++ b/level_0/f_utf/tests/unit/c/test-utf-is_digit.c @@ -18,7 +18,7 @@ void test__f_utf_is_digit__works(void **state) { ssize_t bytes = 0; ssize_t bytes_number = 0; uint64_t number = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-is_emoji.c b/level_0/f_utf/tests/unit/c/test-utf-is_emoji.c index 014d350..1eb7f21 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-is_emoji.c +++ b/level_0/f_utf/tests/unit/c/test-utf-is_emoji.c @@ -15,7 +15,7 @@ void test__f_utf_is_emoji__works(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-is_numeric.c b/level_0/f_utf/tests/unit/c/test-utf-is_numeric.c index c397486..993198c 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-is_numeric.c +++ b/level_0/f_utf/tests/unit/c/test-utf-is_numeric.c @@ -15,7 +15,7 @@ void test__f_utf_is_numeric__works(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-is_phonetic.c b/level_0/f_utf/tests/unit/c/test-utf-is_phonetic.c index 4e2b3aa..6a0abaf 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-is_phonetic.c +++ b/level_0/f_utf/tests/unit/c/test-utf-is_phonetic.c @@ -15,7 +15,7 @@ void test__f_utf_is_phonetic__works(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-is_private.c b/level_0/f_utf/tests/unit/c/test-utf-is_private.c index e9d5f52..dc0d830 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-is_private.c +++ b/level_0/f_utf/tests/unit/c/test-utf-is_private.c @@ -15,7 +15,7 @@ void test__f_utf_is_private__works(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-is_punctuation.c b/level_0/f_utf/tests/unit/c/test-utf-is_punctuation.c index ca7f9e2..1673cf9 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-is_punctuation.c +++ b/level_0/f_utf/tests/unit/c/test-utf-is_punctuation.c @@ -15,7 +15,7 @@ void test__f_utf_is_punctuation__works(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-is_subscript.c b/level_0/f_utf/tests/unit/c/test-utf-is_subscript.c index 4924931..ca3f826 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-is_subscript.c +++ b/level_0/f_utf/tests/unit/c/test-utf-is_subscript.c @@ -15,7 +15,7 @@ void test__f_utf_is_subscript__works(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-is_superscript.c b/level_0/f_utf/tests/unit/c/test-utf-is_superscript.c index 9180f95..d27e888 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-is_superscript.c +++ b/level_0/f_utf/tests/unit/c/test-utf-is_superscript.c @@ -15,7 +15,7 @@ void test__f_utf_is_superscript__works(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-is_symbol.c b/level_0/f_utf/tests/unit/c/test-utf-is_symbol.c index 0646b0b..9716525 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-is_symbol.c +++ b/level_0/f_utf/tests/unit/c/test-utf-is_symbol.c @@ -15,7 +15,7 @@ void test__f_utf_is_symbol__works(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-is_whitespace.c b/level_0/f_utf/tests/unit/c/test-utf-is_whitespace.c index ba78894..222982c 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-is_whitespace.c +++ b/level_0/f_utf/tests/unit/c/test-utf-is_whitespace.c @@ -15,7 +15,7 @@ void test__f_utf_is_whitespace__works(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-is_whitespace_modifier.c b/level_0/f_utf/tests/unit/c/test-utf-is_whitespace_modifier.c index 57c5771..e8cd69c 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-is_whitespace_modifier.c +++ b/level_0/f_utf/tests/unit/c/test-utf-is_whitespace_modifier.c @@ -15,7 +15,7 @@ void test__f_utf_is_whitespace_modifier__works(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-is_whitespace_other.c b/level_0/f_utf/tests/unit/c/test-utf-is_whitespace_other.c index 5690110..6f653a5 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-is_whitespace_other.c +++ b/level_0/f_utf/tests/unit/c/test-utf-is_whitespace_other.c @@ -15,7 +15,7 @@ void test__f_utf_is_whitespace_other__works(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-is_whitespace_zero_width.c b/level_0/f_utf/tests/unit/c/test-utf-is_whitespace_zero_width.c index bc5dbe9..8a57cba 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-is_whitespace_zero_width.c +++ b/level_0/f_utf/tests/unit/c/test-utf-is_whitespace_zero_width.c @@ -15,7 +15,7 @@ void test__f_utf_is_whitespace_zero_width__works(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-is_wide.c b/level_0/f_utf/tests/unit/c/test-utf-is_wide.c index ddab706..c1cf078 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-is_wide.c +++ b/level_0/f_utf/tests/unit/c/test-utf-is_wide.c @@ -15,7 +15,7 @@ void test__f_utf_is_wide__works(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-is_word.c b/level_0/f_utf/tests/unit/c/test-utf-is_word.c index 3d35ba4..eb5036f 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-is_word.c +++ b/level_0/f_utf/tests/unit/c/test-utf-is_word.c @@ -15,7 +15,7 @@ void test__f_utf_is_word__strict_is_false(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); @@ -61,7 +61,7 @@ void test__f_utf_is_word__strict_is_true(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-is_word_dash.c b/level_0/f_utf/tests/unit/c/test-utf-is_word_dash.c index d65d1ae..370c638 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-is_word_dash.c +++ b/level_0/f_utf/tests/unit/c/test-utf-is_word_dash.c @@ -15,7 +15,7 @@ void test__f_utf_is_word_dash__strict_is_false(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); @@ -61,7 +61,7 @@ void test__f_utf_is_word_dash__strict_is_true(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-is_word_dash_plus.c b/level_0/f_utf/tests/unit/c/test-utf-is_word_dash_plus.c index 50da276..1f95b6a 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-is_word_dash_plus.c +++ b/level_0/f_utf/tests/unit/c/test-utf-is_word_dash_plus.c @@ -15,7 +15,7 @@ void test__f_utf_is_word_dash_plus__strict_is_false(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); @@ -61,7 +61,7 @@ void test__f_utf_is_word_dash_plus__strict_is_true(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-is_zero_width.c b/level_0/f_utf/tests/unit/c/test-utf-is_zero_width.c index a3c183e..d70e5cd 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-is_zero_width.c +++ b/level_0/f_utf/tests/unit/c/test-utf-is_zero_width.c @@ -15,7 +15,7 @@ void test__f_utf_is_zero_width__works(void **state) { f_utf_char_t sequence = 0; ssize_t bytes = 0; - f_array_length_t line = 0; + f_number_unsigned_t line = 0; do { bytes = data__bytesequence_get_line(file, &sequence); diff --git a/level_0/f_utf/tests/unit/c/test-utf-map_multis_append.c b/level_0/f_utf/tests/unit/c/test-utf-map_multis_append.c index 88d8b89..60ef6b1 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-map_multis_append.c +++ b/level_0/f_utf/tests/unit/c/test-utf-map_multis_append.c @@ -25,7 +25,7 @@ void test__f_utf_map_multis_append__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(source.name.used, test_name.used); - for (f_array_length_t i = 0; i < source.name.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.name.used; ++i) { assert_int_equal(source.name.string[i], test_name.string[i]); } // for @@ -36,11 +36,11 @@ void test__f_utf_map_multis_append__works(void **state) { assert_int_equal(source.value.array[0].used, test_value.array[0].used); assert_int_equal(source.value.array[1].used, test_value.array[1].used); - for (f_array_length_t i = 0; i < source.value.array[0].used; ++i) { + for (f_number_unsigned_t i = 0; i < source.value.array[0].used; ++i) { assert_int_equal(source.value.array[0].string[i], test_value.array[0].string[i]); } // for - for (f_array_length_t i = 0; i < source.value.array[1].used; ++i) { + for (f_number_unsigned_t i = 0; i < source.value.array[1].used; ++i) { assert_int_equal(source.value.array[1].string[i], test_value.array[1].string[i]); } // for } @@ -59,15 +59,15 @@ void test__f_utf_map_multis_append__works(void **state) { assert_string_equal(destination.array[0].value.array[0].string, source.value.array[0].string); assert_string_equal(destination.array[0].value.array[1].string, source.value.array[1].string); - for (f_array_length_t j = 0; j < destination.array[0].name.used; ++j) { + for (f_number_unsigned_t j = 0; j < destination.array[0].name.used; ++j) { assert_int_equal(destination.array[0].name.string[j], source.name.string[j]); } // for - for (f_array_length_t j = 0; j < destination.array[0].value.array[0].used; ++j) { + for (f_number_unsigned_t j = 0; j < destination.array[0].value.array[0].used; ++j) { assert_int_equal(destination.array[0].value.array[0].string[j], source.value.array[0].string[j]); } // for - for (f_array_length_t j = 0; j < destination.array[0].value.array[1].used; ++j) { + for (f_number_unsigned_t j = 0; j < destination.array[0].value.array[1].used; ++j) { assert_int_equal(destination.array[0].value.array[1].string[j], source.value.array[1].string[j]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-map_multis_append_all.c b/level_0/f_utf/tests/unit/c/test-utf-map_multis_append_all.c index 283d4e6..22dc620 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-map_multis_append_all.c +++ b/level_0/f_utf/tests/unit/c/test-utf-map_multis_append_all.c @@ -51,7 +51,7 @@ void test__f_utf_map_multis_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < length_inner; ++i) { + for (f_number_unsigned_t i = 0; i < length_inner; ++i) { assert_int_equal(destination.array[i].name.used, source.array[i].name.used); assert_int_equal(destination.array[i].value.used, source.array[i].value.used); @@ -64,7 +64,7 @@ void test__f_utf_map_multis_append_all__works(void **state) { } // for } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { free((void *) source.array[i].name.string); free((void *) source.array[i].value.array[0].string); @@ -72,7 +72,7 @@ void test__f_utf_map_multis_append_all__works(void **state) { free((void *) source.array[i].value.array); } // for - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].name.string); free((void *) destination.array[i].value.array[0].string); diff --git a/level_0/f_utf/tests/unit/c/test-utf-map_multiss_append.c b/level_0/f_utf/tests/unit/c/test-utf-map_multiss_append.c index 1038079..aee96de 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-map_multiss_append.c +++ b/level_0/f_utf/tests/unit/c/test-utf-map_multiss_append.c @@ -64,7 +64,7 @@ void test__f_utf_map_multiss_append__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.array[0].used, length_inner); - for (f_array_length_t i = 0; i < length_inner; ++i) { + for (f_number_unsigned_t i = 0; i < length_inner; ++i) { assert_int_equal(destination.array[0].array[i].name.used, test_names[i].used); assert_int_equal(destination.array[0].array[i].value.used, test_values[i].used); @@ -77,7 +77,7 @@ void test__f_utf_map_multiss_append__works(void **state) { } // for } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { free((void *) source.array[i].name.string); free((void *) source.array[i].value.array[0].string); @@ -86,7 +86,7 @@ void test__f_utf_map_multiss_append__works(void **state) { } // for - for (f_array_length_t i = 0; i < destination.array[0].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[0].used; ++i) { free((void *) destination.array[0].array[i].name.string); free((void *) destination.array[0].array[i].value.array[0].string); diff --git a/level_0/f_utf/tests/unit/c/test-utf-map_multiss_append_all.c b/level_0/f_utf/tests/unit/c/test-utf-map_multiss_append_all.c index 397473a..bc06232 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-map_multiss_append_all.c +++ b/level_0/f_utf/tests/unit/c/test-utf-map_multiss_append_all.c @@ -40,7 +40,7 @@ void test__f_utf_map_multiss_append_all__works(void **state) { assert_int_equal(source.used, 0); assert_int_equal(source.size, length_outer); - f_array_length_t i = 0; + f_number_unsigned_t i = 0; for (; source.used < length_outer; ++source.used) { @@ -79,9 +79,9 @@ void test__f_utf_map_multiss_append_all__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, source.used); - for (f_array_length_t j = 0; j < length_outer; ++j) { + for (f_number_unsigned_t j = 0; j < length_outer; ++j) { - for (f_array_length_t i = 0; i < length_inner; ++i) { + for (f_number_unsigned_t i = 0; i < length_inner; ++i) { assert_int_equal(destination.array[j].array[i].name.used, test_names[i].used); assert_int_equal(destination.array[j].array[i].value.used, test_values[i].used); @@ -95,9 +95,9 @@ void test__f_utf_map_multiss_append_all__works(void **state) { } // for } - for (f_array_length_t j = 0; j < source.used; ++j) { + for (f_number_unsigned_t j = 0; j < source.used; ++j) { - for (f_array_length_t i = 0; i < source.array[j].used; ++i) { + for (f_number_unsigned_t i = 0; i < source.array[j].used; ++i) { free((void *) source.array[j].array[i].name.string); free((void *) source.array[j].array[i].value.array[0].string); @@ -108,9 +108,9 @@ void test__f_utf_map_multiss_append_all__works(void **state) { free((void *) source.array[j].array); } // for - for (f_array_length_t j = 0; j < destination.used; ++j) { + for (f_number_unsigned_t j = 0; j < destination.used; ++j) { - for (f_array_length_t i = 0; i < destination.array[j].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[j].used; ++i) { free((void *) destination.array[j].array[i].name.string); free((void *) destination.array[j].array[i].value.array[0].string); diff --git a/level_0/f_utf/tests/unit/c/test-utf-maps_append_all.c b/level_0/f_utf/tests/unit/c/test-utf-maps_append_all.c index a084c59..7471413 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-maps_append_all.c +++ b/level_0/f_utf/tests/unit/c/test-utf-maps_append_all.c @@ -43,7 +43,7 @@ void test__f_utf_maps_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < length_inner; ++i) { + for (f_number_unsigned_t i = 0; i < length_inner; ++i) { assert_int_equal(destination.array[i].name.used, source.array[i].name.used); assert_int_equal(destination.array[i].value.used, source.array[i].value.used); @@ -53,13 +53,13 @@ void test__f_utf_maps_append_all__works(void **state) { } // for } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { free((void *) source.array[i].name.string); free((void *) source.array[i].value.string); } // for - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].name.string); free((void *) destination.array[i].value.string); diff --git a/level_0/f_utf/tests/unit/c/test-utf-mapss_append.c b/level_0/f_utf/tests/unit/c/test-utf-mapss_append.c index 9f5ca1f..f522e1b 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-mapss_append.c +++ b/level_0/f_utf/tests/unit/c/test-utf-mapss_append.c @@ -49,7 +49,7 @@ void test__f_utf_mapss_append__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.array[0].used, length_inner); - for (f_array_length_t i = 0; i < length_inner; ++i) { + for (f_number_unsigned_t i = 0; i < length_inner; ++i) { assert_int_equal(destination.array[0].array[i].name.used, test_names[i].used); assert_int_equal(destination.array[0].array[i].value.used, test_values[i].used); @@ -59,14 +59,14 @@ void test__f_utf_mapss_append__works(void **state) { } // for } - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { free((void *) source.array[i].name.string); free((void *) source.array[i].value.string); } // for - for (f_array_length_t i = 0; i < destination.array[0].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[0].used; ++i) { free((void *) destination.array[0].array[i].name.string); free((void *) destination.array[0].array[i].value.string); diff --git a/level_0/f_utf/tests/unit/c/test-utf-mapss_append_all.c b/level_0/f_utf/tests/unit/c/test-utf-mapss_append_all.c index dc9b486..9632928 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-mapss_append_all.c +++ b/level_0/f_utf/tests/unit/c/test-utf-mapss_append_all.c @@ -29,7 +29,7 @@ void test__f_utf_mapss_append_all__works(void **state) { assert_int_equal(source.used, 0); assert_int_equal(source.size, length_outer); - f_array_length_t i = 0; + f_number_unsigned_t i = 0; for (; source.used < length_outer; ++source.used) { @@ -64,9 +64,9 @@ void test__f_utf_mapss_append_all__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, source.used); - for (f_array_length_t j = 0; j < length_outer; ++j) { + for (f_number_unsigned_t j = 0; j < length_outer; ++j) { - for (f_array_length_t i = 0; i < length_inner; ++i) { + for (f_number_unsigned_t i = 0; i < length_inner; ++i) { assert_int_equal(destination.array[j].array[i].name.used, test_names[i].used); assert_int_equal(destination.array[j].array[i].value.used, test_values[i].used); @@ -77,9 +77,9 @@ void test__f_utf_mapss_append_all__works(void **state) { } // for } - for (f_array_length_t j = 0; j < source.used; ++j) { + for (f_number_unsigned_t j = 0; j < source.used; ++j) { - for (f_array_length_t i = 0; i < source.array[j].used; ++i) { + for (f_number_unsigned_t i = 0; i < source.array[j].used; ++i) { free((void *) source.array[j].array[i].name.string); free((void *) source.array[j].array[i].value.string); @@ -88,9 +88,9 @@ void test__f_utf_mapss_append_all__works(void **state) { free((void *) source.array[j].array); } // for - for (f_array_length_t j = 0; j < destination.used; ++j) { + for (f_number_unsigned_t j = 0; j < destination.used; ++j) { - for (f_array_length_t i = 0; i < destination.array[j].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[j].used; ++i) { free((void *) destination.array[j].array[i].name.string); free((void *) destination.array[j].array[i].value.string); diff --git a/level_0/f_utf/tests/unit/c/test-utf-mash.c b/level_0/f_utf/tests/unit/c/test-utf-mash.c index 9df7b16..a84dc53 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-mash.c +++ b/level_0/f_utf/tests/unit/c/test-utf-mash.c @@ -18,7 +18,7 @@ void test__f_utf_mash__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, source.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.string[i], source.string[i]); } // for } @@ -30,7 +30,7 @@ void test__f_utf_mash__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.string[i], source.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-mash_nulless.c b/level_0/f_utf/tests/unit/c/test-utf-mash_nulless.c index c067bf9..c9a3312 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-mash_nulless.c +++ b/level_0/f_utf/tests/unit/c/test-utf-mash_nulless.c @@ -19,7 +19,7 @@ void test__f_utf_mash_nulless__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected1.used); - for (f_array_length_t i = 0; i < expected1.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected1.used; ++i) { assert_int_equal(destination.string[i], expected1.string[i]); } // for } @@ -31,7 +31,7 @@ void test__f_utf_mash_nulless__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected2.used); - for (f_array_length_t i = 0; i < expected2.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected2.used; ++i) { assert_int_equal(destination.string[i], expected2.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-mish.c b/level_0/f_utf/tests/unit/c/test-utf-mish.c index bd3ea5d..7f0bd53 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-mish.c +++ b/level_0/f_utf/tests/unit/c/test-utf-mish.c @@ -18,7 +18,7 @@ void test__f_utf_mish__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, source.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.string[i], source.string[i]); } // for } @@ -30,7 +30,7 @@ void test__f_utf_mish__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected.used); - for (f_array_length_t i = 0; i < expected.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected.used; ++i) { assert_int_equal(destination.string[i], expected.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-mish_nulless.c b/level_0/f_utf/tests/unit/c/test-utf-mish_nulless.c index ef99e8a..69dec7d 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-mish_nulless.c +++ b/level_0/f_utf/tests/unit/c/test-utf-mish_nulless.c @@ -19,7 +19,7 @@ void test__f_utf_mish_nulless__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected1.used); - for (f_array_length_t i = 0; i < expected1.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected1.used; ++i) { assert_int_equal(destination.string[i], expected1.string[i]); } // for } @@ -31,7 +31,7 @@ void test__f_utf_mish_nulless__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected2.used); - for (f_array_length_t i = 0; i < expected2.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected2.used; ++i) { assert_int_equal(destination.string[i], expected2.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-prepend.c b/level_0/f_utf/tests/unit/c/test-utf-prepend.c index fa71b60..02a284f 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-prepend.c +++ b/level_0/f_utf/tests/unit/c/test-utf-prepend.c @@ -16,7 +16,7 @@ void test__f_utf_prepend__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, source.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.string[i], source.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-prepend_assure.c b/level_0/f_utf/tests/unit/c/test-utf-prepend_assure.c index 8f99fbf..b2fe26e 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-prepend_assure.c +++ b/level_0/f_utf/tests/unit/c/test-utf-prepend_assure.c @@ -16,7 +16,7 @@ void test__f_utf_prepend_assure__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, source.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.string[i], source.string[i]); } // for } @@ -28,7 +28,7 @@ void test__f_utf_prepend_assure__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, source.used); - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { assert_int_equal(destination.string[i], source.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-prepend_assure_nulless.c b/level_0/f_utf/tests/unit/c/test-utf-prepend_assure_nulless.c index 657022c..a62459f 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-prepend_assure_nulless.c +++ b/level_0/f_utf/tests/unit/c/test-utf-prepend_assure_nulless.c @@ -17,7 +17,7 @@ void test__f_utf_prepend_assure_nulless__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected.used); - for (f_array_length_t i = 0; i < expected.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected.used; ++i) { assert_int_equal(destination.string[i], expected.string[i]); } // for } @@ -29,7 +29,7 @@ void test__f_utf_prepend_assure_nulless__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected.used); - for (f_array_length_t i = 0; i < expected.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected.used; ++i) { assert_int_equal(destination.string[i], expected.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-prepend_nulless.c b/level_0/f_utf/tests/unit/c/test-utf-prepend_nulless.c index da0ed95..a53396e 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-prepend_nulless.c +++ b/level_0/f_utf/tests/unit/c/test-utf-prepend_nulless.c @@ -17,7 +17,7 @@ void test__f_utf_prepend_nulless__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, expected.used); - for (f_array_length_t i = 0; i < expected.used; ++i) { + for (f_number_unsigned_t i = 0; i < expected.used; ++i) { assert_int_equal(destination.string[i], expected.string[i]); } // for } diff --git a/level_0/f_utf/tests/unit/c/test-utf-triples_append_all.c b/level_0/f_utf/tests/unit/c/test-utf-triples_append_all.c index 889c168..958c368 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-triples_append_all.c +++ b/level_0/f_utf/tests/unit/c/test-utf-triples_append_all.c @@ -32,7 +32,7 @@ void test__f_utf_triples_append_all__works(void **state) { assert_int_equal(destination.used, source.used); assert_int_equal(destination.size, source.used); - for (f_array_length_t i = 0; i < length_sources; ++i) { + for (f_number_unsigned_t i = 0; i < length_sources; ++i) { assert_int_equal(destination.array[i].a.used, source.array[i].a.used); assert_int_equal(destination.array[i].b.used, source.array[i].b.used); @@ -44,7 +44,7 @@ void test__f_utf_triples_append_all__works(void **state) { } // for } - for (f_array_length_t i = 0; i < destination.used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.used; ++i) { free((void *) destination.array[i].a.string); free((void *) destination.array[i].b.string); diff --git a/level_0/f_utf/tests/unit/c/test-utf-tripless_append.c b/level_0/f_utf/tests/unit/c/test-utf-tripless_append.c index 578770e..13d4903 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-tripless_append.c +++ b/level_0/f_utf/tests/unit/c/test-utf-tripless_append.c @@ -31,7 +31,7 @@ void test__f_utf_tripless_append__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.array[0].used, length_sources); - for (f_array_length_t i = 0; i < length_sources; ++i) { + for (f_number_unsigned_t i = 0; i < length_sources; ++i) { assert_int_equal(destination.array[0].array[i].a.used, sources_array[i].a.used); assert_int_equal(destination.array[0].array[i].b.used, sources_array[i].b.used); @@ -43,7 +43,7 @@ void test__f_utf_tripless_append__works(void **state) { } // for } - for (f_array_length_t i = 0; i < destination.array[0].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[0].used; ++i) { free((void *) destination.array[0].array[i].a.string); free((void *) destination.array[0].array[i].b.string); diff --git a/level_0/f_utf/tests/unit/c/test-utf-tripless_append_all.c b/level_0/f_utf/tests/unit/c/test-utf-tripless_append_all.c index 4963b40..5e8908e 100644 --- a/level_0/f_utf/tests/unit/c/test-utf-tripless_append_all.c +++ b/level_0/f_utf/tests/unit/c/test-utf-tripless_append_all.c @@ -50,9 +50,9 @@ void test__f_utf_tripless_append_all__works(void **state) { assert_int_equal(status, F_none); assert_int_equal(destination.used, source.used); - for (f_array_length_t j = 0; j < length_sources_set; ++j) { + for (f_number_unsigned_t j = 0; j < length_sources_set; ++j) { - for (f_array_length_t i = 0; i < length_sources; ++i) { + for (f_number_unsigned_t i = 0; i < length_sources; ++i) { assert_int_equal(destination.array[j].array[i].a.used, sources_set_array[j].array[i].a.used); assert_int_equal(destination.array[j].array[i].b.used, sources_set_array[j].array[i].b.used); @@ -65,9 +65,9 @@ void test__f_utf_tripless_append_all__works(void **state) { } // for } - for (f_array_length_t j = 0; j < destination.used; ++j) { + for (f_number_unsigned_t j = 0; j < destination.used; ++j) { - for (f_array_length_t i = 0; i < destination.array[j].used; ++i) { + for (f_number_unsigned_t i = 0; i < destination.array[j].used; ++i) { free((void *) destination.array[j].array[i].a.string); free((void *) destination.array[j].array[i].b.string); diff --git a/level_1/fl_control_group/c/control_group.c b/level_1/fl_control_group/c/control_group.c index 4bed9db..fca2507 100644 --- a/level_1/fl_control_group/c/control_group.c +++ b/level_1/fl_control_group/c/control_group.c @@ -25,7 +25,7 @@ extern "C" { f_status_t status = F_none; f_string_static_t path = f_string_static_t_initialize; - for (f_array_length_t i = 0; i < control_group.groups.used; ++i) { + for (f_number_unsigned_t i = 0; i < control_group.groups.used; ++i) { if (!control_group.groups.array[i].used) continue; diff --git a/level_1/fl_conversion/c/private-conversion.c b/level_1/fl_conversion/c/private-conversion.c index 8b05abc..500fd0e 100644 --- a/level_1/fl_conversion/c/private-conversion.c +++ b/level_1/fl_conversion/c/private-conversion.c @@ -6,13 +6,13 @@ extern "C" { #endif #if !defined(_di_fl_conversion_dynamic_partial_to_binary_signed_) || !defined(_di_fl_conversion_dynamic_partial_to_signed_detect_) || !defined(_di_fl_conversion_dynamic_to_binary_signed_) || !defined(_di_fl_conversion_dynamic_to_signed_detect_) - f_status_t private_fl_conversion_dynamic_to_binary_signed(const uint16_t flag, const f_string_t string, const f_array_length_t length, f_number_signed_t * const number) { + f_status_t private_fl_conversion_dynamic_to_binary_signed(const uint16_t flag, const f_string_t string, const f_number_unsigned_t length, f_number_signed_t * const number) { uint8_t digits = 0; uint8_t digit = 0; f_number_unsigned_t converted = 0; - for (f_array_length_t i = 0; i < length; ++i) { + for (f_number_unsigned_t i = 0; i < length; ++i) { if (string[i] == f_string_ascii_period_s.string[0]) { return F_status_set_error(F_number_decimal); @@ -88,13 +88,13 @@ extern "C" { #endif // !defined(_di_fl_conversion_dynamic_partial_to_binary_signed_) || !defined(_di_fl_conversion_dynamic_partial_to_signed_detect_) || !defined(_di_fl_conversion_dynamic_to_binary_signed_) || !defined(_di_fl_conversion_dynamic_to_signed_detect_) #if !defined(_di_fl_conversion_dynamic_partial_to_binary_unsigned_) || !defined(_di_fl_conversion_dynamic_partial_to_unsigned_detect_) || !defined(_di_fl_conversion_dynamic_to_binary_unsigned_) || !defined(_di_fl_conversion_dynamic_to_unsigned_detect_) - f_status_t private_fl_conversion_dynamic_to_binary_unsigned(const uint16_t flag, const f_string_t string, const f_array_length_t length, f_number_unsigned_t * const number) { + f_status_t private_fl_conversion_dynamic_to_binary_unsigned(const uint16_t flag, const f_string_t string, const f_number_unsigned_t length, f_number_unsigned_t * const number) { uint8_t digits = 0; uint8_t digit = 0; f_number_unsigned_t converted = 0; - for (f_array_length_t i = 0; i < length; ++i) { + for (f_number_unsigned_t i = 0; i < length; ++i) { if (string[i] == f_string_ascii_period_s.string[0]) { return F_status_set_error(F_number_decimal); @@ -141,7 +141,7 @@ extern "C" { #endif // !defined(_di_fl_conversion_dynamic_partial_to_binary_unsigned_) || !defined(_di_fl_conversion_dynamic_partial_to_unsigned_detect_) || !defined(_di_fl_conversion_dynamic_to_binary_unsigned_) || !defined(_di_fl_conversion_dynamic_to_unsigned_detect_) #if !defined(_di_fl_conversion_dynamic_partial_to_decimal_signed_) || !defined(_di_fl_conversion_dynamic_partial_to_signed_detect_) || !defined(_di_fl_conversion_dynamic_to_decimal_signed_) || !defined(_di_fl_conversion_dynamic_to_signed_detect_) - f_status_t private_fl_conversion_dynamic_to_base_signed(const fl_conversion_data_t data, const f_string_t string, const f_array_length_t length, f_number_signed_t * const number) { + f_status_t private_fl_conversion_dynamic_to_base_signed(const fl_conversion_data_t data, const f_string_t string, const f_number_unsigned_t length, f_number_signed_t * const number) { uint8_t digits = 0; uint8_t digit = 0; @@ -162,7 +162,7 @@ extern "C" { character_to_digit = f_conversion_character_to_octal; } - for (f_array_length_t i = 0; i < length; ++i) { + for (f_number_unsigned_t i = 0; i < length; ++i) { if (string[i] == f_string_ascii_period_s.string[0]) { return F_status_set_error(F_number_decimal); @@ -237,7 +237,7 @@ extern "C" { #endif // !defined(_di_fl_conversion_dynamic_partial_to_decimal_signed_) || !defined(_di_fl_conversion_dynamic_partial_to_signed_detect_) || !defined(_di_fl_conversion_dynamic_to_decimal_signed_) || !defined(_di_fl_conversion_dynamic_to_signed_detect_) #if !defined(_di_fl_conversion_dynamic_partial_to_decimal_unsigned_) || !defined(_di_fl_conversion_dynamic_partial_to_unsigned_detect_) || !defined(_di_fl_conversion_dynamic_to_decimal_unsigned_) || !defined(_di_fl_conversion_dynamic_to_unsigned_detect_) - f_status_t private_fl_conversion_dynamic_to_base_unsigned(const fl_conversion_data_t data, const f_string_t string, const f_array_length_t length, f_number_unsigned_t * const number) { + f_status_t private_fl_conversion_dynamic_to_base_unsigned(const fl_conversion_data_t data, const f_string_t string, const f_number_unsigned_t length, f_number_unsigned_t * const number) { uint8_t digits = 0; uint8_t digit = 0; @@ -258,7 +258,7 @@ extern "C" { character_to_digit = f_conversion_character_to_octal; } - for (f_array_length_t i = 0; i < length; ++i) { + for (f_number_unsigned_t i = 0; i < length; ++i) { if (string[i] == f_string_ascii_period_s.string[0]) { return F_status_set_error(F_number_decimal); @@ -315,17 +315,17 @@ extern "C" { #endif // !defined(_di_fl_conversion_dynamic_partial_to_decimal_unsigned_) || !defined(_di_fl_conversion_dynamic_partial_to_unsigned_detect_) || !defined(_di_fl_conversion_dynamic_to_decimal_unsigned_) || !defined(_di_fl_conversion_dynamic_to_unsigned_detect_) #if !defined(_di_fl_conversion_dynamic_to_signed_detect_) || !defined(_di_fl_conversion_dynamic_partial_to_signed_detect_) - f_status_t private_fl_conversion_dynamic_to_signed_detect(const uint16_t flag, const f_string_t string, const f_array_length_t length, f_number_signed_t * const number) { + f_status_t private_fl_conversion_dynamic_to_signed_detect(const uint16_t flag, const f_string_t string, const f_number_unsigned_t length, f_number_signed_t * const number) { uint8_t width = 0; - f_array_length_t width_max = 0; + f_number_unsigned_t width_max = 0; uint8_t mode = 0; int8_t vector = 0; // 0 for assumed positive, 1 for explicit positive, -1 for negative. - f_array_length_t j = 0; - f_array_length_t offset = 0; + f_number_unsigned_t j = 0; + f_number_unsigned_t offset = 0; f_status_t status = F_none; - for (f_array_length_t i = 0; i < length; ++i) { + for (f_number_unsigned_t i = 0; i < length; ++i) { width = macro_f_utf_byte_width_is(string[i]); @@ -472,17 +472,17 @@ extern "C" { #endif // !defined(_di_fl_conversion_dynamic_to_signed_detect_) || !defined(_di_fl_conversion_dynamic_partial_to_signed_detect_) #if !defined(_di_fl_conversion_dynamic_to_unsigned_detect_) || !defined(_di_fl_conversion_dynamic_partial_to_unsigned_detect_) - f_status_t private_fl_conversion_dynamic_to_unsigned_detect(const uint16_t flag, const f_string_t string, const f_array_length_t length, f_number_unsigned_t * const number) { + f_status_t private_fl_conversion_dynamic_to_unsigned_detect(const uint16_t flag, const f_string_t string, const f_number_unsigned_t length, f_number_unsigned_t * const number) { uint8_t width = 0; - f_array_length_t width_max = 0; + f_number_unsigned_t width_max = 0; uint8_t mode = 0; - f_array_length_t j = 0; - f_array_length_t offset = 0; + f_number_unsigned_t j = 0; + f_number_unsigned_t offset = 0; f_status_t status = F_none; int8_t sign_found = 0; - for (f_array_length_t i = 0; i < length; ++i) { + for (f_number_unsigned_t i = 0; i < length; ++i) { width = macro_f_utf_byte_width_is(string[i]); diff --git a/level_1/fl_conversion/c/private-conversion.h b/level_1/fl_conversion/c/private-conversion.h index 856c8f3..30cff93 100644 --- a/level_1/fl_conversion/c/private-conversion.h +++ b/level_1/fl_conversion/c/private-conversion.h @@ -46,7 +46,7 @@ extern "C" { * @see fl_conversion_dynamic_to_signed_detect() */ #if !defined(_di_fl_conversion_dynamic_partial_to_binary_signed_) || !defined(_di_fl_conversion_dynamic_partial_to_signed_detect_) || !defined(_di_fl_conversion_dynamic_to_binary_signed_) || !defined(_di_fl_conversion_dynamic_to_signed_detect_) - extern f_status_t private_fl_conversion_dynamic_to_binary_signed(const uint16_t flag, const f_string_t string, const f_array_length_t length, f_number_signed_t * const number) F_attribute_visibility_internal_d; + extern f_status_t private_fl_conversion_dynamic_to_binary_signed(const uint16_t flag, const f_string_t string, const f_number_unsigned_t length, f_number_signed_t * const number) F_attribute_visibility_internal_d; #endif // !defined(_di_fl_conversion_dynamic_partial_to_binary_signed_) || !defined(_di_fl_conversion_dynamic_partial_to_signed_detect_) || !defined(_di_fl_conversion_dynamic_to_binary_signed_) || !defined(_di_fl_conversion_dynamic_to_signed_detect_) /** @@ -79,7 +79,7 @@ extern "C" { * @see fl_conversion_dynamic_to_unsigned_detect() */ #if !defined(_di_fl_conversion_dynamic_partial_to_binary_unsigned_) || !defined(_di_fl_conversion_dynamic_partial_to_unsigned_detect_) || !defined(_di_fl_conversion_dynamic_to_binary_unsigned_) || !defined(_di_fl_conversion_dynamic_to_unsigned_detect_) - extern f_status_t private_fl_conversion_dynamic_to_binary_unsigned(const uint16_t flag, const f_string_t string, const f_array_length_t length, f_number_unsigned_t * const number) F_attribute_visibility_internal_d; + extern f_status_t private_fl_conversion_dynamic_to_binary_unsigned(const uint16_t flag, const f_string_t string, const f_number_unsigned_t length, f_number_unsigned_t * const number) F_attribute_visibility_internal_d; #endif // !defined(_di_fl_conversion_dynamic_partial_to_binary_unsigned_) || !defined(_di_fl_conversion_dynamic_partial_to_unsigned_detect_) || !defined(_di_fl_conversion_dynamic_to_binary_unsigned_) || !defined(_di_fl_conversion_dynamic_to_unsigned_detect_) /** @@ -113,7 +113,7 @@ extern "C" { * @see fl_conversion_dynamic_to_unsigned_detect() */ #if !defined(_di_fl_conversion_dynamic_partial_to_decimal_signed_) || !defined(_di_fl_conversion_dynamic_partial_to_signed_detect_) || !defined(_di_fl_conversion_dynamic_to_decimal_signed_) || !defined(_di_fl_conversion_dynamic_to_signed_detect_) - extern f_status_t private_fl_conversion_dynamic_to_base_signed(const fl_conversion_data_t data, const f_string_t string, const f_array_length_t length, f_number_signed_t * const number) F_attribute_visibility_internal_d; + extern f_status_t private_fl_conversion_dynamic_to_base_signed(const fl_conversion_data_t data, const f_string_t string, const f_number_unsigned_t length, f_number_signed_t * const number) F_attribute_visibility_internal_d; #endif // !defined(_di_fl_conversion_dynamic_partial_to_decimal_signed_) || !defined(_di_fl_conversion_dynamic_partial_to_signed_detect_) || !defined(_di_fl_conversion_dynamic_to_decimal_signed_) || !defined(_di_fl_conversion_dynamic_to_signed_detect_) /** @@ -146,7 +146,7 @@ extern "C" { * @see fl_conversion_dynamic_to_unsigned_detect() */ #if !defined(_di_fl_conversion_dynamic_partial_to_decimal_unsigned_) || !defined(_di_fl_conversion_dynamic_partial_to_unsigned_detect_) || !defined(_di_fl_conversion_dynamic_to_decimal_unsigned_) || !defined(_di_fl_conversion_dynamic_to_unsigned_detect_) - extern f_status_t private_fl_conversion_dynamic_to_base_unsigned(const fl_conversion_data_t data, const f_string_t string, const f_array_length_t length, f_number_unsigned_t * const number) F_attribute_visibility_internal_d; + extern f_status_t private_fl_conversion_dynamic_to_base_unsigned(const fl_conversion_data_t data, const f_string_t string, const f_number_unsigned_t length, f_number_unsigned_t * const number) F_attribute_visibility_internal_d; #endif // !defined(_di_fl_conversion_dynamic_partial_to_decimal_unsigned_) || !defined(_di_fl_conversion_dynamic_partial_to_unsigned_detect_) || !defined(_di_fl_conversion_dynamic_to_decimal_unsigned_) || !defined(_di_fl_conversion_dynamic_to_unsigned_detect_) /** @@ -176,7 +176,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #if !defined(_di_fl_conversion_dynamic_to_signed_detect_) || !defined(_di_fl_conversion_dynamic_partial_to_signed_detect_) - extern f_status_t private_fl_conversion_dynamic_to_signed_detect(const uint16_t flag, const f_string_t string, const f_array_length_t length, f_number_signed_t * const number) F_attribute_visibility_internal_d; + extern f_status_t private_fl_conversion_dynamic_to_signed_detect(const uint16_t flag, const f_string_t string, const f_number_unsigned_t length, f_number_signed_t * const number) F_attribute_visibility_internal_d; #endif // !defined(_di_fl_conversion_dynamic_to_signed_detect_) || !defined(_di_fl_conversion_dynamic_partial_to_signed_detect_) /** @@ -210,7 +210,7 @@ extern "C" { * @see strtoull() */ #if !defined(_di_fl_conversion_dynamic_to_unsigned_detect_) || !defined(_di_fl_conversion_dynamic_partial_to_unsigned_detect_) - extern f_status_t private_fl_conversion_dynamic_to_unsigned_detect(const uint16_t flag, const f_string_t string, const f_array_length_t length, f_number_unsigned_t * const number) F_attribute_visibility_internal_d; + extern f_status_t private_fl_conversion_dynamic_to_unsigned_detect(const uint16_t flag, const f_string_t string, const f_number_unsigned_t length, f_number_unsigned_t * const number) F_attribute_visibility_internal_d; #endif // !defined(_di_fl_conversion_dynamic_to_unsigned_detect_) || !defined(_di_fl_conversion_dynamic_partial_to_unsigned_detect_) #ifdef __cplusplus diff --git a/level_1/fl_directory/c/directory.c b/level_1/fl_directory/c/directory.c index ff059c2..21475c8 100644 --- a/level_1/fl_directory/c/directory.c +++ b/level_1/fl_directory/c/directory.c @@ -15,8 +15,8 @@ extern "C" { if (status == F_true) return F_directory_found; { - f_array_length_t at_tree = 0; - f_array_length_t at_path = 0; + f_number_unsigned_t at_tree = 0; + f_number_unsigned_t at_path = 0; f_string_static_t tree = f_string_static_t_initialize; f_char_t tree_string[path.used + 1]; @@ -201,8 +201,8 @@ extern "C" { const bool null_terminated = path->string[path->used] == 0; bool first_nulless = F_false; - f_array_length_t i = path->used - 1; - f_array_length_t j = 0; + f_number_unsigned_t i = path->used - 1; + f_number_unsigned_t j = 0; f_status_t status = F_none; diff --git a/level_1/fl_directory/c/private-directory.c b/level_1/fl_directory/c/private-directory.c index eb34e16..0e756ba 100644 --- a/level_1/fl_directory/c/private-directory.c +++ b/level_1/fl_directory/c/private-directory.c @@ -47,9 +47,9 @@ extern "C" { recurse->state.status = F_none; - f_array_length_t i = 0; + f_number_unsigned_t i = 0; uint8_t j = 0; - const f_array_length_t used_original = recurse->path.used; + const f_number_unsigned_t used_original = recurse->path.used; static const uint8_t flag_actions[] = { f_directory_recurse_do_flag_before_e, @@ -364,14 +364,14 @@ extern "C" { bool separator_prepend = F_false; bool separator_append = F_false; - f_array_length_t total = 0; - f_array_length_t start = 0; - f_array_length_t length_truncated = source.used; + f_number_unsigned_t total = 0; + f_number_unsigned_t start = 0; + f_number_unsigned_t length_truncated = source.used; f_status_t status = F_none; { - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; if (destination->used > 0) { if (!destination->string[destination->used - 1]) { diff --git a/level_1/fl_environment/c/environment.c b/level_1/fl_environment/c/environment.c index e395a4d..859acc0 100644 --- a/level_1/fl_environment/c/environment.c +++ b/level_1/fl_environment/c/environment.c @@ -52,7 +52,7 @@ extern "C" { f_status_t status = f_string_maps_increase_by(names.used, environment); if (F_status_is_error(status)) return status; - for (f_array_length_t i = 0; i < names.used; ++i) { + for (f_number_unsigned_t i = 0; i < names.used; ++i) { environment->array[environment->used].name.used = 0; environment->array[environment->used].value.used = 0; @@ -98,11 +98,11 @@ extern "C" { return F_none; } - f_array_length_t i = 0; - f_array_length_t j = 0; - f_array_length_t k = 0; - f_array_length_t first = 0; - f_array_length_t total = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; + f_number_unsigned_t first = 0; + f_number_unsigned_t total = 0; // Do a quick pre-process of PATH to approximate the amount of parts needed, reducing the number of allocations. for (; i <= path.used; ++i) { @@ -274,12 +274,12 @@ extern "C" { return F_none; } - f_array_length_t i = 0; - f_array_length_t j = 0; - f_array_length_t k = 0; - f_array_length_t r = path.used; - f_array_length_t last = path.used; - f_array_length_t total = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; + f_number_unsigned_t r = path.used; + f_number_unsigned_t last = path.used; + f_number_unsigned_t total = 0; // Do a quick pre-process of PATH to approximate the amount of parts needed, reducing the number of allocations. for (; i <= path.used; ++i) { diff --git a/level_1/fl_fss/c/fss/basic.c b/level_1/fl_fss/c/fss/basic.c index e52e1c1..76999e6 100644 --- a/level_1/fl_fss/c/fss/basic.c +++ b/level_1/fl_fss/c/fss/basic.c @@ -103,7 +103,7 @@ extern "C" { return; } - const f_array_length_t destination_used = destination->used; + const f_number_unsigned_t destination_used = destination->used; for (; range->start <= range->stop && range->start < content.used; ++range->start) { @@ -161,7 +161,7 @@ extern "C" { } #endif // _di_level_1_parameter_checking_ - const f_array_length_t delimits_used = delimits->used; + const f_number_unsigned_t delimits_used = delimits->used; private_fl_fss_basic_read(buffer, F_true, range, found, quote, delimits, state); @@ -188,7 +188,7 @@ extern "C" { } #endif // _di_level_1_parameter_checking_ - const f_array_length_t destination_used = destination->used; + const f_number_unsigned_t destination_used = destination->used; private_fl_fss_basic_write(F_true, object, quote ? quote : f_fss_quote_double_s.string[0], range, destination, state); diff --git a/level_1/fl_fss/c/fss/basic.h b/level_1/fl_fss/c/fss/basic.h index 05a7274..d94d5a4 100644 --- a/level_1/fl_fss/c/fss/basic.h +++ b/level_1/fl_fss/c/fss/basic.h @@ -180,8 +180,8 @@ extern "C" { * F_interrupt (with error bit) if stopping due to an interrupt. * F_parameter (with error bit) if a parameter is invalid. * - * Errors (with error bit) from: f_array_lengths_increase(). - * Errors (with error bit) from: f_array_lengths_increase_by(). + * Errors (with error bit) from: f_number_unsigneds_increase(). + * Errors (with error bit) from: f_number_unsigneds_increase_by(). * Errors (with error bit) from: f_fss_is_graph(). * Errors (with error bit) from: f_fss_is_space(). * Errors (with error bit) from: f_fss_is_zero_width(). @@ -190,8 +190,8 @@ extern "C" { * Errors (with error bit) from: f_fss_skip_past_space(). * Errors (with error bit) from: f_utf_buffer_increment(). * - * @see f_array_lengths_increase() - * @see f_array_lengths_increase_by() + * @see f_number_unsigneds_increase() + * @see f_number_unsigneds_increase_by() * @see f_fss_is_graph() * @see f_fss_is_space() * @see f_fss_is_zero_width() diff --git a/level_1/fl_fss/c/fss/basic_list.c b/level_1/fl_fss/c/fss/basic_list.c index 558d626..a3c0c84 100644 --- a/level_1/fl_fss/c/fss/basic_list.c +++ b/level_1/fl_fss/c/fss/basic_list.c @@ -17,8 +17,8 @@ extern "C" { } #endif // _di_level_1_parameter_checking_ - const f_array_length_t delimits_used = delimits->used; - const f_array_length_t comments_used = comments->used; + const f_number_unsigned_t delimits_used = delimits->used; + const f_number_unsigned_t comments_used = comments->used; f_fss_skip_past_delimit(buffer, range, state); if (F_status_is_error(state->status)) return; @@ -45,11 +45,11 @@ extern "C" { found->array[found->used].start = range->start; - f_array_length_t newline_last = range->start; - f_array_length_t slash_first = 0; - f_array_length_t slash_count = 0; - f_array_length_t start = 0; - f_array_length_t comment_delimit = 0; + f_number_unsigned_t newline_last = range->start; + f_number_unsigned_t slash_first = 0; + f_number_unsigned_t slash_count = 0; + f_number_unsigned_t start = 0; + f_number_unsigned_t comment_delimit = 0; uint8_t graph_first = 0x1; // 0x0 = false, 0x1 = true, 0x2 = false, but there is a delimited comment, comment_delimit is set. @@ -63,7 +63,7 @@ extern "C" { if (buffer.string[range->start] == f_fss_eol_s.string[0]) { if (graph_first == 0x2) { - state->status = f_array_lengths_increase(state->step_small, delimits); + state->status = f_number_unsigneds_increase(state->step_small, delimits); if (F_status_is_error(state->status)) break; delimits->array[delimits->used++] = comment_delimit; @@ -132,7 +132,7 @@ extern "C" { return; } - state->status = f_array_lengths_increase_by((slash_count / 2) + 1, delimits); + state->status = f_number_unsigneds_increase_by((slash_count / 2) + 1, delimits); if (F_status_is_error(state->status)) break; while (slash_count > 0) { @@ -152,7 +152,7 @@ extern "C" { if (F_status_is_error(state->status)) break; if (graph_first == 0x2) { - state->status = f_array_lengths_increase(state->step_small, delimits); + state->status = f_number_unsigneds_increase(state->step_small, delimits); if (F_status_is_error(state->status)) break; delimits->array[delimits->used++] = comment_delimit; @@ -217,7 +217,7 @@ extern "C" { if (buffer.string[range->start] == f_fss_eol_s.string[0]) { if (graph_first == 0x2) { - state->status = f_array_lengths_increase(state->step_small, delimits); + state->status = f_number_unsigneds_increase(state->step_small, delimits); if (F_status_is_error(state->status)) break; delimits->array[delimits->used++] = comment_delimit; @@ -328,15 +328,15 @@ extern "C" { state->status = f_string_dynamic_increase_by(state->step_small + 3, destination); if (F_status_is_error(state->status)) return; - const f_array_length_t destination_used = destination->used; + const f_number_unsigned_t destination_used = destination->used; bool is_comment = F_false; bool has_graph = F_false; bool do_prepend = prepend ? F_true : F_false; - f_array_length_t i = 0; - f_array_length_t slash_count = 0; - f_array_length_t start = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t slash_count = 0; + f_number_unsigned_t start = 0; uint8_t width = 0; @@ -551,7 +551,7 @@ extern "C" { } #endif // _di_level_1_parameter_checking_ - const f_array_length_t delimits_used = delimits->used; + const f_number_unsigned_t delimits_used = delimits->used; f_fss_skip_past_space(buffer, range, state); if (F_status_is_error(state->status)) return; @@ -606,10 +606,10 @@ extern "C" { return; } - f_array_length_t slash_first = 0; - f_array_length_t slash_count = 0; - f_array_length_t start = 0; - f_array_length_t stop = 0; + f_number_unsigned_t slash_first = 0; + f_number_unsigned_t slash_count = 0; + f_number_unsigned_t start = 0; + f_number_unsigned_t stop = 0; bool graph_first = F_true; @@ -699,7 +699,7 @@ extern "C" { range->start = slash_first; - state->status = f_array_lengths_increase_by((slash_count / 2) + 1, delimits); + state->status = f_number_unsigneds_increase_by((slash_count / 2) + 1, delimits); if (F_status_is_error(state->status)) break; if (slash_count % 2 == 0) { @@ -740,7 +740,7 @@ extern "C" { graph_first = F_false; // Comments may only have white space before the '#', therefore only the first slash needs to be delimited. - state->status = f_array_lengths_increase(state->step_small, delimits); + state->status = f_number_unsigneds_increase(state->step_small, delimits); if (F_status_is_error(state->status)) break; delimits->array[delimits->used++] = slash_first; @@ -885,10 +885,10 @@ extern "C" { return; } - const f_array_length_t destination_used = destination->used; + const f_number_unsigned_t destination_used = destination->used; - f_array_length_t i = 0; - f_array_length_t slash_count = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t slash_count = 0; uint8_t width = 0; diff --git a/level_1/fl_fss/c/fss/basic_list.h b/level_1/fl_fss/c/fss/basic_list.h index 0b2d75b..51722cd 100644 --- a/level_1/fl_fss/c/fss/basic_list.h +++ b/level_1/fl_fss/c/fss/basic_list.h @@ -74,16 +74,16 @@ extern "C" { * F_interrupt (with error bit) if stopping due to an interrupt. * F_parameter (with error bit) if a parameter is invalid. * - * Errors (with error bit) from: f_array_lengths_increase(). - * Errors (with error bit) from: f_array_lengths_increase_by(). + * Errors (with error bit) from: f_number_unsigneds_increase(). + * Errors (with error bit) from: f_number_unsigneds_increase_by(). * Errors (with error bit) from: f_fss_is_space(). * Errors (with error bit) from: f_fss_seek_to_eol(). * Errors (with error bit) from: f_fss_skip_past_delimit(). * Errors (with error bit) from: f_string_ranges_increase(). * Errors (with error bit) from: f_utf_buffer_increment(). * - * @see f_array_lengths_increase() - * @see f_array_lengths_increase_by() + * @see f_number_unsigneds_increase() + * @see f_number_unsigneds_increase_by() * @see f_fss_is_space() * @see f_fss_seek_to_eol() * @see f_fss_skip_past_delimit() @@ -200,7 +200,7 @@ extern "C" { * F_interrupt (with error bit) if stopping due to an interrupt. * F_parameter (with error bit) if a parameter is invalid. * - * Errors (with error bit) from: f_array_lengths_increase_by(). + * Errors (with error bit) from: f_number_unsigneds_increase_by(). * Errors (with error bit) from: f_fss_is_graph(). * Errors (with error bit) from: f_fss_is_space(). * Errors (with error bit) from: f_fss_is_zero_width(). @@ -209,7 +209,7 @@ extern "C" { * Errors (with error bit) from: f_fss_skip_past_space(). * Errors (with error bit) from: f_utf_buffer_increment(). * - * @see f_array_lengths_increase_by() + * @see f_number_unsigneds_increase_by() * @see f_fss_is_graph() * @see f_fss_is_space() * @see f_fss_is_zero_width() diff --git a/level_1/fl_fss/c/fss/embedded_list.c b/level_1/fl_fss/c/fss/embedded_list.c index 6dfb271..fb5f78d 100644 --- a/level_1/fl_fss/c/fss/embedded_list.c +++ b/level_1/fl_fss/c/fss/embedded_list.c @@ -25,9 +25,9 @@ extern "C" { state->status = f_fss_nest_increase(state->step_small, found); if (F_status_is_error(state->status)) return; - f_array_lengths_t positions_start = f_array_lengths_t_initialize; + f_number_unsigneds_t positions_start = f_number_unsigneds_t_initialize; - state->status = f_array_lengths_increase(state->step_small, &positions_start); + state->status = f_number_unsigneds_increase(state->step_small, &positions_start); if (F_status_is_error(state->status)) return; f_fss_objects_t objects = f_fss_objects_t_initialize; @@ -35,37 +35,37 @@ extern "C" { state->status = f_string_ranges_increase(state->step_small, &objects); if (F_status_is_error(state->status)) { - f_array_lengths_resize(0, &positions_start); + f_number_unsigneds_resize(0, &positions_start); return; } - f_array_lengths_t slashes = f_array_lengths_t_initialize; + f_number_unsigneds_t slashes = f_number_unsigneds_t_initialize; - state->status = f_array_lengths_increase(state->step_small, &slashes); + state->status = f_number_unsigneds_increase(state->step_small, &slashes); if (F_status_is_error(state->status)) { - f_array_lengths_resize(0, &positions_start); + f_number_unsigneds_resize(0, &positions_start); f_string_ranges_resize(0, &objects); return; } - const f_array_length_t delimits_used = delimits->used; - const f_array_length_t comments_used = comments->used; + const f_number_unsigned_t delimits_used = delimits->used; + const f_number_unsigned_t comments_used = comments->used; - f_array_length_t depth = 0; - f_array_length_t position = 0; + f_number_unsigned_t depth = 0; + f_number_unsigned_t position = 0; - f_array_length_t position_previous = range->start; - f_array_length_t line_start = range->start; - f_array_length_t newline_last = range->start; - f_array_length_t comment_delimit = 0; + f_number_unsigned_t position_previous = range->start; + f_number_unsigned_t line_start = range->start; + f_number_unsigned_t newline_last = range->start; + f_number_unsigned_t comment_delimit = 0; - f_array_length_t slash_first = 0; - f_array_length_t slash_last = 0; + f_number_unsigned_t slash_first = 0; + f_number_unsigned_t slash_last = 0; - f_array_length_t before_list_open = position_previous; + f_number_unsigned_t before_list_open = position_previous; bool is_open = F_false; @@ -89,7 +89,7 @@ extern "C" { if (buffer.string[range->start] == f_fss_eol_s.string[0]) { if (graph_first == 0x2) { - state->status = f_array_lengths_increase(state->step_small, delimits); + state->status = f_number_unsigneds_increase(state->step_small, delimits); if (F_status_is_error(state->status)) break; delimits->array[delimits->used++] = comment_delimit; @@ -104,9 +104,9 @@ extern "C" { delimits->used = delimits_used; comments->used = comments_used; - f_array_lengths_resize(0, &positions_start); + f_number_unsigneds_resize(0, &positions_start); f_string_ranges_resize(0, &objects); - f_array_lengths_resize(0, &slashes); + f_number_unsigneds_resize(0, &slashes); state->status = (range->start >= buffer.used) ? F_end_not_nest_eos : F_end_not_nest_stop; @@ -115,9 +115,9 @@ extern "C" { } else { if (range->start >= buffer.used || range->start > range->stop) { - f_array_lengths_resize(0, &positions_start); + f_number_unsigneds_resize(0, &positions_start); f_string_ranges_resize(0, &objects); - f_array_lengths_resize(0, &slashes); + f_number_unsigneds_resize(0, &slashes); state->status = (range->start >= buffer.used) ? F_none_eos : F_none_stop; @@ -163,9 +163,9 @@ extern "C" { delimits->used = delimits_used; comments->used = comments_used; - f_array_lengths_resize(0, &positions_start); + f_number_unsigneds_resize(0, &positions_start); f_string_ranges_resize(0, &objects); - f_array_lengths_resize(0, &slashes); + f_number_unsigneds_resize(0, &slashes); state->status = (range->start >= buffer.used) ? F_end_not_nest_eos : F_end_not_nest_stop; @@ -177,9 +177,9 @@ extern "C" { delimits->used = delimits_used; comments->used = comments_used; - f_array_lengths_resize(0, &positions_start); + f_number_unsigneds_resize(0, &positions_start); f_string_ranges_resize(0, &objects); - f_array_lengths_resize(0, &slashes); + f_number_unsigneds_resize(0, &slashes); state->status = (range->start >= buffer.used) ? F_data_not_eos : F_data_not_stop; @@ -194,7 +194,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_s.string[0]) { if (graph_first == 0x2) { - state->status = f_array_lengths_increase(state->step_small, delimits); + state->status = f_number_unsigneds_increase(state->step_small, delimits); if (F_status_is_error(state->status)) break; delimits->array[delimits->used++] = comment_delimit; @@ -225,7 +225,7 @@ extern "C" { if (buffer.string[range->start] == f_fss_eol_s.string[0]) { if (graph_first == 0x2) { - state->status = f_array_lengths_increase(state->step_small, delimits); + state->status = f_number_unsigneds_increase(state->step_small, delimits); if (F_status_is_error(state->status)) break; delimits->array[delimits->used++] = comment_delimit; @@ -259,9 +259,9 @@ extern "C" { delimits->used = delimits_used; comments->used = comments_used; - f_array_lengths_resize(0, &positions_start); + f_number_unsigneds_resize(0, &positions_start); f_string_ranges_resize(0, &objects); - f_array_lengths_resize(0, &slashes); + f_number_unsigneds_resize(0, &slashes); state->status = (range->start >= buffer.used) ? F_end_not_nest_eos : F_end_not_nest_stop; @@ -273,9 +273,9 @@ extern "C" { delimits->used = delimits_used; comments->used = comments_used; - f_array_lengths_resize(0, &positions_start); + f_number_unsigneds_resize(0, &positions_start); f_string_ranges_resize(0, &objects); - f_array_lengths_resize(0, &slashes); + f_number_unsigneds_resize(0, &slashes); state->status = (range->start >= buffer.used) ? F_data_not_eos : F_data_not_stop; @@ -298,7 +298,7 @@ extern "C" { range->start = slash_first; - state->status = f_array_lengths_increase_by((slashes.array[depth] / 2) + 1, delimits); + state->status = f_number_unsigneds_increase_by((slashes.array[depth] / 2) + 1, delimits); if (F_status_is_error(state->status)) break; // Apply slash delimits, only slashes and placeholders should be present. @@ -321,13 +321,13 @@ extern "C" { // When slashes are even, the object is valid and needs to be processed. if (is_object) { if (++depth > positions_start.size) { - state->status = f_array_lengths_increase(state->step_small, &positions_start); + state->status = f_number_unsigneds_increase(state->step_small, &positions_start); if (F_status_is_error(state->status)) break; state->status = f_string_ranges_increase(state->step_small, &objects); if (F_status_is_error(state->status)) break; - state->status = f_array_lengths_increase(state->step_small, &slashes); + state->status = f_number_unsigneds_increase(state->step_small, &slashes); if (F_status_is_error(state->status)) break; } @@ -345,7 +345,7 @@ extern "C" { } } else { - state->status = f_array_lengths_increase(state->step_small, delimits); + state->status = f_number_unsigneds_increase(state->step_small, delimits); if (F_status_is_error(state->status)) break; delimits->array[delimits->used++] = slash_last; @@ -400,9 +400,9 @@ extern "C" { delimits->used = delimits_used; comments->used = comments_used; - f_array_lengths_resize(0, &positions_start); + f_number_unsigneds_resize(0, &positions_start); f_string_ranges_resize(0, &objects); - f_array_lengths_resize(0, &slashes); + f_number_unsigneds_resize(0, &slashes); state->status = (range->start >= buffer.used) ? F_end_not_nest_eos : F_end_not_nest_stop; @@ -414,9 +414,9 @@ extern "C" { delimits->used = delimits_used; comments->used = comments_used; - f_array_lengths_resize(0, &positions_start); + f_number_unsigneds_resize(0, &positions_start); f_string_ranges_resize(0, &objects); - f_array_lengths_resize(0, &slashes); + f_number_unsigneds_resize(0, &slashes); state->status = (range->start >= buffer.used) ? F_data_not_eos : F_data_not_stop; @@ -428,13 +428,13 @@ extern "C" { ++depth; if (depth >= positions_start.size) { - state->status = f_array_lengths_increase(state->step_small, &positions_start); + state->status = f_number_unsigneds_increase(state->step_small, &positions_start); if (F_status_is_error(state->status)) break; state->status = f_string_ranges_increase(state->step_small, &objects); if (F_status_is_error(state->status)) break; - state->status = f_array_lengths_increase(state->step_small, &slashes); + state->status = f_number_unsigneds_increase(state->step_small, &slashes); if (F_status_is_error(state->status)) break; } @@ -451,7 +451,7 @@ extern "C" { slashes.array[depth] = 0; if (graph_first == 0x2) { - state->status = f_array_lengths_increase(state->step_small, delimits); + state->status = f_number_unsigneds_increase(state->step_small, delimits); if (F_status_is_error(state->status)) break; delimits->array[delimits->used++] = comment_delimit; @@ -468,7 +468,7 @@ extern "C" { if (F_status_is_error(state->status)) break; if (graph_first == 0x2) { - state->status = f_array_lengths_increase(state->step_small, delimits); + state->status = f_number_unsigneds_increase(state->step_small, delimits); if (F_status_is_error(state->status)) break; delimits->array[delimits->used++] = comment_delimit; @@ -505,9 +505,9 @@ extern "C" { delimits->used = delimits_used; comments->used = comments_used; - f_array_lengths_resize(0, &positions_start); + f_number_unsigneds_resize(0, &positions_start); f_string_ranges_resize(0, &objects); - f_array_lengths_resize(0, &slashes); + f_number_unsigneds_resize(0, &slashes); state->status = (range->start >= buffer.used) ? F_end_not_nest_eos : F_end_not_nest_stop; @@ -519,9 +519,9 @@ extern "C" { delimits->used = delimits_used; comments->used = comments_used; - f_array_lengths_resize(0, &positions_start); + f_number_unsigneds_resize(0, &positions_start); f_string_ranges_resize(0, &objects); - f_array_lengths_resize(0, &slashes); + f_number_unsigneds_resize(0, &slashes); state->status = (range->start >= buffer.used) ? F_data_not_eos : F_data_not_stop; @@ -563,9 +563,9 @@ extern "C" { delimits->used = delimits_used; comments->used = comments_used; - f_array_lengths_resize(0, &positions_start); + f_number_unsigneds_resize(0, &positions_start); f_string_ranges_resize(0, &objects); - f_array_lengths_resize(0, &slashes); + f_number_unsigneds_resize(0, &slashes); state->status = (range->start >= buffer.used) ? F_end_not_nest_eos : F_end_not_nest_stop; @@ -577,9 +577,9 @@ extern "C" { delimits->used = delimits_used; comments->used = comments_used; - f_array_lengths_resize(0, &positions_start); + f_number_unsigneds_resize(0, &positions_start); f_string_ranges_resize(0, &objects); - f_array_lengths_resize(0, &slashes); + f_number_unsigneds_resize(0, &slashes); state->status = (range->start >= buffer.used) ? F_data_not_eos : F_data_not_stop; @@ -624,7 +624,7 @@ extern "C" { } if (graph_first == 0x2) { - state->status = f_array_lengths_increase(state->step_small, delimits); + state->status = f_number_unsigneds_increase(state->step_small, delimits); if (F_status_is_error(state->status)) break; delimits->array[delimits->used++] = comment_delimit; @@ -638,9 +638,9 @@ extern "C" { state->status = f_utf_buffer_increment(buffer, range, 1); if (F_status_is_error(state->status)) break; - f_array_lengths_resize(0, &positions_start); + f_number_unsigneds_resize(0, &positions_start); f_string_ranges_resize(0, &objects); - f_array_lengths_resize(0, &slashes); + f_number_unsigneds_resize(0, &slashes); if (range->start >= buffer.used) { state->status = F_none_eos; @@ -668,7 +668,7 @@ extern "C" { if (buffer.string[range->start] == f_fss_eol_s.string[0]) { if (graph_first == 0x2) { - state->status = f_array_lengths_increase(state->step_small, delimits); + state->status = f_number_unsigneds_increase(state->step_small, delimits); if (F_status_is_error(state->status)) break; delimits->array[delimits->used++] = comment_delimit; @@ -694,9 +694,9 @@ extern "C" { delimits->used = delimits_used; comments->used = comments_used; - f_array_lengths_resize(0, &positions_start); + f_number_unsigneds_resize(0, &positions_start); f_string_ranges_resize(0, &objects); - f_array_lengths_resize(0, &slashes); + f_number_unsigneds_resize(0, &slashes); state->status = (range->start >= buffer.used) ? F_end_not_nest_eos : F_end_not_nest_stop; @@ -708,9 +708,9 @@ extern "C" { delimits->used = delimits_used; comments->used = comments_used; - f_array_lengths_resize(0, &positions_start); + f_number_unsigneds_resize(0, &positions_start); f_string_ranges_resize(0, &objects); - f_array_lengths_resize(0, &slashes); + f_number_unsigneds_resize(0, &slashes); state->status = (range->start >= buffer.used) ? F_data_not_eos : F_data_not_stop; @@ -733,7 +733,7 @@ extern "C" { } else { if (graph_first == 0x2) { - state->status = f_array_lengths_increase(state->step_small, delimits); + state->status = f_number_unsigneds_increase(state->step_small, delimits); if (F_status_is_error(state->status)) break; delimits->array[delimits->used++] = comment_delimit; @@ -773,9 +773,9 @@ extern "C" { if (F_status_is_error(state->status)) break; } // while - f_array_lengths_resize(0, &positions_start); + f_number_unsigneds_resize(0, &positions_start); f_string_ranges_resize(0, &objects); - f_array_lengths_resize(0, &slashes); + f_number_unsigneds_resize(0, &slashes); delimits->used = delimits_used; comments->used = comments_used; @@ -832,18 +832,18 @@ extern "C" { return; } - const f_array_length_t destination_used = destination->used; + const f_number_unsigned_t destination_used = destination->used; bool is_comment = F_false; bool ends_on_eol = F_false; bool has_graph = F_false; bool do_prepend = prepend ? F_true : F_false; - f_array_length_t i = 0; - f_array_length_t slash_count = 0; - f_array_length_t start = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t slash_count = 0; + f_number_unsigned_t start = 0; - f_array_length_t r = 0; + f_number_unsigned_t r = 0; uint8_t width = 0; @@ -1098,7 +1098,7 @@ extern "C" { } #endif // _di_level_1_parameter_checking_ - const f_array_length_t delimits_used = delimits->used; + const f_number_unsigned_t delimits_used = delimits->used; f_fss_skip_past_space(buffer, range, state); if (F_status_is_error(state->status)) return; @@ -1167,10 +1167,10 @@ extern "C" { return; } - f_array_length_t start = 0; - f_array_length_t stop = 0; - f_array_length_t slash_first = 0; - f_array_length_t slash_count = 0; + f_number_unsigned_t start = 0; + f_number_unsigned_t stop = 0; + f_number_unsigned_t slash_first = 0; + f_number_unsigned_t slash_count = 0; bool graph_first = F_true; @@ -1263,7 +1263,7 @@ extern "C" { range->start = slash_first; - state->status = f_array_lengths_increase_by((slash_count / 2) + 1, delimits); + state->status = f_number_unsigneds_increase_by((slash_count / 2) + 1, delimits); if (F_status_is_error(state->status)) break; if (slash_count % 2 == 0) { @@ -1300,7 +1300,7 @@ extern "C" { graph_first = F_false; // Comments may only have white space before the '#', therefore only the first slash needs to be delimited. - state->status = f_array_lengths_increase(state->step_small, delimits); + state->status = f_number_unsigneds_increase(state->step_small, delimits); if (F_status_is_error(state->status)) break; delimits->array[delimits->used++] = slash_first; @@ -1476,10 +1476,10 @@ extern "C" { state->status = f_string_dynamic_increase_by(state->step_small + 4, destination); if (F_status_is_error(state->status)) return; - const f_array_length_t destination_used = destination->used; + const f_number_unsigned_t destination_used = destination->used; - f_array_length_t i = 0; - f_array_length_t slash_count = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t slash_count = 0; bool ends_on_space = F_false; diff --git a/level_1/fl_fss/c/fss/embedded_list.h b/level_1/fl_fss/c/fss/embedded_list.h index 380a5b9..68cf785 100644 --- a/level_1/fl_fss/c/fss/embedded_list.h +++ b/level_1/fl_fss/c/fss/embedded_list.h @@ -78,8 +78,8 @@ extern "C" { * F_interrupt (with error bit) if stopping due to an interrupt. * F_parameter (with error bit) if a parameter is invalid. * - * Errors (with error bit) from: f_array_lengths_increase(). - * Errors (with error bit) from: f_array_lengths_increase_by(). + * Errors (with error bit) from: f_number_unsigneds_increase(). + * Errors (with error bit) from: f_number_unsigneds_increase_by(). * Errors (with error bit) from: f_fss_is_space(). * Errors (with error bit) from: f_fss_nest_increase(). * Errors (with error bit) from: f_fss_seek_to_eol(). @@ -87,8 +87,8 @@ extern "C" { * Errors (with error bit) from: f_string_ranges_increase(). * Errors (with error bit) from: f_utf_buffer_increment(). * - * @see f_array_lengths_increase() - * @see f_array_lengths_increase_by() + * @see f_number_unsigneds_increase() + * @see f_number_unsigneds_increase_by() * @see f_fss_is_space() * @see f_fss_nest_increase() * @see f_fss_seek_to_eol() @@ -210,7 +210,7 @@ extern "C" { * F_interrupt (with error bit) if stopping due to an interrupt. * F_parameter (with error bit) if a parameter is invalid. * - * Errors (with error bit) from: f_array_lengths_increase_by(). + * Errors (with error bit) from: f_number_unsigneds_increase_by(). * Errors (with error bit) from: f_fss_is_graph(). * Errors (with error bit) from: f_fss_is_space(). * Errors (with error bit) from: f_fss_is_zero_width(). @@ -219,7 +219,7 @@ extern "C" { * Errors (with error bit) from: f_fss_skip_past_space(). * Errors (with error bit) from: f_utf_buffer_increment(). * - * @see f_array_lengths_increase_by() + * @see f_number_unsigneds_increase_by() * @see f_fss_is_graph() * @see f_fss_is_space() * @see f_fss_is_zero_width() diff --git a/level_1/fl_fss/c/fss/extended.c b/level_1/fl_fss/c/fss/extended.c index 684e1a2..6813e72 100644 --- a/level_1/fl_fss/c/fss/extended.c +++ b/level_1/fl_fss/c/fss/extended.c @@ -40,8 +40,8 @@ extern "C" { return; } - const f_array_length_t delimits_used = delimits->used; - const f_array_length_t quotes_used = quotes ? quotes->used : 0; + const f_number_unsigned_t delimits_used = delimits->used; + const f_number_unsigned_t quotes_used = quotes ? quotes->used : 0; uint8_t content_found = 0; uint8_t quote = 0; @@ -149,7 +149,7 @@ extern "C" { } #endif // _di_level_1_parameter_checking_ - const f_array_length_t destination_used = destination->used; + const f_number_unsigned_t destination_used = destination->used; // This operates exactly like an object, syntax-wise. private_fl_fss_basic_write(F_false, content, quote ? quote : f_fss_quote_double_s.string[0], range, destination, state); @@ -219,7 +219,7 @@ extern "C" { } #endif // _di_level_1_parameter_checking_ - const f_array_length_t delimits_used = delimits->used; + const f_number_unsigned_t delimits_used = delimits->used; private_fl_fss_basic_read(buffer, F_true, range, found, quote, delimits, state); @@ -248,7 +248,7 @@ void fl_fss_extended_object_write(const f_string_static_t object, const uint8_t } #endif // _di_level_1_parameter_checking_ - const f_array_length_t destination_used = destination->used; + const f_number_unsigned_t destination_used = destination->used; private_fl_fss_basic_write(F_true, object, quote ? quote : f_fss_quote_double_s.string[0], range, destination, state); diff --git a/level_1/fl_fss/c/fss/extended.h b/level_1/fl_fss/c/fss/extended.h index e0c6f98..22bbe8f 100644 --- a/level_1/fl_fss/c/fss/extended.h +++ b/level_1/fl_fss/c/fss/extended.h @@ -72,8 +72,8 @@ extern "C" { * F_interrupt (with error bit) if stopping due to an interrupt. * F_parameter (with error bit) if a parameter is invalid. * - * Errors (with error bit) from: f_array_lengths_increase(). - * Errors (with error bit) from: f_array_lengths_increase_by(). + * Errors (with error bit) from: f_number_unsigneds_increase(). + * Errors (with error bit) from: f_number_unsigneds_increase_by(). * Errors (with error bit) from: f_fss_is_graph(). * Errors (with error bit) from: f_fss_is_space(). * Errors (with error bit) from: f_fss_is_zero_width(). @@ -81,8 +81,8 @@ extern "C" { * Errors (with error bit) from: f_fss_skip_past_space(). * Errors (with error bit) from: f_utf_buffer_increment(). * - * @see f_array_lengths_increase() - * @see f_array_lengths_increase_by() + * @see f_number_unsigneds_increase() + * @see f_number_unsigneds_increase_by() * @see f_fss_is_graph() * @see f_fss_is_space() * @see f_fss_is_zero_width() @@ -207,8 +207,8 @@ extern "C" { * F_interrupt (with error bit) if stopping due to an interrupt. * F_parameter (with error bit) if a parameter is invalid. * - * Errors (with error bit) from: f_array_lengths_increase(). - * Errors (with error bit) from: f_array_lengths_increase_by(). + * Errors (with error bit) from: f_number_unsigneds_increase(). + * Errors (with error bit) from: f_number_unsigneds_increase_by(). * Errors (with error bit) from: f_fss_is_graph(). * Errors (with error bit) from: f_fss_is_space(). * Errors (with error bit) from: f_fss_is_zero_width(). @@ -218,8 +218,8 @@ extern "C" { * Errors (with error bit) from: f_uint8s_increase(). * Errors (with error bit) from: f_utf_buffer_increment(). * - * @see f_array_lengths_increase() - * @see f_array_lengths_increase_by() + * @see f_number_unsigneds_increase() + * @see f_number_unsigneds_increase_by() * @see f_fss_is_graph() * @see f_fss_is_space() * @see f_fss_is_zero_width() diff --git a/level_1/fl_fss/c/fss/extended_list.c b/level_1/fl_fss/c/fss/extended_list.c index df35735..5c112bf 100644 --- a/level_1/fl_fss/c/fss/extended_list.c +++ b/level_1/fl_fss/c/fss/extended_list.c @@ -17,8 +17,8 @@ extern "C" { } #endif // _di_level_1_parameter_checking_ - const f_array_length_t delimits_used = delimits->used; - const f_array_length_t comments_used = comments->used; + const f_number_unsigned_t delimits_used = delimits->used; + const f_number_unsigned_t comments_used = comments->used; f_fss_skip_past_delimit(buffer, range, state); if (F_status_is_error(state->status)) return; @@ -45,10 +45,10 @@ extern "C" { found->array[found->used].start = range->start; - f_array_length_t newline_last = range->start; - f_array_length_t slash_first = 0; - f_array_length_t slash_count = 0; - f_array_length_t start = 0; + f_number_unsigned_t newline_last = range->start; + f_number_unsigned_t slash_first = 0; + f_number_unsigned_t slash_count = 0; + f_number_unsigned_t start = 0; // Identify where the content ends. while (range->start <= range->stop && range->start < buffer.used) { @@ -116,7 +116,7 @@ extern "C" { if (range->start > range->stop || range->start >= buffer.used) break; if (buffer.string[range->start] == f_fss_eol_s.string[0]) { - state->status = f_array_lengths_increase(state->step_small, delimits); + state->status = f_number_unsigneds_increase(state->step_small, delimits); if (F_status_is_error(state->status)) break; delimits->array[delimits->used++] = slash_first; @@ -125,7 +125,7 @@ extern "C" { } } else if (buffer.string[range->start] == f_fss_comment_s.string[0]) { - state->status = f_array_lengths_increase(state->step_small, delimits); + state->status = f_number_unsigneds_increase(state->step_small, delimits); if (F_status_is_error(state->status)) break; delimits->array[delimits->used++] = slash_first; @@ -270,17 +270,17 @@ extern "C" { state->status = f_string_dynamic_increase_by(state->step_small + 4, destination); if (F_status_is_error(state->status)) return; - const f_array_length_t destination_used = destination->used; + const f_number_unsigned_t destination_used = destination->used; bool is_comment = F_false; bool ends_on_eol = F_false; bool has_graph = F_false; bool do_prepend = prepend ? F_true : F_false; - f_array_length_t i = 0; - f_array_length_t r = 0; - f_array_length_t slash_count = 0; - f_array_length_t start = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t r = 0; + f_number_unsigned_t slash_count = 0; + f_number_unsigned_t start = 0; uint8_t width = 0; @@ -538,7 +538,7 @@ extern "C" { } #endif // _di_level_1_parameter_checking_ - const f_array_length_t delimits_used = delimits->used; + const f_number_unsigned_t delimits_used = delimits->used; f_fss_skip_past_space(buffer, range, state); if (F_status_is_error(state->status)) return; @@ -607,10 +607,10 @@ extern "C" { return; } - f_array_length_t start = 0; - f_array_length_t stop = 0; - f_array_length_t slash_first = 0; - f_array_length_t slash_count = 0; + f_number_unsigned_t start = 0; + f_number_unsigned_t stop = 0; + f_number_unsigned_t slash_first = 0; + f_number_unsigned_t slash_count = 0; bool graph_first = F_true; @@ -702,7 +702,7 @@ extern "C" { start = range->start; range->start = slash_first; - state->status = f_array_lengths_increase_by((slash_count / 2) + 1, delimits); + state->status = f_number_unsigneds_increase_by((slash_count / 2) + 1, delimits); if (F_status_is_error(state->status)) break; if (slash_count % 2 == 0) { @@ -739,7 +739,7 @@ extern "C" { graph_first = F_false; // Comments may only have white space before the '#', therefore only the first slash needs to be delimited. - state->status = f_array_lengths_increase(state->step_small, delimits); + state->status = f_number_unsigneds_increase(state->step_small, delimits); if (F_status_is_error(state->status)) break; delimits->array[delimits->used++] = slash_first; @@ -916,10 +916,10 @@ extern "C" { state->status = f_string_dynamic_increase_by(state->step_small + 4, destination); if (F_status_is_error(state->status)) return; - const f_array_length_t destination_used = destination->used; + const f_number_unsigned_t destination_used = destination->used; - f_array_length_t i = 0; - f_array_length_t slash_count = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t slash_count = 0; bool ends_on_space = F_false; diff --git a/level_1/fl_fss/c/fss/extended_list.h b/level_1/fl_fss/c/fss/extended_list.h index b860a94..051c605 100644 --- a/level_1/fl_fss/c/fss/extended_list.h +++ b/level_1/fl_fss/c/fss/extended_list.h @@ -76,16 +76,16 @@ extern "C" { * F_interrupt (with error bit) if stopping due to an interrupt. * F_parameter (with error bit) if a parameter is invalid. * - * Errors (with error bit) from: f_array_lengths_increase(). - * Errors (with error bit) from: f_array_lengths_increase_by(). + * Errors (with error bit) from: f_number_unsigneds_increase(). + * Errors (with error bit) from: f_number_unsigneds_increase_by(). * Errors (with error bit) from: f_fss_is_space(). * Errors (with error bit) from: f_fss_seek_to_eol(). * Errors (with error bit) from: f_fss_skip_past_delimit(). * Errors (with error bit) from: f_string_ranges_increase(). * Errors (with error bit) from: f_utf_buffer_increment(). * - * @see f_array_lengths_increase() - * @see f_array_lengths_increase_by() + * @see f_number_unsigneds_increase() + * @see f_number_unsigneds_increase_by() * @see f_fss_is_space() * @see f_fss_seek_to_eol() * @see f_fss_skip_past_delimit() @@ -206,7 +206,7 @@ extern "C" { * F_interrupt (with error bit) if stopping due to an interrupt. * F_parameter (with error bit) if a parameter is invalid. * - * Errors (with error bit) from: f_array_lengths_increase_by(). + * Errors (with error bit) from: f_number_unsigneds_increase_by(). * Errors (with error bit) from: f_fss_is_graph(). * Errors (with error bit) from: f_fss_is_space(). * Errors (with error bit) from: f_fss_is_zero_width(). @@ -215,7 +215,7 @@ extern "C" { * Errors (with error bit) from: f_fss_skip_past_space(). * Errors (with error bit) from: f_utf_buffer_increment(). * - * @see f_array_lengths_increase_by() + * @see f_number_unsigneds_increase_by() * @see f_fss_is_graph() * @see f_fss_is_space() * @see f_fss_is_zero_width() diff --git a/level_1/fl_fss/c/private-fss.c b/level_1/fl_fss/c/private-fss.c index 0eadde7..a60e44c 100644 --- a/level_1/fl_fss/c/private-fss.c +++ b/level_1/fl_fss/c/private-fss.c @@ -29,10 +29,10 @@ extern "C" { #endif // !defined(_di_fl_fss_basic_list_content_write_) || !defined(_di_fl_fss_extended_list_content_write_) || !defined(_di_fl_fss_embedded_list_content_write_) #if !defined(_di_fl_fss_basic_list_object_write_) || !defined(_di_fl_fss_extended_list_object_write_) - void private_fl_fss_basic_list_write_object_trim(const f_array_length_t used_start, f_string_dynamic_t * const destination, f_state_t * const state) { + void private_fl_fss_basic_list_write_object_trim(const f_number_unsigned_t used_start, f_string_dynamic_t * const destination, f_state_t * const state) { f_string_range_t destination_range = macro_f_string_range_t_initialize_2(destination->used); - f_array_length_t i = 0; + f_number_unsigned_t i = 0; uint8_t width = 0; state->status = F_none; @@ -139,7 +139,7 @@ extern "C" { } // Save the delimits used position in case of unterminated quote. - const f_array_length_t delimits_used = delimits->used; + const f_number_unsigned_t delimits_used = delimits->used; // Begin the search. found->start = range->start; @@ -185,7 +185,7 @@ extern "C" { // Identify where the object begins. if (buffer.string[range->start] == f_fss_slash_s.string[0]) { - f_array_length_t first_slash = range->start; + f_number_unsigned_t first_slash = range->start; found->start = range->start; @@ -259,7 +259,7 @@ extern "C" { // Only the first slash before a quote needs to be escaped (or not) as once there is a slash before a quote, this cannot ever be a quote object. // This simplifies the number of slashes needed. - state->status = f_array_lengths_increase(state->step_small, delimits); + state->status = f_number_unsigneds_increase(state->step_small, delimits); if (F_status_is_error(state->status)) return; delimits->array[delimits->used++] = first_slash; @@ -279,9 +279,9 @@ extern "C" { // Identify where the object ends. if (quote_found) { - f_array_length_t first_slash = 0; - f_array_length_t slash_count = 0; - f_array_length_t location = 0; + f_number_unsigned_t first_slash = 0; + f_number_unsigned_t slash_count = 0; + f_number_unsigned_t location = 0; while (range->start <= range->stop && range->start < buffer.used) { @@ -382,7 +382,7 @@ extern "C" { range->start = first_slash; if (slash_count % 2 == 0) { - state->status = f_array_lengths_increase_by(slash_count / 2, delimits); + state->status = f_number_unsigneds_increase_by(slash_count / 2, delimits); if (F_status_is_error(state->status)) return; while (slash_count > 0) { @@ -480,7 +480,7 @@ extern "C" { return; } - state->status = f_array_lengths_increase_by((slash_count / 2) + 1, delimits); + state->status = f_number_unsigneds_increase_by((slash_count / 2) + 1, delimits); if (F_status_is_error(state->status)) return; while (slash_count > 0) { @@ -756,15 +756,15 @@ extern "C" { state->status = f_string_dynamic_increase_by(state->step_small + 5, destination); if (F_status_is_error(state->status)) return; - const f_array_length_t input_start = range->start; - const f_array_length_t used_start = destination->used; + const f_number_unsigned_t input_start = range->start; + const f_number_unsigned_t used_start = destination->used; bool quoted_is = F_false; bool commented = F_false; - f_array_length_t item_first = 0; - f_array_length_t item_total = 0; - f_array_length_t i = 0; + f_number_unsigned_t item_first = 0; + f_number_unsigned_t item_total = 0; + f_number_unsigned_t i = 0; uint8_t width = 0; @@ -1125,10 +1125,10 @@ extern "C" { #endif // !defined(_di_fl_fss_basic_object_write_) || !defined(_di_fl_fss_extended_object_write_) || !defined(_di_fl_fss_extended_content_write_) #if !defined(_di_fl_fss_basic_object_write_) || !defined(_di_fl_fss_extended_object_write_) - void private_fl_fss_basic_write_object_trim(const uint8_t quote, const f_array_length_t used_start, f_string_dynamic_t * const destination, f_state_t * const state) { + void private_fl_fss_basic_write_object_trim(const uint8_t quote, const f_number_unsigned_t used_start, f_string_dynamic_t * const destination, f_state_t * const state) { f_string_range_t destination_range = macro_f_string_range_t_initialize_2(destination->used); - f_array_length_t i = 0; + f_number_unsigned_t i = 0; uint8_t width = 0; const f_char_t quote_char = quote ? quote : f_string_ascii_quote_double_s.string[0]; @@ -1150,7 +1150,7 @@ extern "C" { } // for if (destination->string[destination_range.start] == quote_char) { - const f_array_length_t front = destination_range.start; + const f_number_unsigned_t front = destination_range.start; for (++destination_range.start; destination_range.start < destination->used; ++destination_range.start) { @@ -1203,7 +1203,7 @@ extern "C" { } } // for - const f_array_length_t rear = destination_range.start + 1; + const f_number_unsigned_t rear = destination_range.start + 1; for (; destination_range.start > front; --destination_range.start) { diff --git a/level_1/fl_fss/c/private-fss.h b/level_1/fl_fss/c/private-fss.h index 0cc4990..3c5b1e8 100644 --- a/level_1/fl_fss/c/private-fss.h +++ b/level_1/fl_fss/c/private-fss.h @@ -79,7 +79,7 @@ extern "C" { * @see fl_fss_extended_list_object_write() */ #if !defined(_di_fl_fss_basic_list_object_write_) || !defined(_di_fl_fss_extended_list_object_write_) - extern void private_fl_fss_basic_list_write_object_trim(const f_array_length_t used_start, f_string_dynamic_t * const destination, f_state_t * const state) F_attribute_visibility_internal_d; + extern void private_fl_fss_basic_list_write_object_trim(const f_number_unsigned_t used_start, f_string_dynamic_t * const destination, f_state_t * const state) F_attribute_visibility_internal_d; #endif // !defined(_di_fl_fss_basic_list_object_write_) || !defined(_di_fl_fss_extended_list_object_write_) /** @@ -134,8 +134,8 @@ extern "C" { * F_none_eol (with error bit) after reaching an EOL, which is not supported by the standard. * F_parameter (with error bit) if a parameter is invalid. * - * Errors (with error bit) from: f_array_lengths_increase(). - * Errors (with error bit) from: f_array_lengths_increase_by(). + * Errors (with error bit) from: f_number_unsigneds_increase(). + * Errors (with error bit) from: f_number_unsigneds_increase_by(). * Errors (with error bit) from: f_fss_is_graph(). * Errors (with error bit) from: f_fss_is_space(). * Errors (with error bit) from: f_fss_is_zero_width(). @@ -143,8 +143,8 @@ extern "C" { * Errors (with error bit) from: f_fss_skip_past_space(). * Errors (with error bit) from: f_utf_buffer_increment(). * - * @see f_array_lengths_increase() - * @see f_array_lengths_increase_by() + * @see f_number_unsigneds_increase() + * @see f_number_unsigneds_increase_by() * @see f_fss_is_graph() * @see f_fss_is_space() * @see f_fss_is_zero_width() @@ -256,7 +256,7 @@ extern "C" { * @see fl_fss_extended_object_write() */ #if !defined(_di_fl_fss_basic_object_write_) || !defined(_di_fl_fss_extended_object_write_) - extern void private_fl_fss_basic_write_object_trim(const uint8_t quote, const f_array_length_t used_start, f_string_dynamic_t * const destination, f_state_t * const state) F_attribute_visibility_internal_d; + extern void private_fl_fss_basic_write_object_trim(const uint8_t quote, const f_number_unsigned_t used_start, f_string_dynamic_t * const destination, f_state_t * const state) F_attribute_visibility_internal_d; #endif // !defined(_di_fl_fss_basic_object_write_) || !defined(_di_fl_fss_extended_object_write_) #ifdef __cplusplus diff --git a/level_1/fl_path/c/path.c b/level_1/fl_path/c/path.c index 03e36b9..c18fb83 100644 --- a/level_1/fl_path/c/path.c +++ b/level_1/fl_path/c/path.c @@ -19,13 +19,13 @@ extern "C" { return F_none; } - f_array_length_t at = 0; + f_number_unsigned_t at = 0; uint8_t previous_1 = f_path_separator_s.string[0]; uint8_t previous_2 = 0; - f_array_length_t size_chunk = 0; - f_array_length_t position = 0; + f_number_unsigned_t size_chunk = 0; + f_number_unsigned_t position = 0; canonical->used = 0; diff --git a/level_1/fl_print/c/print.c b/level_1/fl_print/c/print.c index 09f3e94..c6a25a7 100644 --- a/level_1/fl_print/c/print.c +++ b/level_1/fl_print/c/print.c @@ -68,7 +68,7 @@ extern "C" { #endif // _di_fl_print_string_va_ #ifndef _di_fl_print_trim_ - f_status_t fl_print_trim(const f_string_t string, const f_array_length_t length, const f_file_t file) { + f_status_t fl_print_trim(const f_string_t string, const f_number_unsigned_t length, const f_file_t file) { if (!file.stream) return F_stream_not; if (!string || !length) return F_data_not; @@ -78,7 +78,7 @@ extern "C" { #endif // _di_fl_print_trim_ #ifndef _di_fl_print_trim_raw_ - f_status_t fl_print_trim_raw(const f_string_t string, const f_array_length_t length, const f_file_t file) { + f_status_t fl_print_trim_raw(const f_string_t string, const f_number_unsigned_t length, const f_file_t file) { if (!file.stream) return F_stream_not; if (!string || !length) return F_data_not; @@ -88,7 +88,7 @@ extern "C" { #endif // _di_fl_print_trim_raw_ #ifndef _di_fl_print_trim_raw_safely_ - f_status_t fl_print_trim_raw_safely(const f_string_t string, const f_array_length_t length, const f_file_t file) { + f_status_t fl_print_trim_raw_safely(const f_string_t string, const f_number_unsigned_t length, const f_file_t file) { if (!file.stream) return F_stream_not; if (!string || !length) return F_data_not; @@ -98,7 +98,7 @@ extern "C" { #endif // _di_fl_print_trim_raw_safely_ #ifndef _di_fl_print_trim_safely_ - f_status_t fl_print_trim_safely(const f_string_t string, const f_array_length_t length, const f_file_t file) { + f_status_t fl_print_trim_safely(const f_string_t string, const f_number_unsigned_t length, const f_file_t file) { if (!file.stream) return F_stream_not; if (!string || !length) return F_data_not; @@ -153,7 +153,7 @@ extern "C" { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used) return F_data_not; - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -169,7 +169,7 @@ extern "C" { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used) return F_data_not; - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -185,7 +185,7 @@ extern "C" { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used) return F_data_not; - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -201,7 +201,7 @@ extern "C" { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used) return F_data_not; - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -212,7 +212,7 @@ extern "C" { #endif // _di_fl_print_trim_dynamic_partial_safely_ #ifndef _di_fl_print_trim_except_ - f_status_t fl_print_trim_except(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_file_t file) { + f_status_t fl_print_trim_except(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_file_t file) { if (!file.stream) return F_stream_not; if (!string || !length) return F_data_not; @@ -224,7 +224,7 @@ extern "C" { #endif // _di_fl_print_trim_except_ #ifndef _di_fl_print_trim_except_raw_ - f_status_t fl_print_trim_except_raw(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_file_t file) { + f_status_t fl_print_trim_except_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_file_t file) { if (!file.stream) return F_stream_not; if (!string || !length) return F_data_not; @@ -236,7 +236,7 @@ extern "C" { #endif // _di_fl_print_trim_except_raw_ #ifndef _di_fl_print_trim_except_raw_safely_ - f_status_t fl_print_trim_except_raw_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_file_t file) { + f_status_t fl_print_trim_except_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_file_t file) { if (!file.stream) return F_stream_not; if (!string || !length) return F_data_not; @@ -248,7 +248,7 @@ extern "C" { #endif // _di_fl_print_trim_except_raw_safely_ #ifndef _di_fl_print_trim_except_safely_ - f_status_t fl_print_trim_except_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_file_t file) { + f_status_t fl_print_trim_except_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_file_t file) { if (!file.stream) return F_stream_not; if (!string || !length) return F_data_not; @@ -260,7 +260,7 @@ extern "C" { #endif // _di_fl_print_trim_except_safely_ #ifndef _di_fl_print_trim_except_dynamic_ - f_status_t fl_print_trim_except_dynamic(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_file_t file) { + f_status_t fl_print_trim_except_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used) return F_data_not; @@ -272,7 +272,7 @@ extern "C" { #endif // _di_fl_print_trim_except_dynamic_ #ifndef _di_fl_print_trim_except_dynamic_raw_ - f_status_t fl_print_trim_except_dynamic_raw(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_file_t file) { + f_status_t fl_print_trim_except_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used) return F_data_not; @@ -284,7 +284,7 @@ extern "C" { #endif // _di_fl_print_trim_except_dynamic_raw_ #ifndef _di_fl_print_trim_except_dynamic_raw_safely_ - f_status_t fl_print_trim_except_dynamic_raw_safely(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_file_t file) { + f_status_t fl_print_trim_except_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used) return F_data_not; @@ -296,7 +296,7 @@ extern "C" { #endif // _di_fl_print_trim_except_dynamic_raw_safely_ #ifndef _di_fl_print_trim_except_dynamic_safely_ - f_status_t fl_print_trim_except_dynamic_safely(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_file_t file) { + f_status_t fl_print_trim_except_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used) return F_data_not; @@ -308,7 +308,7 @@ extern "C" { #endif // _di_fl_print_trim_except_dynamic_safely_ #ifndef _di_fl_print_trim_except_in_ - f_status_t fl_print_trim_except_in(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t fl_print_trim_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!string || !length) return F_data_not; @@ -318,7 +318,7 @@ extern "C" { #endif // _di_fl_print_trim_except_in_ #ifndef _di_fl_print_trim_except_in_raw_ - f_status_t fl_print_trim_except_in_raw(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t fl_print_trim_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!string || !length) return F_data_not; @@ -328,7 +328,7 @@ extern "C" { #endif // _di_fl_print_trim_except_in_raw_ #ifndef _di_fl_print_trim_except_in_raw_safely_ - f_status_t fl_print_trim_except_in_raw_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t fl_print_trim_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!string || !length) return F_data_not; @@ -338,7 +338,7 @@ extern "C" { #endif // _di_fl_print_trim_except_in_raw_safely_ #ifndef _di_fl_print_trim_except_in_safely_ - f_status_t fl_print_trim_except_in_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t fl_print_trim_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!string || !length) return F_data_not; @@ -348,7 +348,7 @@ extern "C" { #endif // _di_fl_print_trim_except_in_safely_ #ifndef _di_fl_print_trim_except_in_dynamic_ - f_status_t fl_print_trim_except_in_dynamic(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t fl_print_trim_except_in_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used) return F_data_not; @@ -358,7 +358,7 @@ extern "C" { #endif // _di_fl_print_trim_except_in_dynamic_ #ifndef _di_fl_print_trim_except_in_dynamic_raw_ - f_status_t fl_print_trim_except_in_dynamic_raw(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t fl_print_trim_except_in_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used) return F_data_not; @@ -368,7 +368,7 @@ extern "C" { #endif // _di_fl_print_trim_except_in_dynamic_raw_ #ifndef _di_fl_print_trim_except_in_dynamic_raw_safely_ - f_status_t fl_print_trim_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t fl_print_trim_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used) return F_data_not; @@ -378,7 +378,7 @@ extern "C" { #endif // _di_fl_print_trim_except_in_dynamic_raw_safely_ #ifndef _di_fl_print_trim_except_in_dynamic_safely_ - f_status_t fl_print_trim_except_in_dynamic_safely(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t fl_print_trim_except_in_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used) return F_data_not; @@ -388,12 +388,12 @@ extern "C" { #endif // _di_fl_print_trim_except_in_dynamic_safely_ #ifndef _di_fl_print_trim_except_in_dynamic_partial_ - f_status_t fl_print_trim_except_in_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t fl_print_trim_except_in_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used) return F_data_not; - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -404,12 +404,12 @@ extern "C" { #endif // _di_fl_print_trim_except_in_dynamic_partial_ #ifndef _di_fl_print_trim_except_in_dynamic_partial_raw_ - f_status_t fl_print_trim_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t fl_print_trim_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used) return F_data_not; - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -420,12 +420,12 @@ extern "C" { #endif // _di_fl_print_trim_except_in_dynamic_partial_raw_ #ifndef _di_fl_print_trim_except_in_dynamic_partial_raw_safely_ - f_status_t fl_print_trim_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t fl_print_trim_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used) return F_data_not; - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -436,12 +436,12 @@ extern "C" { #endif // _di_fl_print_trim_except_in_dynamic_partial_raw_safely_ #ifndef _di_fl_print_trim_except_in_dynamic_partial_safely_ - f_status_t fl_print_trim_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t fl_print_trim_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used) return F_data_not; - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -452,12 +452,12 @@ extern "C" { #endif // _di_fl_print_trim_except_in_dynamic_partial_safely_ #ifndef _di_fl_print_trim_except_dynamic_partial_ - f_status_t fl_print_trim_except_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, const f_file_t file) { + f_status_t fl_print_trim_except_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used) return F_data_not; - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -470,12 +470,12 @@ extern "C" { #endif // _di_fl_print_trim_except_dynamic_partial_ #ifndef _di_fl_print_trim_except_dynamic_partial_raw_ - f_status_t fl_print_trim_except_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, const f_file_t file) { + f_status_t fl_print_trim_except_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used) return F_data_not; - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -488,12 +488,12 @@ extern "C" { #endif // _di_fl_print_trim_except_dynamic_partial_raw_ #ifndef _di_fl_print_trim_except_dynamic_partial_raw_safely_ - f_status_t fl_print_trim_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, const f_file_t file) { + f_status_t fl_print_trim_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used) return F_data_not; - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; @@ -506,12 +506,12 @@ extern "C" { #endif // _di_fl_print_trim_except_dynamic_partial_raw_safely_ #ifndef _di_fl_print_trim_except_dynamic_partial_safely_ - f_status_t fl_print_trim_except_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, const f_file_t file) { + f_status_t fl_print_trim_except_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file) { if (!file.stream) return F_stream_not; if (!buffer.used || range.start > range.stop || range.start >= buffer.used) return F_data_not; - f_array_length_t length = (range.stop - range.start) + 1; + f_number_unsigned_t length = (range.stop - range.start) + 1; if (length + range.start > buffer.used) { length = buffer.used - range.start; diff --git a/level_1/fl_print/c/print.h b/level_1/fl_print/c/print.h index 4c531fe..f981359 100644 --- a/level_1/fl_print/c/print.h +++ b/level_1/fl_print/c/print.h @@ -97,7 +97,7 @@ extern "C" { * Basic Format Flags: * - "-": Use left-justification. * - "#": Use alternate form conversion (prefixing 0b/0B, 0o/0O, 0t/0T, 0d/0D, 0x/0X). - * - ";": Ignore characters in the given positions from a f_array_length_t (only applies to static/dynamic string arguments but not character arguments). + * - ";": Ignore characters in the given positions from a f_number_unsigned_t (only applies to static/dynamic string arguments but not character arguments). * - ":": Ignore characters in the given ranges from a f_string_range_t (only applies to static/dynamic string arguments but not character arguments). * - "/", Print only the given range of a string, specified by f_string_range_t (only applies to static/dynamic string arguments but not character arguments). * - "+", Always show the signs (+ or -). @@ -143,7 +143,7 @@ extern "C" { * - "u", "U": Type is a uint32_t digit. * - "ul", "UL": Type is a uint64_t digit. * - "ull", "ULL": Type is a f_uint128_t digit. - * - "un", "UN": Type is a f_number_unsigned_t digit (which by default is what f_array_length_t is a type of). + * - "un", "UN": Type is a f_number_unsigned_t digit (which by default is what f_number_unsigned_t is a type of). * * The following are control characters and their replacements for "safe" printing (unknown is used for invalid UTF-8 sequences): * - "␆": Acknowledge. @@ -379,7 +379,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_ - extern f_status_t fl_print_trim(const f_string_t string, const f_array_length_t length, const f_file_t file); + extern f_status_t fl_print_trim(const f_string_t string, const f_number_unsigned_t length, const f_file_t file); #endif // _di_fl_print_trim_ /** @@ -420,7 +420,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_raw_ - extern f_status_t fl_print_trim_raw(const f_string_t string, const f_array_length_t length, const f_file_t file); + extern f_status_t fl_print_trim_raw(const f_string_t string, const f_number_unsigned_t length, const f_file_t file); #endif // _di_fl_print_trim_raw_ /** @@ -463,7 +463,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_raw_safely_ - extern f_status_t fl_print_trim_raw_safely(const f_string_t string, const f_array_length_t length, const f_file_t file); + extern f_status_t fl_print_trim_raw_safely(const f_string_t string, const f_number_unsigned_t length, const f_file_t file); #endif // _di_fl_print_trim_raw_safely_ /** @@ -504,7 +504,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_safely_ - extern f_status_t fl_print_trim_safely(const f_string_t string, const f_array_length_t length, const f_file_t file); + extern f_status_t fl_print_trim_safely(const f_string_t string, const f_number_unsigned_t length, const f_file_t file); #endif // _di_fl_print_trim_safely_ /** @@ -903,7 +903,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_ - extern f_status_t fl_print_trim_except(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_file_t file); + extern f_status_t fl_print_trim_except(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_file_t file); #endif // _di_fl_print_trim_except_ /** @@ -953,7 +953,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_raw_ - extern f_status_t fl_print_trim_except_raw(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_file_t file); + extern f_status_t fl_print_trim_except_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_file_t file); #endif // _di_fl_print_trim_except_raw_ /** @@ -1004,7 +1004,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_raw_safely_ - extern f_status_t fl_print_trim_except_raw_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_file_t file); + extern f_status_t fl_print_trim_except_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_file_t file); #endif // _di_fl_print_trim_except_raw_safely_ /** @@ -1053,7 +1053,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_safely_ - extern f_status_t fl_print_trim_except_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_file_t file); + extern f_status_t fl_print_trim_except_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_file_t file); #endif // _di_fl_print_trim_except_safely_ /** @@ -1099,7 +1099,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_dynamic_ - extern f_status_t fl_print_trim_except_dynamic(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_file_t file); + extern f_status_t fl_print_trim_except_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_file_t file); #endif // _di_fl_print_trim_except_dynamic_ /** @@ -1146,7 +1146,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_dynamic_raw_ - extern f_status_t fl_print_trim_except_dynamic_raw(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_file_t file); + extern f_status_t fl_print_trim_except_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_file_t file); #endif // _di_fl_print_trim_except_dynamic_raw_ /** @@ -1194,7 +1194,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_dynamic_raw_safely_ - extern f_status_t fl_print_trim_except_dynamic_raw_safely(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_file_t file); + extern f_status_t fl_print_trim_except_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_file_t file); #endif // _di_fl_print_trim_except_dynamic_raw_safely_ /** @@ -1240,7 +1240,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_dynamic_safely_ - extern f_status_t fl_print_trim_except_dynamic_safely(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_file_t file); + extern f_status_t fl_print_trim_except_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_file_t file); #endif // _di_fl_print_trim_except_dynamic_safely_ /** @@ -1293,7 +1293,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_in_ - extern f_status_t fl_print_trim_except_in(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t fl_print_trim_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_fl_print_trim_except_in_ /** @@ -1347,7 +1347,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_in_raw_ - extern f_status_t fl_print_trim_except_in_raw(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t fl_print_trim_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_fl_print_trim_except_in_raw_ /** @@ -1402,7 +1402,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_in_raw_safely_ - extern f_status_t fl_print_trim_except_in_raw_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t fl_print_trim_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_fl_print_trim_except_in_raw_safely_ /** @@ -1455,7 +1455,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_in_safely_ - extern f_status_t fl_print_trim_except_in_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t fl_print_trim_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_fl_print_trim_except_in_safely_ /** @@ -1507,7 +1507,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_in_dynamic_ - extern f_status_t fl_print_trim_except_in_dynamic(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t fl_print_trim_except_in_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_fl_print_trim_except_in_dynamic_ /** @@ -1558,7 +1558,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_in_dynamic_raw_ - extern f_status_t fl_print_trim_except_in_dynamic_raw(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t fl_print_trim_except_in_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_fl_print_trim_except_in_dynamic_raw_ /** @@ -1610,7 +1610,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_in_dynamic_raw_safely_ - extern f_status_t fl_print_trim_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t fl_print_trim_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_fl_print_trim_except_in_dynamic_raw_safely_ /** @@ -1660,7 +1660,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_in_dynamic_safely_ - extern f_status_t fl_print_trim_except_in_dynamic_safely(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t fl_print_trim_except_in_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_fl_print_trim_except_in_dynamic_safely_ /** @@ -1712,7 +1712,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_in_dynamic_partial_ - extern f_status_t fl_print_trim_except_in_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t fl_print_trim_except_in_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_fl_print_trim_except_in_dynamic_partial_ /** @@ -1764,7 +1764,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_in_dynamic_partial_raw_ - extern f_status_t fl_print_trim_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t fl_print_trim_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_fl_print_trim_except_in_dynamic_partial_raw_ /** @@ -1818,7 +1818,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_in_dynamic_partial_raw_safely_ - extern f_status_t fl_print_trim_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t fl_print_trim_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_fl_print_trim_except_in_dynamic_partial_raw_safely_ /** @@ -1870,7 +1870,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_in_dynamic_partial_safely_ - extern f_status_t fl_print_trim_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file); + extern f_status_t fl_print_trim_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file); #endif // _di_fl_print_trim_except_in_dynamic_partial_safely_ /** @@ -1918,7 +1918,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_dynamic_partial_ - extern f_status_t fl_print_trim_except_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, const f_file_t file); + extern f_status_t fl_print_trim_except_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_fl_print_trim_except_dynamic_partial_ /** @@ -1966,7 +1966,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_dynamic_partial_raw_ - extern f_status_t fl_print_trim_except_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, const f_file_t file); + extern f_status_t fl_print_trim_except_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_fl_print_trim_except_dynamic_partial_raw_ /** @@ -2016,7 +2016,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_dynamic_partial_raw_safely_ - extern f_status_t fl_print_trim_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, const f_file_t file); + extern f_status_t fl_print_trim_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_fl_print_trim_except_dynamic_partial_raw_safely_ /** @@ -2064,7 +2064,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_print_trim_except_dynamic_partial_safely_ - extern f_status_t fl_print_trim_except_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, const f_file_t file); + extern f_status_t fl_print_trim_except_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, const f_file_t file); #endif // _di_fl_print_trim_except_dynamic_partial_safely_ #ifdef __cplusplus diff --git a/level_1/fl_print/c/private-print.c b/level_1/fl_print/c/private-print.c index cfdba57..2d4abc7 100644 --- a/level_1/fl_print/c/private-print.c +++ b/level_1/fl_print/c/private-print.c @@ -320,7 +320,7 @@ extern "C" { const f_string_range_t partial = va_arg(apl, f_string_range_t); if (flag & F_print_format_flag_ignore_index_d) { - const f_array_lengths_t except_at = va_arg(apl, f_array_lengths_t); + const f_number_unsigneds_t except_at = va_arg(apl, f_number_unsigneds_t); f_string_ranges_t except_in = f_string_ranges_t_initialize; if (flag & F_print_format_flag_ignore_range_d) { @@ -333,7 +333,7 @@ extern "C" { break; } - f_array_length_t length = (partial.stop - partial.start) + 1; + f_number_unsigned_t length = (partial.stop - partial.start) + 1; if (length + partial.start > value.used) { length = value.used - partial.start; @@ -347,7 +347,7 @@ extern "C" { } } else if (flag & F_print_format_flag_ignore_range_d) { - const f_array_lengths_t except_at = f_array_lengths_t_initialize; + const f_number_unsigneds_t except_at = f_number_unsigneds_t_initialize; const f_string_ranges_t except_in = va_arg(apl, f_string_ranges_t); if (partial.start > partial.stop || partial.start >= value.used) { @@ -356,7 +356,7 @@ extern "C" { break; } - f_array_length_t length = (partial.stop - partial.start) + 1; + f_number_unsigned_t length = (partial.stop - partial.start) + 1; if (length + partial.start > value.used) { length = value.used - partial.start; @@ -376,7 +376,7 @@ extern "C" { break; } - f_array_length_t length = (partial.stop - partial.start) + 1; + f_number_unsigned_t length = (partial.stop - partial.start) + 1; if (length + partial.start > value.used) { length = value.used - partial.start; @@ -391,7 +391,7 @@ extern "C" { } } else if (flag & F_print_format_flag_ignore_index_d) { - const f_array_lengths_t except_at = va_arg(apl, f_array_lengths_t); + const f_number_unsigneds_t except_at = va_arg(apl, f_number_unsigneds_t); f_string_ranges_t except_in = f_string_ranges_t_initialize; if (flag & F_print_format_flag_ignore_range_d) { @@ -406,7 +406,7 @@ extern "C" { } } else if (flag & F_print_format_flag_ignore_range_d) { - const f_array_lengths_t except_at = f_array_lengths_t_initialize; + const f_number_unsigneds_t except_at = f_number_unsigneds_t_initialize; const f_string_ranges_t except_in = va_arg(apl, f_string_ranges_t); if (flag & F_print_format_flag_trim_d) { @@ -434,7 +434,7 @@ extern "C" { const f_string_range_t partial = va_arg(apl, f_string_range_t); if (flag & F_print_format_flag_ignore_index_d) { - const f_array_lengths_t except_at = va_arg(apl, f_array_lengths_t); + const f_number_unsigneds_t except_at = va_arg(apl, f_number_unsigneds_t); f_string_ranges_t except_in = f_string_ranges_t_initialize; if (flag & F_print_format_flag_ignore_range_d) { @@ -447,7 +447,7 @@ extern "C" { break; } - f_array_length_t length = (partial.stop - partial.start) + 1; + f_number_unsigned_t length = (partial.stop - partial.start) + 1; if (length + partial.start > value.used) { length = value.used - partial.start; @@ -461,7 +461,7 @@ extern "C" { } } else if (flag & F_print_format_flag_ignore_range_d) { - const f_array_lengths_t except_at = f_array_lengths_t_initialize; + const f_number_unsigneds_t except_at = f_number_unsigneds_t_initialize; const f_string_ranges_t except_in = va_arg(apl, f_string_ranges_t); if (partial.start > partial.stop || partial.start >= value.used) { @@ -470,7 +470,7 @@ extern "C" { break; } - f_array_length_t length = (partial.stop - partial.start) + 1; + f_number_unsigned_t length = (partial.stop - partial.start) + 1; if (length + partial.start > value.used) { length = value.used - partial.start; @@ -490,7 +490,7 @@ extern "C" { break; } - f_array_length_t length = (partial.stop - partial.start) + 1; + f_number_unsigned_t length = (partial.stop - partial.start) + 1; if (length + partial.start > value.used) { length = value.used - partial.start; @@ -505,7 +505,7 @@ extern "C" { } } else if (flag & F_print_format_flag_ignore_index_d) { - const f_array_lengths_t except_at = va_arg(apl, f_array_lengths_t); + const f_number_unsigneds_t except_at = va_arg(apl, f_number_unsigneds_t); f_string_ranges_t except_in = f_string_ranges_t_initialize; if (flag & F_print_format_flag_ignore_range_d) { @@ -520,7 +520,7 @@ extern "C" { } } else if (flag & F_print_format_flag_ignore_range_d) { - const f_array_lengths_t except_at = f_array_lengths_t_initialize; + const f_number_unsigneds_t except_at = f_number_unsigneds_t_initialize; const f_string_ranges_t except_in = va_arg(apl, f_string_ranges_t); if (flag & F_print_format_flag_trim_d) { @@ -712,7 +712,7 @@ extern "C" { const f_string_range_t partial = va_arg(apl, f_string_range_t); if (flag & F_print_format_flag_ignore_index_d) { - const f_array_lengths_t except_at = va_arg(apl, f_array_lengths_t); + const f_number_unsigneds_t except_at = va_arg(apl, f_number_unsigneds_t); f_string_ranges_t except_in = f_string_ranges_t_initialize; if (flag & F_print_format_flag_ignore_range_d) { @@ -725,7 +725,7 @@ extern "C" { break; } - f_array_length_t length = (partial.stop - partial.start) + 1; + f_number_unsigned_t length = (partial.stop - partial.start) + 1; if (length + partial.start > value.used) { length = value.used - partial.start; @@ -739,7 +739,7 @@ extern "C" { } } else if (flag & F_print_format_flag_ignore_range_d) { - const f_array_lengths_t except_at = f_array_lengths_t_initialize; + const f_number_unsigneds_t except_at = f_number_unsigneds_t_initialize; const f_string_ranges_t except_in = va_arg(apl, f_string_ranges_t); if (partial.start > partial.stop || partial.start >= value.used) { @@ -748,7 +748,7 @@ extern "C" { break; } - f_array_length_t length = (partial.stop - partial.start) + 1; + f_number_unsigned_t length = (partial.stop - partial.start) + 1; if (length + partial.start > value.used) { length = value.used - partial.start; @@ -768,7 +768,7 @@ extern "C" { break; } - f_array_length_t length = (partial.stop - partial.start) + 1; + f_number_unsigned_t length = (partial.stop - partial.start) + 1; if (length + partial.start > value.used) { length = value.used - partial.start; @@ -783,7 +783,7 @@ extern "C" { } } else if (flag & F_print_format_flag_ignore_index_d) { - const f_array_lengths_t except_at = va_arg(apl, f_array_lengths_t); + const f_number_unsigneds_t except_at = va_arg(apl, f_number_unsigneds_t); f_string_ranges_t except_in = f_string_ranges_t_initialize; if (flag & F_print_format_flag_ignore_range_d) { @@ -798,7 +798,7 @@ extern "C" { } } else if (flag & F_print_format_flag_ignore_range_d) { - const f_array_lengths_t except_at = f_array_lengths_t_initialize; + const f_number_unsigneds_t except_at = f_number_unsigneds_t_initialize; const f_string_ranges_t except_in = va_arg(apl, f_string_ranges_t); if (flag & F_print_format_flag_trim_d) { @@ -833,7 +833,7 @@ extern "C" { const f_string_range_t partial = va_arg(apl, f_string_range_t); if (flag & F_print_format_flag_ignore_index_d) { - const f_array_lengths_t except_at = va_arg(apl, f_array_lengths_t); + const f_number_unsigneds_t except_at = va_arg(apl, f_number_unsigneds_t); f_string_ranges_t except_in = f_string_ranges_t_initialize; if (flag & F_print_format_flag_ignore_range_d) { @@ -846,7 +846,7 @@ extern "C" { break; } - f_array_length_t length = (partial.stop - partial.start) + 1; + f_number_unsigned_t length = (partial.stop - partial.start) + 1; if (length + partial.start > value.used) { length = value.used - partial.start; @@ -860,7 +860,7 @@ extern "C" { } } else if (flag & F_print_format_flag_ignore_range_d) { - const f_array_lengths_t except_at = f_array_lengths_t_initialize; + const f_number_unsigneds_t except_at = f_number_unsigneds_t_initialize; const f_string_ranges_t except_in = va_arg(apl, f_string_ranges_t); if (partial.start > partial.stop || partial.start >= value.used) { @@ -869,7 +869,7 @@ extern "C" { break; } - f_array_length_t length = (partial.stop - partial.start) + 1; + f_number_unsigned_t length = (partial.stop - partial.start) + 1; if (length + partial.start > value.used) { length = value.used - partial.start; @@ -889,7 +889,7 @@ extern "C" { break; } - f_array_length_t length = (partial.stop - partial.start) + 1; + f_number_unsigned_t length = (partial.stop - partial.start) + 1; if (length + partial.start > value.used) { length = value.used - partial.start; @@ -904,7 +904,7 @@ extern "C" { } } else if (flag & F_print_format_flag_ignore_index_d) { - const f_array_lengths_t except_at = va_arg(apl, f_array_lengths_t); + const f_number_unsigneds_t except_at = va_arg(apl, f_number_unsigneds_t); f_string_ranges_t except_in = f_string_ranges_t_initialize; if (flag & F_print_format_flag_ignore_range_d) { @@ -919,7 +919,7 @@ extern "C" { } } else if (flag & F_print_format_flag_ignore_range_d) { - const f_array_lengths_t except_at = f_array_lengths_t_initialize; + const f_number_unsigneds_t except_at = f_number_unsigneds_t_initialize; const f_string_ranges_t except_in = va_arg(apl, f_string_ranges_t); if (flag & F_print_format_flag_trim_d) { @@ -1193,16 +1193,16 @@ extern "C" { #endif // !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) #if !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_except_) || !defined(_di_fl_print_trim_except_dynamic_) || !defined(_di_fl_print_trim_except_dynamic_partial_) || !defined(_di_fl_print_trim_except_in_) || !defined(_di_fl_print_trim_except_in_dynamic_) || !defined(_di_fl_print_trim_except_in_dynamic_partial_) - f_status_t private_fl_print_trim_except_in(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t private_fl_print_trim_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { - f_array_length_t i = offset; - f_array_length_t j = 0; - f_array_length_t k = 0; - f_array_length_t previous = 0; - f_array_length_t at = 0; - f_array_length_t at2 = 0; - f_array_length_t in = 0; - f_array_length_t in2 = 0; + f_number_unsigned_t i = offset; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; + f_number_unsigned_t previous = 0; + f_number_unsigned_t at = 0; + f_number_unsigned_t at2 = 0; + f_number_unsigned_t in = 0; + f_number_unsigned_t in2 = 0; f_status_t status = F_none; @@ -1462,16 +1462,16 @@ extern "C" { #endif // !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_except_) || !defined(_di_fl_print_trim_except_dynamic_) || !defined(_di_fl_print_trim_except_dynamic_partial_) || !defined(_di_fl_print_trim_except_in_) || !defined(_di_fl_print_trim_except_in_dynamic_) || !defined(_di_fl_print_trim_except_in_dynamic_partial_) #if !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_except_raw_) || !defined(_di_fl_print_trim_except_dynamic_raw_) || !defined(_di_fl_print_trim_except_dynamic_partial_raw_) || !defined(_di_fl_print_trim_except_in_raw_) || !defined(_di_fl_print_trim_except_in_dynamic_raw_) || !defined(_di_fl_print_trim_except_in_dynamic_partial_raw_) - f_status_t private_fl_print_trim_except_in_raw(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t private_fl_print_trim_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { - f_array_length_t i = offset; - f_array_length_t j = 0; - f_array_length_t k = 0; - f_array_length_t previous = 0; - f_array_length_t at = 0; - f_array_length_t at2 = 0; - f_array_length_t in = 0; - f_array_length_t in2 = 0; + f_number_unsigned_t i = offset; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; + f_number_unsigned_t previous = 0; + f_number_unsigned_t at = 0; + f_number_unsigned_t at2 = 0; + f_number_unsigned_t in = 0; + f_number_unsigned_t in2 = 0; f_status_t status = F_none; @@ -1668,16 +1668,16 @@ extern "C" { #endif // !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_except_raw_) || !defined(_di_fl_print_trim_except_dynamic_raw_) || !defined(_di_fl_print_trim_except_dynamic_partial_raw_) || !defined(_di_fl_print_trim_except_in_raw_) || !defined(_di_fl_print_trim_except_in_dynamic_raw_) || !defined(_di_fl_print_trim_except_in_dynamic_partial_raw_) #if !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_except_raw_safely_) || !defined(_di_fl_print_trim_except_dynamic_raw_safely_) || !defined(_di_fl_print_trim_except_dynamic_partial_raw_safely_) || !defined(_di_fl_print_trim_except_in_raw_safely_) || !defined(_di_fl_print_trim_except_in_dynamic_raw_safely_) || !defined(_di_fl_print_trim_except_in_dynamic_partial_raw_safely_) - f_status_t private_fl_print_trim_except_in_raw_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t private_fl_print_trim_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { - f_array_length_t i = offset; - f_array_length_t j = 0; - f_array_length_t k = 0; - f_array_length_t previous = 0; - f_array_length_t at = 0; - f_array_length_t at2 = 0; - f_array_length_t in = 0; - f_array_length_t in2 = 0; + f_number_unsigned_t i = offset; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; + f_number_unsigned_t previous = 0; + f_number_unsigned_t at = 0; + f_number_unsigned_t at2 = 0; + f_number_unsigned_t in = 0; + f_number_unsigned_t in2 = 0; f_status_t status = F_none; @@ -1929,16 +1929,16 @@ extern "C" { #endif // !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_except_raw_safely_) || !defined(_di_fl_print_trim_except_dynamic_raw_safely_) || !defined(_di_fl_print_trim_except_dynamic_partial_raw_safely_) || !defined(_di_fl_print_trim_except_in_raw_safely_) || !defined(_di_fl_print_trim_except_in_dynamic_raw_safely_) || !defined(_di_fl_print_trim_except_in_dynamic_partial_raw_safely_) #if !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_except_dynamic_safely_) || !defined(_di_fl_print_trim_except_dynamic_partial_safely_) || !defined(_di_fl_print_trim_except_in_dynamic_safely_) || !defined(_di_fl_print_trim_except_in_dynamic_partial_safely_) || !defined(_di_fl_print_trim_except_in_safely_) || !defined(_di_fl_print_trim_except_safely_) - f_status_t private_fl_print_trim_except_in_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) { + f_status_t private_fl_print_trim_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) { - f_array_length_t i = offset; - f_array_length_t j = 0; - f_array_length_t k = 0; - f_array_length_t previous = 0; - f_array_length_t at = 0; - f_array_length_t at2 = 0; - f_array_length_t in = 0; - f_array_length_t in2 = 0; + f_number_unsigned_t i = offset; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; + f_number_unsigned_t previous = 0; + f_number_unsigned_t at = 0; + f_number_unsigned_t at2 = 0; + f_number_unsigned_t in = 0; + f_number_unsigned_t in2 = 0; f_status_t status = F_none; @@ -2188,12 +2188,12 @@ extern "C" { #endif // !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_except_dynamic_safely_) || !defined(_di_fl_print_trim_except_dynamic_partial_safely_) || !defined(_di_fl_print_trim_except_in_dynamic_safely_) || !defined(_di_fl_print_trim_except_in_dynamic_partial_safely_) || !defined(_di_fl_print_trim_except_in_safely_) || !defined(_di_fl_print_trim_except_safely_) #if !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_) || !defined(_di_fl_print_trim_dynamic_) || !defined(_di_fl_print_trim_dynamic_partial_) - f_status_t private_fl_print_trim(const f_string_t string, const f_array_length_t length, const f_file_t file) { + f_status_t private_fl_print_trim(const f_string_t string, const f_number_unsigned_t length, const f_file_t file) { - f_array_length_t i = 0; - f_array_length_t j = 0; - f_array_length_t k = 0; - f_array_length_t previous = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; + f_number_unsigned_t previous = 0; f_status_t status = F_none; @@ -2368,12 +2368,12 @@ extern "C" { #endif // !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_) || !defined(_di_fl_print_trim_dynamic_) || !defined(_di_fl_print_trim_dynamic_partial_) #if !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_raw_) || !defined(_di_fl_print_trim_dynamic_raw_) || !defined(_di_fl_print_trim_dynamic_partial_raw_) - f_status_t private_fl_print_trim_raw(const f_string_t string, const f_array_length_t length, const f_file_t file) { + f_status_t private_fl_print_trim_raw(const f_string_t string, const f_number_unsigned_t length, const f_file_t file) { - f_array_length_t i = 0; - f_array_length_t j = 0; - f_array_length_t k = 0; - f_array_length_t previous = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; + f_number_unsigned_t previous = 0; f_status_t status = F_none; @@ -2487,12 +2487,12 @@ extern "C" { #endif // !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_raw_) || !defined(_di_fl_print_trim_dynamic_raw_) || !defined(_di_fl_print_trim_dynamic_partial_raw_) #if !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_raw_safely_) || !defined(_di_fl_print_trim_dynamic_raw_safely_) || !defined(_di_fl_print_trim_dynamic_partial_raw_safely_) - f_status_t private_fl_print_trim_raw_safely(const f_string_t string, const f_array_length_t length, const f_file_t file) { + f_status_t private_fl_print_trim_raw_safely(const f_string_t string, const f_number_unsigned_t length, const f_file_t file) { - f_array_length_t i = 0; - f_array_length_t j = 0; - f_array_length_t k = 0; - f_array_length_t previous = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; + f_number_unsigned_t previous = 0; f_status_t status = F_none; @@ -2661,12 +2661,12 @@ extern "C" { #endif // !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_raw_safely_) || !defined(_di_fl_print_trim_dynamic_raw_safely_) || !defined(_di_fl_print_trim_dynamic_partial_raw_safely_) #if !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_safely_) || !defined(_di_fl_print_trim_dynamic_safely_) || !defined(_di_fl_print_trim_dynamic_partial_safely_) - f_status_t private_fl_print_trim_safely(const f_string_t string, const f_array_length_t length, const f_file_t file) { + f_status_t private_fl_print_trim_safely(const f_string_t string, const f_number_unsigned_t length, const f_file_t file) { - f_array_length_t i = 0; - f_array_length_t j = 0; - f_array_length_t k = 0; - f_array_length_t previous = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; + f_number_unsigned_t previous = 0; f_status_t status = F_none; diff --git a/level_1/fl_print/c/private-print.h b/level_1/fl_print/c/private-print.h index 98df1ac..ddcc65e 100644 --- a/level_1/fl_print/c/private-print.h +++ b/level_1/fl_print/c/private-print.h @@ -121,7 +121,7 @@ extern "C" { * @see fl_print_trim_except_in_dynamic_partial() */ #if !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_except_) || !defined(_di_fl_print_trim_except_dynamic_) || !defined(_di_fl_print_trim_except_dynamic_partial_) || !defined(_di_fl_print_trim_except_in_) || !defined(_di_fl_print_trim_except_in_dynamic_) || !defined(_di_fl_print_trim_except_in_dynamic_partial_) - extern f_status_t private_fl_print_trim_except_in(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) F_attribute_visibility_internal_d; + extern f_status_t private_fl_print_trim_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) F_attribute_visibility_internal_d; #endif // !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_except_) || !defined(_di_fl_print_trim_except_dynamic_) || !defined(_di_fl_print_trim_except_dynamic_partial_) || !defined(_di_fl_print_trim_except_in_) || !defined(_di_fl_print_trim_except_in_dynamic_) || !defined(_di_fl_print_trim_except_in_dynamic_partial_) /** @@ -168,7 +168,7 @@ extern "C" { * @see fl_print_trim_except_in_dynamic_partial_raw() */ #if !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_except_raw_) || !defined(_di_fl_print_trim_except_dynamic_raw_) || !defined(_di_fl_print_trim_except_dynamic_partial_raw_) || !defined(_di_fl_print_trim_except_in_raw_) || !defined(_di_fl_print_trim_except_in_dynamic_raw_) || !defined(_di_fl_print_trim_except_in_dynamic_partial_raw_) - extern f_status_t private_fl_print_trim_except_in_raw(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) F_attribute_visibility_internal_d; + extern f_status_t private_fl_print_trim_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) F_attribute_visibility_internal_d; #endif // !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_except_raw_) || !defined(_di_fl_print_trim_except_dynamic_raw_) || !defined(_di_fl_print_trim_except_dynamic_partial_raw_) || !defined(_di_fl_print_trim_except_in_raw_) || !defined(_di_fl_print_trim_except_in_dynamic_raw_) || !defined(_di_fl_print_trim_except_in_dynamic_partial_raw_) /** @@ -216,7 +216,7 @@ extern "C" { * @see fl_print_trim_except_in_dynamic_partial_raw_safely() */ #if !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_except_raw_safely_) || !defined(_di_fl_print_trim_except_dynamic_raw_safely_) || !defined(_di_fl_print_trim_except_dynamic_partial_raw_safely_) || !defined(_di_fl_print_trim_except_in_raw_safely_) || !defined(_di_fl_print_trim_except_in_dynamic_raw_safely_) || !defined(_di_fl_print_trim_except_in_dynamic_partial_raw_safely_) - extern f_status_t private_fl_print_trim_except_in_raw_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) F_attribute_visibility_internal_d; + extern f_status_t private_fl_print_trim_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) F_attribute_visibility_internal_d; #endif // !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_except_raw_safely_) || !defined(_di_fl_print_trim_except_dynamic_raw_safely_) || !defined(_di_fl_print_trim_except_dynamic_partial_raw_safely_) || !defined(_di_fl_print_trim_except_in_raw_safely_) || !defined(_di_fl_print_trim_except_in_dynamic_raw_safely_) || !defined(_di_fl_print_trim_except_in_dynamic_partial_raw_safely_) /** @@ -264,7 +264,7 @@ extern "C" { * @see fl_print_trim_except_safely() */ #if !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_except_dynamic_safely_) || !defined(_di_fl_print_trim_except_dynamic_partial_safely_) || !defined(_di_fl_print_trim_except_in_dynamic_safely_) || !defined(_di_fl_print_trim_except_in_dynamic_partial_safely_) || !defined(_di_fl_print_trim_except_in_safely_) || !defined(_di_fl_print_trim_except_safely_) - extern f_status_t private_fl_print_trim_except_in_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t stop, const f_array_lengths_t except_at, const f_string_ranges_t except_in, const f_file_t file) F_attribute_visibility_internal_d; + extern f_status_t private_fl_print_trim_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t stop, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, const f_file_t file) F_attribute_visibility_internal_d; #endif // !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_except_dynamic_safely_) || !defined(_di_fl_print_trim_except_dynamic_partial_safely_) || !defined(_di_fl_print_trim_except_in_dynamic_safely_) || !defined(_di_fl_print_trim_except_in_dynamic_partial_safely_) || !defined(_di_fl_print_trim_except_in_safely_) || !defined(_di_fl_print_trim_except_safely_) /** @@ -302,7 +302,7 @@ extern "C" { * @see fl_print_trim_dynamic_partial() */ #if !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_) || !defined(_di_fl_print_trim_dynamic_) || !defined(_di_fl_print_trim_dynamic_partial_) - extern f_status_t private_fl_print_trim(const f_string_t string, const f_array_length_t length, const f_file_t file) F_attribute_visibility_internal_d; + extern f_status_t private_fl_print_trim(const f_string_t string, const f_number_unsigned_t length, const f_file_t file) F_attribute_visibility_internal_d; #endif // !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_) || !defined(_di_fl_print_trim_dynamic_) || !defined(_di_fl_print_trim_dynamic_partial_) /** @@ -338,7 +338,7 @@ extern "C" { * @see fl_print_trim_dynamic_partial_raw() */ #if !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_raw_) || !defined(_di_fl_print_trim_dynamic_raw_) || !defined(_di_fl_print_trim_dynamic_partial_raw_) - extern f_status_t private_fl_print_trim_raw(const f_string_t string, const f_array_length_t length, const f_file_t file) F_attribute_visibility_internal_d; + extern f_status_t private_fl_print_trim_raw(const f_string_t string, const f_number_unsigned_t length, const f_file_t file) F_attribute_visibility_internal_d; #endif // !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_raw_) || !defined(_di_fl_print_trim_dynamic_raw_) || !defined(_di_fl_print_trim_dynamic_partial_raw_) /** @@ -375,7 +375,7 @@ extern "C" { * @see fl_print_trim_dynamic_partial_raw_safely() */ #if !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_raw_safely_) || !defined(_di_fl_print_trim_dynamic_raw_safely_) || !defined(_di_fl_print_trim_dynamic_partial_raw_safely_) - extern f_status_t private_fl_print_trim_raw_safely(const f_string_t string, const f_array_length_t length, const f_file_t file) F_attribute_visibility_internal_d; + extern f_status_t private_fl_print_trim_raw_safely(const f_string_t string, const f_number_unsigned_t length, const f_file_t file) F_attribute_visibility_internal_d; #endif // !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_raw_safely_) || !defined(_di_fl_print_trim_dynamic_raw_safely_) || !defined(_di_fl_print_trim_dynamic_partial_raw_safely_) /** @@ -412,7 +412,7 @@ extern "C" { * @see fl_print_trim_dynamic_partial_safely() */ #if !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_safely_) || !defined(_di_fl_print_trim_dynamic_safely_) || !defined(_di_fl_print_trim_dynamic_partial_safely_) - extern f_status_t private_fl_print_trim_safely(const f_string_t string, const f_array_length_t length, const f_file_t file) F_attribute_visibility_internal_d; + extern f_status_t private_fl_print_trim_safely(const f_string_t string, const f_number_unsigned_t length, const f_file_t file) F_attribute_visibility_internal_d; #endif // !defined(_di_fl_print_format_) || !defined(_di_fl_print_format_convert_) || !defined(_di_fl_print_trim_safely_) || !defined(_di_fl_print_trim_dynamic_safely_) || !defined(_di_fl_print_trim_dynamic_partial_safely_) #ifdef __cplusplus diff --git a/level_1/fl_signal/c/signal.c b/level_1/fl_signal/c/signal.c index fdfd71f..d915c27 100644 --- a/level_1/fl_signal/c/signal.c +++ b/level_1/fl_signal/c/signal.c @@ -33,7 +33,7 @@ extern "C" { const f_status_t status = f_signal_read(signal_interrupt->signal, 0, &information); if (F_status_set_fine(status) == F_interrupt) { - for (f_array_length_t i = 0; i < signal_interrupt->interrupts.used; ++i) { + for (f_number_unsigned_t i = 0; i < signal_interrupt->interrupts.used; ++i) { if (information.ssi_signo == signal_interrupt->interrupts.array[i]) { signal_interrupt->trigger = information.ssi_signo; 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 13053f8..9c8442f 100644 --- a/level_1/fl_utf_file/c/private-utf_file.c +++ b/level_1/fl_utf_file/c/private-utf_file.c @@ -10,7 +10,7 @@ extern "C" { uint8_t increment_by = 0; - for (f_array_length_t i = 0; i < size_read; i += increment_by) { + for (f_number_unsigned_t i = 0; i < size_read; i += increment_by) { increment_by = 0; @@ -70,20 +70,20 @@ 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_status_t private_fl_utf_file_write_until(const f_file_t file, const f_utf_string_t string, const f_array_length_t total, f_array_length_t * const written) { + f_status_t private_fl_utf_file_write_until(const f_file_t file, const f_utf_string_t string, const f_number_unsigned_t total, f_number_unsigned_t * const written) { *written = 0; - f_array_length_t write_size = file.size_write > 4 ? file.size_write : 4; - f_array_length_t write_max = total; - f_array_length_t i = 0; + f_number_unsigned_t write_size = file.size_write > 4 ? file.size_write : 4; + f_number_unsigned_t write_max = total; + f_number_unsigned_t i = 0; if (write_size > write_max) { write_size = write_max; } - f_array_length_t last = 0; - f_array_length_t used = 0; + f_number_unsigned_t last = 0; + f_number_unsigned_t used = 0; ssize_t size_write = 0; uint8_t buffer_write[write_size]; 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 e99fd52..59ee55f 100644 --- a/level_1/fl_utf_file/c/private-utf_file.h +++ b/level_1/fl_utf_file/c/private-utf_file.h @@ -79,7 +79,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_status_t private_fl_utf_file_write_until(const f_file_t file, const f_utf_string_t string, const f_array_length_t total, f_array_length_t * const written) F_attribute_visibility_internal_d; + extern f_status_t private_fl_utf_file_write_until(const f_file_t file, const f_utf_string_t string, const f_number_unsigned_t total, f_number_unsigned_t * const written) F_attribute_visibility_internal_d; #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 b54da70..b5f5e31 100644 --- a/level_1/fl_utf_file/c/utf_file.c +++ b/level_1/fl_utf_file/c/utf_file.c @@ -130,7 +130,7 @@ extern "C" { #endif // _di_fl_utf_file_read_block_ #ifndef _di_fl_utf_file_read_until_ - f_status_t fl_utf_file_read_until(const f_file_t file, const f_array_length_t total, f_utf_string_dynamic_t * const destination) { + f_status_t fl_utf_file_read_until(const f_file_t file, const f_number_unsigned_t total, f_utf_string_dynamic_t * const destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -149,8 +149,8 @@ extern "C" { uint8_t width = 0; int8_t width_last = -1; - f_array_length_t buffer_size = file.size_read; - f_array_length_t buffer_count = 0; + f_number_unsigned_t buffer_size = file.size_read; + f_number_unsigned_t buffer_count = 0; if (total < buffer_size) { buffer_size = total; @@ -202,7 +202,7 @@ extern "C" { #endif // _di_fl_utf_file_read_until_ #ifndef _di_fl_utf_file_write_ - f_status_t fl_utf_file_write(const f_file_t file, const f_utf_string_static_t destination, f_array_length_t * const written) { + f_status_t fl_utf_file_write(const f_file_t file, const f_utf_string_static_t destination, f_number_unsigned_t * const written) { #ifndef _di_level_0_parameter_checking_ if (!file.size_write) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -233,7 +233,7 @@ extern "C" { #endif // _di_fl_utf_file_write_ #ifndef _di_fl_utf_file_write_block_ - f_status_t fl_utf_file_write_block(const f_file_t file, const f_utf_string_static_t destination, f_array_length_t * const written) { + f_status_t fl_utf_file_write_block(const f_file_t file, const f_utf_string_static_t destination, f_number_unsigned_t * const written) { #ifndef _di_level_0_parameter_checking_ if (!file.size_write) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -252,7 +252,7 @@ extern "C" { return F_data_not; } - f_array_length_t write_max = file.size_write; + f_number_unsigned_t write_max = file.size_write; if (write_max > destination.used) { write_max = destination.used; @@ -270,7 +270,7 @@ extern "C" { #endif // _di_fl_utf_file_write_block_ #ifndef _di_fl_utf_file_write_until_ - f_status_t fl_utf_file_write_until(const f_file_t file, const f_utf_string_static_t destination, const f_array_length_t total, f_array_length_t * const written) { + f_status_t fl_utf_file_write_until(const f_file_t file, const f_utf_string_static_t destination, const f_number_unsigned_t total, f_number_unsigned_t * const written) { #ifndef _di_level_0_parameter_checking_ if (!file.size_write) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -289,7 +289,7 @@ extern "C" { return F_data_not; } - f_array_length_t write_max = file.size_write; + f_number_unsigned_t write_max = file.size_write; if (write_max > destination.used) { write_max = destination.used; @@ -307,7 +307,7 @@ extern "C" { #endif // _di_fl_utf_file_write_until_ #ifndef _di_fl_utf_file_write_range_ - f_status_t fl_utf_file_write_range(const f_file_t file, const f_utf_string_static_t destination, const f_string_range_t range, f_array_length_t * const written) { + f_status_t fl_utf_file_write_range(const f_file_t file, const f_utf_string_static_t destination, const f_string_range_t range, f_number_unsigned_t * const written) { #ifndef _di_level_0_parameter_checking_ if (!file.size_write) return F_status_set_error(F_parameter); if (range.start >= destination.used) return F_status_set_error(F_parameter); @@ -327,8 +327,8 @@ extern "C" { return F_data_not; } - const f_array_length_t total = (range.stop - range.start) + 1; - f_array_length_t write_max = total; + const f_number_unsigned_t total = (range.stop - range.start) + 1; + f_number_unsigned_t write_max = total; if (write_max > destination.used) { write_max = destination.used; diff --git a/level_1/fl_utf_file/c/utf_file.h b/level_1/fl_utf_file/c/utf_file.h index c2b3d84..d750938 100644 --- a/level_1/fl_utf_file/c/utf_file.h +++ b/level_1/fl_utf_file/c/utf_file.h @@ -125,7 +125,7 @@ extern "C" { * @see read() */ #ifndef _di_fl_utf_file_read_until_ - extern f_status_t fl_utf_file_read_until(const f_file_t file, const f_array_length_t total, f_utf_string_dynamic_t * const destination); + extern f_status_t fl_utf_file_read_until(const f_file_t file, const f_number_unsigned_t total, f_utf_string_dynamic_t * const destination); #endif // _di_fl_utf_file_read_until_ /** @@ -158,7 +158,7 @@ extern "C" { * @see write() */ #ifndef _di_fl_utf_file_write_ - extern f_status_t fl_utf_file_write(const f_file_t file, const f_utf_string_static_t destination, f_array_length_t * const written); + extern f_status_t fl_utf_file_write(const f_file_t file, const f_utf_string_static_t destination, f_number_unsigned_t * const written); #endif // _di_fl_utf_file_write_ /** @@ -193,7 +193,7 @@ extern "C" { * @see write() */ #ifndef _di_fl_utf_file_write_block_ - extern f_status_t fl_utf_file_write_block(const f_file_t file, const f_utf_string_static_t destination, f_array_length_t * const written); + extern f_status_t fl_utf_file_write_block(const f_file_t file, const f_utf_string_static_t destination, f_number_unsigned_t * const written); #endif // _di_fl_utf_file_write_block_ /** @@ -228,7 +228,7 @@ extern "C" { * @see write() */ #ifndef _di_fl_utf_file_write_until_ - extern f_status_t fl_utf_file_write_until(const f_file_t file, const f_utf_string_static_t destination, const f_array_length_t total, f_array_length_t * const written); + extern f_status_t fl_utf_file_write_until(const f_file_t file, const f_utf_string_static_t destination, const f_number_unsigned_t total, f_number_unsigned_t * const written); #endif // _di_fl_utf_file_write_until_ /** @@ -263,7 +263,7 @@ extern "C" { * @see write() */ #ifndef _di_fl_utf_file_write_range_ - extern f_status_t fl_utf_file_write_range(const f_file_t file, const f_utf_string_static_t buffer, const f_string_range_t range, f_array_length_t * const written); + extern f_status_t fl_utf_file_write_range(const f_file_t file, const f_utf_string_static_t buffer, const f_string_range_t range, f_number_unsigned_t * const 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 3e886f3..be3eea7 100644 --- a/level_2/fll_control_group/c/control_group.c +++ b/level_2/fll_control_group/c/control_group.c @@ -17,7 +17,7 @@ extern "C" { f_string_static_t path = f_string_static_t_initialize; - for (f_array_length_t i = 0; i < control_group.groups.used; ++i) { + for (f_number_unsigned_t i = 0; i < control_group.groups.used; ++i) { if (!control_group.groups.array[i].used) continue; diff --git a/level_2/fll_execute/c/execute.c b/level_2/fll_execute/c/execute.c index 36050ee..192e3b4 100644 --- a/level_2/fll_execute/c/execute.c +++ b/level_2/fll_execute/c/execute.c @@ -38,14 +38,14 @@ extern "C" { #endif // _di_fll_execute_arguments_add_parameter_ #ifndef _di_fll_execute_arguments_add_parameter_set_ - f_status_t fll_execute_arguments_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 * const arguments) { + f_status_t fll_execute_arguments_add_parameter_set(const f_string_static_t prefix[], const f_string_static_t name[], const f_string_static_t value[], const f_number_unsigned_t size, f_string_dynamics_t * const arguments) { #ifndef _di_level_2_parameter_checking_ if (!arguments) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ f_status_t status = f_string_dynamics_increase_by(size, arguments); - for (f_array_length_t i = 0; F_status_is_error_not(status) && i < size; ++i) { + for (f_number_unsigned_t i = 0; F_status_is_error_not(status) && i < size; ++i) { status = private_fll_execute_arguments_add_parameter(prefix[i], name[i], value[i], arguments); } // for @@ -55,14 +55,14 @@ extern "C" { #endif // _di_fll_execute_arguments_add_parameter_set_ #ifndef _di_fll_execute_arguments_add_set_ - f_status_t fll_execute_arguments_add_set(const f_string_static_t source[], const f_array_length_t size, f_string_dynamics_t * const arguments) { + f_status_t fll_execute_arguments_add_set(const f_string_static_t source[], const f_number_unsigned_t size, f_string_dynamics_t * const arguments) { #ifndef _di_level_2_parameter_checking_ if (!arguments) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ f_status_t status = f_string_dynamics_increase_by(size, arguments); - for (f_array_length_t i = 0; F_status_is_error_not(status) && i < size; ++i) { + for (f_number_unsigned_t i = 0; F_status_is_error_not(status) && i < size; ++i) { status = private_fll_execute_arguments_add(source[i], arguments); } // for @@ -144,7 +144,7 @@ extern "C" { } // Search each individual path in PATH until a match is found. - for (f_array_length_t i = 0; i < paths.used; ++i) { + for (f_number_unsigned_t i = 0; i < paths.used; ++i) { status = f_string_dynamic_append(program_name, &paths.array[i]); @@ -199,7 +199,7 @@ extern "C" { if (environment) { clearenv(); - for (f_array_length_t i = 0; i < environment->used; ++i) { + for (f_number_unsigned_t i = 0; i < environment->used; ++i) { f_environment_set(environment->array[i].name, environment->array[i].value, F_true); } // for } @@ -210,7 +210,7 @@ extern "C" { if (environment) { clearenv(); - for (f_array_length_t i = 0; i < environment->used; ++i) { + for (f_number_unsigned_t i = 0; i < environment->used; ++i) { f_environment_set(environment->array[i].name, environment->array[i].value, F_true); } // for } @@ -336,7 +336,7 @@ extern "C" { } // Search each individual path in PATH until a match is found. - for (f_array_length_t i = 0; i < paths.used; ++i) { + for (f_number_unsigned_t i = 0; i < paths.used; ++i) { status = f_string_dynamic_append(program_name, &paths.array[i]); diff --git a/level_2/fll_execute/c/execute.h b/level_2/fll_execute/c/execute.h index 2af273b..f528b7e 100644 --- a/level_2/fll_execute/c/execute.h +++ b/level_2/fll_execute/c/execute.h @@ -153,7 +153,7 @@ extern "C" { * @see f_string_dynamics_increase() */ #ifndef _di_fll_execute_arguments_add_parameter_set_ - extern f_status_t fll_execute_arguments_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 * const arguments); + extern f_status_t fll_execute_arguments_add_parameter_set(const f_string_static_t prefix[], const f_string_static_t name[], const f_string_static_t value[], const f_number_unsigned_t size, f_string_dynamics_t * const arguments); #endif // _di_fll_execute_arguments_add_parameter_set_ /** @@ -181,7 +181,7 @@ extern "C" { * @see f_string_dynamics_increase() */ #ifndef _di_fll_execute_arguments_add_set_ - extern f_status_t fll_execute_arguments_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_add_set(const f_string_static_t source[], const f_number_unsigned_t size, f_string_dynamics_t *arguments); #endif // _di_fll_execute_arguments_add_set_ /** diff --git a/level_2/fll_execute/c/private-execute.c b/level_2/fll_execute/c/private-execute.c index 9395b81..7fcc9d1 100644 --- a/level_2/fll_execute/c/private-execute.c +++ b/level_2/fll_execute/c/private-execute.c @@ -139,7 +139,7 @@ extern "C" { CPU_ZERO_S(size, set); - for (f_array_length_t i = 0; i < as.affinity->used; ++i) { + for (f_number_unsigned_t i = 0; i < as.affinity->used; ++i) { CPU_SET_S(as.affinity->array[i], size, set); } // for @@ -176,7 +176,7 @@ extern "C" { } if (as.limits) { - for (f_array_length_t i = 0; i < as.limits->used; ++i) { + for (f_number_unsigned_t i = 0; i < as.limits->used; ++i) { if (F_status_is_error(f_limit_process(id_child, as.limits->array[i].type, &as.limits->array[i].value, 0))) { result = &f_string_ascii_1_s; @@ -311,7 +311,7 @@ extern "C" { if (parameter && parameter->environment) { clearenv(); - for (f_array_length_t i = 0; i < parameter->environment->used; ++i) { + for (f_number_unsigned_t i = 0; i < parameter->environment->used; ++i) { f_environment_set(parameter->environment->array[i].name, parameter->environment->array[i].value, F_true); } // for } @@ -493,7 +493,7 @@ extern "C" { if (parameter && parameter->environment) { clearenv(); - for (f_array_length_t i = 0; i < parameter->environment->used; ++i) { + for (f_number_unsigned_t i = 0; i < parameter->environment->used; ++i) { f_environment_set(parameter->environment->array[i].name, parameter->environment->array[i].value, F_true); } // for } @@ -562,12 +562,12 @@ extern "C" { } if (fixated_is) { - for (f_array_length_t i = 1; i < arguments.used; ++i) { + for (f_number_unsigned_t i = 1; i < arguments.used; ++i) { fixed_arguments[i] = arguments.array[i].string; } // for } else { - for (f_array_length_t i = 0; i < arguments.used; ++i) { + for (f_number_unsigned_t i = 0; i < arguments.used; ++i) { fixed_arguments[i + 1] = arguments.array[i].string; } // for } diff --git a/level_2/fll_file/c/private-file.c b/level_2/fll_file/c/private-file.c index 06d7cb1..81d28be 100644 --- a/level_2/fll_file/c/private-file.c +++ b/level_2/fll_file/c/private-file.c @@ -39,7 +39,7 @@ extern "C" { }; uint8_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t j = 0; f_string_static_t path_sub = f_string_static_t_initialize; for (; i < 7; ++i) { @@ -68,7 +68,7 @@ extern "C" { f_string_static_t path_sub = f_string_static_t_initialize; - for (f_array_length_t i = 0; F_status_is_fine(status) && i < listing.directory.used; ++i) { + for (f_number_unsigned_t i = 0; F_status_is_fine(status) && i < listing.directory.used; ++i) { path_sub.used = path.used + listing.directory.array[i].used + 1; @@ -138,7 +138,7 @@ extern "C" { }; uint8_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t j = 0; f_string_static_t path_sub = f_string_static_t_initialize; for (; i < 7; ++i) { @@ -166,7 +166,7 @@ extern "C" { { f_string_static_t path_sub = f_string_static_t_initialize; - for (f_array_length_t i = 0; F_status_is_fine(status) && i < listing.directory.used; ++i) { + for (f_number_unsigned_t i = 0; F_status_is_fine(status) && i < listing.directory.used; ++i) { path_sub.used = path.used + listing.directory.array[i].used + 1; diff --git a/level_2/fll_fss/c/fss.c b/level_2/fll_fss/c/fss.c index 14ea1c5..e440234 100644 --- a/level_2/fll_fss/c/fss.c +++ b/level_2/fll_fss/c/fss.c @@ -165,7 +165,7 @@ extern "C" { #endif // _di_fll_fss_identify_ #ifndef _di_fll_fss_snatch_ - 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_static_t names[], const f_array_length_t size, f_string_dynamic_t * const values[], bool matches[], f_array_length_t * const 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_static_t names[], const f_number_unsigned_t size, f_string_dynamic_t * const values[], bool matches[], f_number_unsigned_t * const 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); @@ -178,8 +178,8 @@ extern "C" { f_status_t status = F_none; - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; bool matched[size]; @@ -218,7 +218,7 @@ extern "C" { #endif // _di_fll_fss_snatch_ #ifndef _di_fll_fss_snatch_apart_ - 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_static_t names[], const f_array_length_t size, f_string_dynamics_t * const values[], bool matches[], f_array_lengths_t * const 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_static_t names[], const f_number_unsigned_t size, f_string_dynamics_t * const values[], bool matches[], f_number_unsigneds_t * const 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); @@ -232,9 +232,9 @@ extern "C" { f_status_t status = F_none; f_fss_content_t *content = 0; - f_array_length_t i = 0; - f_array_length_t j = 0; - f_array_length_t k = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; for (; i < objects.used; ++i) { @@ -252,7 +252,7 @@ extern "C" { } if (values[j]->used + contents.array[i].used > values[j]->size) { - if (values[j]->used + contents.array[i].used > F_array_length_t_size_d) { + if (values[j]->used + contents.array[i].used > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -260,7 +260,7 @@ extern "C" { if (F_status_is_error(status)) return status; if (indexs) { - status = f_array_lengths_increase_by(content->used, indexs[j]); + status = f_number_unsigneds_increase_by(content->used, indexs[j]); if (F_status_is_error(status)) return status; } } @@ -284,7 +284,7 @@ extern "C" { #endif // _di_fll_fss_snatch_apart_ #ifndef _di_fll_fss_snatch_map_ - 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_static_t names[], const f_array_length_t size, f_string_maps_t * const values[], bool matches[], f_array_lengths_t * const 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_static_t names[], const f_number_unsigned_t size, f_string_maps_t * const values[], bool matches[], f_number_unsigneds_t * const 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); @@ -298,9 +298,9 @@ extern "C" { f_status_t status = F_none; f_string_dynamic_t name = f_string_dynamic_t_initialize; - f_array_length_t i = 0; - f_array_length_t j = 0; - f_array_length_t k = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; bool matched = F_false; @@ -357,8 +357,8 @@ extern "C" { } if (values[j]->used == values[j]->size) { - if (values[j]->used + F_fss_default_allocation_step_d > F_array_length_t_size_d) { - if (values[j]->used == F_array_length_t_size_d) { + if (values[j]->used + F_fss_default_allocation_step_d > F_number_t_size_unsigned_d) { + if (values[j]->used == F_number_t_size_unsigned_d) { f_string_dynamic_resize(0, &name); return F_status_set_error(F_array_too_large); @@ -373,7 +373,7 @@ extern "C" { } if (indexs) { - macro_f_array_lengths_t_resize(status, (*indexs[j]), indexs[j]->used + 1); + macro_f_number_unsigneds_t_resize(status, (*indexs[j]), indexs[j]->used + 1); if (F_status_is_error(status)) return status; } } @@ -387,7 +387,7 @@ extern "C" { } if (indexs) { - macro_f_array_lengths_t_resize(status, (*indexs[j]), indexs[j]->used + F_fss_default_allocation_step_d); + macro_f_number_unsigneds_t_resize(status, (*indexs[j]), indexs[j]->used + F_fss_default_allocation_step_d); if (F_status_is_error(status)) return status; } } @@ -427,7 +427,7 @@ extern "C" { #endif // _di_fll_fss_snatch_map_ #ifndef _di_fll_fss_snatch_map_apart_ - 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_static_t names[], const f_array_length_t size, f_string_map_multis_t * const values[], bool matches[], f_array_lengths_t * const 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_static_t names[], const f_number_unsigned_t size, f_string_map_multis_t * const values[], bool matches[], f_number_unsigneds_t * const 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); @@ -440,9 +440,9 @@ extern "C" { f_status_t status = F_none; - f_array_length_t i = 0; - f_array_length_t j = 0; - f_array_length_t k = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; f_string_map_multi_t *map_multi = 0; @@ -465,7 +465,7 @@ extern "C" { if (F_status_is_error(status)) return status; if (indexs) { - macro_f_array_lengths_t_increase(status, F_fss_default_allocation_step_small_d, (*indexs[j])); + macro_f_number_unsigneds_t_increase(status, F_fss_default_allocation_step_small_d, (*indexs[j])); if (F_status_is_error(status)) return status; } @@ -501,7 +501,7 @@ extern "C" { #endif // _di_fll_fss_snatch_map_apart_ #ifndef _di_fll_fss_snatch_map_mash_ - 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_static_t names[], const f_array_length_t size, const f_string_static_t glue, f_string_maps_t * const values[], bool matches[], f_array_lengths_t * const 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_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_maps_t * const values[], bool matches[], f_number_unsigneds_t * const 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); @@ -514,9 +514,9 @@ extern "C" { f_status_t status = F_none; - f_array_length_t i = 0; - f_array_length_t j = 0; - f_array_length_t k = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; f_string_map_t *map = 0; @@ -539,7 +539,7 @@ extern "C" { if (F_status_is_error(status)) return status; if (indexs) { - macro_f_array_lengths_t_increase(status, F_fss_default_allocation_step_small_d, (*indexs[j])); + macro_f_number_unsigneds_t_increase(status, F_fss_default_allocation_step_small_d, (*indexs[j])); if (F_status_is_error(status)) return status; } @@ -570,7 +570,7 @@ extern "C" { #endif // _di_fll_fss_snatch_map_mash_ #ifndef _di_fll_fss_snatch_map_mash_apart_ - 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_static_t names[], const f_array_length_t size, const f_string_static_t glue, f_string_map_multis_t * const values[], bool matches[], f_array_lengths_t * const 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_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_map_multis_t * const values[], bool matches[], f_number_unsigneds_t * const 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); @@ -584,9 +584,9 @@ extern "C" { f_status_t status = F_none; f_string_dynamic_t name = f_string_dynamic_t_initialize; - f_array_length_t i = 0; - f_array_length_t j = 0; - f_array_length_t k = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; bool matched = F_false; @@ -646,7 +646,7 @@ extern "C" { if (F_status_is_error(status)) return status; if (indexs) { - macro_f_array_lengths_t_increase(status, F_fss_default_allocation_step_small_d, (*indexs[j])); + macro_f_number_unsigneds_t_increase(status, F_fss_default_allocation_step_small_d, (*indexs[j])); if (F_status_is_error(status)) return status; } @@ -687,7 +687,7 @@ extern "C" { #endif // _di_fll_fss_snatch_map_mash_apart_ #ifndef _di_fll_fss_snatch_map_together_ - 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_static_t names[], const f_array_length_t size, const f_string_static_t glue, f_string_maps_t * const values[], bool matches[], f_array_lengths_t * const 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_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_maps_t * const values[], bool matches[], f_number_unsigneds_t * const 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); @@ -701,9 +701,9 @@ extern "C" { f_status_t status = F_none; f_string_dynamic_t name = f_string_dynamic_t_initialize; - f_array_length_t i = 0; - f_array_length_t j = 0; - f_array_length_t k = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; bool matched = F_false; @@ -762,7 +762,7 @@ extern "C" { if (F_status_is_error(status)) return status; if (indexs) { - macro_f_array_lengths_t_increase(status, F_fss_default_allocation_step_small_d, (*indexs[j])); + macro_f_number_unsigneds_t_increase(status, F_fss_default_allocation_step_small_d, (*indexs[j])); if (F_status_is_error(status)) return status; } @@ -801,7 +801,7 @@ extern "C" { #endif // _di_fll_fss_snatch_map_together_ #ifndef _di_fll_fss_snatch_mash_ - 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_static_t names[], const f_array_length_t size, const f_string_static_t glue, f_string_dynamic_t * const values[], bool matches[], f_array_length_t * const 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_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_dynamic_t * const values[], bool matches[], f_number_unsigned_t * const 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); @@ -814,9 +814,9 @@ extern "C" { f_status_t status = F_none; - f_array_length_t i = 0; - f_array_length_t j = 0; - f_array_length_t k = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; bool matched[size]; @@ -856,7 +856,7 @@ extern "C" { #endif // _di_fll_fss_snatch_mash_ #ifndef _di_fll_fss_snatch_mash_apart_ - 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_static_t names[], const f_array_length_t size, const f_string_static_t glue, f_string_dynamics_t * const values[], bool matches[], f_array_lengths_t * const 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_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_dynamics_t * const values[], bool matches[], f_number_unsigneds_t * const 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); @@ -869,9 +869,9 @@ extern "C" { f_status_t status = F_none; - f_array_length_t i = 0; - f_array_length_t j = 0; - f_array_length_t k = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; for (; i < objects.used; ++i) { @@ -890,7 +890,7 @@ extern "C" { if (F_status_is_error(status)) return status; if (indexs) { - macro_f_array_lengths_t_increase(status, F_fss_default_allocation_step_small_d, (*indexs[j])); + macro_f_number_unsigneds_t_increase(status, F_fss_default_allocation_step_small_d, (*indexs[j])); if (F_status_is_error(status)) return status; } @@ -914,7 +914,7 @@ extern "C" { #endif // _di_fll_fss_snatch_mash_apart_ #ifndef _di_fll_fss_snatch_together_ - 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_static_t names[], const f_array_length_t size, const f_string_static_t glue, f_string_dynamic_t * const values[], bool matches[], f_array_length_t * const 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_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_dynamic_t * const values[], bool matches[], f_number_unsigned_t * const 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); @@ -927,9 +927,9 @@ extern "C" { f_status_t status = F_none; - f_array_length_t i = 0; - f_array_length_t j = 0; - f_array_length_t k = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; for (; i < objects.used; ++i) { diff --git a/level_2/fll_fss/c/fss.h b/level_2/fll_fss/c/fss.h index 7adebc7..77c02c3 100644 --- a/level_2/fll_fss/c/fss.h +++ b/level_2/fll_fss/c/fss.h @@ -119,7 +119,7 @@ extern "C" { * @see f_compare_trim() */ #ifndef _di_fll_fss_snatch_ - 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_static_t names[], const f_array_length_t size, f_string_dynamic_t * const values[], bool matches[], f_array_length_t * const 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_static_t names[], const f_number_unsigned_t size, f_string_dynamic_t * const values[], bool matches[], f_number_unsigned_t * const indexs[]); #endif // _di_fll_fss_snatch_ /** @@ -167,7 +167,7 @@ extern "C" { * @see f_compare_trim() */ #ifndef _di_fll_fss_snatch_apart_ - 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_static_t names[], const f_array_length_t size, f_string_dynamics_t * const values[], bool matches[], f_array_lengths_t * const 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_static_t names[], const f_number_unsigned_t size, f_string_dynamics_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]); #endif // _di_fll_fss_snatch_apart_ /** @@ -217,7 +217,7 @@ extern "C" { * @see f_compare_trim() */ #ifndef _di_fll_fss_snatch_map_ - 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_static_t names[], const f_array_length_t size, f_string_maps_t * const values[], bool matches[], f_array_lengths_t * const 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_static_t names[], const f_number_unsigned_t size, f_string_maps_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]); #endif // _di_fll_fss_snatch_map_ /** @@ -269,7 +269,7 @@ extern "C" { * @see f_compare_trim() */ #ifndef _di_fll_fss_snatch_map_apart_ - 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_static_t names[], const f_array_length_t size, f_string_map_multis_t * const values[], bool matches[], f_array_lengths_t * const 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_static_t names[], const f_number_unsigned_t size, f_string_map_multis_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]); #endif // _di_fll_fss_snatch_map_apart_ /** @@ -319,7 +319,7 @@ extern "C" { * Errors (with error bit) from: f_compare_dynamic_partial_trim_string(). */ #ifndef _di_fll_fss_snatch_map_mash_ - 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_static_t names[], const f_array_length_t size, const f_string_static_t glue, f_string_maps_t * const values[], bool matches[], f_array_lengths_t * const 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_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_maps_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]); #endif // _di_fll_fss_snatch_map_mash_ /** @@ -373,7 +373,7 @@ extern "C" { * @see f_compare_trim() */ #ifndef _di_fll_fss_snatch_map_mash_apart_ - 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_static_t names[], const f_array_length_t size, const f_string_static_t glue, f_string_map_multis_t * const values[], bool matches[], f_array_lengths_t * const 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_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_map_multis_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]); #endif // _di_fll_fss_snatch_map_mash_apart_ /** @@ -426,7 +426,7 @@ extern "C" { * @see f_compare_trim() */ #ifndef _di_fll_fss_snatch_map_together_ - 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_static_t names[], const f_array_length_t size, const f_string_static_t glue, f_string_maps_t * const values[], bool matches[], f_array_lengths_t * const 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_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_maps_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]); #endif // _di_fll_fss_snatch_map_together_ /** @@ -473,7 +473,7 @@ extern "C" { * Errors (with error bit) from: f_compare_dynamic_partial_trim_string(). */ #ifndef _di_fll_fss_snatch_mash_ - 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_static_t names[], const f_array_length_t size, const f_string_static_t glue, f_string_dynamic_t * const values[], bool matches[], f_array_length_t * const 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_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_dynamic_t * const values[], bool matches[], f_number_unsigned_t * const indexs[]); #endif // _di_fll_fss_snatch_mash_ /** @@ -524,7 +524,7 @@ extern "C" { * @see f_compare_trim() */ #ifndef _di_fll_fss_snatch_mash_apart_ - 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_static_t names[], const f_array_length_t size, const f_string_static_t glue, f_string_dynamics_t * const values[], bool matches[], f_array_lengths_t * const 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_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_dynamics_t * const values[], bool matches[], f_number_unsigneds_t * const indexs[]); #endif // _di_fll_fss_snatch_mash_apart_ /** @@ -572,7 +572,7 @@ extern "C" { * @see f_compare_trim() */ #ifndef _di_fll_fss_snatch_together_ - 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_static_t names[], const f_array_length_t size, const f_string_static_t glue, f_string_dynamic_t * const values[], bool matches[], f_array_length_t * const 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_static_t names[], const f_number_unsigned_t size, const f_string_static_t glue, f_string_dynamic_t * const values[], bool matches[], f_number_unsigned_t * const 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 bbb8325..bddd2bc 100644 --- a/level_2/fll_fss/c/fss/basic.c +++ b/level_2/fll_fss/c/fss/basic.c @@ -17,7 +17,7 @@ extern "C" { #endif // _di_level_2_parameter_checking_ f_status_t status = F_none; - f_array_length_t initial_used = objects->used; + f_number_unsigned_t initial_used = objects->used; bool found_data = F_false; diff --git a/level_2/fll_fss/c/fss/basic_list.c b/level_2/fll_fss/c/fss/basic_list.c index b210143..db37735 100644 --- a/level_2/fll_fss/c/fss/basic_list.c +++ b/level_2/fll_fss/c/fss/basic_list.c @@ -17,7 +17,7 @@ extern "C" { #endif // _di_level_2_parameter_checking_ f_status_t status = F_none; - f_array_length_t initial_used = objects->used; + f_number_unsigned_t initial_used = objects->used; bool found_data = F_false; diff --git a/level_2/fll_fss/c/fss/embedded_list.c b/level_2/fll_fss/c/fss/embedded_list.c index 71d5a70..fcde9b1 100644 --- a/level_2/fll_fss/c/fss/embedded_list.c +++ b/level_2/fll_fss/c/fss/embedded_list.c @@ -16,7 +16,7 @@ extern "C" { } #endif // _di_level_2_parameter_checking_ - f_array_length_t initial_used = 0; + f_number_unsigned_t initial_used = 0; bool found_data = F_false; diff --git a/level_2/fll_fss/c/fss/extended.c b/level_2/fll_fss/c/fss/extended.c index 7533be7..3749296 100644 --- a/level_2/fll_fss/c/fss/extended.c +++ b/level_2/fll_fss/c/fss/extended.c @@ -17,7 +17,7 @@ extern "C" { #endif // _di_level_2_parameter_checking_ f_status_t status = F_none; - f_array_length_t initial_used = objects->used; + f_number_unsigned_t initial_used = objects->used; bool found_data = F_false; @@ -217,7 +217,7 @@ extern "C" { if (state->status == F_none || state->status == F_none_stop || state->status == F_none_eos || state->status == F_none_eol) { uint8_t complete = f_fss_complete_next_e; - for (f_array_length_t i = 0; i < contents.used; ++i) { + for (f_number_unsigned_t i = 0; i < contents.used; ++i) { if (i + 1 == contents.used) { complete = f_fss_complete_end_e; diff --git a/level_2/fll_fss/c/fss/extended_list.c b/level_2/fll_fss/c/fss/extended_list.c index 07f8979..0589b83 100644 --- a/level_2/fll_fss/c/fss/extended_list.c +++ b/level_2/fll_fss/c/fss/extended_list.c @@ -17,7 +17,7 @@ extern "C" { #endif // _di_level_2_parameter_checking_ f_status_t status = F_none; - f_array_length_t initial_used = objects->used; + f_number_unsigned_t initial_used = objects->used; bool found_data = F_false; diff --git a/level_2/fll_fss/c/fss/payload.c b/level_2/fll_fss/c/fss/payload.c index 2b88862..1246931 100644 --- a/level_2/fll_fss/c/fss/payload.c +++ b/level_2/fll_fss/c/fss/payload.c @@ -17,7 +17,7 @@ extern "C" { #endif // _di_level_2_parameter_checking_ f_status_t status = F_none; - f_array_length_t initial_used = objects->used; + f_number_unsigned_t initial_used = objects->used; bool found_data = F_false; @@ -237,7 +237,7 @@ extern "C" { state->status = f_string_dynamic_increase_by(content.used, destination); if (F_status_is_error(state->status)) return; - f_array_length_t i = 0; + f_number_unsigned_t i = 0; // Copy in blocks to allow for interruptability of potentially large data sets. for (; i < content.used && i + F_fss_default_block_size_normal_d < content.used; i += F_fss_default_block_size_normal_d) { diff --git a/level_2/fll_iki/c/private-iki.c b/level_2/fll_iki/c/private-iki.c index a4cfaf6..0af3b35 100644 --- a/level_2/fll_iki/c/private-iki.c +++ b/level_2/fll_iki/c/private-iki.c @@ -16,9 +16,9 @@ extern "C" { if (F_status_is_error(status)) return status; } - f_array_length_t i = 0; - f_array_length_t j = 0; - f_array_length_t delimits = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; + f_number_unsigned_t delimits = 0; for (; i < content.used; ++i) { @@ -81,11 +81,11 @@ extern "C" { if (F_status_is_error(status)) return status; } - f_array_length_t i = 0; - f_array_length_t j = 0; - f_array_length_t delimits = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; + f_number_unsigned_t delimits = 0; - const f_array_length_t used = unescaped->used; + const f_number_unsigned_t used = unescaped->used; for (; i < content.used; ++i) { diff --git a/level_2/fll_print/c/print.c b/level_2/fll_print/c/print.c index a7e5b40..76974ca 100644 --- a/level_2/fll_print/c/print.c +++ b/level_2/fll_print/c/print.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fll_print_ - f_status_t fll_print(const f_string_t string, const f_array_length_t length, f_file_t file) { + f_status_t fll_print(const f_string_t string, const f_number_unsigned_t length, f_file_t file) { if (!file.stream) return F_stream_not; @@ -170,7 +170,7 @@ extern "C" { #endif // _di_fll_print_dynamic_safely_ #ifndef _di_fll_print_except_ - f_status_t fll_print_except(const f_string_t buffer, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except, f_file_t file) { + f_status_t fll_print_except(const f_string_t buffer, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except, f_file_t file) { if (!file.stream) return F_stream_not; @@ -185,7 +185,7 @@ extern "C" { #endif // _di_fll_print_except_ #ifndef _di_fll_print_except_dynamic_ - f_status_t fll_print_except_dynamic(const f_string_static_t buffer, const f_array_lengths_t except, f_file_t file) { + f_status_t fll_print_except_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except, f_file_t file) { if (!file.stream) return F_stream_not; @@ -200,7 +200,7 @@ extern "C" { #endif // _di_fll_print_except_dynamic_ #ifndef _di_fll_print_except_dynamic_partial_ - f_status_t fll_print_except_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, f_file_t file) { + f_status_t fll_print_except_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, f_file_t file) { if (!file.stream) return F_stream_not; @@ -215,7 +215,7 @@ extern "C" { #endif // _di_fll_print_except_dynamic_partial_ #ifndef _di_fll_print_except_dynamic_partial_raw_ - f_status_t fll_print_except_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, f_file_t file) { + f_status_t fll_print_except_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, f_file_t file) { if (!file.stream) return F_stream_not; @@ -230,7 +230,7 @@ extern "C" { #endif // _di_fll_print_except_dynamic_partial_raw_ #ifndef _di_fll_print_except_dynamic_partial_raw_safely_ - f_status_t fll_print_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, f_file_t file) { + f_status_t fll_print_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, f_file_t file) { if (!file.stream) return F_stream_not; @@ -245,7 +245,7 @@ extern "C" { #endif // _di_fll_print_except_dynamic_partial_raw_safely_ #ifndef _di_fll_print_except_dynamic_partial_safely_ - f_status_t fll_print_except_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, f_file_t file) { + f_status_t fll_print_except_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, f_file_t file) { if (!file.stream) return F_stream_not; @@ -260,7 +260,7 @@ extern "C" { #endif // _di_fll_print_except_dynamic_partial_safely_ #ifndef _di_fll_print_except_dynamic_raw_ - f_status_t fll_print_except_dynamic_raw(const f_string_static_t buffer, const f_array_lengths_t except, f_file_t file) { + f_status_t fll_print_except_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except, f_file_t file) { if (!file.stream) return F_stream_not; @@ -275,7 +275,7 @@ extern "C" { #endif // _di_fll_print_except_dynamic_raw_ #ifndef _di_fll_print_except_dynamic_raw_safely_ - f_status_t fll_print_except_dynamic_raw_safely(const f_string_static_t buffer, const f_array_lengths_t except, f_file_t file) { + f_status_t fll_print_except_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except, f_file_t file) { if (!file.stream) return F_stream_not; @@ -290,7 +290,7 @@ extern "C" { #endif // _di_fll_print_except_dynamic_raw_safely_ #ifndef _di_fll_print_except_dynamic_safely_ - f_status_t fll_print_except_dynamic_safely(const f_string_static_t buffer, const f_array_lengths_t except, f_file_t file) { + f_status_t fll_print_except_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except, f_file_t file) { if (!file.stream) return F_stream_not; @@ -305,7 +305,7 @@ extern "C" { #endif // _di_fll_print_except_dynamic_safely_ #ifndef _di_fll_print_except_raw_ - f_status_t fll_print_except_raw(const f_string_t buffer, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except, f_file_t file) { + f_status_t fll_print_except_raw(const f_string_t buffer, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except, f_file_t file) { if (!file.stream) return F_stream_not; @@ -320,7 +320,7 @@ extern "C" { #endif // _di_fll_print_except_raw_ #ifndef _di_fll_print_except_raw_safely_ - f_status_t fll_print_except_raw_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except, f_file_t file) { + f_status_t fll_print_except_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except, f_file_t file) { if (!file.stream) return F_stream_not; @@ -335,7 +335,7 @@ extern "C" { #endif // _di_fll_print_except_raw_safely_ #ifndef _di_fll_print_except_safely_ - f_status_t fll_print_except_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except, f_file_t file) { + f_status_t fll_print_except_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except, f_file_t file) { if (!file.stream) return F_stream_not; @@ -350,7 +350,7 @@ extern "C" { #endif // _di_fll_print_except_safely_ #ifndef _di_fll_print_except_in_ - f_status_t fll_print_except_in(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -365,7 +365,7 @@ extern "C" { #endif // _di_fll_print_except_in_ #ifndef _di_fll_print_except_in_dynamic_ - f_status_t fll_print_except_in_dynamic(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_except_in_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -380,7 +380,7 @@ extern "C" { #endif // _di_fll_print_except_in_dynamic_ #ifndef _di_fll_print_except_in_dynamic_partial_ - f_status_t fll_print_except_in_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_except_in_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -395,7 +395,7 @@ extern "C" { #endif // _di_fll_print_except_in_dynamic_partial_ #ifndef _di_fll_print_except_in_dynamic_partial_raw_ - f_status_t fll_print_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -410,7 +410,7 @@ extern "C" { #endif // _di_fll_print_except_in_dynamic_partial_raw_ #ifndef _di_fll_print_except_in_dynamic_partial_raw_safely_ - f_status_t fll_print_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -425,7 +425,7 @@ extern "C" { #endif // _di_fll_print_except_in_dynamic_partial_raw_safely_ #ifndef _di_fll_print_except_in_dynamic_partial_safely_ - f_status_t fll_print_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -440,7 +440,7 @@ extern "C" { #endif // _di_fll_print_except_in_dynamic_partial_safely_ #ifndef _di_fll_print_except_in_dynamic_raw_ - f_status_t fll_print_except_in_dynamic_raw(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_except_in_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -455,7 +455,7 @@ extern "C" { #endif // _di_fll_print_except_in_dynamic_raw_ #ifndef _di_fll_print_except_in_dynamic_raw_safely_ - f_status_t fll_print_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -470,7 +470,7 @@ extern "C" { #endif // _di_fll_print_except_in_dynamic_raw_safely_ #ifndef _di_fll_print_except_in_dynamic_safely_ - f_status_t fll_print_except_in_dynamic_safely(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_except_in_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -485,7 +485,7 @@ extern "C" { #endif // _di_fll_print_except_in_dynamic_safely_ #ifndef _di_fll_print_except_in_raw_ - f_status_t fll_print_except_in_raw(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -500,7 +500,7 @@ extern "C" { #endif // _di_fll_print_except_in_raw_ #ifndef _di_fll_print_except_in_raw_safely_ - f_status_t fll_print_except_in_raw_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -515,7 +515,7 @@ extern "C" { #endif // _di_fll_print_except_in_raw_safely_ #ifndef _di_fll_print_except_in_safely_ - f_status_t fll_print_except_in_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -570,7 +570,7 @@ extern "C" { #endif // _di_fll_print_format_convert_ #ifndef _di_fll_print_raw_ - f_status_t fll_print_raw(const f_string_t string, const f_array_length_t length, f_file_t file) { + f_status_t fll_print_raw(const f_string_t string, const f_number_unsigned_t length, f_file_t file) { if (!file.stream) return F_stream_not; @@ -585,7 +585,7 @@ extern "C" { #endif // _di_fll_print_raw_ #ifndef _di_fll_print_raw_safely_ - f_status_t fll_print_raw_safely(const f_string_t string, const f_array_length_t length, f_file_t file) { + f_status_t fll_print_raw_safely(const f_string_t string, const f_number_unsigned_t length, f_file_t file) { if (!file.stream) return F_stream_not; @@ -615,7 +615,7 @@ extern "C" { #endif // _di_fll_print_raw_terminated_ #ifndef _di_fll_print_safely_ - f_status_t fll_print_safely(const f_string_t string, const f_array_length_t length, f_file_t file) { + f_status_t fll_print_safely(const f_string_t string, const f_number_unsigned_t length, f_file_t file) { if (!file.stream) return F_stream_not; @@ -675,7 +675,7 @@ extern "C" { #endif // _di_fll_print_terminated_ #ifndef _di_fll_print_trim_raw_ - f_status_t fll_print_trim_raw(const f_string_t string, const f_array_length_t length, f_file_t file) { + f_status_t fll_print_trim_raw(const f_string_t string, const f_number_unsigned_t length, f_file_t file) { if (!file.stream) return F_stream_not; @@ -690,7 +690,7 @@ extern "C" { #endif // _di_fll_print_trim_raw_ #ifndef _di_fll_print_trim_raw_safely_ - f_status_t fll_print_trim_raw_safely(const f_string_t string, const f_array_length_t length, f_file_t file) { + f_status_t fll_print_trim_raw_safely(const f_string_t string, const f_number_unsigned_t length, f_file_t file) { if (!file.stream) return F_stream_not; @@ -705,7 +705,7 @@ extern "C" { #endif // _di_fll_print_trim_raw_safely_ #ifndef _di_fll_print_trim_safely_ - f_status_t fll_print_trim_safely(const f_string_t string, const f_array_length_t length, f_file_t file) { + f_status_t fll_print_trim_safely(const f_string_t string, const f_number_unsigned_t length, f_file_t file) { if (!file.stream) return F_stream_not; @@ -840,7 +840,7 @@ extern "C" { #endif // _di_fll_print_trim_dynamic_partial_safely_ #ifndef _di_fll_print_trim_except_ - f_status_t fll_print_trim_except(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except, f_file_t file) { + f_status_t fll_print_trim_except(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except, f_file_t file) { if (!file.stream) return F_stream_not; @@ -855,7 +855,7 @@ extern "C" { #endif // _di_fll_print_trim_except_ #ifndef _di_fll_print_trim_except_raw_ - f_status_t fll_print_trim_except_raw(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except, f_file_t file) { + f_status_t fll_print_trim_except_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except, f_file_t file) { if (!file.stream) return F_stream_not; @@ -870,7 +870,7 @@ extern "C" { #endif // _di_fll_print_trim_except_raw_ #ifndef _di_fll_print_trim_except_raw_safely_ - f_status_t fll_print_trim_except_raw_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except, f_file_t file) { + f_status_t fll_print_trim_except_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except, f_file_t file) { if (!file.stream) return F_stream_not; @@ -885,7 +885,7 @@ extern "C" { #endif // _di_fll_print_trim_except_raw_safely_ #ifndef _di_fll_print_trim_except_safely_ - f_status_t fll_print_trim_except_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except, f_file_t file) { + f_status_t fll_print_trim_except_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except, f_file_t file) { if (!file.stream) return F_stream_not; @@ -900,7 +900,7 @@ extern "C" { #endif // _di_fll_print_trim_except_safely_ #ifndef _di_fll_print_trim_except_dynamic_ - f_status_t fll_print_trim_except_dynamic(const f_string_static_t buffer, const f_array_lengths_t except, f_file_t file) { + f_status_t fll_print_trim_except_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except, f_file_t file) { if (!file.stream) return F_stream_not; @@ -915,7 +915,7 @@ extern "C" { #endif // _di_fll_print_trim_except_dynamic_ #ifndef _di_fll_print_trim_except_dynamic_raw_ - f_status_t fll_print_trim_except_dynamic_raw(const f_string_static_t buffer, const f_array_lengths_t except, f_file_t file) { + f_status_t fll_print_trim_except_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except, f_file_t file) { if (!file.stream) return F_stream_not; @@ -930,7 +930,7 @@ extern "C" { #endif // _di_fll_print_trim_except_dynamic_raw_ #ifndef _di_fll_print_trim_except_dynamic_raw_safely_ - f_status_t fll_print_trim_except_dynamic_raw_safely(const f_string_static_t buffer, const f_array_lengths_t except, f_file_t file) { + f_status_t fll_print_trim_except_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except, f_file_t file) { if (!file.stream) return F_stream_not; @@ -945,7 +945,7 @@ extern "C" { #endif // _di_fll_print_trim_except_dynamic_raw_safely_ #ifndef _di_fll_print_trim_except_dynamic_safely_ - f_status_t fll_print_trim_except_dynamic_safely(const f_string_static_t buffer, const f_array_lengths_t except, f_file_t file) { + f_status_t fll_print_trim_except_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except, f_file_t file) { if (!file.stream) return F_stream_not; @@ -960,7 +960,7 @@ extern "C" { #endif // _di_fll_print_trim_except_dynamic_safely_ #ifndef _di_fll_print_trim_except_in_ - f_status_t fll_print_trim_except_in(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_trim_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -975,7 +975,7 @@ extern "C" { #endif // _di_fll_print_trim_except_in_ #ifndef _di_fll_print_trim_except_in_raw_ - f_status_t fll_print_trim_except_in_raw(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_trim_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -990,7 +990,7 @@ extern "C" { #endif // _di_fll_print_trim_except_in_raw_ #ifndef _di_fll_print_trim_except_in_raw_safely_ - f_status_t fll_print_trim_except_in_raw_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_trim_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -1005,7 +1005,7 @@ extern "C" { #endif // _di_fll_print_trim_except_in_raw_safely_ #ifndef _di_fll_print_trim_except_in_safely_ - f_status_t fll_print_trim_except_in_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_trim_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -1020,7 +1020,7 @@ extern "C" { #endif // _di_fll_print_trim_except_in_safely_ #ifndef _di_fll_print_trim_except_in_dynamic_ - f_status_t fll_print_trim_except_in_dynamic(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_trim_except_in_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -1035,7 +1035,7 @@ extern "C" { #endif // _di_fll_print_trim_except_in_dynamic_ #ifndef _di_fll_print_trim_except_in_dynamic_raw_ - f_status_t fll_print_trim_except_in_dynamic_raw(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_trim_except_in_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -1050,7 +1050,7 @@ extern "C" { #endif // _di_fll_print_trim_except_in_dynamic_raw_ #ifndef _di_fll_print_trim_except_in_dynamic_raw_safely_ - f_status_t fll_print_trim_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_trim_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -1065,7 +1065,7 @@ extern "C" { #endif // _di_fll_print_trim_except_in_dynamic_raw_safely_ #ifndef _di_fll_print_trim_except_in_dynamic_safely_ - f_status_t fll_print_trim_except_in_dynamic_safely(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_trim_except_in_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -1080,7 +1080,7 @@ extern "C" { #endif // _di_fll_print_trim_except_in_dynamic_safely_ #ifndef _di_fll_print_trim_except_in_dynamic_partial_ - f_status_t fll_print_trim_except_in_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_trim_except_in_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -1095,7 +1095,7 @@ extern "C" { #endif // _di_fll_print_trim_except_in_dynamic_partial_ #ifndef _di_fll_print_trim_except_in_dynamic_partial_raw_ - f_status_t fll_print_trim_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_trim_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -1110,7 +1110,7 @@ extern "C" { #endif // _di_fll_print_trim_except_in_dynamic_partial_raw_ #ifndef _di_fll_print_trim_except_in_dynamic_partial_raw_safely_ - f_status_t fll_print_trim_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_trim_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -1125,7 +1125,7 @@ extern "C" { #endif // _di_fll_print_trim_except_in_dynamic_partial_raw_safely_ #ifndef _di_fll_print_trim_except_in_dynamic_partial_safely_ - f_status_t fll_print_trim_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file) { + f_status_t fll_print_trim_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file) { if (!file.stream) return F_stream_not; @@ -1140,7 +1140,7 @@ extern "C" { #endif // _di_fll_print_trim_except_in_dynamic_partial_safely_ #ifndef _di_fll_print_trim_except_dynamic_partial_ - f_status_t fll_print_trim_except_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, f_file_t file) { + f_status_t fll_print_trim_except_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, f_file_t file) { if (!file.stream) return F_stream_not; @@ -1155,7 +1155,7 @@ extern "C" { #endif // _di_fll_print_trim_except_dynamic_partial_ #ifndef _di_fll_print_trim_except_dynamic_partial_raw_ - f_status_t fll_print_trim_except_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, f_file_t file) { + f_status_t fll_print_trim_except_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, f_file_t file) { if (!file.stream) return F_stream_not; @@ -1170,7 +1170,7 @@ extern "C" { #endif // _di_fll_print_trim_except_dynamic_partial_raw_ #ifndef _di_fll_print_trim_except_dynamic_partial_raw_safely_ - f_status_t fll_print_trim_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, f_file_t file) { + f_status_t fll_print_trim_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, f_file_t file) { if (!file.stream) return F_stream_not; @@ -1185,7 +1185,7 @@ extern "C" { #endif // _di_fll_print_trim_except_dynamic_partial_raw_safely_ #ifndef _di_fll_print_trim_except_dynamic_partial_safely_ - f_status_t fll_print_trim_except_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, f_file_t file) { + f_status_t fll_print_trim_except_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, f_file_t file) { if (!file.stream) return F_stream_not; diff --git a/level_2/fll_print/c/print.h b/level_2/fll_print/c/print.h index 960bf04..d7dfe23 100644 --- a/level_2/fll_print/c/print.h +++ b/level_2/fll_print/c/print.h @@ -52,7 +52,7 @@ extern "C" { * @see f_print() */ #ifndef _di_fll_print_ - extern f_status_t fll_print(const f_string_t string, const f_array_length_t length, f_file_t file); + extern f_status_t fll_print(const f_string_t string, const f_number_unsigned_t length, f_file_t file); #endif // _di_fll_print_ /** @@ -331,7 +331,7 @@ extern "C" { * @see f_print_except() */ #ifndef _di_fll_print_except_ - extern f_status_t fll_print_except(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except, f_file_t file); + extern f_status_t fll_print_except(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except, f_file_t file); #endif // _di_fll_print_except_ /** @@ -358,7 +358,7 @@ extern "C" { * @see f_print_except_dynamic() */ #ifndef _di_fll_print_except_dynamic_ - extern f_status_t fll_print_except_dynamic(const f_string_static_t buffer, const f_array_lengths_t except, f_file_t file); + extern f_status_t fll_print_except_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except, f_file_t file); #endif // _di_fll_print_except_dynamic_ /** @@ -387,7 +387,7 @@ extern "C" { * @see f_print_except_dynamic_partial() */ #ifndef _di_fll_print_except_dynamic_partial_ - extern f_status_t fll_print_except_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, f_file_t file); + extern f_status_t fll_print_except_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, f_file_t file); #endif // _di_fll_print_except_dynamic_partial_ /** @@ -416,7 +416,7 @@ extern "C" { * @see f_print_except_dynamic_partial_raw() */ #ifndef _di_fll_print_except_dynamic_partial_raw_ - extern f_status_t fll_print_except_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, f_file_t file); + extern f_status_t fll_print_except_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, f_file_t file); #endif // _di_fll_print_except_dynamic_partial_raw_ /** @@ -445,7 +445,7 @@ extern "C" { * @see f_print_except_dynamic_partial_raw_safely() */ #ifndef _di_fll_print_except_dynamic_partial_raw_safely_ - extern f_status_t fll_print_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, f_file_t file); + extern f_status_t fll_print_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, f_file_t file); #endif // _di_fll_print_except_dynamic_partial_raw_safely_ /** @@ -474,7 +474,7 @@ extern "C" { * @see f_print_except_dynamic_partial_safely() */ #ifndef _di_fll_print_except_dynamic_partial_safely_ - extern f_status_t fll_print_except_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, f_file_t file); + extern f_status_t fll_print_except_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, f_file_t file); #endif // _di_fll_print_except_dynamic_partial_safely_ /** @@ -501,7 +501,7 @@ extern "C" { * @see f_print_except_dynamic_raw() */ #ifndef _di_fll_print_except_dynamic_raw_ - extern f_status_t fll_print_except_dynamic_raw(const f_string_static_t buffer, const f_array_lengths_t except, f_file_t file); + extern f_status_t fll_print_except_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except, f_file_t file); #endif // _di_fll_print_except_dynamic_raw_ /** @@ -528,7 +528,7 @@ extern "C" { * @see f_print_except_dynamic_raw_safely() */ #ifndef _di_fll_print_except_dynamic_raw_safely_ - extern f_status_t fll_print_except_dynamic_raw_safely(const f_string_static_t buffer, const f_array_lengths_t except, f_file_t file); + extern f_status_t fll_print_except_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except, f_file_t file); #endif // _di_fll_print_except_dynamic_raw_safely_ /** @@ -555,7 +555,7 @@ extern "C" { * @see f_print_except_dynamic_safely() */ #ifndef _di_fll_print_except_dynamic_safely_ - extern f_status_t fll_print_except_dynamic_safely(const f_string_static_t buffer, const f_array_lengths_t except, f_file_t file); + extern f_status_t fll_print_except_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except, f_file_t file); #endif // _di_fll_print_except_dynamic_safely_ /** @@ -589,7 +589,7 @@ extern "C" { * @see f_print_except_in() */ #ifndef _di_fll_print_except_in_ - extern f_status_t fll_print_except_in(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); #endif // _di_fll_print_except_in_ /** @@ -623,7 +623,7 @@ extern "C" { * @see f_print_except_in_raw() */ #ifndef _di_fll_print_except_in_raw_ - extern f_status_t fll_print_except_in_raw(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); #endif // _di_fll_print_except_in_raw_ /** @@ -657,7 +657,7 @@ extern "C" { * @see f_print_except_in_raw_safely() */ #ifndef _di_fll_print_except_in_raw_safely_ - extern f_status_t fll_print_except_in_raw_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); #endif // _di_fll_print_except_in_raw_safely_ /** @@ -691,7 +691,7 @@ extern "C" { * @see f_print_except_in_safely() */ #ifndef _di_fll_print_except_in_safely_ - extern f_status_t fll_print_except_in_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); #endif // _di_fll_print_except_in_safely_ /** @@ -721,7 +721,7 @@ extern "C" { * @see f_print_except_in_dynamic() */ #ifndef _di_fll_print_except_in_dynamic_ - extern f_status_t fll_print_except_in_dynamic(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_except_in_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); #endif // _di_fll_print_except_in_dynamic_ /** @@ -753,7 +753,7 @@ extern "C" { * @see f_print_except_in_dynamic_partial() */ #ifndef _di_fll_print_except_in_dynamic_partial_ - extern f_status_t fll_print_except_in_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_except_in_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); #endif // _di_fll_print_except_in_dynamic_partial_ /** @@ -785,7 +785,7 @@ extern "C" { * @see f_print_except_in_dynamic_partial_raw() */ #ifndef _di_fll_print_except_in_dynamic_partial_raw_ - extern f_status_t fll_print_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); #endif // _di_fll_print_except_in_dynamic_partial_raw_ /** @@ -817,7 +817,7 @@ extern "C" { * @see f_print_except_in_dynamic_partial_raw_safely() */ #ifndef _di_fll_print_except_in_dynamic_partial_raw_safely_ - extern f_status_t fll_print_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); #endif // _di_fll_print_except_in_dynamic_partial_raw_safely_ /** @@ -849,7 +849,7 @@ extern "C" { * @see f_print_except_in_dynamic_partial_safely() */ #ifndef _di_fll_print_except_in_dynamic_partial_safely_ - extern f_status_t fll_print_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); #endif // _di_fll_print_except_in_dynamic_partial_safely_ /** @@ -879,7 +879,7 @@ extern "C" { * @see f_print_except_in_dynamic_raw() */ #ifndef _di_fll_print_except_in_dynamic_raw_ - extern f_status_t fll_print_except_in_dynamic_raw(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_except_in_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); #endif // _di_fll_print_except_in_dynamic_raw_ /** @@ -909,7 +909,7 @@ extern "C" { * @see f_print_except_in_dynamic_raw_safely() */ #ifndef _di_fll_print_except_in_dynamic_raw_safely_ - extern f_status_t fll_print_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); #endif // _di_fll_print_except_in_dynamic_raw_safely_ /** @@ -939,7 +939,7 @@ extern "C" { * @see f_print_except_in_dynamic_safely() */ #ifndef _di_fll_print_except_in_dynamic_safely_ - extern f_status_t fll_print_except_in_dynamic_safely(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_except_in_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); #endif // _di_fll_print_except_in_dynamic_safely_ /** @@ -970,7 +970,7 @@ extern "C" { * @see f_print_except_raw() */ #ifndef _di_fll_print_except_raw_ - extern f_status_t fll_print_except_raw(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except, f_file_t file); + extern f_status_t fll_print_except_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except, f_file_t file); #endif // _di_fll_print_except_raw_ /** @@ -1001,7 +1001,7 @@ extern "C" { * @see f_print_except_raw_safely() */ #ifndef _di_fll_print_except_raw_safely_ - extern f_status_t fll_print_except_raw_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except, f_file_t file); + extern f_status_t fll_print_except_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except, f_file_t file); #endif // _di_fll_print_except_raw_safely_ /** @@ -1032,7 +1032,7 @@ extern "C" { * @see f_print_except_safely() */ #ifndef _di_fll_print_except_safely_ - extern f_status_t fll_print_except_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except, f_file_t file); + extern f_status_t fll_print_except_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except, f_file_t file); #endif // _di_fll_print_except_safely_ /** @@ -1121,7 +1121,7 @@ extern "C" { * @see f_print_raw() */ #ifndef _di_fll_print_raw_ - extern f_status_t fll_print_raw(const f_string_t string, const f_array_length_t length, f_file_t file); + extern f_status_t fll_print_raw(const f_string_t string, const f_number_unsigned_t length, f_file_t file); #endif // _di_fll_print_raw_ /** @@ -1147,7 +1147,7 @@ extern "C" { * @see f_print_raw_safely() */ #ifndef _di_fll_print_raw_safely_ - extern f_status_t fll_print_raw_safely(const f_string_t string, const f_array_length_t length, f_file_t file); + extern f_status_t fll_print_raw_safely(const f_string_t string, const f_number_unsigned_t length, f_file_t file); #endif // _di_fll_print_raw_safely_ /** @@ -1197,7 +1197,7 @@ extern "C" { * @see f_print_safely() */ #ifndef _di_fll_print_safely_ - extern f_status_t fll_print_safely(const f_string_t string, const f_array_length_t length, f_file_t file); + extern f_status_t fll_print_safely(const f_string_t string, const f_number_unsigned_t length, f_file_t file); #endif // _di_fll_print_safely_ /** @@ -1300,7 +1300,7 @@ extern "C" { * @see f_print_except_dynamic_partial() */ #ifndef _di_fll_print_trim_ - extern f_status_t fll_print_trim(const f_string_t string, const f_array_length_t length, f_file_t file); + extern f_status_t fll_print_trim(const f_string_t string, const f_number_unsigned_t length, f_file_t file); #endif // _di_fll_print_trim_ /** @@ -1326,7 +1326,7 @@ extern "C" { * @see fl_print_trim_raw() */ #ifndef _di_fll_print_trim_raw_ - extern f_status_t fll_print_trim_raw(const f_string_t string, const f_array_length_t length, f_file_t file); + extern f_status_t fll_print_trim_raw(const f_string_t string, const f_number_unsigned_t length, f_file_t file); #endif // _di_fll_print_trim_raw_ /** @@ -1352,7 +1352,7 @@ extern "C" { * @see fl_print_trim_raw_safely() */ #ifndef _di_fll_print_trim_raw_safely_ - extern f_status_t fll_print_trim_raw_safely(const f_string_t string, const f_array_length_t length, f_file_t file); + extern f_status_t fll_print_trim_raw_safely(const f_string_t string, const f_number_unsigned_t length, f_file_t file); #endif // _di_fll_print_trim_raw_safely_ /** @@ -1378,7 +1378,7 @@ extern "C" { * @see fl_print_trim_safely() */ #ifndef _di_fll_print_trim_safely_ - extern f_status_t fll_print_trim_safely(const f_string_t string, const f_array_length_t length, f_file_t file); + extern f_status_t fll_print_trim_safely(const f_string_t string, const f_number_unsigned_t length, f_file_t file); #endif // _di_fll_print_trim_safely_ /** @@ -1609,7 +1609,7 @@ extern "C" { * @see fl_print_trim_except() */ #ifndef _di_fll_print_trim_except_ - extern f_status_t fll_print_trim_except(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except, f_file_t file); + extern f_status_t fll_print_trim_except(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except, f_file_t file); #endif // _di_fll_print_trim_except_ /** @@ -1640,7 +1640,7 @@ extern "C" { * @see fl_print_trim_except_raw() */ #ifndef _di_fll_print_trim_except_raw_ - extern f_status_t fll_print_trim_except_raw(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except, f_file_t file); + extern f_status_t fll_print_trim_except_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except, f_file_t file); #endif // _di_fll_print_trim_except_raw_ /** @@ -1671,7 +1671,7 @@ extern "C" { * @see fl_print_trim_except_raw_safely() */ #ifndef _di_fll_print_trim_except_raw_safely_ - extern f_status_t fll_print_trim_except_raw_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except, f_file_t file); + extern f_status_t fll_print_trim_except_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except, f_file_t file); #endif // _di_fll_print_trim_except_raw_safely_ /** @@ -1702,7 +1702,7 @@ extern "C" { * @see fl_print_trim_except_safely() */ #ifndef _di_fll_print_trim_except_safely_ - extern f_status_t fll_print_trim_except_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except, f_file_t file); + extern f_status_t fll_print_trim_except_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except, f_file_t file); #endif // _di_fll_print_trim_except_safely_ /** @@ -1729,7 +1729,7 @@ extern "C" { * @see fl_print_trim_except_dynamic() */ #ifndef _di_fll_print_trim_except_dynamic_ - extern f_status_t fll_print_trim_except_dynamic(const f_string_static_t buffer, const f_array_lengths_t except, f_file_t file); + extern f_status_t fll_print_trim_except_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except, f_file_t file); #endif // _di_fll_print_trim_except_dynamic_ /** @@ -1756,7 +1756,7 @@ extern "C" { * @see fl_print_trim_except_dynamic_raw() */ #ifndef _di_fll_print_trim_except_dynamic_raw_ - extern f_status_t fll_print_trim_except_dynamic_raw(const f_string_static_t buffer, const f_array_lengths_t except, f_file_t file); + extern f_status_t fll_print_trim_except_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except, f_file_t file); #endif // _di_fll_print_trim_except_dynamic_raw_ /** @@ -1783,7 +1783,7 @@ extern "C" { * @see fl_print_trim_except_dynamic_raw_safely() */ #ifndef _di_fll_print_trim_except_dynamic_raw_safely_ - extern f_status_t fll_print_trim_except_dynamic_raw_safely(const f_string_static_t buffer, const f_array_lengths_t except, f_file_t file); + extern f_status_t fll_print_trim_except_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except, f_file_t file); #endif // _di_fll_print_trim_except_dynamic_raw_safely_ /** @@ -1810,7 +1810,7 @@ extern "C" { * @see fl_print_trim_except_dynamic_safely() */ #ifndef _di_fll_print_trim_except_dynamic_safely_ - extern f_status_t fll_print_trim_except_dynamic_safely(const f_string_static_t buffer, const f_array_lengths_t except, f_file_t file); + extern f_status_t fll_print_trim_except_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except, f_file_t file); #endif // _di_fll_print_trim_except_dynamic_safely_ /** @@ -1844,7 +1844,7 @@ extern "C" { * @see fl_print_trim_except_in() */ #ifndef _di_fll_print_trim_except_in_ - extern f_status_t fll_print_trim_except_in(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_trim_except_in(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); #endif // _di_fll_print_trim_except_in_ /** @@ -1878,7 +1878,7 @@ extern "C" { * @see fl_print_trim_except_in_raw() */ #ifndef _di_fll_print_trim_except_in_raw_ - extern f_status_t fll_print_trim_except_in_raw(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_trim_except_in_raw(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); #endif // _di_fll_print_trim_except_in_raw_ /** @@ -1912,7 +1912,7 @@ extern "C" { * @see fl_print_trim_except_in_raw_safely() */ #ifndef _di_fll_print_trim_except_in_raw_safely_ - extern f_status_t fll_print_trim_except_in_raw_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_trim_except_in_raw_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); #endif // _di_fll_print_trim_except_in_raw_safely_ /** @@ -1946,7 +1946,7 @@ extern "C" { * @see fl_print_trim_except_in_safely() */ #ifndef _di_fll_print_trim_except_in_safely_ - extern f_status_t fll_print_trim_except_in_safely(const f_string_t string, const f_array_length_t offset, const f_array_length_t length, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_trim_except_in_safely(const f_string_t string, const f_number_unsigned_t offset, const f_number_unsigned_t length, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); #endif // _di_fll_print_trim_except_in_safely_ /** @@ -1976,7 +1976,7 @@ extern "C" { * @see fl_print_trim_except_in_dynamic() */ #ifndef _di_fll_print_trim_except_in_dynamic_ - extern f_status_t fll_print_trim_except_in_dynamic(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_trim_except_in_dynamic(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); #endif // _di_fll_print_trim_except_in_dynamic_ /** @@ -2006,7 +2006,7 @@ extern "C" { * @see fl_print_trim_except_in_dynamic_raw() */ #ifndef _di_fll_print_trim_except_in_dynamic_raw_ - extern f_status_t fll_print_trim_except_in_dynamic_raw(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_trim_except_in_dynamic_raw(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); #endif // _di_fll_print_trim_except_in_dynamic_raw_ /** @@ -2036,7 +2036,7 @@ extern "C" { * @see fl_print_trim_except_in_dynamic_raw_safely() */ #ifndef _di_fll_print_trim_except_in_dynamic_raw_safely_ - extern f_status_t fll_print_trim_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_trim_except_in_dynamic_raw_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); #endif // _di_fll_print_trim_except_in_dynamic_raw_safely_ /** @@ -2066,7 +2066,7 @@ extern "C" { * @see fl_print_trim_except_in_dynamic_safely() */ #ifndef _di_fll_print_trim_except_in_dynamic_safely_ - extern f_status_t fll_print_trim_except_in_dynamic_safely(const f_string_static_t buffer, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_trim_except_in_dynamic_safely(const f_string_static_t buffer, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); #endif // _di_fll_print_trim_except_in_dynamic_safely_ /** @@ -2098,7 +2098,7 @@ extern "C" { * @see fl_print_trim_except_in_dynamic_partial() */ #ifndef _di_fll_print_trim_except_in_dynamic_partial_ - extern f_status_t fll_print_trim_except_in_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_trim_except_in_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); #endif // _di_fll_print_trim_except_in_dynamic_partial_ /** @@ -2130,7 +2130,7 @@ extern "C" { * @see f_print_except_dynamic_partial() */ #ifndef _di_fll_print_trim_except_in_dynamic_partial_raw_ - extern f_status_t fll_print_trim_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_trim_except_in_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); #endif // _di_fll_print_trim_except_in_dynamic_partial_raw_ /** @@ -2162,7 +2162,7 @@ extern "C" { * @see f_print_except_dynamic_partial() */ #ifndef _di_fll_print_trim_except_in_dynamic_partial_raw_safely_ - extern f_status_t fll_print_trim_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_trim_except_in_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); #endif // _di_fll_print_trim_except_in_dynamic_partial_raw_safely_ /** @@ -2194,7 +2194,7 @@ extern "C" { * @see f_print_except_dynamic_partial() */ #ifndef _di_fll_print_trim_except_in_dynamic_partial_safely_ - extern f_status_t fll_print_trim_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except_at, const f_string_ranges_t except_in, f_file_t file); + extern f_status_t fll_print_trim_except_in_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except_at, const f_string_ranges_t except_in, f_file_t file); #endif // _di_fll_print_trim_except_in_dynamic_partial_safely_ /** @@ -2223,7 +2223,7 @@ extern "C" { * @see fl_print_trim_except_dynamic_partial() */ #ifndef _di_fll_print_trim_except_dynamic_partial_ - extern f_status_t fll_print_trim_except_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, f_file_t file); + extern f_status_t fll_print_trim_except_dynamic_partial(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, f_file_t file); #endif // _di_fll_print_trim_except_dynamic_partial_ /** @@ -2252,7 +2252,7 @@ extern "C" { * @see fl_print_trim_except_dynamic_partial_raw() */ #ifndef _di_fll_print_trim_except_dynamic_partial_raw_ - extern f_status_t fll_print_trim_except_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, f_file_t file); + extern f_status_t fll_print_trim_except_dynamic_partial_raw(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, f_file_t file); #endif // _di_fll_print_trim_except_dynamic_partial_raw_ /** @@ -2281,7 +2281,7 @@ extern "C" { * @see fl_print_trim_except_dynamic_partial_raw_safely() */ #ifndef _di_fll_print_trim_except_dynamic_partial_raw_safely_ - extern f_status_t fll_print_trim_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, f_file_t file); + extern f_status_t fll_print_trim_except_dynamic_partial_raw_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, f_file_t file); #endif // _di_fll_print_trim_except_dynamic_partial_raw_safely_ /** @@ -2310,7 +2310,7 @@ extern "C" { * @see fl_print_trim_except_dynamic_partial_safely() */ #ifndef _di_fll_print_trim_except_dynamic_partial_safely_ - extern f_status_t fll_print_trim_except_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_array_lengths_t except, f_file_t file); + extern f_status_t fll_print_trim_except_dynamic_partial_safely(const f_string_static_t buffer, const f_string_range_t range, const f_number_unsigneds_t except, f_file_t file); #endif // _di_fll_print_trim_except_dynamic_partial_safely_ #ifdef __cplusplus diff --git a/level_2/fll_program/c/private-program.c b/level_2/fll_program/c/private-program.c index ad9507f..2d9a562 100644 --- a/level_2/fll_program/c/private-program.c +++ b/level_2/fll_program/c/private-program.c @@ -57,7 +57,7 @@ extern "C" { context->set.warning = f_color_set_empty_s; if (sets) { - for (f_array_length_t i = 0; sets[i]; ++i) { + for (f_number_unsigned_t i = 0; sets[i]; ++i) { *sets[i] = f_color_set_empty_s; } // for } diff --git a/level_2/fll_program/c/program.c b/level_2/fll_program/c/program.c index 414fe22..cb5cd2e 100644 --- a/level_2/fll_program/c/program.c +++ b/level_2/fll_program/c/program.c @@ -11,7 +11,7 @@ extern "C" { { if (choices.used) { f_status_t status = F_none; - f_array_length_t choice = 0; + f_number_unsigned_t choice = 0; if (right) { status = f_console_parameter_prioritize_right(main->parameters, choices, &choice); @@ -88,7 +88,7 @@ extern "C" { if (!choices.used) return F_data_not; - f_array_length_t choice = 0; + f_number_unsigned_t choice = 0; { const f_status_t status = right ? f_console_parameter_prioritize_right(main->parameters, choices, &choice) : f_console_parameter_prioritize_left(main->parameters, choices, &choice); @@ -110,16 +110,16 @@ extern "C" { #endif // _di_fll_program_parameter_process_verbosity_ #ifndef _di_fll_program_parameter_additional_append_ - f_status_t fll_program_parameter_additional_append(const f_string_static_t * const arguments, const f_array_lengths_t values, f_string_dynamics_t * const destination) { + f_status_t fll_program_parameter_additional_append(const f_string_static_t * const arguments, const f_number_unsigneds_t values, f_string_dynamics_t * const destination) { #ifndef _di_level_2_parameter_checking_ if (!arguments) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ f_status_t status = F_none; - const f_array_length_t start = destination->used; + const f_number_unsigned_t start = destination->used; - for (f_array_length_t i = 0; i < values.used; ++i) { + for (f_number_unsigned_t i = 0; i < values.used; ++i) { if (arguments[values.array[i]].used) { status = f_string_dynamics_increase(F_memory_default_allocation_small_d, destination); @@ -147,16 +147,16 @@ extern "C" { #endif // _di_fll_program_parameter_additional_append_ #ifndef _di_fll_program_parameter_additional_mash_ - f_status_t fll_program_parameter_additional_mash(const f_string_static_t glue, const f_string_static_t * const arguments, const f_array_lengths_t values, f_string_dynamic_t * const destination) { + f_status_t fll_program_parameter_additional_mash(const f_string_static_t glue, const f_string_static_t * const arguments, const f_number_unsigneds_t values, f_string_dynamic_t * const destination) { #ifndef _di_level_2_parameter_checking_ if (!arguments) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ f_status_t status = F_none; - const f_array_length_t start = destination->used; + const f_number_unsigned_t start = destination->used; - for (f_array_length_t i = 0; i < values.used; ++i) { + for (f_number_unsigned_t i = 0; i < values.used; ++i) { if (arguments[values.array[i]].used) { status = f_string_dynamic_mash(glue, arguments[values.array[i]], destination); @@ -172,16 +172,16 @@ extern "C" { #endif // _di_fll_program_parameter_additional_mash_ #ifndef _di_fll_program_parameter_additional_rip_ - f_status_t fll_program_parameter_additional_rip(const f_string_static_t * const arguments, const f_array_lengths_t values, f_string_dynamics_t * const destination) { + f_status_t fll_program_parameter_additional_rip(const f_string_static_t * const arguments, const f_number_unsigneds_t values, f_string_dynamics_t * const destination) { #ifndef _di_level_2_parameter_checking_ if (!arguments) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ f_status_t status = F_none; - const f_array_length_t start = destination->used; + const f_number_unsigned_t start = destination->used; - for (f_array_length_t i = 0; i < values.used; ++i) { + for (f_number_unsigned_t i = 0; i < values.used; ++i) { if (arguments[values.array[i]].used) { status = f_string_dynamics_increase(F_memory_default_allocation_small_d, destination); @@ -209,17 +209,17 @@ extern "C" { #endif // _di_fll_program_parameter_additional_rip_ #ifndef _di_fll_program_parameter_additional_rip_mash_ - f_status_t fll_program_parameter_additional_rip_mash(const f_string_static_t glue, const f_string_static_t * const arguments, const f_array_lengths_t values, f_string_dynamic_t * const destination) { + f_status_t fll_program_parameter_additional_rip_mash(const f_string_static_t glue, const f_string_static_t * const arguments, const f_number_unsigneds_t values, f_string_dynamic_t * const destination) { #ifndef _di_level_2_parameter_checking_ if (!arguments) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ f_status_t status = F_none; - const f_array_length_t start = destination->used; + const f_number_unsigned_t start = destination->used; f_string_dynamic_t ripped = f_string_dynamic_t_initialize; - for (f_array_length_t i = 0; i < values.used; ++i) { + for (f_number_unsigned_t i = 0; i < values.used; ++i) { if (arguments[values.array[i]].used) { ripped.used = 0; diff --git a/level_2/fll_program/c/program.h b/level_2/fll_program/c/program.h index 46c15a39..14c9e46 100644 --- a/level_2/fll_program/c/program.h +++ b/level_2/fll_program/c/program.h @@ -154,7 +154,7 @@ extern "C" { * @see f_string_dynamic_append() */ #ifndef _di_fll_program_parameter_additional_append_ - extern f_status_t fll_program_parameter_additional_append(const f_string_static_t * const arguments, const f_array_lengths_t values, f_string_dynamics_t * const destination); + extern f_status_t fll_program_parameter_additional_append(const f_string_static_t * const arguments, const f_number_unsigneds_t values, f_string_dynamics_t * const destination); #endif // _di_fll_program_parameter_additional_append_ /** @@ -183,7 +183,7 @@ extern "C" { * @see f_string_dynamic_mash() */ #ifndef _di_fll_program_parameter_additional_mash_ - extern f_status_t fll_program_parameter_additional_mash(const f_string_static_t glue, const f_string_static_t *arguments, const f_array_lengths_t values, f_string_dynamic_t * const destination); + extern f_status_t fll_program_parameter_additional_mash(const f_string_static_t glue, const f_string_static_t *arguments, const f_number_unsigneds_t values, f_string_dynamic_t * const destination); #endif // _di_fll_program_parameter_additional_mash_ /** @@ -211,7 +211,7 @@ extern "C" { * @see f_rip_dynamic() */ #ifndef _di_fll_program_parameter_additional_rip_ - extern f_status_t fll_program_parameter_additional_rip(const f_string_static_t * const arguments, const f_array_lengths_t values, f_string_dynamics_t * const destination); + extern f_status_t fll_program_parameter_additional_rip(const f_string_static_t * const arguments, const f_number_unsigneds_t values, f_string_dynamics_t * const destination); #endif // _di_fll_program_parameter_additional_rip_ /** @@ -244,7 +244,7 @@ extern "C" { * @see f_rip_dynamic() */ #ifndef _di_fll_program_parameter_additional_rip_mash_ - extern f_status_t fll_program_parameter_additional_rip_mash(const f_string_static_t glue, const f_string_static_t *arguments, const f_array_lengths_t values, f_string_dynamic_t * const destination); + extern f_status_t fll_program_parameter_additional_rip_mash(const f_string_static_t glue, const f_string_static_t *arguments, const f_number_unsigneds_t values, f_string_dynamic_t * const destination); #endif // _di_fll_program_parameter_additional_rip_mash_ /** diff --git a/level_3/byte_dump/c/byte_dump.c b/level_3/byte_dump/c/byte_dump.c index fa06937..28ec16b 100644 --- a/level_3/byte_dump/c/byte_dump.c +++ b/level_3/byte_dump/c/byte_dump.c @@ -20,7 +20,7 @@ extern "C" { if (F_status_is_error(status)) return; { - f_array_length_t choice = 0; + f_number_unsigned_t choice = 0; f_uint16s_t choices = f_uint16s_t_initialize; // Identify and prioritize "color context" parameters. @@ -73,7 +73,7 @@ extern "C" { // Identify priority of mode parameters. { uint16_t choices_array[5] = { byte_dump_parameter_hexidecimal_e, byte_dump_parameter_duodecimal_e, byte_dump_parameter_octal_e, byte_dump_parameter_binary_e, byte_dump_parameter_decimal_e }; - f_array_length_t choice = 0; + f_number_unsigned_t choice = 0; const f_uint16s_t choices = macro_f_uint16s_t_initialize_1(choices_array, 0, 5); status = f_console_parameter_prioritize_right(main->parameters, choices, &choice); @@ -104,7 +104,7 @@ extern "C" { // Identify priority of presentation parameters. { uint16_t choices_array[3] = { byte_dump_parameter_normal_e, byte_dump_parameter_simple_e, byte_dump_parameter_classic_e }; - f_array_length_t choice = 0; + f_number_unsigned_t choice = 0; const f_uint16s_t choices = macro_f_uint16s_t_initialize_1(choices_array, 0, 3); status = f_console_parameter_prioritize_right(main->parameters, choices, &choice); @@ -129,7 +129,7 @@ extern "C" { // Identify priority of narrow and wide parameters. { uint16_t choices_array[2] = { byte_dump_parameter_narrow_e, byte_dump_parameter_wide_e }; - f_array_length_t choice = byte_dump_parameter_wide_e; + f_number_unsigned_t choice = byte_dump_parameter_wide_e; const f_uint16s_t choices = macro_f_uint16s_t_initialize_1(choices_array, 0, 2); status = f_console_parameter_prioritize_right(main->parameters, choices, &choice); @@ -184,7 +184,7 @@ extern "C" { } if (main->parameters.array[byte_dump_parameter_width_e].result & f_console_result_value_e) { - const f_array_length_t index = main->parameters.array[byte_dump_parameter_width_e].values.array[main->parameters.array[byte_dump_parameter_width_e].values.used - 1]; + const f_number_unsigned_t index = main->parameters.array[byte_dump_parameter_width_e].values.array[main->parameters.array[byte_dump_parameter_width_e].values.used - 1]; f_number_unsigned_t number = 0; status = fl_conversion_dynamic_to_unsigned_detect(fl_conversion_data_base_10_c, data.argv[index], &number); @@ -223,7 +223,7 @@ extern "C" { } if (main->parameters.array[byte_dump_parameter_first_e].result & f_console_result_value_e) { - const f_array_length_t index = main->parameters.array[byte_dump_parameter_first_e].values.array[main->parameters.array[byte_dump_parameter_first_e].values.used - 1]; + const f_number_unsigned_t index = main->parameters.array[byte_dump_parameter_first_e].values.array[main->parameters.array[byte_dump_parameter_first_e].values.used - 1]; f_number_unsigned_t number = 0; status = fl_conversion_dynamic_to_unsigned_detect(fl_conversion_data_base_10_c, data.argv[index], &number); @@ -262,7 +262,7 @@ extern "C" { } if (main->parameters.array[byte_dump_parameter_last_e].result & f_console_result_value_e) { - const f_array_length_t index = main->parameters.array[byte_dump_parameter_last_e].values.array[main->parameters.array[byte_dump_parameter_last_e].values.used - 1]; + const f_number_unsigned_t index = main->parameters.array[byte_dump_parameter_last_e].values.array[main->parameters.array[byte_dump_parameter_last_e].values.used - 1]; f_number_unsigned_t number = 0; status = fl_conversion_dynamic_to_unsigned_detect(fl_conversion_data_base_10_c, data.argv[index], &number); @@ -353,7 +353,7 @@ extern "C" { { f_status_t missing_files = F_none; - for (f_array_length_t counter = 0; counter < main->parameters.remaining.used; ++counter) { + for (f_number_unsigned_t counter = 0; counter < main->parameters.remaining.used; ++counter) { status = f_file_exists(data.argv[main->parameters.remaining.array[counter]], F_true); @@ -379,7 +379,7 @@ extern "C" { f_file_t file = f_file_t_initialize; - for (f_array_length_t counter = 0; counter < main->parameters.remaining.used; ++counter) { + for (f_number_unsigned_t counter = 0; counter < main->parameters.remaining.used; ++counter) { status = f_file_stream_open(data.argv[main->parameters.remaining.array[counter]], f_string_empty_s, &file); diff --git a/level_3/byte_dump/c/common.c b/level_3/byte_dump/c/common.c index daeaba4..d951e0d 100644 --- a/level_3/byte_dump/c/common.c +++ b/level_3/byte_dump/c/common.c @@ -113,7 +113,7 @@ extern "C" { } { - f_array_length_t choice = 0; + f_number_unsigned_t choice = 0; f_uint16s_t choices = f_uint16s_t_initialize; // Identify and prioritize "color context" parameters. diff --git a/level_3/byte_dump/c/private-byte_dump.c b/level_3/byte_dump/c/private-byte_dump.c index edd2370..a8f769b 100644 --- a/level_3/byte_dump/c/private-byte_dump.c +++ b/level_3/byte_dump/c/private-byte_dump.c @@ -28,7 +28,7 @@ extern "C" { // Store the current character main until it can be printed. f_utf_string_dynamic_t sequence = f_utf_string_dynamic_t_initialize; f_utf_char_t block[data->width]; - f_array_length_t current = 0; + f_number_unsigned_t current = 0; // The row starts based on the first byte starting point and how many columns of bytes are displayed per row. if (data->first) { @@ -360,7 +360,7 @@ extern "C" { bool reset = F_false; - f_array_length_t current = sequence.used - 1; + f_number_unsigned_t current = sequence.used - 1; if (byte_current == 1) { byte = macro_f_utf_char_t_to_char_1(sequence.string[current]); diff --git a/level_3/control/c/common.c b/level_3/control/c/common.c index 9c59be5..bedb7c2 100644 --- a/level_3/control/c/common.c +++ b/level_3/control/c/common.c @@ -216,7 +216,7 @@ extern "C" { } { - f_array_length_t choice = 0; + f_number_unsigned_t choice = 0; f_uint16s_t choices = f_uint16s_t_initialize; // Identify and prioritize "color context" parameters. diff --git a/level_3/control/c/control.c b/level_3/control/c/control.c index b8d8e4d..bd56112 100644 --- a/level_3/control/c/control.c +++ b/level_3/control/c/control.c @@ -21,7 +21,7 @@ extern "C" { if (F_status_is_error(status)) return; { - f_array_length_t choice = 0; + f_number_unsigned_t choice = 0; f_uint16s_t choices = f_uint16s_t_initialize; // Identify and prioritize "color context" parameters. @@ -100,7 +100,7 @@ extern "C" { control_long_socket_s }; - f_array_length_t index = f_array_length_t_initialize; + f_number_unsigned_t index = f_number_unsigned_t_initialize; for (uint8_t i = 0; i < 3; ++i) { diff --git a/level_3/control/c/private-common.c b/level_3/control/c/private-common.c index 221540c..5c5e280 100644 --- a/level_3/control/c/private-common.c +++ b/level_3/control/c/private-common.c @@ -60,7 +60,7 @@ extern "C" { f_string_ranges_resize(0, &data->cache.header_objects); f_string_rangess_resize(0, &data->cache.header_contents); - f_array_lengths_resize(0, &data->cache.delimits); + f_number_unsigneds_resize(0, &data->cache.delimits); } #endif // _di_control_data_delete_ diff --git a/level_3/control/c/private-common.h b/level_3/control/c/private-common.h index 7f9fb99..8dc883c 100644 --- a/level_3/control/c/private-common.h +++ b/level_3/control/c/private-common.h @@ -314,7 +314,7 @@ extern "C" { 0, \ 0, \ f_status_t_initialize, \ - f_array_length_t_initialize, \ + f_number_unsigned_t_initialize, \ } #endif // _di_control_payload_header_t_ diff --git a/level_3/control/c/private-control.c b/level_3/control/c/private-control.c index df063c0..11281e6 100644 --- a/level_3/control/c/private-control.c +++ b/level_3/control/c/private-control.c @@ -137,11 +137,11 @@ extern "C" { data->cache.large.used = 0; data->cache.small.used = 0; - f_array_length_t i = 0; + f_number_unsigned_t i = 0; f_status_t status = F_none; { - f_array_length_t length = 5 + f_fss_header_s.used + f_fss_payload_s.used; + f_number_unsigned_t length = 5 + f_fss_header_s.used + f_fss_payload_s.used; length += control_action_s.used + control_length_s.used + control_type_s.used; length += (f_fss_payload_list_open_s.used + f_fss_payload_list_close_s.used) * 2; length += (f_fss_payload_header_open_s.used + f_fss_payload_header_close_s.used) * 3; @@ -283,12 +283,12 @@ extern "C" { header->length = 0; f_status_t status = F_none; - f_array_length_t i = 0; + f_number_unsigned_t i = 0; f_string_range_t range_header = f_string_range_t_initialize; f_string_range_t range_payload = f_string_range_t_initialize; { - f_array_length_t length = 5; + f_number_unsigned_t length = 5; uint8_t head[length]; memset(head, 0, sizeof(uint8_t) * length); @@ -431,7 +431,7 @@ extern "C" { if (f_compare_dynamic_partial_string(control_action_s.string, data->cache.large, control_action_s.used, data->cache.header_objects.array[i]) == F_equal_to) { if (!(found & 0x1)) { - const f_array_length_t action_length = (data->cache.header_contents.array[i].array[0].stop - data->cache.header_contents.array[i].array[0].start) + 1; + const f_number_unsigned_t action_length = (data->cache.header_contents.array[i].array[0].stop - data->cache.header_contents.array[i].array[0].start) + 1; char action_string[action_length + 1]; const f_string_static_t action = macro_f_string_static_t_initialize_1(action_string, 0, action_length); @@ -494,7 +494,7 @@ extern "C" { if (F_status_set_fine(status) == F_number) { // Not a number, so attempt get by status string name. - const f_array_length_t name_length = (data->cache.header_contents.array[i].array[0].stop - data->cache.header_contents.array[i].array[0].start) + 1; + const f_number_unsigned_t name_length = (data->cache.header_contents.array[i].array[0].stop - data->cache.header_contents.array[i].array[0].start) + 1; char name_string[name_length + 1]; const f_string_static_t name = macro_f_string_static_t_initialize_1(name_string, 0, name_length); @@ -615,7 +615,7 @@ extern "C" { data->cache.small.used = 0; if (main->parameters.array[control_parameter_settings_e].result & f_console_result_value_e) { - const f_array_length_t index = main->parameters.array[control_parameter_settings_e].values.array[main->parameters.array[control_parameter_settings_e].values.used - 1]; + const f_number_unsigned_t index = main->parameters.array[control_parameter_settings_e].values.array[main->parameters.array[control_parameter_settings_e].values.used - 1]; status = f_string_dynamic_append(data->argv[index], &data->cache.small); } @@ -674,7 +674,7 @@ extern "C" { if (F_status_is_error_not(status)) { uint8_t parameter_hass[] = { 0, 0, 0, 0 }; - f_array_length_t parameter_ats[] = { 0, 0, 0, 0 }; + f_number_unsigned_t parameter_ats[] = { 0, 0, 0, 0 }; { const f_string_static_t parameter_names[] = { @@ -684,7 +684,7 @@ extern "C" { control_path_socket_suffix_s, }; - f_array_length_t i = 0; + f_number_unsigned_t i = 0; uint8_t j = 0; f_string_range_t range = f_string_range_t_initialize; @@ -707,7 +707,7 @@ extern "C" { data->cache.small.used = 0; if (main->parameters.array[control_parameter_socket_e].result & f_console_result_value_e) { - const f_array_length_t index = main->parameters.array[control_parameter_socket_e].values.array[main->parameters.array[control_parameter_socket_e].values.used - 1]; + const f_number_unsigned_t index = main->parameters.array[control_parameter_socket_e].values.array[main->parameters.array[control_parameter_socket_e].values.used - 1]; status = f_string_dynamic_append(data->argv[index], &data->cache.small); } @@ -772,7 +772,7 @@ extern "C" { for (uint8_t i = 0; i < 3; ++i) { if (append_ids[i] && main->parameters.array[append_ids[i]].result & f_console_result_value_e) { - const f_array_length_t index = main->parameters.array[append_ids[i]].values.array[main->parameters.array[append_ids[i]].values.used - 1]; + const f_number_unsigned_t index = main->parameters.array[append_ids[i]].values.array[main->parameters.array[append_ids[i]].values.used - 1]; status = f_string_dynamic_append(data->argv[index], &data->cache.small); } @@ -846,7 +846,7 @@ extern "C" { f_string_ranges_resize(0, &objects); f_string_rangess_resize(0, &contents); - f_array_lengths_resize(0, &delimits); + f_number_unsigneds_resize(0, &delimits); data->cache.large.used = 0; data->cache.small.used = 0; diff --git a/level_3/controller/c/common.c b/level_3/controller/c/common.c index 58c6e0f..bd90f0c 100644 --- a/level_3/controller/c/common.c +++ b/level_3/controller/c/common.c @@ -648,7 +648,7 @@ extern "C" { } { - f_array_length_t choice = 0; + f_number_unsigned_t choice = 0; f_uint16s_t choices = f_uint16s_t_initialize; // Identify and prioritize "color context" parameters. diff --git a/level_3/controller/c/common/private-cache.c b/level_3/controller/c/common/private-cache.c index 87ab707..3843645 100644 --- a/level_3/controller/c/common/private-cache.c +++ b/level_3/controller/c/common/private-cache.c @@ -24,9 +24,9 @@ extern "C" { f_string_dynamics_resize(0, &cache->expanded); - f_array_lengths_resize(0, &cache->ats); - f_array_lengths_resize(0, &cache->stack); - f_array_lengths_resize(0, &cache->delimits); + f_number_unsigneds_resize(0, &cache->ats); + f_number_unsigneds_resize(0, &cache->stack); + f_number_unsigneds_resize(0, &cache->delimits); f_string_ranges_resize(0, &cache->comments); f_string_ranges_resize(0, &cache->content_action); diff --git a/level_3/controller/c/common/private-cache.h b/level_3/controller/c/common/private-cache.h index c6065e5..6e221bb 100644 --- a/level_3/controller/c/common/private-cache.h +++ b/level_3/controller/c/common/private-cache.h @@ -24,8 +24,8 @@ extern "C" { */ #ifndef _di_controller_cache_action_t_ typedef struct { - f_array_length_t line_action; - f_array_length_t line_item; + f_number_unsigned_t line_action; + f_number_unsigned_t line_item; f_string_dynamic_t name_action; f_string_dynamic_t name_file; @@ -78,8 +78,8 @@ extern "C" { f_string_range_t range_action; - f_array_lengths_t ats; - f_array_lengths_t stack; + f_number_unsigneds_t ats; + f_number_unsigneds_t stack; f_fss_comments_t comments; f_fss_delimits_t delimits; @@ -102,8 +102,8 @@ extern "C" { #define controller_cache_t_initialize { \ f_time_spec_t_initialize, \ f_string_range_t_initialize, \ - f_array_lengths_t_initialize, \ - f_array_lengths_t_initialize, \ + f_number_unsigneds_t_initialize, \ + f_number_unsigneds_t_initialize, \ f_fss_comments_t_initialize, \ f_fss_delimits_t_initialize, \ f_fss_content_t_initialize, \ @@ -137,7 +137,7 @@ extern "C" { * @param cache * The cache to deallocate. * - * @see macro_f_array_lengths_t_delete_simple() + * @see macro_f_number_unsigneds_t_delete_simple() * @see macro_f_fss_delimits_t_delete_simple() * * @see controller_cache_action_delete_simple() diff --git a/level_3/controller/c/common/private-entry.c b/level_3/controller/c/common/private-entry.c index db543e7..8be713a 100644 --- a/level_3/controller/c/common/private-entry.c +++ b/level_3/controller/c/common/private-entry.c @@ -27,10 +27,10 @@ extern "C" { #endif // _di_controller_entry_actions_delete_simple_ #ifndef _di_controller_entry_actions_increase_by_ - f_status_t controller_entry_actions_increase_by(const f_array_length_t amount, controller_entry_actions_t * const actions) { + f_status_t controller_entry_actions_increase_by(const f_number_unsigned_t amount, controller_entry_actions_t * const actions) { if (actions->used + amount > actions->size) { - if (actions->used + amount > F_array_length_t_size_d) { + if (actions->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -71,10 +71,10 @@ extern "C" { #endif // _di_controller_entry_items_delete_simple_ #ifndef _di_controller_entry_items_increase_by_ - f_status_t controller_entry_items_increase_by(const f_array_length_t amount, controller_entry_items_t * const items) { + f_status_t controller_entry_items_increase_by(const f_number_unsigned_t amount, controller_entry_items_t * const items) { if (items->used + amount > items->size) { - if (items->used + amount > F_array_length_t_size_d) { + if (items->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } diff --git a/level_3/controller/c/common/private-entry.h b/level_3/controller/c/common/private-entry.h index 3c973b7..9b7f63c 100644 --- a/level_3/controller/c/common/private-entry.h +++ b/level_3/controller/c/common/private-entry.h @@ -74,7 +74,7 @@ extern "C" { uint8_t code; uint8_t flag; - f_array_length_t line; + f_number_unsigned_t line; f_number_unsigned_t number; f_status_t status; @@ -104,8 +104,8 @@ extern "C" { typedef struct { controller_entry_action_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } controller_entry_actions_t; #define controller_entry_actions_t_initialize { \ @@ -124,7 +124,7 @@ extern "C" { */ #ifndef _di_controller_entry_item_t_ typedef struct { - f_array_length_t line; + f_number_unsigned_t line; f_string_dynamic_t name; controller_entry_actions_t actions; @@ -149,8 +149,8 @@ extern "C" { typedef struct { controller_entry_item_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } controller_entry_items_t; #define controller_entry_items_t_initialize { \ @@ -310,7 +310,7 @@ extern "C" { * @see f_memory_resize() */ #ifndef _di_controller_entry_actions_increase_by_ - extern f_status_t controller_entry_actions_increase_by(const f_array_length_t amount, controller_entry_actions_t * const actions) F_attribute_visibility_internal_d; + extern f_status_t controller_entry_actions_increase_by(const f_number_unsigned_t amount, controller_entry_actions_t * const actions) F_attribute_visibility_internal_d; #endif // _di_controller_entry_actions_increase_by_ /** @@ -357,7 +357,7 @@ extern "C" { * @see f_memory_resize() */ #ifndef _di_controller_entry_items_increase_by_ - extern f_status_t controller_entry_items_increase_by(const f_array_length_t amount, controller_entry_items_t * const items) F_attribute_visibility_internal_d; + extern f_status_t controller_entry_items_increase_by(const f_number_unsigned_t amount, controller_entry_items_t * const items) F_attribute_visibility_internal_d; #endif // _di_controller_entry_items_increase_by_ #ifdef __cplusplus diff --git a/level_3/controller/c/common/private-process.c b/level_3/controller/c/common/private-process.c index aa70c85..cf3b21c 100644 --- a/level_3/controller/c/common/private-process.c +++ b/level_3/controller/c/common/private-process.c @@ -9,14 +9,14 @@ extern "C" { f_status_t controller_pids_increase(controller_pids_t * const pids) { if (pids->used + 1 > pids->size) { - f_array_length_t size = pids->used + controller_common_allocation_small_d; + f_number_unsigned_t size = pids->used + controller_common_allocation_small_d; - if (size > F_array_length_t_size_d) { - if (pids->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (pids->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return controller_pids_resize(size, pids); @@ -27,7 +27,7 @@ extern "C" { #endif // _di_controller_pids_increase_ #ifndef _di_controller_pids_resize_ - f_status_t controller_pids_resize(const f_array_length_t length, controller_pids_t * const pids) { + f_status_t controller_pids_resize(const f_number_unsigned_t length, controller_pids_t * const pids) { const f_status_t status = f_memory_resize(pids->size, length, sizeof(controller_rule_t), (void **) & pids->array); if (F_status_is_error(status)) return status; @@ -64,7 +64,7 @@ extern "C" { f_string_dynamics_resize(0, &process->path_pids); - f_array_lengths_resize(0, &process->stack); + f_number_unsigneds_resize(0, &process->stack); } #endif // _di_controller_process_delete_simple_ @@ -79,14 +79,14 @@ extern "C" { f_status_t controller_processs_increase(controller_processs_t * const processs) { if (processs->used + 1 > processs->size) { - f_array_length_t size = processs->used + controller_common_allocation_small_d; + f_number_unsigned_t size = processs->used + controller_common_allocation_small_d; - if (size > F_array_length_t_size_d) { - if (processs->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (processs->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return controller_processs_resize(size, processs); @@ -97,16 +97,16 @@ extern "C" { #endif // _di_controller_processs_increase_ #ifndef _di_controller_processs_resize_ - f_status_t controller_processs_resize(const f_array_length_t length, controller_processs_t * const processs) { + f_status_t controller_processs_resize(const f_number_unsigned_t length, controller_processs_t * const processs) { f_status_t status = F_none; - for (f_array_length_t i = length; i < processs->size; ++i) { + for (f_number_unsigned_t i = length; i < processs->size; ++i) { if (processs->array[i]) { controller_process_delete_simple(processs->array[i]); - f_memory_delete(1, sizeof(f_array_length_t *), (void **) & processs->array[i]); + f_memory_delete(1, sizeof(f_number_unsigned_t *), (void **) & processs->array[i]); } } // for @@ -145,7 +145,7 @@ extern "C" { return status; } - for (f_array_length_t i = 0; i < controller_rule_action_type__enum_size_e; ++i) { + for (f_number_unsigned_t i = 0; i < controller_rule_action_type__enum_size_e; ++i) { process->rule.status[i] = F_known_not; } // for } // for diff --git a/level_3/controller/c/common/private-process.h b/level_3/controller/c/common/private-process.h index 8a09e7c..fde8556 100644 --- a/level_3/controller/c/common/private-process.h +++ b/level_3/controller/c/common/private-process.h @@ -23,8 +23,8 @@ extern "C" { typedef struct { pid_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } controller_pids_t; #define controller_pids_t_initialize { \ @@ -95,7 +95,7 @@ extern "C" { }; typedef struct { - f_array_length_t id; + f_number_unsigned_t id; uint8_t state; uint8_t action; @@ -111,7 +111,7 @@ extern "C" { f_thread_mutex_t wait_lock; controller_cache_t cache; - f_array_lengths_t stack; + f_number_unsigneds_t stack; f_string_dynamics_t path_pids; @@ -135,7 +135,7 @@ extern "C" { f_thread_lock_t_initialize, \ f_thread_condition_t_initialize, \ controller_cache_t_initialize, \ - f_array_lengths_t_initialize, \ + f_number_unsigneds_t_initialize, \ f_string_dynamics_t_initialize, \ controller_pids_t_initialize, \ controller_rule_t_initialize, \ @@ -158,8 +158,8 @@ extern "C" { typedef struct { controller_process_t **array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } controller_processs_t; #define controller_processs_t_initialize { \ @@ -172,7 +172,7 @@ extern "C" { /** * Increase the size of the pid 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param pids @@ -209,7 +209,7 @@ extern "C" { * @see f_memory_resize() */ #ifndef _di_controller_pids_resize_ - extern f_status_t controller_pids_resize(const f_array_length_t length, controller_pids_t * const pids) F_attribute_visibility_internal_d; + extern f_status_t controller_pids_resize(const f_number_unsigned_t length, controller_pids_t * const pids) F_attribute_visibility_internal_d; #endif // _di_controller_pids_resize_ /** @@ -241,7 +241,7 @@ extern "C" { /** * Increase the size of the rule 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param processs @@ -283,7 +283,7 @@ extern "C" { * @see f_thread_lock_create() */ #ifndef _di_controller_processs_resize_ - extern f_status_t controller_processs_resize(const f_array_length_t length, controller_processs_t * const processs) F_attribute_visibility_internal_d; + extern f_status_t controller_processs_resize(const f_number_unsigned_t length, controller_processs_t * const processs) F_attribute_visibility_internal_d; #endif // _di_controller_processs_resize_ #ifdef __cplusplus diff --git a/level_3/controller/c/common/private-rule.c b/level_3/controller/c/common/private-rule.c index 0dade7a..85c560e 100644 --- a/level_3/controller/c/common/private-rule.c +++ b/level_3/controller/c/common/private-rule.c @@ -33,10 +33,10 @@ extern "C" { #endif // _di_controller_rule_actions_delete_simple_ #ifndef _di_controller_rule_actions_increase_by_ - f_status_t controller_rule_actions_increase_by(const f_array_length_t amount, controller_rule_actions_t * const actions) { + f_status_t controller_rule_actions_increase_by(const f_number_unsigned_t amount, controller_rule_actions_t * const actions) { if (actions->used + amount > actions->size) { - if (actions->used + amount > F_array_length_t_size_d) { + if (actions->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -131,14 +131,14 @@ extern "C" { f_status_t controller_rule_ons_increase(controller_rule_ons_t * const ons) { if (ons->used + 1 > ons->size) { - f_array_length_t size = ons->used + controller_common_allocation_small_d; + f_number_unsigned_t size = ons->used + controller_common_allocation_small_d; - if (size > F_array_length_t_size_d) { - if (ons->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (ons->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return controller_rule_ons_resize(size, ons); @@ -149,9 +149,9 @@ extern "C" { #endif // _di_controller_rule_ons_increase_ #ifndef _di_controller_rule_ons_resize_ - f_status_t controller_rule_ons_resize(const f_array_length_t length, controller_rule_ons_t * const ons) { + f_status_t controller_rule_ons_resize(const f_number_unsigned_t length, controller_rule_ons_t * const ons) { - for (f_array_length_t i = length; i < ons->size; ++i) { + for (f_number_unsigned_t i = length; i < ons->size; ++i) { controller_rule_on_delete_simple(&ons->array[i]); } // for @@ -179,14 +179,14 @@ extern "C" { f_status_t controller_rules_increase(controller_rules_t * const rules) { if (rules->used + 1 > rules->size) { - f_array_length_t size = rules->used + controller_common_allocation_small_d; + f_number_unsigned_t size = rules->used + controller_common_allocation_small_d; - if (size > F_array_length_t_size_d) { - if (rules->used + 1 > F_array_length_t_size_d) { + if (size > F_number_t_size_unsigned_d) { + if (rules->used + 1 > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } - size = F_array_length_t_size_d; + size = F_number_t_size_unsigned_d; } return controller_rules_resize(size, rules); @@ -197,9 +197,9 @@ extern "C" { #endif // _di_controller_rules_increase_ #ifndef _di_controller_rules_resize_ - f_status_t controller_rules_resize(const f_array_length_t length, controller_rules_t * const rules) { + f_status_t controller_rules_resize(const f_number_unsigned_t length, controller_rules_t * const rules) { - for (f_array_length_t i = length; i < rules->size; ++i) { + for (f_number_unsigned_t i = length; i < rules->size; ++i) { controller_rule_delete_simple(&rules->array[i]); } // for diff --git a/level_3/controller/c/common/private-rule.h b/level_3/controller/c/common/private-rule.h index c16d31e..fef5f57 100644 --- a/level_3/controller/c/common/private-rule.h +++ b/level_3/controller/c/common/private-rule.h @@ -108,7 +108,7 @@ extern "C" { typedef struct { uint8_t type; - f_array_length_t line; + f_number_unsigned_t line; f_status_t status; f_string_dynamics_t parameters; @@ -135,8 +135,8 @@ extern "C" { typedef struct { controller_rule_action_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } controller_rule_actions_t; #define controller_rule_actions_t_initialize { \ @@ -166,7 +166,7 @@ extern "C" { typedef struct { uint8_t type; uint8_t with; - f_array_length_t line; + f_number_unsigned_t line; f_string_dynamic_t pid_file; controller_rule_rerun_t reruns[controller_rule_action_execute_type__enum_size_e]; @@ -205,8 +205,8 @@ extern "C" { typedef struct { controller_rule_item_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } controller_rule_items_t; #define controller_rule_items_initialize { \ @@ -252,8 +252,8 @@ extern "C" { typedef struct { controller_rule_on_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } controller_rule_ons_t; #define controller_rule_ons_t_initialize { \ @@ -443,8 +443,8 @@ extern "C" { typedef struct { controller_rule_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } controller_rules_t; #define controller_rules_t_initialize { \ @@ -496,7 +496,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_controller_rule_actions_increase_by_ - extern f_status_t controller_rule_actions_increase_by(const f_array_length_t amount, controller_rule_actions_t * const actions) F_attribute_visibility_internal_d; + extern f_status_t controller_rule_actions_increase_by(const f_number_unsigned_t amount, controller_rule_actions_t * const actions) F_attribute_visibility_internal_d; #endif // _di_controller_rule_actions_increase_by_ /** @@ -574,7 +574,7 @@ extern "C" { /** * Increase the size of the Rule 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param ons @@ -611,7 +611,7 @@ extern "C" { * @see f_memory_resize() */ #ifndef _di_controller_rule_ons_resize_ - extern f_status_t controller_rule_ons_resize(const f_array_length_t length, controller_rule_ons_t * const ons) F_attribute_visibility_internal_d; + extern f_status_t controller_rule_ons_resize(const f_number_unsigned_t length, controller_rule_ons_t * const ons) F_attribute_visibility_internal_d; #endif // _di_controller_rule_ons_resize_ /** @@ -629,7 +629,7 @@ extern "C" { /** * Increase the size of the Rule 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_d). + * If the given length is too large for the buffer, then attempt to set max buffer size (F_number_t_size_unsigned_d). * If already set to the maximum buffer size, then the resize will fail. * * @param rules @@ -666,7 +666,7 @@ extern "C" { * @see f_memory_resize() */ #ifndef _di_controller_rules_resize_ - extern f_status_t controller_rules_resize(const f_array_length_t length, controller_rules_t * const rules) F_attribute_visibility_internal_d; + extern f_status_t controller_rules_resize(const f_number_unsigned_t length, controller_rules_t * const rules) F_attribute_visibility_internal_d; #endif // _di_controller_rules_resize_ #ifdef __cplusplus diff --git a/level_3/controller/c/common/private-setting.h b/level_3/controller/c/common/private-setting.h index e22f5fd..d37e1dc 100644 --- a/level_3/controller/c/common/private-setting.h +++ b/level_3/controller/c/common/private-setting.h @@ -72,7 +72,7 @@ extern "C" { uint8_t ready; uint8_t mode; - f_array_length_t failsafe_item_id; + f_number_unsigned_t failsafe_item_id; controller_control_t control; diff --git a/level_3/controller/c/controller.c b/level_3/controller/c/controller.c index 85f2fd3..3aec018 100644 --- a/level_3/controller/c/controller.c +++ b/level_3/controller/c/controller.c @@ -26,7 +26,7 @@ extern "C" { if (F_status_is_error(status)) return; { - f_array_length_t choice = 0; + f_number_unsigned_t choice = 0; f_uint16s_t choices = f_uint16s_t_initialize; // Identify and prioritize "color context" parameters. @@ -144,7 +144,7 @@ extern "C" { status = F_status_set_error(F_parameter); } else if (main->parameters.array[controller_parameter_settings_e].locations.used) { - const f_array_length_t index = main->parameters.array[controller_parameter_settings_e].values.array[main->parameters.array[controller_parameter_settings_e].values.used - 1]; + const f_number_unsigned_t index = main->parameters.array[controller_parameter_settings_e].values.array[main->parameters.array[controller_parameter_settings_e].values.used - 1]; status = controller_path_canonical_relative(&setting, argv[index], &setting.path_setting); @@ -185,7 +185,7 @@ extern "C" { else if (main->parameters.array[controller_parameter_pid_e].locations.used) { setting.path_pid.used = 0; - const f_array_length_t index = main->parameters.array[controller_parameter_pid_e].values.array[main->parameters.array[controller_parameter_pid_e].values.used - 1]; + const f_number_unsigned_t index = main->parameters.array[controller_parameter_pid_e].values.array[main->parameters.array[controller_parameter_pid_e].values.used - 1]; if (argv[index].used) { status = controller_path_canonical_relative(&setting, argv[index], &setting.path_pid); @@ -241,7 +241,7 @@ extern "C" { status = F_status_set_error(F_parameter); } else if (main->parameters.array[controller_parameter_cgroup_e].locations.used) { - const f_array_length_t index = main->parameters.array[controller_parameter_cgroup_e].values.array[main->parameters.array[controller_parameter_cgroup_e].values.used - 1]; + const f_number_unsigned_t index = main->parameters.array[controller_parameter_cgroup_e].values.array[main->parameters.array[controller_parameter_cgroup_e].values.used - 1]; if (argv[index].used) { status = controller_path_canonical_relative(&setting, argv[index], &setting.path_cgroup); diff --git a/level_3/controller/c/controller/private-controller.c b/level_3/controller/c/controller/private-controller.c index 3af796b..84efa55 100644 --- a/level_3/controller/c/controller/private-controller.c +++ b/level_3/controller/c/controller/private-controller.c @@ -376,7 +376,7 @@ extern "C" { const f_string_range_t range = macro_f_string_range_t_initialize_2(setting->path_current.used); if (f_compare_dynamic_partial_string(destination->string, setting->path_current, destination->used, range) == F_equal_to) { - f_array_length_t length = destination->used - setting->path_current.used; + f_number_unsigned_t length = destination->used - setting->path_current.used; if (length) { f_char_t temporary[--length]; @@ -793,7 +793,7 @@ extern "C" { if (status == F_false) return F_false; } - for (f_array_length_t i = macro_f_utf_byte_width(name.string[0]); i < name.used; i += macro_f_utf_byte_width(name.string[i])) { + for (f_number_unsigned_t i = macro_f_utf_byte_width(name.string[0]); i < name.used; i += macro_f_utf_byte_width(name.string[i])) { if (name.string[i] == '_') continue; @@ -814,7 +814,7 @@ extern "C" { f_status_t status = F_none; - for (f_array_length_t i = 0; i < name.used; i += macro_f_utf_byte_width(name.string[i])) { + for (f_number_unsigned_t i = 0; i < name.used; i += macro_f_utf_byte_width(name.string[i])) { status = f_utf_is_graph(name.string, name.used); diff --git a/level_3/controller/c/entry/private-entry.c b/level_3/controller/c/entry/private-entry.c index d3510b3..0f7ebc5 100644 --- a/level_3/controller/c/entry/private-entry.c +++ b/level_3/controller/c/entry/private-entry.c @@ -129,12 +129,12 @@ extern "C" { controller_entry_action_t *action = 0; - f_array_length_t allocate = 0; - f_array_length_t at_least = 0; - f_array_length_t at_most = 0; + f_number_unsigned_t allocate = 0; + f_number_unsigned_t at_least = 0; + f_number_unsigned_t at_most = 0; - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; for (; i < cache->object_actions.used; ++i) { @@ -608,11 +608,11 @@ extern "C" { f_status_t status = F_none; f_status_t status2 = F_none; - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; - f_array_length_t at_i = 0; - f_array_length_t at_j = 1; + f_number_unsigned_t at_i = 0; + f_number_unsigned_t at_j = 1; controller_entry_t *entry = is_entry ? &global.setting->entry : &global.setting->exit; controller_entry_actions_t *actions = 0; @@ -629,10 +629,10 @@ extern "C" { cache->action.name_action.used = 0; cache->action.name_item.used = 0; - macro_f_array_lengths_t_increase_by(status, cache->ats, controller_common_allocation_small_d) + macro_f_number_unsigneds_t_increase_by(status, cache->ats, controller_common_allocation_small_d) if (F_status_is_error(status)) { - controller_entry_print_error(is_entry, global.main->error, cache->action, F_status_set_fine(status), "macro_f_array_lengths_t_increase_by", F_true, global.thread); + controller_entry_print_error(is_entry, global.main->error, cache->action, F_status_set_fine(status), "macro_f_number_unsigneds_t_increase_by", F_true, global.thread); return status; } @@ -732,10 +732,10 @@ extern "C" { if (error_has) break; - macro_f_array_lengths_t_increase_by(status2, cache->ats, controller_common_allocation_small_d) + macro_f_number_unsigneds_t_increase_by(status2, cache->ats, controller_common_allocation_small_d) if (F_status_is_error(status2)) { - controller_entry_print_error(is_entry, global.main->error, cache->action, F_status_set_fine(status2), "macro_f_array_lengths_t_increase_by", F_true, global.thread); + controller_entry_print_error(is_entry, global.main->error, cache->action, F_status_set_fine(status2), "macro_f_number_unsigneds_t_increase_by", F_true, global.thread); return status2; } @@ -841,8 +841,8 @@ extern "C" { f_status_t status = F_none; f_status_t status_lock = F_none; - f_array_length_t at_i = 0; - f_array_length_t at_j = 1; + f_number_unsigned_t at_i = 0; + f_number_unsigned_t at_j = 1; uint8_t options_force = 0; uint8_t options_process = 0; @@ -852,7 +852,7 @@ extern "C" { controller_entry_actions_t *entry_actions = 0; // An empty stack is used here because each rule here is the first rule run in the rule's scope. - const f_array_lengths_t stack = f_array_lengths_t_initialize; + const f_number_unsigneds_t stack = f_number_unsigneds_t_initialize; cache->ats.used = 0; cache->stack.used = 0; @@ -862,10 +862,10 @@ extern "C" { cache->action.name_action.used = 0; cache->action.name_item.used = 0; - macro_f_array_lengths_t_increase_by(status, cache->ats, controller_common_allocation_small_d) + macro_f_number_unsigneds_t_increase_by(status, cache->ats, controller_common_allocation_small_d) if (F_status_is_error(status)) { - controller_entry_print_error(is_entry, global->main->error, cache->action, F_status_set_fine(status), "macro_f_array_lengths_t_increase_by", F_true, global->thread); + controller_entry_print_error(is_entry, global->main->error, cache->action, F_status_set_fine(status), "macro_f_number_unsigneds_t_increase_by", F_true, global->thread); return status; } @@ -1064,10 +1064,10 @@ extern "C" { return F_status_is_error(F_critical); } - macro_f_array_lengths_t_increase_by(status, cache->ats, controller_common_allocation_small_d) + macro_f_number_unsigneds_t_increase_by(status, cache->ats, controller_common_allocation_small_d) if (F_status_is_error(status)) { - controller_entry_print_error(is_entry, global->main->error, cache->action, F_status_set_fine(status), "macro_f_array_lengths_t_increase_by", F_true, global->thread); + controller_entry_print_error(is_entry, global->main->error, cache->action, F_status_set_fine(status), "macro_f_number_unsigneds_t_increase_by", F_true, global->thread); return status; } @@ -1129,7 +1129,7 @@ extern "C" { return status; } - const f_array_length_t id_rule_length = entry_action->parameters.array[0].used + entry_action->parameters.array[1].used + 1; + const f_number_unsigned_t id_rule_length = entry_action->parameters.array[0].used + entry_action->parameters.array[1].used + 1; f_char_t id_rule_name[id_rule_length + 1]; const f_string_static_t alias_rule = macro_f_string_static_t_initialize_1(id_rule_name, 0, id_rule_length); @@ -1182,12 +1182,12 @@ extern "C" { if (status != F_true) { // Rule execution will re-use the existing cache, so save the current cache. - const f_array_length_t cache_line_action = cache->action.line_action; - const f_array_length_t cache_line_item = cache->action.line_item; + const f_number_unsigned_t cache_line_action = cache->action.line_action; + const f_number_unsigned_t cache_line_item = cache->action.line_item; - const f_array_length_t cache_name_action_used = cache->action.name_action.used; - const f_array_length_t cache_name_item_used = cache->action.name_item.used; - const f_array_length_t cache_name_file_used = cache->action.name_file.used; + const f_number_unsigned_t cache_name_action_used = cache->action.name_action.used; + const f_number_unsigned_t cache_name_item_used = cache->action.name_item.used; + const f_number_unsigned_t cache_name_file_used = cache->action.name_file.used; f_char_t cache_name_action[cache_name_action_used]; f_char_t cache_name_item[cache_name_item_used]; @@ -1308,7 +1308,7 @@ extern "C" { fl_print_format("%r%Q is executing '", global->main->output.to, f_string_eol_s, is_entry ? controller_entry_s : controller_exit_s); - for (f_array_length_t k = 0; k < entry_action->parameters.used; ++k) { + for (f_number_unsigned_t k = 0; k < entry_action->parameters.used; ++k) { fl_print_format("%[%Q%]", global->main->output.to, global->main->context.set.title, entry_action->parameters.array[k], global->main->context.set.title); @@ -1539,7 +1539,7 @@ extern "C" { cache->content_action.used = 0; { - f_array_length_t i = 0; + f_number_unsigned_t i = 0; for (; i < cache->content_actions.used; ++i) { cache->content_actions.array[i].used = 0; @@ -1619,9 +1619,9 @@ extern "C" { f_string_range_t *range = 0; - f_array_length_t at = 0; - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t at = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; f_state_t state = f_state_t_initialize; @@ -1779,7 +1779,7 @@ extern "C" { if (F_status_is_error_not(status)) { controller_entry_action_t *action = 0; - f_array_length_t k = 0; + f_number_unsigned_t k = 0; // 0x1 = missing or not, 0x2 = one or more missing. uint8_t missing = 0; @@ -1902,7 +1902,7 @@ extern "C" { cache->delimits.used = 0; - f_array_length_t i = 0; + f_number_unsigned_t i = 0; controller_entry_t *entry = is_entry ? &global.setting->entry : &global.setting->exit; f_state_t state = f_state_t_initialize; @@ -2355,8 +2355,8 @@ extern "C" { const f_string_static_t *string = 0; f_status_t status = F_none; - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; fl_print_format("%r%Q %[%Q%] {%r", global.main->output.to.stream, f_string_eol_s, is_entry ? controller_Entry_s : controller_Exit_s, global.main->context.set.title, controller_settings_s, global.main->context.set.title, f_string_eol_s); @@ -2575,7 +2575,7 @@ extern "C" { if (entry->items.used) { controller_entry_action_t *action = 0; bool raw = F_false; - f_array_length_t k = 0; + f_number_unsigned_t k = 0; for (i = 0; i < entry->items.used; ++i) { diff --git a/level_3/controller/c/entry/private-entry.h b/level_3/controller/c/entry/private-entry.h index 53b5acc..f19cdb7 100644 --- a/level_3/controller/c/entry/private-entry.h +++ b/level_3/controller/c/entry/private-entry.h @@ -94,13 +94,13 @@ extern "C" { * F_recurse (with error bit) on a recursion error. * F_valid_not (with error bit) on invalid entry item, entry item action, or entry item action value. * - * Errors (with error bit) from: macro_f_array_lengths_t_increase_by(). + * Errors (with error bit) from: macro_f_number_unsigneds_t_increase_by(). * Errors (with error bit) from: f_string_dynamic_append(). * * This will detect and report all errors, but only the first error is returned. * Memory related errors return immediately. - * @see macro_f_array_lengths_t_increase_by() + * @see macro_f_number_unsigneds_t_increase_by() * @see f_string_dynamic_append() */ #ifndef _di_controller_entry_preprocess_ @@ -131,12 +131,12 @@ extern "C" { * * Errors (with error bit) from: f_string_dynamic_append_nulless(). * - * Errors (with error bit) from: macro_f_array_lengths_t_increase_by(). + * Errors (with error bit) from: macro_f_number_unsigneds_t_increase_by(). * Errors (with error bit) from: controller_perform_ready(). * * @see f_string_dynamic_append_nulless() * - * @see macro_f_array_lengths_t_increase_by() + * @see macro_f_number_unsigneds_t_increase_by() * @see controller_perform_ready() */ #ifndef _di_controller_entry_process_ diff --git a/level_3/controller/c/entry/private-entry_print.c b/level_3/controller/c/entry/private-entry_print.c index a980130..b87d75a 100644 --- a/level_3/controller/c/entry/private-entry_print.c +++ b/level_3/controller/c/entry/private-entry_print.c @@ -17,7 +17,7 @@ extern "C" { #ifndef _di_controller_entry_action_parameters_print_ void controller_entry_action_parameters_print(FILE * const stream, const controller_entry_action_t action) { - for (f_array_length_t index = 0; ;) { + for (f_number_unsigned_t index = 0; ;) { f_print_dynamic_safely(action.parameters.array[index], stream); @@ -144,7 +144,7 @@ extern "C" { #endif // _di_controller_entry_setting_read_print_error_with_range_ #ifndef _di_controller_entry_settings_read_print_setting_ignored_ - void controller_entry_settings_read_print_setting_ignored(const controller_global_t global, const bool is_entry, const controller_cache_t cache, const f_array_length_t index) { + void controller_entry_settings_read_print_setting_ignored(const controller_global_t global, const bool is_entry, const controller_cache_t cache, const f_number_unsigned_t index) { if (global.main->warning.verbosity != f_console_verbosity_debug_e) return; @@ -218,7 +218,7 @@ extern "C" { #endif // _di_controller_entry_settings_read_print_setting_unknown_action_ #ifndef _di_controller_entry_settings_read_print_setting_unknown_action_value_ - void controller_entry_settings_read_print_setting_unknown_action_value(const controller_global_t global, const bool is_entry, const controller_cache_t cache, const f_array_length_t index) { + void controller_entry_settings_read_print_setting_unknown_action_value(const controller_global_t global, const bool is_entry, const controller_cache_t cache, const f_number_unsigned_t index) { if (global.main->warning.verbosity != f_console_verbosity_debug_e) return; diff --git a/level_3/controller/c/entry/private-entry_print.h b/level_3/controller/c/entry/private-entry_print.h index 30bbb27..2bc9c96 100644 --- a/level_3/controller/c/entry/private-entry_print.h +++ b/level_3/controller/c/entry/private-entry_print.h @@ -192,7 +192,7 @@ extern "C" { * The expected number of arguments. */ #ifndef _di_controller_entry_settings_read_print_setting_ignored_ - extern void controller_entry_settings_read_print_setting_ignored(const controller_global_t global, const bool is_entry, const controller_cache_t cache, const f_array_length_t index) F_attribute_visibility_internal_d; + extern void controller_entry_settings_read_print_setting_ignored(const controller_global_t global, const bool is_entry, const controller_cache_t cache, const f_number_unsigned_t index) F_attribute_visibility_internal_d; #endif // _di_controller_entry_settings_read_print_setting_ignored_ /** @@ -262,7 +262,7 @@ extern "C" { * The location in the content actions array representing the action value. */ #ifndef _di_controller_entry_settings_read_print_setting_unknown_action_value_ - extern void controller_entry_settings_read_print_setting_unknown_action_value(const controller_global_t global, const bool is_entry, const controller_cache_t cache, const f_array_length_t index) F_attribute_visibility_internal_d; + extern void controller_entry_settings_read_print_setting_unknown_action_value(const controller_global_t global, const bool is_entry, const controller_cache_t cache, const f_number_unsigned_t index) F_attribute_visibility_internal_d; #endif // _di_controller_entry_settings_read_print_setting_unknown_action_value_ #ifdef __cplusplus diff --git a/level_3/controller/c/process/private-process.c b/level_3/controller/c/process/private-process.c index 600cb15..c172c35 100644 --- a/level_3/controller/c/process/private-process.c +++ b/level_3/controller/c/process/private-process.c @@ -13,12 +13,12 @@ extern "C" { #endif #ifndef _di_controller_process_find_ - f_status_t controller_process_find(const f_array_length_t action, const f_string_static_t alias, const controller_processs_t processs, f_array_length_t *at) { + f_status_t controller_process_find(const f_number_unsigned_t action, const f_string_static_t alias, const controller_processs_t processs, f_number_unsigned_t *at) { if (!alias.used) return F_none; if (!processs.used) return F_false; - for (f_array_length_t i = 0; i < processs.used; ++i) { + for (f_number_unsigned_t i = 0; i < processs.used; ++i) { if (processs.array[i] && processs.array[i]->action == action && f_compare_dynamic(alias, processs.array[i]->rule.alias) == F_equal_to) { if (at) *at = i; @@ -32,7 +32,7 @@ extern "C" { #endif // _di_controller_process_find_ #ifndef _di_controller_process_prepare_ - f_status_t controller_process_prepare(const controller_global_t global, const bool is_normal, const uint8_t action, const f_string_static_t alias, f_array_length_t *id) { + f_status_t controller_process_prepare(const controller_global_t global, const bool is_normal, const uint8_t action, const f_string_static_t alias, f_number_unsigned_t *id) { f_status_t status = F_none; @@ -94,7 +94,7 @@ extern "C" { #endif // _di_controller_process_prepare_ #ifndef _di_controller_process_prepare_process_type_ - f_status_t controller_process_prepare_process_type(const controller_global_t global, const uint8_t type, const uint8_t action, const f_string_static_t alias, f_array_length_t *id) { + f_status_t controller_process_prepare_process_type(const controller_global_t global, const uint8_t type, const uint8_t action, const f_string_static_t alias, f_number_unsigned_t *id) { return controller_process_prepare(global, type != controller_process_type_exit_e, action, alias, id); } diff --git a/level_3/controller/c/process/private-process.h b/level_3/controller/c/process/private-process.h index 3a305ad..9b5b550 100644 --- a/level_3/controller/c/process/private-process.h +++ b/level_3/controller/c/process/private-process.h @@ -51,7 +51,7 @@ extern "C" { * @see controller_lock_write() */ #ifndef _di_controller_process_prepare_ - extern f_status_t controller_process_prepare(const controller_global_t global, const bool is_normal, const uint8_t action, const f_string_static_t alias, f_array_length_t *id) F_attribute_visibility_internal_d; + extern f_status_t controller_process_prepare(const controller_global_t global, const bool is_normal, const uint8_t action, const f_string_static_t alias, f_number_unsigned_t *id) F_attribute_visibility_internal_d; #endif // _di_controller_process_prepare_ /** @@ -84,7 +84,7 @@ extern "C" { * @see controller_process_prepare() */ #ifndef _di_controller_process_prepare_process_type_ - extern f_status_t controller_process_prepare_process_type(const controller_global_t global, const uint8_t type, const uint8_t action, const f_string_static_t alias, f_array_length_t *id) F_attribute_visibility_internal_d; + extern f_status_t controller_process_prepare_process_type(const controller_global_t global, const uint8_t type, const uint8_t action, const f_string_static_t alias, f_number_unsigned_t *id) F_attribute_visibility_internal_d; #endif // _di_controller_process_prepare_process_type_ /** @@ -111,7 +111,7 @@ extern "C" { * F_true if there is a process found (address is stored in "at"). */ #ifndef _di_controller_process_find_ - f_status_t controller_process_find(const f_array_length_t action, const f_string_static_t alias, const controller_processs_t processs, f_array_length_t *at) F_attribute_visibility_internal_d; + f_status_t controller_process_find(const f_number_unsigned_t action, const f_string_static_t alias, const controller_processs_t processs, f_number_unsigned_t *at) F_attribute_visibility_internal_d; #endif // _di_controller_process_find_ /*** diff --git a/level_3/controller/c/rule/private-rule.c b/level_3/controller/c/rule/private-rule.c index dabdae7..ed521db 100644 --- a/level_3/controller/c/rule/private-rule.c +++ b/level_3/controller/c/rule/private-rule.c @@ -41,12 +41,12 @@ extern "C" { #endif // _di_controller_rule_action_method_name_ #ifndef _di_controller_rule_find_ - f_status_t controller_rule_find(const f_string_static_t alias, const controller_rules_t rules, f_array_length_t *at) { + f_status_t controller_rule_find(const f_string_static_t alias, const controller_rules_t rules, f_number_unsigned_t *at) { if (!alias.used) return F_none; if (!rules.used) return F_false; - for (f_array_length_t i = 0; i < rules.used; ++i) { + for (f_number_unsigned_t i = 0; i < rules.used; ++i) { if (f_compare_dynamic(alias, rules.array[i].alias) == F_equal_to) { if (at) *at = i; @@ -131,7 +131,7 @@ extern "C" { f_string_range_t range = f_string_range_t_initialize; - for (f_array_length_t i = 0; i < content->used; ++i) { + for (f_number_unsigned_t i = 0; i < content->used; ++i) { if (content->array[i].start > content->array[i].stop) continue; @@ -224,7 +224,7 @@ extern "C" { controller_state_interrupt_t custom = macro_controller_state_interrupt_t_initialize_1(is_normal, global.thread); f_state_t state = macro_f_state_t_initialize_1(controller_common_allocation_large_d, controller_common_allocation_small_d, F_none, 0, 0, 0, &controller_thread_signal_state_fss, 0, (void *) &custom, 0); - f_array_length_t i = 0; + f_number_unsigned_t i = 0; for (; i < cache->comments.size; ++i) { @@ -670,7 +670,7 @@ extern "C" { #endif // _di_controller_rule_action_read_ #ifndef _di_controller_rule_action_read_rerun_number_ - f_status_t controller_rule_action_read_rerun_number(const controller_global_t global, const f_string_t name, controller_cache_t * const cache, f_array_length_t * const index, f_number_unsigned_t * const number) { + f_status_t controller_rule_action_read_rerun_number(const controller_global_t global, const f_string_t name, controller_cache_t * const cache, f_number_unsigned_t * const index, f_number_unsigned_t * const number) { f_status_t status = F_none; f_number_signed_t parsed = 0; @@ -745,7 +745,7 @@ extern "C" { macro_f_control_group_t_delete_simple(destination->cgroup) f_capability_delete(&destination->capability); - f_array_length_t i = 0; + f_number_unsigned_t i = 0; for (; i < controller_rule_action_type__enum_size_e; ++i) { destination->status[i] = source.status[i]; @@ -885,7 +885,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - f_array_length_t j = 0; + f_number_unsigned_t j = 0; for (i = 0; i < source.items.used; ++i) { @@ -951,9 +951,9 @@ extern "C" { f_status_t status = F_none; f_status_t success = F_false; - f_array_length_t i = 0; - f_array_length_t j = 0; - f_array_length_t k = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; // Child processes should receive all signals and handle the signals as they see fit. f_signal_how_t signals = f_signal_how_t_initialize; @@ -1416,7 +1416,7 @@ extern "C" { pid_t *child = 0; { - f_array_length_t i = 0; + f_number_unsigned_t i = 0; while (i < process->childs.used && process->childs.array[i]) { ++i; @@ -1444,7 +1444,7 @@ extern "C" { fl_print_format("%]' with the arguments: '%[", main->output.to, main->context.set.title, main->context.set.important); - for (f_array_length_t i = program.used ? 0 : 1; i < arguments.used; ++i) { + for (f_number_unsigned_t i = program.used ? 0 : 1; i < arguments.used; ++i) { if (program.used && i || !program.used && i > 1) { f_print_dynamic_raw(f_string_space_s, main->output.to); @@ -1638,7 +1638,7 @@ extern "C" { f_string_dynamic_t *child_pid_file = 0; { - f_array_length_t i = 0; + f_number_unsigned_t i = 0; while (i < process->childs.used && process->childs.array[i]) { ++i; @@ -1700,7 +1700,7 @@ extern "C" { fl_print_format("%]' with the arguments: '%[", main->error.to, main->context.set.title, main->context.set.important); - for (f_array_length_t i = program.used ? 0 : 1; i < arguments.used; ++i) { + for (f_number_unsigned_t i = program.used ? 0 : 1; i < arguments.used; ++i) { if (program.used && i || !program.used && i > 1) { f_print_dynamic_raw(f_string_space_s, main->error.to); @@ -1942,8 +1942,8 @@ extern "C" { f_status_t status = f_string_dynamics_increase_by(action.parameters.used, &process->cache.expanded); if (F_status_is_error(status)) return status; - f_array_length_t i = 0; - f_array_length_t first = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t first = 0; f_string_range_t range = f_string_range_t_initialize; f_iki_data_t *iki_data = 0; @@ -2022,7 +2022,7 @@ extern "C" { f_status_t status = F_none; if (f_compare_dynamic_partial_string(controller_define_s.string, source, controller_define_s.used, vocabulary) == F_equal_to) { - f_array_length_t i = 0; + f_number_unsigned_t i = 0; // First check to see if the environment variable is overwritten by a "define". for (; i < process->rule.define.used; ++i) { @@ -2072,7 +2072,7 @@ extern "C" { } } else if (f_compare_dynamic_partial_string(controller_parameter_s.string, source, controller_parameter_s.used, vocabulary) == F_equal_to) { - f_array_length_t i = 0; + f_number_unsigned_t i = 0; for (; i < process->rule.parameter.used; ++i) { @@ -2213,12 +2213,12 @@ extern "C" { F_true, // socket. }; - for (f_array_length_t i = 0; i < 17; ++i) { + for (f_number_unsigned_t i = 0; i < 17; ++i) { if (f_compare_dynamic_partial_string(options[i].string, source, options[i].used, content) == F_equal_to) { if (values[i]) { if (parameters->array[codes[i]].result & f_console_result_value_e) { - const f_array_length_t index = parameters->array[codes[i]].values.array[parameters->array[codes[i]].values.used - 1]; + const f_number_unsigned_t index = parameters->array[codes[i]].values.array[parameters->array[codes[i]].values.used - 1]; status = f_string_dynamic_increase_by(symbols[i].used + expands[i].used + f_string_ascii_space_s.used + argv[index].used + 1, destination); if (F_status_is_error(status)) return status; @@ -2290,7 +2290,7 @@ extern "C" { if (f_compare_dynamic_partial_string(buffer.string, source, buffer.used, content) == F_equal_to) { if (parameters->array[codes[i]].result & f_console_result_value_e) { - const f_array_length_t index = parameters->array[codes[i]].values.array[parameters->array[codes[i]].values.used - 1]; + const f_number_unsigned_t index = parameters->array[codes[i]].values.array[parameters->array[codes[i]].values.used - 1]; status = f_string_dynamic_append(argv[index], destination); if (F_status_is_error(status)) return status; @@ -2362,7 +2362,7 @@ extern "C" { controller_state_interrupt_t custom = macro_controller_state_interrupt_t_initialize_1(is_normal, global.thread); f_state_t state = macro_f_state_t_initialize_1(controller_common_allocation_large_d, controller_common_allocation_small_d, F_none, 0, 0, 0, &controller_thread_signal_state_fss, 0, (void *) &custom, 0); f_string_range_t range = macro_f_string_range_t_initialize_2(cache->buffer_item.used); - f_array_length_t last = 0; + f_number_unsigned_t last = 0; uint8_t type = 0; uint8_t method = 0; @@ -2526,10 +2526,10 @@ extern "C" { #endif // _di_controller_rule_item_read_ #ifndef _di_controller_rule_items_increase_by_ - f_status_t controller_rule_items_increase_by(const f_array_length_t amount, controller_rule_items_t * const items) { + f_status_t controller_rule_items_increase_by(const f_number_unsigned_t amount, controller_rule_items_t * const items) { if (items->used + amount > items->size) { - if (items->used + amount > F_array_length_t_size_d) { + if (items->used + amount > F_number_t_size_unsigned_d) { return F_status_set_error(F_array_too_large); } @@ -2620,12 +2620,12 @@ extern "C" { controller_rule_validate(global, process->rule, process->action, process->options, &process->cache); } - f_array_length_t i = 0; + f_number_unsigned_t i = 0; { - f_array_length_t j = 0; - f_array_length_t id_rule = 0; - f_array_length_t id_dependency = 0; + f_number_unsigned_t j = 0; + f_number_unsigned_t id_rule = 0; + f_number_unsigned_t id_dependency = 0; bool found = F_false; @@ -2967,7 +2967,7 @@ extern "C" { if (process->options & controller_process_option_require_d) { bool missing = F_true; - f_array_length_t j = 0; + f_number_unsigned_t j = 0; for (i = 0; i < process->rule.items.used; ++i) { @@ -3030,7 +3030,7 @@ extern "C" { } } - f_array_length_t id_rule = 0; + f_number_unsigned_t id_rule = 0; f_thread_unlock(&process->lock); @@ -3073,7 +3073,7 @@ extern "C" { rule->status[process->action] = process->rule.status[process->action]; - f_array_length_t j = 0; + f_number_unsigned_t j = 0; controller_rule_item_t *rule_item = 0; @@ -3104,7 +3104,7 @@ extern "C" { #endif // _di_controller_rule_process_ #ifndef _di_controller_rule_process_begin_ - f_status_t controller_rule_process_begin(const controller_global_t global, const uint8_t options_force, const f_string_static_t alias_rule, const uint8_t action, const uint8_t options, const uint8_t type, const f_array_lengths_t stack, const controller_cache_t cache) { + f_status_t controller_rule_process_begin(const controller_global_t global, const uint8_t options_force, const f_string_static_t alias_rule, const uint8_t action, const uint8_t options, const uint8_t type, const f_number_unsigneds_t stack, const controller_cache_t cache) { if (!controller_thread_is_enabled_process_type(type, global.thread)) { return F_status_set_error(F_interrupt); @@ -3124,7 +3124,7 @@ extern "C" { } { - f_array_length_t at = 0; + f_number_unsigned_t at = 0; status = controller_process_prepare(global, type != controller_process_type_exit_e, action, alias_rule, &at); @@ -3238,14 +3238,14 @@ extern "C" { if (F_status_is_error_not(status) && stack.used) { if (process->stack.size < stack.used) { - status = f_array_lengths_resize(stack.used, &process->stack); + status = f_number_unsigneds_resize(stack.used, &process->stack); } if (F_status_is_error(status)) { - controller_print_error(global.thread, global.main->error, F_status_set_fine(status), "f_array_lengths_resize", F_true); + controller_print_error(global.thread, global.main->error, F_status_set_fine(status), "f_number_unsigneds_resize", F_true); } else { - for (f_array_length_t i = 0; i < stack.used; ++i) { + for (f_number_unsigned_t i = 0; i < stack.used; ++i) { process->stack.array[i] = stack.array[i]; } // for @@ -3363,9 +3363,9 @@ extern "C" { f_status_t status = F_none; - f_array_length_t id_rule = 0; + f_number_unsigned_t id_rule = 0; - const f_array_length_t used_original_stack = process->stack.used; + const f_number_unsigned_t used_original_stack = process->stack.used; status_lock = controller_lock_read_process(process, global.thread, &global.thread->lock.rule); @@ -3435,7 +3435,7 @@ extern "C" { return F_process_not; } else { - for (f_array_length_t i = 0; i < process->stack.used && controller_thread_is_enabled_process(process, global.thread); ++i) { + for (f_number_unsigned_t i = 0; i < process->stack.used && controller_thread_is_enabled_process(process, global.thread); ++i) { if (process->stack.array[i] == id_rule) { if (global.main->error.verbosity > f_console_verbosity_quiet_e) { @@ -3468,10 +3468,10 @@ extern "C" { } if (F_status_is_error_not(status)) { - status = f_array_lengths_increase(controller_common_allocation_small_d, &process->stack); + status = f_number_unsigneds_increase(controller_common_allocation_small_d, &process->stack); if (F_status_is_error(status)) { - controller_print_error(global.thread, global.main->error, F_status_set_fine(status), "f_array_lengths_increase", F_true); + controller_print_error(global.thread, global.main->error, F_status_set_fine(status), "f_number_unsigneds_increase", F_true); } else { f_thread_unlock(&process->lock); @@ -3683,10 +3683,10 @@ extern "C" { cache->action.name_item.used = 0; { - f_array_length_t i = 0; - f_array_length_t j = 0; - f_array_length_t k = 0; - f_array_length_t l = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; + f_number_unsigned_t l = 0; for (i = 0; i < rule->cgroup.groups.size; ++i) { rule->cgroup.groups.array[i].used = 0; @@ -3810,8 +3810,8 @@ extern "C" { controller_print_error(global.thread, global.main->error, F_status_set_fine(status), "controller_rule_items_increase_by", F_true); } else { - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; f_state_t state = f_state_t_initialize; for (; i < cache->object_items.used; ++i) { @@ -3965,15 +3965,15 @@ extern "C" { f_string_dynamics_t *setting_values = 0; f_string_maps_t *setting_maps = 0; - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; uint8_t type = 0; uint8_t action = 0; bool empty_disallow = F_true; // Save the current name item and line number to restore on return. - const f_array_length_t line_item = cache->action.line_item; - const f_array_length_t length_name_item = cache->action.name_item.used; + const f_number_unsigned_t line_item = cache->action.line_item; + const f_number_unsigned_t length_name_item = cache->action.name_item.used; f_char_t name_item[length_name_item]; name_item[length_name_item] = 0; @@ -5262,7 +5262,7 @@ extern "C" { macro_f_int32s_t_increase_by(status, rule->groups, controller_common_allocation_small_d) if (F_status_is_error(status)) { - controller_rule_print_error(global.thread, global.main->error, cache->action, F_status_set_fine(status), "macro_f_array_lengths_t_increase_by", F_true, F_false); + controller_rule_print_error(global.thread, global.main->error, cache->action, F_status_set_fine(status), "macro_f_number_unsigneds_t_increase_by", F_true, F_false); if (F_status_set_fine(status) == F_memory_not) { status_return = status; @@ -5715,8 +5715,8 @@ extern "C" { return; } - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; // Find at least one of the requested action. { @@ -6006,9 +6006,9 @@ extern "C" { controller_rule_item_t *item = 0; controller_rule_rerun_item_t *rerun_item = 0; - f_array_length_t j = 0; - f_array_length_t k = 0; - f_array_length_t l = 0; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; + f_number_unsigned_t l = 0; for (i = 0; i < rule.items.used; ++i) { @@ -6198,11 +6198,11 @@ extern "C" { bool required_not_run = F_false; bool skip = F_false; - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; // Vuild a list of what to wait for so that anything new after this point will not be waited for. - const f_array_length_t process_total = global.thread->processs.used; + const f_number_unsigned_t process_total = global.thread->processs.used; controller_process_t *process_list[process_total]; for (; i < process_total; ++i) { diff --git a/level_3/controller/c/rule/private-rule.h b/level_3/controller/c/rule/private-rule.h index 2aca99b..abc4d8e 100644 --- a/level_3/controller/c/rule/private-rule.h +++ b/level_3/controller/c/rule/private-rule.h @@ -60,7 +60,7 @@ extern "C" { * F_false on success and rule was not found. */ #ifndef _di_controller_rule_find_ - extern f_status_t controller_rule_find(const f_string_static_t alias, const controller_rules_t rules, f_array_length_t *at) F_attribute_visibility_internal_d; + extern f_status_t controller_rule_find(const f_string_static_t alias, const controller_rules_t rules, f_number_unsigned_t *at) F_attribute_visibility_internal_d; #endif // _di_controller_rule_find_ /** @@ -492,7 +492,7 @@ extern "C" { * @see f_memory_resize() */ #ifndef _di_controller_rule_items_increase_by_ - extern f_status_t controller_rule_items_increase_by(const f_array_length_t amount, controller_rule_items_t * const items) F_attribute_visibility_internal_d; + extern f_status_t controller_rule_items_increase_by(const f_number_unsigned_t amount, controller_rule_items_t * const items) F_attribute_visibility_internal_d; #endif // _di_controller_rule_items_increase_by_ /** @@ -503,7 +503,7 @@ extern "C" { * * This requires that a read lock be set on process->lock before being called. * - * This function is recursively called for each "need", "want", and "wish", and has a max recursion length of the max size of the f_array_lengths_t array. + * This function is recursively called for each "need", "want", and "wish", and has a max recursion length of the max size of the f_number_unsigneds_t array. * * The rule status will be updated by this function. * @@ -570,7 +570,7 @@ extern "C" { * @see f_thread_create() */ #ifndef _di_controller_rule_process_begin_ - extern f_status_t controller_rule_process_begin(const controller_global_t global, const uint8_t options_force, const f_string_static_t alias_rule, const uint8_t action, const uint8_t options, const uint8_t type, const f_array_lengths_t stack, const controller_cache_t cache) F_attribute_visibility_internal_d; + extern f_status_t controller_rule_process_begin(const controller_global_t global, const uint8_t options_force, const f_string_static_t alias_rule, const uint8_t action, const uint8_t options, const uint8_t type, const f_number_unsigneds_t stack, const controller_cache_t cache) F_attribute_visibility_internal_d; #endif // _di_controller_rule_process_begin_ /** @@ -674,7 +674,7 @@ extern "C" { * @see fl_conversion_dynamic_partial_to_signed_detect() */ #ifndef _di_controller_rule_action_read_rerun_number_ - extern f_status_t controller_rule_action_read_rerun_number(const controller_global_t global, const f_string_t name, controller_cache_t * const cache, f_array_length_t * const index, f_number_unsigned_t * const number) F_attribute_visibility_internal_d; + extern f_status_t controller_rule_action_read_rerun_number(const controller_global_t global, const f_string_t name, controller_cache_t * const cache, f_number_unsigned_t * const index, f_number_unsigned_t * const number) F_attribute_visibility_internal_d; #endif // _di_controller_rule_action_read_rerun_number_ /** diff --git a/level_3/controller/c/rule/private-rule_print.c b/level_3/controller/c/rule/private-rule_print.c index d44f817..0f5695c 100644 --- a/level_3/controller/c/rule/private-rule_print.c +++ b/level_3/controller/c/rule/private-rule_print.c @@ -362,7 +362,7 @@ extern "C" { #endif // _di_controller_rule_item_print_error_rule_not_loaded_ #ifndef _di_controller_rule_setting_read_print_error_ - void controller_rule_setting_read_print_error(const fl_print_t print, const f_string_t message, const f_array_length_t index, const f_array_length_t line_item, controller_thread_t * const thread, controller_cache_t * const cache) { + void controller_rule_setting_read_print_error(const fl_print_t print, const f_string_t message, const f_number_unsigned_t index, const f_number_unsigned_t line_item, controller_thread_t * const thread, controller_cache_t * const cache) { if (print.verbosity == f_console_verbosity_quiet_e) return; @@ -385,7 +385,7 @@ extern "C" { #endif // _di_controller_rule_setting_read_print_error_ #ifndef _di_controller_rule_setting_read_print_error_with_range_ - void controller_rule_setting_read_print_error_with_range(const fl_print_t print, const f_string_t before, const f_string_range_t range, const f_string_t after, const f_array_length_t index, const f_array_length_t line_item, controller_thread_t * const thread, controller_cache_t * const cache) { + void controller_rule_setting_read_print_error_with_range(const fl_print_t print, const f_string_t before, const f_string_range_t range, const f_string_t after, const f_number_unsigned_t index, const f_number_unsigned_t line_item, controller_thread_t * const thread, controller_cache_t * const cache) { if (print.verbosity == f_console_verbosity_quiet_e) return; @@ -456,7 +456,7 @@ extern "C" { #endif // _di_controller_rule_setting_read_print_value_ #ifndef _di_controller_rule_setting_read_print_values_ - void controller_rule_setting_read_print_values(const controller_global_t global, const f_string_static_t name, const f_array_length_t index, controller_cache_t * const cache) { + void controller_rule_setting_read_print_values(const controller_global_t global, const f_string_static_t name, const f_number_unsigned_t index, controller_cache_t * const cache) { if (global.main->error.verbosity != f_console_verbosity_debug_e) { if (!(global.main->error.verbosity == f_console_verbosity_verbose_e && (global.main->parameters.array[controller_parameter_simulate_e].result & f_console_result_found_e))) { @@ -468,7 +468,7 @@ extern "C" { fl_print_format("%rProcessing rule item action '%[%Q%]' setting value to", global.main->output.to, f_string_eol_s, global.main->context.set.title, name, global.main->context.set.title); - for (f_array_length_t j = 0; j < cache->content_actions.array[index].used; ++j) { + for (f_number_unsigned_t j = 0; j < cache->content_actions.array[index].used; ++j) { fl_print_format(" '%[%/Q%]'", global.main->output.to, global.main->context.set.important, cache->buffer_item, cache->content_actions.array[index].array[j], global.main->context.set.important); diff --git a/level_3/controller/c/rule/private-rule_print.h b/level_3/controller/c/rule/private-rule_print.h index 943543c..16694b9 100644 --- a/level_3/controller/c/rule/private-rule_print.h +++ b/level_3/controller/c/rule/private-rule_print.h @@ -182,7 +182,7 @@ extern "C" { * @see controller_rule_setting_read() */ #ifndef _di_controller_rule_setting_read_print_error_ - extern void controller_rule_setting_read_print_error(const fl_print_t print, const f_string_t message, const f_array_length_t index, const f_array_length_t line_item, controller_thread_t * const thread, controller_cache_t * const cache) F_attribute_visibility_internal_d; + extern void controller_rule_setting_read_print_error(const fl_print_t print, const f_string_t message, const f_number_unsigned_t index, const f_number_unsigned_t line_item, controller_thread_t * const thread, controller_cache_t * const cache) F_attribute_visibility_internal_d; #endif // _di_controller_rule_setting_read_print_error_ /** @@ -211,7 +211,7 @@ extern "C" { * @see controller_rule_setting_read() */ #ifndef _di_controller_rule_setting_read_print_error_with_range_ - extern void controller_rule_setting_read_print_error_with_range(const fl_print_t print, const f_string_t before, const f_string_range_t range, const f_string_t after, const f_array_length_t index, const f_array_length_t line_item, controller_thread_t * const thread, controller_cache_t * const cache) F_attribute_visibility_internal_d; + extern void controller_rule_setting_read_print_error_with_range(const fl_print_t print, const f_string_t before, const f_string_range_t range, const f_string_t after, const f_number_unsigned_t index, const f_number_unsigned_t line_item, controller_thread_t * const thread, controller_cache_t * const cache) F_attribute_visibility_internal_d; #endif // _di_controller_rule_setting_read_print_error_with_range_ /** @@ -262,7 +262,7 @@ extern "C" { * A structure for containing and caching relevant data. */ #ifndef _di_controller_rule_setting_read_print_values_ - extern void controller_rule_setting_read_print_values(const controller_global_t global, const f_string_static_t name, const f_array_length_t index, controller_cache_t * const cache) F_attribute_visibility_internal_d; + extern void controller_rule_setting_read_print_values(const controller_global_t global, const f_string_static_t name, const f_number_unsigned_t index, controller_cache_t * const cache) F_attribute_visibility_internal_d; #endif // _di_controller_rule_setting_read_print_values_ #ifdef __cplusplus diff --git a/level_3/controller/c/thread/private-thread.c b/level_3/controller/c/thread/private-thread.c index 7dfd8cc..5a0ffd3 100644 --- a/level_3/controller/c/thread/private-thread.c +++ b/level_3/controller/c/thread/private-thread.c @@ -38,7 +38,7 @@ extern "C" { if (f_thread_lock_write_try(&global->thread->lock.process) == F_none) { controller_process_t *process = 0; - f_array_length_t i = 0; + f_number_unsigned_t i = 0; for (; i < global->thread->processs.size && global->thread->enabled == controller_thread_enabled_e; ++i) { @@ -68,7 +68,7 @@ extern "C" { // If process has a PID file, then it is running in the background, only cleanup if the PID file no longer exists. if (process->path_pids.used) { - f_array_length_t j = 0; + f_number_unsigned_t j = 0; for (; j < process->path_pids.used; ++j) { @@ -119,7 +119,7 @@ extern "C" { // Deallocate dynamic portions of the structure that are only ever needed while the process is running. controller_cache_delete_simple(&process->cache); - f_array_lengths_resize(0, &process->stack); + f_number_unsigneds_resize(0, &process->stack); // Shrink the childs array. if (process->childs.used) { diff --git a/level_3/controller/c/thread/private-thread_process.c b/level_3/controller/c/thread/private-thread_process.c index 9925b44..039e189 100644 --- a/level_3/controller/c/thread/private-thread_process.c +++ b/level_3/controller/c/thread/private-thread_process.c @@ -60,8 +60,8 @@ extern "C" { controller_process_t *process = 0; f_status_t status = F_none; - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; pid_t pid = 0; if (is_normal) { diff --git a/level_3/fake/c/main/build.c b/level_3/fake/c/main/build.c index 33920d5..7868f29 100644 --- a/level_3/fake/c/main/build.c +++ b/level_3/fake/c/main/build.c @@ -121,7 +121,7 @@ extern "C" { &main->setting.defines, }; - f_array_length_t i = 0; + f_number_unsigned_t i = 0; for (uint8_t s = 0; s < 12; ++s) { @@ -140,7 +140,7 @@ extern "C" { #endif // _di_fake_build_arguments_standard_add_ #ifndef _di_fake_build_copy_ - void fake_build_copy(fake_data_t * const data, const f_mode_t mode, const f_string_static_t label, const f_string_static_t source, const f_string_static_t destination, const f_string_statics_t files, const f_string_static_t file_stage, const f_array_length_t perserve_offset) { + void fake_build_copy(fake_data_t * const data, const f_mode_t mode, const f_string_static_t label, const f_string_static_t source, const f_string_static_t destination, const f_string_statics_t files, const f_string_static_t file_stage, const f_number_unsigned_t perserve_offset) { if (!data || !data->main) return; if (data->main->setting.state.status == F_child) return; @@ -180,7 +180,7 @@ extern "C" { return; } - for (f_array_length_t i = 0; i < files.used; ++i) { + for (f_number_unsigned_t i = 0; i < files.used; ++i) { if (fake_signal_check(main)) break; if (!files.array[i].used) continue; @@ -403,7 +403,7 @@ extern "C" { f_string_dynamic_t defines = f_string_dynamic_t_initialize; if (main->setting.defines.used) { - for (f_array_length_t i = 0; i < main->setting.defines.used; ++i) { + for (f_number_unsigned_t i = 0; i < main->setting.defines.used; ++i) { main->setting.state.status = f_string_dynamic_mash(f_string_space_s, main->setting.defines.array[i], &defines); if (F_status_is_error(main->setting.state.status)) break; @@ -533,7 +533,7 @@ extern "C" { return; } - for (f_array_length_t i = name->used; i > 0; --i) { + for (f_number_unsigned_t i = name->used; i > 0; --i) { if (name->string[i] == f_path_extension_separator_s.string[0]) { name->used = i; @@ -553,8 +553,8 @@ extern "C" { fake_main_t * const main = data->main; - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; f_string_static_t source = f_string_static_t_initialize; @@ -758,8 +758,8 @@ extern "C" { fake_main_t * const main = data->main; - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; const f_string_statics_t *sources[2] = { generic, diff --git a/level_3/fake/c/main/build.h b/level_3/fake/c/main/build.h index c468596..b6f9776 100644 --- a/level_3/fake/c/main/build.h +++ b/level_3/fake/c/main/build.h @@ -104,7 +104,7 @@ extern "C" { * @see fll_program_print_signal_received() */ #ifndef _di_fake_build_copy_ - extern void fake_build_copy(fake_data_t * const data, const f_mode_t mode, const f_string_static_t label, const f_string_static_t source, const f_string_static_t destination, const f_string_statics_t files, const f_string_static_t file_stage, const f_array_length_t perserve_offset); + extern void fake_build_copy(fake_data_t * const data, const f_mode_t mode, const f_string_static_t label, const f_string_static_t source, const f_string_static_t destination, const f_string_statics_t files, const f_string_static_t file_stage, const f_number_unsigned_t perserve_offset); #endif // _di_fake_build_copy_ /** diff --git a/level_3/fake/c/main/build/library.c b/level_3/fake/c/main/build/library.c index 90adaea..860dbc5 100644 --- a/level_3/fake/c/main/build/library.c +++ b/level_3/fake/c/main/build/library.c @@ -53,7 +53,7 @@ extern "C" { f_string_static_t parameter_file_name_micro = f_string_static_t_initialize; f_string_static_t parameter_file_name_nano = f_string_static_t_initialize; - f_array_length_t strings_length = 1; + f_number_unsigned_t strings_length = 1; parameter_file_name.used = fake_build_parameter_library_name_prefix_s.used + data_build->setting.build_name.used + fake_build_parameter_library_name_suffix_shared_s.used; @@ -371,7 +371,7 @@ extern "C" { fake_string_dynamic_reset(&main->cache_2); fake_string_dynamics_reset(&main->cache_arguments); - f_array_length_t i = 0; + f_number_unsigned_t i = 0; for (; i < data_build->setting.build_indexer_arguments.used; ++i) { @@ -416,7 +416,7 @@ extern "C" { } if (F_status_is_error_not(main->setting.state.status)) { - f_array_length_t j = 0; + f_number_unsigned_t j = 0; const f_string_dynamics_t *sources[2] = { &data_build->setting.build_sources_library, diff --git a/level_3/fake/c/main/build/load.c b/level_3/fake/c/main/build/load.c index 46ff6c1..25fdd07 100644 --- a/level_3/fake/c/main/build/load.c +++ b/level_3/fake/c/main/build/load.c @@ -13,7 +13,7 @@ extern "C" { fake_main_t * const main = data->main; // Reset the environment. - for (f_array_length_t i = 0; i < environment->used; ++i) { + for (f_number_unsigned_t i = 0; i < environment->used; ++i) { environment->array[i].name.used = 0; environment->array[i].value.used = 0; @@ -86,7 +86,7 @@ extern "C" { modes_custom.array = modes_custom_array; if (build_arguments) { - f_array_length_t i = 0; + f_number_unsigned_t i = 0; if (build_arguments->used > 1) { for (; i < modes_custom.used; ++i) { @@ -560,8 +560,8 @@ extern "C" { bool found = F_false; - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; for (; i < modes->used; ++i) { @@ -1096,7 +1096,7 @@ extern "C" { 5, // version_target }; - for (f_array_length_t i = 0; i < 40; ++i) { + for (f_number_unsigned_t i = 0; i < 40; ++i) { // Assign the default for literal and path types. if (!settings_single_matches[i] && settings_single_destination[i]) { diff --git a/level_3/fake/c/main/build/objects.c b/level_3/fake/c/main/build/objects.c index ddc8175..432e924 100644 --- a/level_3/fake/c/main/build/objects.c +++ b/level_3/fake/c/main/build/objects.c @@ -33,8 +33,8 @@ extern "C" { &data_build->setting.build_sources_library_static, }; - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; uint8_t k = 0; for (i = 0; i < 2; ++i) { diff --git a/level_3/fake/c/main/build/skeleton.c b/level_3/fake/c/main/build/skeleton.c index 948db67..896be52 100644 --- a/level_3/fake/c/main/build/skeleton.c +++ b/level_3/fake/c/main/build/skeleton.c @@ -54,7 +54,7 @@ extern "C" { fake_build_print_message_skeleton_build_base(&main->program.message); bool created = F_false; - f_array_length_t j = 0; + f_number_unsigned_t j = 0; for (uint8_t i = 0; i < 19; ++i) { diff --git a/level_3/fake/c/main/common.c b/level_3/fake/c/main/common.c index 5be6e32..e793313 100644 --- a/level_3/fake/c/main/common.c +++ b/level_3/fake/c/main/common.c @@ -114,8 +114,8 @@ extern "C" { return; } - f_array_length_t j = 0; - f_array_length_t index = 0; + f_number_unsigned_t j = 0; + f_number_unsigned_t index = 0; { uint8_t i = 0; @@ -161,7 +161,7 @@ extern "C" { } { - static const f_array_length_t parameters[] = { + static const f_number_unsigned_t parameters[] = { fake_parameter_build_e, fake_parameter_data_e, fake_parameter_documents_e, @@ -363,7 +363,7 @@ extern "C" { } { - static const f_array_length_t parameters[] = { + static const f_number_unsigned_t parameters[] = { fake_parameter_define_e, fake_parameter_mode_e, }; @@ -378,7 +378,7 @@ extern "C" { &main->setting.modes, }; - f_array_length_t width_max = 0; + f_number_unsigned_t width_max = 0; for (i = 0; i < 2; ++i) { @@ -574,7 +574,7 @@ extern "C" { } if (iki_data->delimits.used > fake_max_over_array_d) { - f_array_lengths_resize(fake_allocation_large_d, &iki_data->delimits); + f_number_unsigneds_resize(fake_allocation_large_d, &iki_data->delimits); } if (iki_data->variable.used > fake_max_over_array_d) { diff --git a/level_3/fake/c/main/common.h b/level_3/fake/c/main/common.h index 1f3f4ee..9999760 100644 --- a/level_3/fake/c/main/common.h +++ b/level_3/fake/c/main/common.h @@ -116,7 +116,7 @@ extern "C" { * @param iki_data * The iki data to shrink. * - * @see f_array_lengths_resize() + * @see f_number_unsigneds_resize() * @see f_string_ranges_resize() */ #ifndef _di_fake_iki_data_reset_ diff --git a/level_3/fake/c/main/common/print.c b/level_3/fake/c/main/common/print.c index 87ab591..2acad15 100644 --- a/level_3/fake/c/main/common/print.c +++ b/level_3/fake/c/main/common/print.c @@ -8,7 +8,7 @@ extern "C" { const f_string_t fake_f_a[] = { "f_account_group_id_by_name", "f_account_id_by_name", - "f_array_lengths_increase", + "f_number_unsigneds_increase", "f_compare_dynamic_partial", "f_console_parameter_prioritize_right", "f_console_parameter_process", diff --git a/level_3/fake/c/main/common/print.h b/level_3/fake/c/main/common/print.h index 20bd196..1503352 100644 --- a/level_3/fake/c/main/common/print.h +++ b/level_3/fake/c/main/common/print.h @@ -41,7 +41,7 @@ extern "C" { enum { fake_f_f_account_group_id_by_name_e, fake_f_f_account_id_by_name_e, - fake_f_f_array_lengths_increase_e, + fake_f_f_number_unsigneds_increase_e, fake_f_f_compare_dynamic_partial_e, fake_f_f_console_parameter_prioritize_right_e, fake_f_f_console_parameter_process_e, diff --git a/level_3/fake/c/main/common/type.h b/level_3/fake/c/main/common/type.h index 99e74dd..1982fb9 100644 --- a/level_3/fake/c/main/common/type.h +++ b/level_3/fake/c/main/common/type.h @@ -806,7 +806,7 @@ extern "C" { f_fss_nameds_t fakefile; - f_array_length_t id_main; + f_number_unsigned_t id_main; fake_main_t *main; fake_data_t *data; diff --git a/level_3/fake/c/main/fake.c b/level_3/fake/c/main/fake.c index 793eac6..9374ace 100644 --- a/level_3/fake/c/main/fake.c +++ b/level_3/fake/c/main/fake.c @@ -85,7 +85,7 @@ extern "C" { } if (F_status_is_error_not(main->setting.state.status)) { - f_array_length_t i = 0; + f_number_unsigned_t i = 0; // Pre-process and perform validation when "clean" is before a "build" or "make" command as a safety check. { @@ -227,7 +227,7 @@ extern "C" { f_print_dynamic(program, main->program.message.to); - for (f_array_length_t i = 0; i < main->cache_arguments.used; ++i) { + for (f_number_unsigned_t i = 0; i < main->cache_arguments.used; ++i) { if (!main->cache_arguments.array[i].used) continue; @@ -454,7 +454,7 @@ extern "C" { ]; if (parameter->result & f_console_result_value_e) { - const f_array_length_t index = parameter->values.array[parameter->location]; + const f_number_unsigned_t index = parameter->values.array[parameter->location]; if (f_path_is_absolute(main->program.parameters.arguments.array[index]) == F_true || f_path_is_relative_current(main->program.parameters.arguments.array[index]) == F_true) { requireds[1] = F_none; // fake_long_data_s diff --git a/level_3/fake/c/main/make/load_fakefile.c b/level_3/fake/c/main/make/load_fakefile.c index e1d14f9..319a162 100644 --- a/level_3/fake/c/main/make/load_fakefile.c +++ b/level_3/fake/c/main/make/load_fakefile.c @@ -64,7 +64,7 @@ extern "C" { if (F_status_is_error(data_make->main->setting.state.status)) { f_string_ranges_resize(0, &list_objects); f_string_rangess_resize(0, &list_contents); - f_array_lengths_resize(0, &delimits); + f_number_unsigneds_resize(0, &delimits); return; } @@ -86,7 +86,7 @@ extern "C" { f_fss_set_resize(0, &settings); f_string_ranges_resize(0, &list_objects); f_string_rangess_resize(0, &list_contents); - f_array_lengths_resize(0, &delimits); + f_number_unsigneds_resize(0, &delimits); return; } @@ -94,7 +94,7 @@ extern "C" { { f_string_range_t content_range = f_string_range_t_initialize; - for (f_array_length_t i = 0; i < list_objects.used; ++i) { + for (f_number_unsigned_t i = 0; i < list_objects.used; ++i) { if (fake_signal_check(data_make->main)) break; @@ -172,7 +172,7 @@ extern "C" { f_string_ranges_resize(0, &list_objects); f_string_rangess_resize(0, &list_contents); - f_array_lengths_resize(0, &delimits); + f_number_unsigneds_resize(0, &delimits); if (F_status_is_error(data_make->main->setting.state.status)) { f_fss_set_resize(0, &settings); @@ -220,7 +220,7 @@ extern "C" { data_make->setting_make.fail = fake_make_operation_fail_exit_e; if (settings.objects.used) { - for (f_array_length_t i = 0; i < settings.objects.used; ++i) { + for (f_number_unsigned_t i = 0; i < settings.objects.used; ++i) { if (f_compare_dynamic_partial_string(fake_make_setting_load_build_s.string, data_make->main->buffer, fake_make_setting_load_build_s.used, settings.objects.array[i]) == F_equal_to) { fake_make_load_fakefile_setting_build(data_make, &settings.objects.array[i], &settings.contents.array[i]); @@ -376,8 +376,8 @@ extern "C" { if (define.used) { f_string_dynamic_t combined = f_string_dynamic_t_initialize; - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; for (; i < define.used; ++i) { @@ -432,8 +432,8 @@ extern "C" { f_string_dynamic_t name_define = f_string_dynamic_t_initialize; - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; data_make->setting_build.flag |= data_build_setting_flag_has_environment_e; @@ -570,7 +570,7 @@ extern "C" { // Each "return" define replaces the previous "return" define. data_make->setting_make.parameter.array[0].value.array[0].used = 0; - for (f_array_length_t i = 1; i < content->used; ++i) { + for (f_number_unsigned_t i = 1; i < content->used; ++i) { data_make->main->setting.state.status = f_string_dynamic_partial_append_nulless(data_make->main->buffer, content->array[i], &data_make->setting_make.parameter.array[0].value.array[0]); diff --git a/level_3/fake/c/main/make/load_parameters.c b/level_3/fake/c/main/make/load_parameters.c index e4777c7..ef63cd5 100644 --- a/level_3/fake/c/main/make/load_parameters.c +++ b/level_3/fake/c/main/make/load_parameters.c @@ -183,7 +183,7 @@ extern "C" { &data_make->parameter_value.mode, }; - f_array_length_t j = 0; + f_number_unsigned_t j = 0; for (uint8_t i = 0; i < 2; ++i) { diff --git a/level_3/fake/c/main/make/operate.c b/level_3/fake/c/main/make/operate.c index eb160a8..ea9b77f 100644 --- a/level_3/fake/c/main/make/operate.c +++ b/level_3/fake/c/main/make/operate.c @@ -14,7 +14,7 @@ extern "C" { fake_make_print_message_now_making(&main->program.message, main->setting.fakefile); - f_array_lengths_t section_stack = f_array_lengths_t_initialize; + f_number_unsigneds_t section_stack = f_number_unsigneds_t_initialize; fake_make_data_t data_make = fake_make_data_t_initialize; data_make.data = data; @@ -98,10 +98,10 @@ extern "C" { data_make.error.custom = main; if (main->program.parameters.remaining.used) { - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; f_string_range_t range = f_string_range_t_initialize; - f_array_length_t index = 0; + f_number_unsigned_t index = 0; main->setting.state.status = F_none; @@ -207,7 +207,7 @@ extern "C" { f_file_stream_flush(data_make.path.top); f_file_stream_close(&data_make.path.top); - f_array_lengths_resize(0, §ion_stack); + f_number_unsigneds_resize(0, §ion_stack); fake_make_data_delete(&data_make); if (F_status_is_error_not(main->setting.state.status)) { @@ -252,12 +252,12 @@ extern "C" { bool unmatched = F_true; bool separate = F_false; - f_array_length_t i = 0; - f_array_length_t j = 0; - f_array_length_t k = 0; - f_array_length_t l = 0; - f_array_length_t m = 0; - f_array_length_t n = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; + f_number_unsigned_t l = 0; + f_number_unsigned_t m = 0; + f_number_unsigned_t n = 0; const f_string_static_t reserved_name[] = { fake_make_parameter_variable_build_s, @@ -1082,7 +1082,7 @@ extern "C" { 0, // modes_default }; - f_array_length_t j = 0; + f_number_unsigned_t j = 0; for (i = 0; i < 36; ++i) { @@ -1167,7 +1167,7 @@ extern "C" { main->program.context.set.warning, }; - for (f_array_length_t i = 0; i < 9; ++i) { + for (f_number_unsigned_t i = 0; i < 9; ++i) { if (f_compare_dynamic_partial_string(context_name[i].string, main->buffer, context_name[i].used, range_name) == F_equal_to) { context = context_value[i].before; @@ -1232,7 +1232,7 @@ extern "C" { #endif // _di_fake_make_operate_expand_environment_ #ifndef _di_fake_make_operate_section_ - int fake_make_operate_section(fake_make_data_t * const data_make, const f_array_length_t id_section, f_array_lengths_t * const section_stack) { + int fake_make_operate_section(fake_make_data_t * const data_make, const f_number_unsigned_t id_section, f_number_unsigneds_t * const section_stack) { if (!data_make || !data_make->main || !section_stack) return 0; if (F_status_is_error(data_make->main->setting.state.status) || data_make->main->setting.state.status == F_child) return data_make->main->program.child; @@ -1248,10 +1248,10 @@ extern "C" { } // Add the operation id to the operation stack. - main->setting.state.status = f_array_lengths_increase(main->setting.state.step_small, section_stack); + main->setting.state.status = f_number_unsigneds_increase(main->setting.state.step_small, section_stack); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&data_make->error, macro_fake_f(f_array_lengths_increase)); + fake_print_error(&data_make->error, macro_fake_f(f_number_unsigneds_increase)); return 0; } @@ -1346,8 +1346,8 @@ extern "C" { fake_state_process_t state_process = fake_state_process_t_initialize; int result; - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; for (i = 0; i < section->objects.used; ++i, main->setting.state.status = F_none) { diff --git a/level_3/fake/c/main/make/operate.h b/level_3/fake/c/main/make/operate.h index da9bd53..ba30739 100644 --- a/level_3/fake/c/main/make/operate.h +++ b/level_3/fake/c/main/make/operate.h @@ -206,7 +206,7 @@ extern "C" { * F_recurse (with error bit) is returned if unable to recurse to another operation section (usually max stack depth reached). * F_valid_not (with error bit) is returned if any part of the section is invalid, such as an invalid operation name. * - * Errors (with error bit) from: f_array_lengths_increase() + * Errors (with error bit) from: f_number_unsigneds_increase() * * Errors (with error bit) from: fake_make_operate_block_postprocess() * Errors (with error bit) from: fake_make_operate_block_prepare() @@ -222,7 +222,7 @@ extern "C" { * The return code of the execution process. * This generally is only needed when F_child is returned, where this holds the return status of the child process. * - * @see f_array_lengths_increase() + * @see f_number_unsigneds_increase() * @see fll_program_print_signal_received() * * @see fake_make_operate_block_postprocess() @@ -232,7 +232,7 @@ extern "C" { * @see fake_make_operate_validate() */ #ifndef _di_fake_make_operate_section_ - extern int fake_make_operate_section(fake_make_data_t * const data_make, const f_array_length_t id_section, f_array_lengths_t *section_stack); + extern int fake_make_operate_section(fake_make_data_t * const data_make, const f_number_unsigned_t id_section, f_number_unsigneds_t *section_stack); #endif // _di_fake_make_operate_section_ #ifdef __cplusplus diff --git a/level_3/fake/c/main/make/operate_process.c b/level_3/fake/c/main/make/operate_process.c index b43566b..9ae65b8 100644 --- a/level_3/fake/c/main/make/operate_process.c +++ b/level_3/fake/c/main/make/operate_process.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fake_make_operate_process_ - int fake_make_operate_process(fake_make_data_t * const data_make, const f_string_range_t section_name, fake_state_process_t * const state_process, f_array_lengths_t * const section_stack) { + int fake_make_operate_process(fake_make_data_t * const data_make, const f_string_range_t section_name, fake_state_process_t * const state_process, f_number_unsigneds_t * const section_stack) { if (!data_make || !data_make->main || !state_process || !section_stack) return 0; if (data_make->main->setting.state.status == F_child) return data_make->main->program.child; @@ -130,7 +130,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_increase_by(source.used, destination); if (F_status_is_error(main->setting.state.status)) return; - for (f_array_length_t i = 0; i < source.used; ++i) { + for (f_number_unsigned_t i = 0; i < source.used; ++i) { // NULL characters are from delimited characters and must be skipped. if (!source.string[i]) continue; @@ -299,7 +299,7 @@ extern "C" { } // Reset the environment. - for (f_array_length_t i = 0; i < data_make->environment.used; ++i) { + for (f_number_unsigned_t i = 0; i < data_make->environment.used; ++i) { data_make->environment.array[i].name.used = 0; data_make->environment.array[i].value.used = 0; diff --git a/level_3/fake/c/main/make/operate_process.h b/level_3/fake/c/main/make/operate_process.h index 73eec51..5efa19c 100644 --- a/level_3/fake/c/main/make/operate_process.h +++ b/level_3/fake/c/main/make/operate_process.h @@ -103,7 +103,7 @@ extern "C" { * @see fake_make_operate_process_type_write() */ #ifndef _di_fake_make_operate_process_ - extern int fake_make_operate_process(fake_make_data_t * const data_make, const f_string_range_t section_name, fake_state_process_t * const state_process, f_array_lengths_t * const section_stack); + extern int fake_make_operate_process(fake_make_data_t * const data_make, const f_string_range_t section_name, fake_state_process_t * const state_process, f_number_unsigneds_t * const section_stack); #endif // _di_fake_make_operate_process_ /** diff --git a/level_3/fake/c/main/make/operate_process_type.c b/level_3/fake/c/main/make/operate_process_type.c index c8cd0a9..f98831b 100644 --- a/level_3/fake/c/main/make/operate_process_type.c +++ b/level_3/fake/c/main/make/operate_process_type.c @@ -94,7 +94,7 @@ extern "C" { else if (state_process->condition == fake_make_operation_if_type_if_equal_e) { state_process->condition_result = fake_condition_result_true_e; - for (f_array_length_t i = 2; i < main->cache_arguments.used; ++i) { + for (f_number_unsigned_t i = 2; i < main->cache_arguments.used; ++i) { if (f_compare_dynamic(main->cache_arguments.array[1], main->cache_arguments.array[i]) == F_equal_to_not) { state_process->condition_result = fake_condition_result_false_e; @@ -106,8 +106,8 @@ extern "C" { else if (state_process->condition == fake_make_operation_if_type_if_equal_not_e) { state_process->condition_result = fake_condition_result_true_e; - f_array_length_t i = 1; - f_array_length_t j = 0; + f_number_unsigned_t i = 1; + f_number_unsigned_t j = 0; for (; i < main->cache_arguments.used; ++i) { @@ -209,7 +209,7 @@ extern "C" { fake_main_t * const main = data_make->main; - const f_array_length_t total = main->cache_arguments.used - 1; + const f_number_unsigned_t total = main->cache_arguments.used - 1; f_status_t failed = F_none; fake_local_t local = macro_fake_local_t_initialize_1(main, &main->cache_map, &failed); @@ -230,7 +230,7 @@ extern "C" { fake_string_dynamic_reset(&main->cache_recurse_do.path_cache); bool existing = F_true; - f_array_length_t i = 0; + f_number_unsigned_t i = 0; const f_string_t *function = 0; const f_string_static_t *operation = 0; uint8_t type = fll_error_file_type_path_e; @@ -379,7 +379,7 @@ extern "C" { main->setting.state.status = F_none; - for (f_array_length_t i = 0; i < main->cache_arguments.used; ++i) { + for (f_number_unsigned_t i = 0; i < main->cache_arguments.used; ++i) { memset(&file_stat, 0, sizeof(struct stat)); @@ -529,7 +529,7 @@ extern "C" { gid_t id = 0; bool dereference = F_true; - f_array_length_t i = 0; + f_number_unsigned_t i = 0; main->setting.state.status = F_none; @@ -587,7 +587,7 @@ extern "C" { // Multiple properties may pass and so if any of them fail, then they all fail. if (if_not) { - for (f_array_length_t i = 2; i < main->cache_arguments.used; ++i) { + for (f_number_unsigned_t i = 2; i < main->cache_arguments.used; ++i) { if (f_environment_exists(main->cache_arguments.array[i]) == F_true) { state_process->condition_result = fake_condition_result_false_e; @@ -597,7 +597,7 @@ extern "C" { } // for } else { - for (f_array_length_t i = 1; i < main->cache_arguments.used; ++i) { + for (f_number_unsigned_t i = 1; i < main->cache_arguments.used; ++i) { if (f_environment_exists(main->cache_arguments.array[i]) != F_true) { state_process->condition_result = fake_condition_result_false_e; @@ -616,7 +616,7 @@ extern "C" { fake_main_t * const main = data_make->main; - f_array_length_t i = if_not ? 2 : 1; + f_number_unsigned_t i = if_not ? 2 : 1; bool dereference = F_true; main->setting.state.status = F_none; @@ -688,7 +688,7 @@ extern "C" { // fifo = 0x8 (0000 1000) invalid = 0x80 (1000 0000) uint8_t type = 0; - f_array_length_t i = if_not ? 2 : 1; + f_number_unsigned_t i = if_not ? 2 : 1; bool dereference = F_true; main->setting.state.status = F_none; @@ -817,7 +817,7 @@ extern "C" { bool is_negative_left = F_false; bool is_negative_right = F_false; - f_array_length_t i = 1; + f_number_unsigned_t i = 1; main->setting.state.status = F_none; state_process->condition_result = fake_condition_result_true_e; @@ -959,7 +959,7 @@ extern "C" { fake_main_t * const main = data_make->main; uid_t id = 0; - f_array_length_t i = if_not ? 2 : 1; + f_number_unsigned_t i = if_not ? 2 : 1; bool dereference = F_true; main->setting.state.status = F_none; @@ -1064,7 +1064,7 @@ extern "C" { state_process->condition_result = fake_condition_result_true_e; - for (f_array_length_t i = if_not ? 4 : 3; i < main->cache_arguments.used; ++i, mode_file = 0) { + for (f_number_unsigned_t i = if_not ? 4 : 3; i < main->cache_arguments.used; ++i, mode_file = 0) { main->setting.state.status = f_file_mode_read(main->cache_arguments.array[i], F_true, &mode_file); @@ -1124,7 +1124,7 @@ extern "C" { fake_main_t * const main = data_make->main; uid_t id = 0; - f_array_length_t i = if_not ? 2 : 1; + f_number_unsigned_t i = if_not ? 2 : 1; bool dereference = F_true; main->setting.state.status = F_none; @@ -1261,8 +1261,8 @@ extern "C" { data_make->parameter_value.work.used, }; - f_array_length_t i = if_not ? 2 : 1; - f_array_length_t j = 0; + f_number_unsigned_t i = if_not ? 2 : 1; + f_number_unsigned_t j = 0; // 0 = unknown, 1 = fail, 2 = pass. uint8_t result = 0; @@ -1433,7 +1433,7 @@ extern "C" { mode_t mode = 0; mode_t mode_file = 0; - for (f_array_length_t i = 1; i < main->cache_arguments.used; ++i, mode = 0) { + for (f_number_unsigned_t i = 1; i < main->cache_arguments.used; ++i, mode = 0) { main->setting.state.status = f_file_mode_read(main->cache_arguments.array[i], F_true, &mode_file); @@ -1484,7 +1484,7 @@ extern "C" { fake_main_t * const main = data_make->main; - const f_array_length_t total = main->cache_arguments.used - 1; + const f_number_unsigned_t total = main->cache_arguments.used - 1; bool existing = F_true; @@ -1509,7 +1509,7 @@ extern "C" { const f_string_static_t *operation = 0; f_string_static_t *file = 0; - for (f_array_length_t i = 0; i < total; ++i) { + for (f_number_unsigned_t i = 0; i < total; ++i) { fake_string_dynamic_reset(&main->cache_argument); @@ -1570,13 +1570,13 @@ extern "C" { #endif // _di_fake_make_operate_process_type_move_ #ifndef _di_fake_make_operate_process_type_operate_ - int fake_make_operate_process_type_operate(fake_make_data_t * const data_make, f_array_lengths_t * const section_stack) { + int fake_make_operate_process_type_operate(fake_make_data_t * const data_make, f_number_unsigneds_t * const section_stack) { if (!data_make || !data_make->main) return 0; fake_main_t * const main = data_make->main; - f_array_length_t id_section = 0; + f_number_unsigned_t id_section = 0; for (; id_section < data_make->fakefile.used; ++id_section) { @@ -1610,7 +1610,7 @@ extern "C" { uid_t id = 0; bool dereference = F_true; - f_array_length_t i = 0; + f_number_unsigned_t i = 0; if (f_compare_dynamic(fake_make_operation_argument_no_dereference_s, main->cache_arguments.array[i]) == F_equal_to) { ++i; @@ -1667,7 +1667,7 @@ extern "C" { fake_main_t * const main = data_make->main; bool found = F_false; - f_array_length_t i = 0; + f_number_unsigned_t i = 0; for (; i < data_make->setting_make.parameter.used; ++i) { @@ -1679,7 +1679,7 @@ extern "C" { } // for if (found) { - for (f_array_length_t j = 0; j < data_make->setting_make.parameter.array[i].value.size; ++j) { + for (f_number_unsigned_t j = 0; j < data_make->setting_make.parameter.array[i].value.size; ++j) { main->setting.state.status = f_string_dynamic_resize(0, &data_make->setting_make.parameter.array[i].value.array[j]); @@ -1739,7 +1739,7 @@ extern "C" { return; } - for (f_array_length_t j = 0; j < data_make->setting_make.parameter.array[i].value.size; ++j) { + for (f_number_unsigned_t j = 0; j < data_make->setting_make.parameter.array[i].value.size; ++j) { main->setting.state.status = f_string_dynamic_append_nulless(main->cache_arguments.array[j + 1], &data_make->setting_make.parameter.array[i].value.array[j]); @@ -1811,11 +1811,11 @@ extern "C" { fake_string_dynamic_reset(&main->cache_1); { - f_array_length_t i = 0; + f_number_unsigned_t i = 0; // Pre-allocate the cache to reduce allocations. { - f_array_length_t total = main->cache_arguments.used; + f_number_unsigned_t total = main->cache_arguments.used; for (; i < main->cache_arguments.used; ++i) { total += main->cache_arguments.array[i].used; @@ -1984,7 +1984,7 @@ extern "C" { fake_make_print_verbose_operate_set_path(&main->program.message, f_string_empty_s); // Clear stack, except for the project root. - for (f_array_length_t i = 1; i < data_make->path.stack.used; ++i) { + for (f_number_unsigned_t i = 1; i < data_make->path.stack.used; ++i) { f_string_dynamic_resize(0, &data_make->path.stack.array[i]); } // for @@ -2005,7 +2005,7 @@ extern "C" { macro_f_mode_t_set_default_umask(mode, main->program.umask); - for (f_array_length_t i = 1; i < main->cache_arguments.used; ++i) { + for (f_number_unsigned_t i = 1; i < main->cache_arguments.used; ++i) { if (f_compare_dynamic(fake_make_operation_argument_file_s, main->cache_arguments.array[0]) == F_equal_to) { main->setting.state.status = f_file_touch(main->cache_arguments.array[i], mode.regular, F_false); @@ -2101,7 +2101,7 @@ extern "C" { } if (F_status_is_error_not(main->setting.state.status)) { - for (f_array_length_t i = 1; i < main->cache_arguments.used; ++i) { + for (f_number_unsigned_t i = 1; i < main->cache_arguments.used; ++i) { fake_string_dynamic_reset(&main->cache_1); diff --git a/level_3/fake/c/main/make/operate_process_type.h b/level_3/fake/c/main/make/operate_process_type.h index a3f90bf..df92d6f 100644 --- a/level_3/fake/c/main/make/operate_process_type.h +++ b/level_3/fake/c/main/make/operate_process_type.h @@ -583,7 +583,7 @@ extern "C" { * @see fake_make_operate_section() */ #ifndef _di_fake_make_operate_process_type_operate_ - extern int fake_make_operate_process_type_operate(fake_make_data_t * const data_make, f_array_lengths_t * const section_stack); + extern int fake_make_operate_process_type_operate(fake_make_data_t * const data_make, f_number_unsigneds_t * const section_stack); #endif // _di_fake_make_operate_process_type_operate_ /** diff --git a/level_3/fake/c/main/make/operate_validate.c b/level_3/fake/c/main/make/operate_validate.c index ea36cc7..0b36c94 100644 --- a/level_3/fake/c/main/make/operate_validate.c +++ b/level_3/fake/c/main/make/operate_validate.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fake_make_operate_validate_ - void fake_make_operate_validate(fake_make_data_t * const data_make, const f_string_range_t section_name, fake_state_process_t * const state_process, f_array_lengths_t * const section_stack) { + void fake_make_operate_validate(fake_make_data_t * const data_make, const f_string_range_t section_name, fake_state_process_t * const state_process, f_number_unsigneds_t * const section_stack) { if (!data_make || !data_make->main) return; if (F_status_is_error(data_make->main->setting.state.status)) return; @@ -98,7 +98,7 @@ extern "C" { if (!name.used) return F_data_not; if (!isalpha(name.string[0]) && name.string[0] != '_') return F_false; - for (f_array_length_t i = 1; i < name.used; ++i) { + for (f_number_unsigned_t i = 1; i < name.used; ++i) { if (!isalnum(name.string[i]) && name.string[i] != '_') return F_false; } // for diff --git a/level_3/fake/c/main/make/operate_validate.h b/level_3/fake/c/main/make/operate_validate.h index cb97446..eb587f2 100644 --- a/level_3/fake/c/main/make/operate_validate.h +++ b/level_3/fake/c/main/make/operate_validate.h @@ -86,7 +86,7 @@ extern "C" { * @see fake_make_operate_validate_type_write() */ #ifndef _di_fake_make_operate_validate_ - extern void fake_make_operate_validate(fake_make_data_t * const data_make, const f_string_range_t section_name, fake_state_process_t * const state_process, f_array_lengths_t * const section_stack); + extern void fake_make_operate_validate(fake_make_data_t * const data_make, const f_string_range_t section_name, fake_state_process_t * const state_process, f_number_unsigneds_t * const section_stack); #endif // _di_fake_make_operate_validate_ /** diff --git a/level_3/fake/c/main/make/operate_validate_type.c b/level_3/fake/c/main/make/operate_validate_type.c index fbc0a16..5e05f85 100644 --- a/level_3/fake/c/main/make/operate_validate_type.c +++ b/level_3/fake/c/main/make/operate_validate_type.c @@ -113,7 +113,7 @@ extern "C" { if (main->cache_arguments.used > 1) { f_status_t status = F_none; - for (f_array_length_t i = 0; i < main->cache_arguments.used; ++i) { + for (f_number_unsigned_t i = 0; i < main->cache_arguments.used; ++i) { fake_make_assure_inside_project(data_make, main->cache_arguments.array[i]); @@ -124,7 +124,7 @@ extern "C" { } } // for - for (f_array_length_t i = 0; i < main->cache_arguments.used - 1; ++i) { + for (f_number_unsigned_t i = 0; i < main->cache_arguments.used - 1; ++i) { if (f_file_exists(main->cache_arguments.array[i], F_true) != F_true) { fake_print_error_file_simple(&main->program.error, macro_fake_f(f_file_is), main->cache_arguments.array[i], f_file_operation_find_s, fll_error_file_type_file_e); @@ -299,9 +299,9 @@ extern "C" { fake_make_operation_if_type_if_not_parameter_e, }; - f_array_length_t i = 0; - f_array_length_t j = 0; - f_array_length_t k = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; f_string_static_t if_and_or; bool dereference = F_true; @@ -671,7 +671,7 @@ extern "C" { if (main->cache_arguments.used > 1) { f_status_t status = F_none; - f_array_length_t i = 0; + f_number_unsigned_t i = 0; for (; i < main->cache_arguments.used; ++i) { @@ -777,7 +777,7 @@ extern "C" { if (main->cache_arguments.used) { f_status_t status = F_none; - for (f_array_length_t i = 0; i < main->cache_arguments.used; ++i) { + for (f_number_unsigned_t i = 0; i < main->cache_arguments.used; ++i) { fake_make_assure_inside_project(data_make, main->cache_arguments.array[i]); @@ -1101,7 +1101,7 @@ extern "C" { { f_status_t status = F_none; - for (f_array_length_t i = 0; i < main->cache_arguments.used; ++i) { + for (f_number_unsigned_t i = 0; i < main->cache_arguments.used; ++i) { fake_make_assure_inside_project(data_make, main->cache_arguments.array[i]); @@ -1113,7 +1113,7 @@ extern "C" { } // for if (F_status_is_error_not(status)) { - for (f_array_length_t i = 0; i < main->cache_arguments.used - 1; ++i) { + for (f_number_unsigned_t i = 0; i < main->cache_arguments.used - 1; ++i) { if (f_file_exists(main->cache_arguments.array[i], F_true) != F_true) { fake_print_error_file_simple(&main->program.error, macro_fake_f(f_file_is), main->cache_arguments.array[i], f_file_operation_find_s, fll_error_file_type_file_e); @@ -1178,7 +1178,7 @@ extern "C" { #endif // _di_fake_make_operate_validate_type_move_ #ifndef _di_fake_make_operate_validate_type_operate_ - void fake_make_operate_validate_type_operate(fake_make_data_t * const data_make, f_array_lengths_t * const section_stack) { + void fake_make_operate_validate_type_operate(fake_make_data_t * const data_make, f_number_unsigneds_t * const section_stack) { if (!data_make || !data_make->main || !section_stack) return; @@ -1193,7 +1193,7 @@ extern "C" { } if (main->cache_arguments.used == 1) { - f_array_length_t id_section = 0; + f_number_unsigned_t id_section = 0; for (; id_section < data_make->fakefile.used; ++id_section) { @@ -1210,7 +1210,7 @@ extern "C" { return; } - for (f_array_length_t i = 0; i < section_stack->used; ++i) { + for (f_number_unsigned_t i = 0; i < section_stack->used; ++i) { if (section_stack->array[i] == id_section) { fake_make_print_error_operation_recursion(&main->program.error, main->buffer, data_make->fakefile.array[id_section].name); @@ -1277,7 +1277,7 @@ extern "C" { f_status_t status = F_none; - for (f_array_length_t i = 0; i < 33; ++i) { + for (f_number_unsigned_t i = 0; i < 33; ++i) { if (f_compare_dynamic(reserved_name[i], main->cache_arguments.array[0]) == F_equal_to) { fake_make_print_error_reserved_parameter_name(&main->program.error, reserved_name[i]); @@ -1304,7 +1304,7 @@ extern "C" { fake_main_t * const main = data_make->main; if (main->cache_arguments.used) { - f_array_length_t i = 1; + f_number_unsigned_t i = 1; if (state_process->operation == fake_make_operation_type_group_e || state_process->operation == fake_make_operation_type_groups_e || state_process->operation == fake_make_operation_type_owner_e || state_process->operation == fake_make_operation_type_owners_e) { if (f_compare_dynamic(fake_make_operation_argument_no_dereference_s, main->cache_arguments.array[i]) == F_equal_to) { @@ -1467,7 +1467,7 @@ extern "C" { f_status_t status = F_none; - for (f_array_length_t i = 1; i < main->cache_arguments.used; ++i) { + for (f_number_unsigned_t i = 1; i < main->cache_arguments.used; ++i) { fake_make_assure_inside_project(data_make, main->cache_arguments.array[i]); diff --git a/level_3/fake/c/main/make/operate_validate_type.h b/level_3/fake/c/main/make/operate_validate_type.h index ff4948d..1dbb311 100644 --- a/level_3/fake/c/main/make/operate_validate_type.h +++ b/level_3/fake/c/main/make/operate_validate_type.h @@ -286,7 +286,7 @@ extern "C" { * F_failure (with error bit) on any error. */ #ifndef _di_fake_make_operate_validate_type_operate_ - extern void fake_make_operate_validate_type_operate(fake_make_data_t * const data_make, f_array_lengths_t * const section_stack); + extern void fake_make_operate_validate_type_operate(fake_make_data_t * const data_make, f_number_unsigneds_t * const section_stack); #endif // _di_fake_make_operate_validate_type_operate_ /** diff --git a/level_3/fake/c/main/make/print/message.c b/level_3/fake/c/main/make/print/message.c index 71f72f9..518cde9 100644 --- a/level_3/fake/c/main/make/print/message.c +++ b/level_3/fake/c/main/make/print/message.c @@ -20,7 +20,7 @@ extern "C" { if (main->setting.modes.used) { fl_print_format("%[' with modes '%]", print->to, print->set->important, print->set->important); - for (f_array_length_t i = 0; i < main->setting.modes.used; ) { + for (f_number_unsigned_t i = 0; i < main->setting.modes.used; ) { fl_print_format("%[%Q%]", print->to, print->set->notable, main->setting.modes.array[i], print->set->notable); diff --git a/level_3/fake/c/main/make/print/verbose.c b/level_3/fake/c/main/make/print/verbose.c index a66e9f0..c276a5b 100644 --- a/level_3/fake/c/main/make/print/verbose.c +++ b/level_3/fake/c/main/make/print/verbose.c @@ -89,7 +89,7 @@ extern "C" { f_file_stream_lock(print->to); - f_array_length_t i = 0; + f_number_unsigned_t i = 0; if (program.used) { f_print_dynamic_safely(program, print->to); diff --git a/level_3/fake/c/main/print/error.c b/level_3/fake/c/main/print/error.c index 97d3a1d..e9f5a24 100644 --- a/level_3/fake/c/main/print/error.c +++ b/level_3/fake/c/main/print/error.c @@ -19,7 +19,7 @@ extern "C" { #endif // _di_fake_print_error_ #ifndef _di_fake_print_error_argument_empty_ - f_status_t fake_print_error_argument_empty(fl_print_t * const print, const f_array_length_t index) { + f_status_t fake_print_error_argument_empty(fl_print_t * const print, const f_number_unsigned_t index) { if (!print) return F_status_set_error(F_output_not); if (print->verbosity == f_console_verbosity_quiet_e) return F_output_not; @@ -457,7 +457,7 @@ extern "C" { fake_main_t * const main = (fake_main_t *) print->custom; - f_array_length_t line = 1; + f_number_unsigned_t line = 1; const f_status_t status = main->setting.state.status; f_fss_count_lines(buffer, operation_name.start, &line, &main->setting.state); @@ -578,14 +578,14 @@ extern "C" { #endif // _di_fake_print_error_operation_path_stack_max_ #ifndef _di_fake_print_error_operation_stack_max_ - f_status_t fake_print_error_operation_stack_max(fl_print_t * const print, const f_string_static_t buffer, const f_string_range_t section_name, const f_string_range_t operation_name, const f_array_length_t stack_max) { + f_status_t fake_print_error_operation_stack_max(fl_print_t * const print, const f_string_static_t buffer, const f_string_range_t section_name, const f_string_range_t operation_name, const f_number_unsigned_t stack_max) { if (!print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; fake_main_t * const main = (fake_main_t *) print->custom; - f_array_length_t line = 1; + f_number_unsigned_t line = 1; const f_status_t status = main->setting.state.status; f_fss_count_lines(buffer, operation_name.start, &line, &main->setting.state); @@ -618,7 +618,7 @@ extern "C" { fake_main_t * const main = (fake_main_t *) print->custom; - f_array_length_t line = 1; + f_number_unsigned_t line = 1; const f_status_t status = main->setting.state.status; f_fss_count_lines(buffer, operation_name.start, &line, &main->setting.state); diff --git a/level_3/fake/c/main/print/error.h b/level_3/fake/c/main/print/error.h index d912416..45ea837 100644 --- a/level_3/fake/c/main/print/error.h +++ b/level_3/fake/c/main/print/error.h @@ -65,7 +65,7 @@ extern "C" { * @see fake_print_context_wrapped_number() */ #ifndef _di_fake_print_error_argument_empty_ - extern f_status_t fake_print_error_argument_empty(fl_print_t * const print, const f_array_length_t index); + extern f_status_t fake_print_error_argument_empty(fl_print_t * const print, const f_number_unsigned_t index); #endif // _di_fake_print_error_argument_empty_ /** @@ -709,7 +709,7 @@ extern "C" { * @see fl_print_format() */ #ifndef _di_fake_print_error_operation_stack_max_ - extern f_status_t fake_print_error_operation_stack_max(fl_print_t * const print, const f_string_static_t buffer, const f_string_range_t section_name, const f_string_range_t operation_name, const f_array_length_t stack_max); + extern f_status_t fake_print_error_operation_stack_max(fl_print_t * const print, const f_string_static_t buffer, const f_string_range_t section_name, const f_string_range_t operation_name, const f_number_unsigned_t stack_max); #endif // _di_fake_print_error_operation_stack_max_ /** diff --git a/level_3/fake/c/main/print/message.c b/level_3/fake/c/main/print/message.c index 16fb3e8..c511c01 100644 --- a/level_3/fake/c/main/print/message.c +++ b/level_3/fake/c/main/print/message.c @@ -28,7 +28,7 @@ extern "C" { ? &main->setting.modes : &setting_build->modes_default; - for (f_array_length_t i = build_arguments && build_arguments->used > 1 ? 1 : 0; i < modes->used; ) { + for (f_number_unsigned_t i = build_arguments && build_arguments->used > 1 ? 1 : 0; i < modes->used; ) { fl_print_format("%[%Q%]", print->to, print->set->notable, modes->array[i], print->set->notable); diff --git a/level_3/fake/c/main/signal.c b/level_3/fake/c/main/signal.c index 57b4ddc..5b15ab6 100644 --- a/level_3/fake/c/main/signal.c +++ b/level_3/fake/c/main/signal.c @@ -50,7 +50,7 @@ extern "C" { if (!main) return; siginfo_t information; - f_array_length_t failsafe = 0; + f_number_unsigned_t failsafe = 0; memset(&information, 0, sizeof(siginfo_t)); diff --git a/level_3/firewall/c/common.c b/level_3/firewall/c/common.c index 795ff42..2b2694d 100644 --- a/level_3/firewall/c/common.c +++ b/level_3/firewall/c/common.c @@ -147,7 +147,7 @@ extern "C" { } { - f_array_length_t choice = 0; + f_number_unsigned_t choice = 0; f_uint16s_t choices = f_uint16s_t_initialize; // Identify and prioritize "color context" parameters. diff --git a/level_3/firewall/c/firewall.c b/level_3/firewall/c/firewall.c index 3e4fb7c..2b1552f 100644 --- a/level_3/firewall/c/firewall.c +++ b/level_3/firewall/c/firewall.c @@ -26,7 +26,7 @@ extern "C" { if (F_status_is_error(status)) return; { - f_array_length_t choice = 0; + f_number_unsigned_t choice = 0; f_uint16s_t choices = f_uint16s_t_initialize; // Identify and prioritize "color context" parameters. @@ -172,9 +172,9 @@ extern "C" { show_mangle = F_false; show_ports = F_false; - f_array_length_t index = 0; + f_number_unsigned_t index = 0; - for (f_array_length_t i = 0; i < main->parameters.remaining.used; ++i) { + for (f_number_unsigned_t i = 0; i < main->parameters.remaining.used; ++i) { index = main->parameters.remaining.array[i]; @@ -327,7 +327,7 @@ extern "C" { // Remove "lo" (loopback) from the device listing. { - f_array_length_t i = 0; + f_number_unsigned_t i = 0; for (; i < data.devices.used; ++i) { @@ -365,7 +365,7 @@ extern "C" { return status; } - for (f_array_length_t i = 0; i < local.chain_objects.used; ++i) { + for (f_number_unsigned_t i = 0; i < local.chain_objects.used; ++i) { if (!reserved.has_stop && f_compare_dynamic_partial_string(firewall_group_stop_s.string, local.buffer, firewall_group_stop_s.used, local.chain_objects.array[i]) == F_equal_to) { reserved.stop_at = i; @@ -508,7 +508,7 @@ extern "C" { return status; } - f_array_length_t i = 0; + f_number_unsigned_t i = 0; local.is_global = F_true; local.is_stop = F_false; @@ -538,7 +538,7 @@ extern "C" { { f_string_dynamic_t path_file = f_string_dynamic_t_initialize; - f_array_length_t j = 0; + f_number_unsigned_t j = 0; for (i = 0; i < data.devices.used; ++i) { diff --git a/level_3/firewall/c/private-common.c b/level_3/firewall/c/private-common.c index 7e1cb14..9234aff 100644 --- a/level_3/firewall/c/private-common.c +++ b/level_3/firewall/c/private-common.c @@ -23,7 +23,7 @@ void firewall_print_debug_tool(const fl_print_t output, const f_string_static_t fl_print_format("%[%r", output.to, output.context, tool); - for (f_array_length_t i = 0; i < arguments.used; ++i) { + for (f_number_unsigned_t i = 0; i < arguments.used; ++i) { fl_print_format(" %Q", output.to, arguments.array[i]); } // for @@ -62,7 +62,7 @@ void firewall_print_error_on_operation(const fl_print_t output, const f_string_s fl_print_format("%r%[%QFailed to perform requested %r operation:%]", output.to, f_string_eol_s, output.context, output.prefix, tool, output.context); fl_print_format("%r %[%r", output.to, f_string_eol_s, output.context, tool); - for (f_array_length_t i = 0; i < arguments.used; ++i) { + for (f_number_unsigned_t i = 0; i < arguments.used; ++i) { fl_print_format(" %Q", output.to, arguments.array[i]); } // for diff --git a/level_3/firewall/c/private-common.h b/level_3/firewall/c/private-common.h index 2783b73..6a9aba8 100644 --- a/level_3/firewall/c/private-common.h +++ b/level_3/firewall/c/private-common.h @@ -18,11 +18,11 @@ typedef struct { bool is_stop; bool is_lock; - f_array_length_t device; + f_number_unsigned_t device; f_string_dynamic_t buffer; - f_array_length_t chain; - f_array_lengths_t chain_ids; + f_number_unsigned_t chain; + f_number_unsigneds_t chain_ids; f_fss_objects_t chain_objects; f_fss_contents_t chain_contents; f_fss_objects_t rule_objects; @@ -38,7 +38,7 @@ typedef struct { 0, \ f_string_dynamic_t_initialize, \ 0, \ - f_array_lengths_t_initialize, \ + f_number_unsigneds_t_initialize, \ f_fss_objects_t_initialize, \ f_fss_contents_t_initialize, \ f_fss_objects_t_initialize, \ @@ -50,9 +50,9 @@ typedef struct { bool has_stop; bool has_lock; - f_array_length_t main_at; - f_array_length_t stop_at; - f_array_length_t lock_at; + f_number_unsigned_t main_at; + f_number_unsigned_t stop_at; + f_number_unsigned_t lock_at; } firewall_reserved_chains_t; #define firewall_reserved_chains_t_initialize \ diff --git a/level_3/firewall/c/private-firewall.c b/level_3/firewall/c/private-firewall.c index 30352e3..b293b06 100644 --- a/level_3/firewall/c/private-firewall.c +++ b/level_3/firewall/c/private-firewall.c @@ -23,10 +23,10 @@ f_status_t firewall_perform_commands(firewall_data_t * const data, firewall_loca int return_code = 0; - f_array_length_t i = 0; - f_array_length_t r = 0; - f_array_length_t repeat = 2; - f_array_length_t length = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t r = 0; + f_number_unsigned_t repeat = 2; + f_number_unsigned_t length = 0; f_string_static_t current_tool = firewall_tool_iptables_s; @@ -472,7 +472,7 @@ f_status_t firewall_perform_commands(firewall_data_t * const data, firewall_loca // Last up is the "rule". if ((!is_ip_list && local->rule_contents.array[i].used > 0) || (is_ip_list && local->rule_contents.array[i].used > 1)) { - f_array_length_t subcounter = 0; + f_number_unsigned_t subcounter = 0; if (is_ip_list) { @@ -662,7 +662,7 @@ f_status_t firewall_perform_commands(firewall_data_t * const data, firewall_loca } if (F_status_is_error(status)) { - f_array_lengths_resize(0, &delimits); + f_number_unsigneds_resize(0, &delimits); break; } @@ -670,7 +670,7 @@ f_status_t firewall_perform_commands(firewall_data_t * const data, firewall_loca ++arguments.used; // The ip_list file contains objects and no content, all objects are what matter an nothing else. - for (f_array_length_t at = 0; at < basic_objects.used; ++at) { + for (f_number_unsigned_t at = 0; at < basic_objects.used; ++at) { arguments.array[arguments.used].used = 0; @@ -684,7 +684,7 @@ f_status_t firewall_perform_commands(firewall_data_t * const data, firewall_loca status = fll_execute_program(current_tool, arguments, 0, 0, (void *) &return_code); if (status == F_child) { - f_array_lengths_resize(0, &delimits); + f_number_unsigneds_resize(0, &delimits); f_string_dynamic_resize(0, &ip_list); f_string_dynamics_resize(0, &arguments); @@ -718,7 +718,7 @@ f_status_t firewall_perform_commands(firewall_data_t * const data, firewall_loca --arguments.used; } - f_array_lengths_resize(0, &delimits); + f_number_unsigneds_resize(0, &delimits); } } @@ -789,10 +789,10 @@ f_status_t firewall_create_custom_chains(firewall_data_t * const data, firewall_ bool create_chain = F_false; int return_code = 0; - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; - f_array_length_t length = 0; + f_number_unsigned_t length = 0; f_string_dynamics_t arguments = f_string_dynamics_t_initialize; local->chain_ids.used = local->chain_objects.used; @@ -800,10 +800,10 @@ f_status_t firewall_create_custom_chains(firewall_data_t * const data, firewall_ status = f_string_dynamics_resize(2, &arguments); if (F_status_is_error(status)) return status; - status = f_array_lengths_increase_by(local->chain_objects.used, &local->chain_ids); + status = f_number_unsigneds_increase_by(local->chain_objects.used, &local->chain_ids); if (F_status_is_error(status)) return status; - memset(local->chain_ids.array, 0, sizeof(f_array_length_t) * local->chain_ids.used); + memset(local->chain_ids.array, 0, sizeof(f_number_unsigned_t) * local->chain_ids.used); status = f_string_dynamic_append(firewall_chain_create_command_s, &arguments.array[0]); @@ -977,7 +977,7 @@ f_status_t firewall_delete_chains(firewall_data_t * const data) { const f_string_static_t tools[2] = { firewall_tool_iptables_s, firewall_tool_ip6tables_s }; f_status_t status = F_none; - for (f_array_length_t i = 0; i < 2; ++i) { + for (f_number_unsigned_t i = 0; i < 2; ++i) { if (firewall_signal_received(data)) { return F_status_set_error(F_interrupt); @@ -1026,7 +1026,7 @@ f_status_t firewall_delete_chains(firewall_data_t * const data) { arguments.array = argument_array; argument_array[0] = firewall_chain_delete_command_s; - for (f_array_length_t i = 0; i < 2; ++i) { + for (f_number_unsigned_t i = 0; i < 2; ++i) { firewall_print_debug_tool(data->main->warning, tools[i], arguments); @@ -1083,8 +1083,8 @@ f_status_t firewall_default_lock(firewall_data_t * const data) { arguments.array[0] = firewall_action_policy_command_s; arguments.array[2] = firewall_chain_drop_s; - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; for (; i < 3; ++i) { @@ -1298,7 +1298,7 @@ f_status_t firewall_delete_local_data(firewall_local_data_t * const local) { local->chain = 0; f_string_dynamic_resize(0, &local->buffer); - f_array_lengths_resize(0, &local->chain_ids); + f_number_unsigneds_resize(0, &local->chain_ids); f_string_ranges_resize(0, &local->chain_objects); f_string_rangess_resize(0, &local->chain_contents); diff --git a/level_3/fss_embedded_list_read/c/common.c b/level_3/fss_embedded_list_read/c/common.c index cfa6775..48bd9c4 100644 --- a/level_3/fss_embedded_list_read/c/common.c +++ b/level_3/fss_embedded_list_read/c/common.c @@ -105,7 +105,7 @@ extern "C" { } { - f_array_length_t choice = 0; + f_number_unsigned_t choice = 0; f_uint16s_t choices = f_uint16s_t_initialize; // Identify and prioritize "color context" parameters. 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 589585c..4d72367 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 @@ -21,7 +21,7 @@ extern "C" { if (F_status_is_error(status)) return; { - f_array_length_t choice = 0; + f_number_unsigned_t choice = 0; f_uint16s_t choices = f_uint16s_t_initialize; // Identify and prioritize "color context" parameters. @@ -195,8 +195,8 @@ extern "C" { status = F_status_set_error(F_parameter); } else if (main->parameters.array[fss_embedded_list_read_parameter_delimit_e].result & f_console_result_value_e) { - const f_array_length_t index = main->parameters.array[fss_embedded_list_read_parameter_delimit_e].values.array[0]; - f_array_length_t length = data.argv[index].used; + const f_number_unsigned_t index = main->parameters.array[fss_embedded_list_read_parameter_delimit_e].values.array[0]; + f_number_unsigned_t length = data.argv[index].used; if (!length) { f_file_stream_lock(main->error.to); @@ -302,7 +302,7 @@ extern "C" { off_t size_file = 0; off_t size_read = 0; - for (f_array_length_t i = 0; i < main->parameters.remaining.used; ++i) { + for (f_number_unsigned_t i = 0; i < main->parameters.remaining.used; ++i) { if (!((++main->signal_check) % fss_embedded_list_read_signal_check_d)) { if (fll_program_standard_signal_received(&main->program)) { @@ -420,8 +420,8 @@ extern "C" { f_fss_nest_resize(0, &data.nest); f_string_dynamic_resize(0, &data.buffer); fss_embedded_list_read_depths_resize(0, &depths); - f_array_lengths_resize(0, &objects_delimits); - f_array_lengths_resize(0, &contents_delimits); + f_number_unsigneds_resize(0, &objects_delimits); + f_number_unsigneds_resize(0, &contents_delimits); f_string_ranges_resize(0, &comments); } else { diff --git a/level_3/fss_embedded_list_read/c/private-common.c b/level_3/fss_embedded_list_read/c/private-common.c index ddc05e2..c47bb33 100644 --- a/level_3/fss_embedded_list_read/c/private-common.c +++ b/level_3/fss_embedded_list_read/c/private-common.c @@ -25,13 +25,13 @@ extern "C" { #endif // _di_fss_embedded_list_read_data_delete_ #ifndef _di_fss_embedded_list_read_depths_resize_ - f_status_t fss_embedded_list_read_depths_resize(const f_array_length_t length, fss_embedded_list_read_depths_t *depths) { + f_status_t fss_embedded_list_read_depths_resize(const f_number_unsigned_t length, fss_embedded_list_read_depths_t *depths) { if (!depths) { return F_status_set_error(F_parameter); } - for (f_array_length_t i = length; i < depths->size; ++i) { + for (f_number_unsigned_t i = length; i < depths->size; ++i) { fss_embedded_list_read_depth_delete(&depths->array[i]); } // for diff --git a/level_3/fss_embedded_list_read/c/private-common.h b/level_3/fss_embedded_list_read/c/private-common.h index 9b5e312..a35b5ee 100644 --- a/level_3/fss_embedded_list_read/c/private-common.h +++ b/level_3/fss_embedded_list_read/c/private-common.h @@ -46,10 +46,10 @@ extern "C" { */ #ifndef _di_fss_embedded_list_read_depth_t_ typedef struct { - f_array_length_t depth; + f_number_unsigned_t depth; - f_array_length_t index_at; - f_array_length_t index_name; + f_number_unsigned_t index_at; + f_number_unsigned_t index_name; f_number_unsigned_t value_at; f_string_dynamic_t value_name; @@ -83,7 +83,7 @@ extern "C" { #ifndef _di_fss_embedded_list_read_skip_t_ typedef struct { bool *skip; - f_array_length_t used; + f_number_unsigned_t used; } fss_embedded_list_read_skip_t; #define fss_embedded_list_read_skip_t_initialize \ @@ -110,8 +110,8 @@ extern "C" { typedef struct { fss_embedded_list_read_depth_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } fss_embedded_list_read_depths_t; #define fss_embedded_list_read_depths_t_initialize { 0, 0, 0 } @@ -137,7 +137,7 @@ extern "C" { f_fss_nest_t nest; uint8_t delimit_mode; - f_array_length_t delimit_depth; + f_number_unsigned_t delimit_depth; } fss_embedded_list_read_data_t; #define fss_embedded_list_read_data_t_initialize \ @@ -206,7 +206,7 @@ extern "C" { * @see fss_embedded_list_read_depths_increase() */ #ifndef _di_fss_embedded_list_read_depths_resize_ - extern f_status_t fss_embedded_list_read_depths_resize(const f_array_length_t length, fss_embedded_list_read_depths_t *depths) F_attribute_visibility_internal_d; + extern f_status_t fss_embedded_list_read_depths_resize(const f_number_unsigned_t length, fss_embedded_list_read_depths_t *depths) F_attribute_visibility_internal_d; #endif // _di_fss_embedded_list_read_depths_resize_ #ifdef __cplusplus diff --git a/level_3/fss_embedded_list_read/c/private-read.c b/level_3/fss_embedded_list_read/c/private-read.c index b6bd4fb..393e3c8 100644 --- a/level_3/fss_embedded_list_read/c/private-read.c +++ b/level_3/fss_embedded_list_read/c/private-read.c @@ -12,20 +12,20 @@ extern "C" { f_status_t status = F_none; - const f_array_length_t values_total = data->main->parameters.array[fss_embedded_list_read_parameter_depth_e].values.used + data->main->parameters.array[fss_embedded_list_read_parameter_at_e].values.used + data->main->parameters.array[fss_embedded_list_read_parameter_name_e].values.used; + const f_number_unsigned_t values_total = data->main->parameters.array[fss_embedded_list_read_parameter_depth_e].values.used + data->main->parameters.array[fss_embedded_list_read_parameter_at_e].values.used + data->main->parameters.array[fss_embedded_list_read_parameter_name_e].values.used; - f_array_length_t values_order[values_total]; - f_array_length_t values_type[values_total]; + f_number_unsigned_t values_order[values_total]; + f_number_unsigned_t values_type[values_total]; - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; // Determine the linear order in which all of the three parameter values are to be applied. if (values_total) { memset(values_order, 0, sizeof(f_char_t) * values_total); - f_array_length_t k = 0; - f_array_length_t l = 0; + f_number_unsigned_t k = 0; + f_number_unsigned_t l = 0; for (; j < data->main->parameters.array[fss_embedded_list_read_parameter_depth_e].values.used; ++j) { @@ -272,8 +272,8 @@ extern "C" { return status; } - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; // Comments are not to be part of the file, so remove them. for (; i < comments->used; ++i) { @@ -299,7 +299,7 @@ extern "C" { f_number_unsigned_t select = 0; if (data->main->parameters.array[fss_embedded_list_read_parameter_select_e].result & f_console_result_value_e) { - const f_array_length_t index = data->main->parameters.array[fss_embedded_list_read_parameter_select_e].values.array[data->main->parameters.array[fss_embedded_list_read_parameter_select_e].values.used - 1]; + const f_number_unsigned_t index = data->main->parameters.array[fss_embedded_list_read_parameter_select_e].values.array[data->main->parameters.array[fss_embedded_list_read_parameter_select_e].values.used - 1]; status = fl_conversion_dynamic_to_unsigned_detect(fl_conversion_data_base_10_c, data->main->parameters.arguments.array[index], &select); @@ -316,10 +316,10 @@ extern "C" { } } - f_array_length_t line = 0; + f_number_unsigned_t line = 0; if (data->main->parameters.array[fss_embedded_list_read_parameter_line_e].result & f_console_result_value_e) { - const f_array_length_t index = data->main->parameters.array[fss_embedded_list_read_parameter_line_e].values.array[data->main->parameters.array[fss_embedded_list_read_parameter_line_e].values.used - 1]; + const f_number_unsigned_t index = data->main->parameters.array[fss_embedded_list_read_parameter_line_e].values.array[data->main->parameters.array[fss_embedded_list_read_parameter_line_e].values.used - 1]; status = fl_conversion_dynamic_to_unsigned_detect(fl_conversion_data_base_10_c, data->main->parameters.arguments.array[index], &line); @@ -346,7 +346,7 @@ extern "C" { #endif // _di_fss_embedded_list_read_main_process_file_ #ifndef _di_fss_embedded_list_read_main_process_for_depth_ - f_status_t fss_embedded_list_read_main_process_for_depth(fss_embedded_list_read_data_t * const data, const f_string_static_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, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits) { + f_status_t fss_embedded_list_read_main_process_for_depth(fss_embedded_list_read_data_t * const data, const f_string_static_t filename, const fss_embedded_list_read_depths_t depths, const f_number_unsigned_t depths_index, const f_number_unsigned_t line, const fss_embedded_list_read_skip_t parents, 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]; @@ -356,7 +356,7 @@ extern "C" { memset(skip, F_false, sizeof(skip) * items->used); if (parents.used) { - for (f_array_length_t i = 0; i < items->used; ++i) { + for (f_number_unsigned_t i = 0; i < items->used; ++i) { if (items->array[i].parent >= parents.used || parents.skip[items->array[i].parent]) { skip[i] = F_true; @@ -365,10 +365,10 @@ extern "C" { } if (depths.array[depths_index].index_name || depths.array[depths_index].index_at) { - const f_array_lengths_t except_none = f_array_lengths_t_initialize; + const f_number_unsigneds_t except_none = f_number_unsigneds_t_initialize; - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; if (!depths.array[depths_index].index_name || (depths.array[depths_index].index_at && depths.array[depths_index].index_at < depths.array[depths_index].index_name)) { @@ -451,8 +451,8 @@ extern "C" { parents_next.used = items->used; } else { - const f_array_length_t parents_depth = depths.array[depths_index + 1].depth - 1; - const f_array_length_t depth_next = depths.array[depths_index + 1].depth; + const f_number_unsigned_t parents_depth = depths.array[depths_index + 1].depth - 1; + const f_number_unsigned_t depth_next = depths.array[depths_index + 1].depth; parents_next.skip = skip_next; parents_next.used = data->nest.depth[parents_depth].used; @@ -463,8 +463,8 @@ extern "C" { f_fss_items_t *items_previous = 0; f_fss_item_t *item_previous = 0; - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; for (; i < items_next->used; ++i) { @@ -492,12 +492,12 @@ extern "C" { } // Process objects. - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; if (data->main->parameters.array[fss_embedded_list_read_parameter_object_e].result & f_console_result_found_e) { if (data->main->parameters.array[fss_embedded_list_read_parameter_total_e].result & f_console_result_found_e) { - f_array_length_t total = 0; + f_number_unsigned_t total = 0; for (i = 0; i < items->used; ++i) { if (skip[i]) continue; @@ -510,7 +510,7 @@ extern "C" { return F_none; } - f_status_t (*print_object)(const f_string_static_t, const f_string_range_t, const f_array_lengths_t, FILE *) = &f_print_except_dynamic_partial; + f_status_t (*print_object)(const f_string_static_t, const f_string_range_t, const f_number_unsigneds_t, FILE *) = &f_print_except_dynamic_partial; if (data->main->parameters.array[fss_embedded_list_read_parameter_trim_e].result & f_console_result_found_e) { print_object = &fl_print_trim_except_dynamic_partial; @@ -548,7 +548,7 @@ extern "C" { } if (data->main->parameters.array[fss_embedded_list_read_parameter_total_e].result & f_console_result_found_e) { - f_array_length_t total = 0; + f_number_unsigned_t total = 0; for (i = 0; i < items->used; ++i) { @@ -588,7 +588,7 @@ extern "C" { } if (data->main->parameters.array[fss_embedded_list_read_parameter_line_e].result & f_console_result_value_e) { - f_array_length_t line_current = 0; + f_number_unsigned_t line_current = 0; f_file_stream_lock(data->main->output); @@ -705,14 +705,14 @@ extern "C" { } } - const f_array_length_t original_objects_used = objects_delimits->used; - const f_array_length_t original_contents_used = contents_delimits->used; + const f_number_unsigned_t original_objects_used = objects_delimits->used; + const f_number_unsigned_t original_contents_used = contents_delimits->used; - f_array_length_t original_objects_delimits[original_objects_used]; - f_array_length_t original_contents_delimits[original_contents_used]; + f_number_unsigned_t original_objects_delimits[original_objects_used]; + f_number_unsigned_t original_contents_delimits[original_contents_used]; - memcpy(&original_objects_delimits, objects_delimits->array, original_objects_used * sizeof(f_array_length_t)); - memcpy(&original_contents_delimits, contents_delimits->array, original_contents_used * sizeof(f_array_length_t)); + memcpy(&original_objects_delimits, objects_delimits->array, original_objects_used * sizeof(f_number_unsigned_t)); + memcpy(&original_contents_delimits, contents_delimits->array, original_contents_used * sizeof(f_number_unsigned_t)); objects_delimits->used = 0; contents_delimits->used = 0; @@ -736,14 +736,14 @@ extern "C" { fss_embedded_list_read_process_delimits_objects(data, 0, original_objects_delimits, original_objects_used, objects_delimits); fss_embedded_list_read_process_delimits_contents(data, 0, original_contents_delimits, original_contents_used, contents_delimits); - for (f_array_length_t i = 1; i <= data->delimit_depth && i < data->nest.used; ++i) { + for (f_number_unsigned_t i = 1; i <= data->delimit_depth && i < data->nest.used; ++i) { fss_embedded_list_read_process_delimits_objects(data, i, original_contents_delimits, original_contents_used, contents_delimits); fss_embedded_list_read_process_delimits_contents(data, i, original_contents_delimits, original_contents_used, contents_delimits); } // for } else if (data->delimit_mode == fss_embedded_list_read_delimit_mode_depth_greater_e) { - for (f_array_length_t i = data->delimit_depth; i < data->nest.used; ++i) { + for (f_number_unsigned_t i = data->delimit_depth; i < data->nest.used; ++i) { fss_embedded_list_read_process_delimits_objects(data, i, original_contents_delimits, original_contents_used, contents_delimits); fss_embedded_list_read_process_delimits_contents(data, i, original_contents_delimits, original_contents_used, contents_delimits); @@ -754,7 +754,7 @@ extern "C" { #endif // _di_fss_embedded_list_read_process_delimits_ #ifndef _di_fss_embedded_list_read_process_delimits_contents_ - void fss_embedded_list_read_process_delimits_contents(fss_embedded_list_read_data_t * const data, const f_array_length_t depth, const f_array_length_t original_delimits[], const f_array_length_t original_used, f_fss_delimits_t *delimits) { + void fss_embedded_list_read_process_delimits_contents(fss_embedded_list_read_data_t * const data, const f_number_unsigned_t depth, const f_number_unsigned_t original_delimits[], const f_number_unsigned_t original_used, f_fss_delimits_t *delimits) { if (!original_used) return; @@ -762,11 +762,11 @@ extern "C" { if (!items->used) return; - f_array_length_t i = 0; - f_array_length_t j = 0; - f_array_length_t k = 0; - f_array_length_t l = 0; - f_array_length_t m = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; + f_number_unsigned_t l = 0; + f_number_unsigned_t m = 0; for (i = 0; i < items->used; ++i) { @@ -807,7 +807,7 @@ extern "C" { #endif // _di_fss_embedded_list_read_process_delimits_contents_ #ifndef _di_fss_embedded_list_read_process_delimits_objects_ - void fss_embedded_list_read_process_delimits_objects(fss_embedded_list_read_data_t * const data, const f_array_length_t depth, const f_array_length_t original_delimits[], const f_array_length_t original_used, f_fss_delimits_t *delimits) { + void fss_embedded_list_read_process_delimits_objects(fss_embedded_list_read_data_t * const data, const f_number_unsigned_t depth, const f_number_unsigned_t original_delimits[], const f_number_unsigned_t original_used, f_fss_delimits_t *delimits) { if (!original_used) return; @@ -815,10 +815,10 @@ extern "C" { if (!items->used) return; - f_array_length_t i = 0; - f_array_length_t j = 0; - f_array_length_t k = 0; - f_array_length_t l = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; + f_number_unsigned_t l = 0; for (i = 0; i < items->used; ++i) { @@ -856,16 +856,16 @@ extern "C" { #endif // _di_fss_embedded_list_read_process_delimits_objects_ #ifndef _di_fss_embedded_list_read_process_delimits_within_greater_ - f_status_t fss_embedded_list_read_process_delimits_within_greater(fss_embedded_list_read_data_t * const data, const f_array_length_t depth, const f_array_length_t location) { + f_status_t fss_embedded_list_read_process_delimits_within_greater(fss_embedded_list_read_data_t * const data, const f_number_unsigned_t depth, const f_number_unsigned_t location) { if (depth + 1 >= data->nest.used) return F_false; f_fss_items_t *items = 0; - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; - for (f_array_length_t d = depth + 1; d < data->nest.used; ++d) { + for (f_number_unsigned_t d = depth + 1; d < data->nest.used; ++d) { items = &data->nest.depth[d]; for (i = 0; i < items->used; ++i) { diff --git a/level_3/fss_embedded_list_read/c/private-read.h b/level_3/fss_embedded_list_read/c/private-read.h index 15ff4ea..ea0d0ad 100644 --- a/level_3/fss_embedded_list_read/c/private-read.h +++ b/level_3/fss_embedded_list_read/c/private-read.h @@ -91,7 +91,7 @@ extern "C" { * @see fss_embedded_list_read_main_process_file() */ #ifndef _di_fss_embedded_list_read_main_process_for_depth_ - extern f_status_t fss_embedded_list_read_main_process_for_depth(fss_embedded_list_read_data_t * const data, const f_string_static_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, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits) F_attribute_visibility_internal_d; + extern f_status_t fss_embedded_list_read_main_process_for_depth(fss_embedded_list_read_data_t * const data, const f_string_static_t filename, const fss_embedded_list_read_depths_t depths, const f_number_unsigned_t depths_index, const f_number_unsigned_t line, const fss_embedded_list_read_skip_t parents, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits) F_attribute_visibility_internal_d; #endif // _di_fss_embedded_list_read_main_process_for_depth_ /** @@ -127,7 +127,7 @@ extern "C" { * @see fss_embedded_list_read_process_delimits() */ #ifndef _di_fss_embedded_list_read_process_delimits_contents_ - extern void fss_embedded_list_read_process_delimits_contents(fss_embedded_list_read_data_t * const data, const f_array_length_t depth, const f_array_length_t original_delimits[], const f_array_length_t original_used, f_fss_delimits_t *delimits) F_attribute_visibility_internal_d; + extern void fss_embedded_list_read_process_delimits_contents(fss_embedded_list_read_data_t * const data, const f_number_unsigned_t depth, const f_number_unsigned_t original_delimits[], const f_number_unsigned_t original_used, f_fss_delimits_t *delimits) F_attribute_visibility_internal_d; #endif // _di_fss_embedded_list_read_process_delimits_contents_ /** @@ -147,7 +147,7 @@ extern "C" { * @see fss_embedded_list_read_process_delimits() */ #ifndef _di_fss_embedded_list_read_process_delimits_objects_ - extern void fss_embedded_list_read_process_delimits_objects(fss_embedded_list_read_data_t * const data, const f_array_length_t depth, const f_array_length_t original_delimits[], const f_array_length_t original_used, f_fss_delimits_t *delimits) F_attribute_visibility_internal_d; + extern void fss_embedded_list_read_process_delimits_objects(fss_embedded_list_read_data_t * const data, const f_number_unsigned_t depth, const f_number_unsigned_t original_delimits[], const f_number_unsigned_t original_used, f_fss_delimits_t *delimits) F_attribute_visibility_internal_d; #endif // _di_fss_embedded_list_read_process_delimits_objects_ /** @@ -168,7 +168,7 @@ extern "C" { * @see fss_embedded_list_read_process_delimits_contents() */ #ifndef _di_fss_embedded_list_read_process_delimits_within_greater_ - extern f_status_t fss_embedded_list_read_process_delimits_within_greater(fss_embedded_list_read_data_t * const data, const f_array_length_t depth, const f_array_length_t location) F_attribute_visibility_internal_d; + extern f_status_t fss_embedded_list_read_process_delimits_within_greater(fss_embedded_list_read_data_t * const data, const f_number_unsigned_t depth, const f_number_unsigned_t location) F_attribute_visibility_internal_d; #endif // _di_fss_embedded_list_read_process_delimits_within_greater_ #ifdef __cplusplus diff --git a/level_3/fss_identify/c/common.c b/level_3/fss_identify/c/common.c index dd2e5bc..544d3bd 100644 --- a/level_3/fss_identify/c/common.c +++ b/level_3/fss_identify/c/common.c @@ -73,7 +73,7 @@ extern "C" { } { - f_array_length_t choice = 0; + f_number_unsigned_t choice = 0; f_uint16s_t choices = f_uint16s_t_initialize; // Identify and prioritize "color context" parameters. diff --git a/level_3/fss_identify/c/fss_identify.c b/level_3/fss_identify/c/fss_identify.c index 7e62094..368c911 100644 --- a/level_3/fss_identify/c/fss_identify.c +++ b/level_3/fss_identify/c/fss_identify.c @@ -20,7 +20,7 @@ extern "C" { if (F_status_is_error(status)) return; { - f_array_length_t choice = 0; + f_number_unsigned_t choice = 0; f_uint16s_t choices = f_uint16s_t_initialize; // Identify and prioritize "color context" parameters. @@ -103,7 +103,7 @@ extern "C" { status = F_status_set_error(F_parameter); } else if (main->parameters.array[fss_identify_parameter_line_e].result & f_console_result_value_e) { - const f_array_length_t index = main->parameters.array[fss_identify_parameter_line_e].values.array[main->parameters.array[fss_identify_parameter_line_e].values.used - 1]; + const f_number_unsigned_t index = main->parameters.array[fss_identify_parameter_line_e].values.array[main->parameters.array[fss_identify_parameter_line_e].values.used - 1]; status = fl_conversion_dynamic_to_unsigned_detect(fl_conversion_data_base_10_c, data.argv[index], &data.line); @@ -143,8 +143,8 @@ extern "C" { status = F_status_set_error(F_parameter); } else if (main->parameters.array[fss_identify_parameter_name_e].result & f_console_result_value_e) { - const f_array_length_t index = main->parameters.array[fss_identify_parameter_name_e].values.array[main->parameters.array[fss_identify_parameter_name_e].values.used - 1]; - const f_array_length_t length = data.argv[index].used; + const f_number_unsigned_t index = main->parameters.array[fss_identify_parameter_name_e].values.array[main->parameters.array[fss_identify_parameter_name_e].values.used - 1]; + const f_number_unsigned_t length = data.argv[index].used; const f_string_range_t range = macro_f_string_range_t_initialize_2(length); if (length == 0) { @@ -168,7 +168,7 @@ extern "C" { if (F_status_is_error_not(status)) { - for (f_array_length_t i = range.start; i <= range.stop; ++i) { + for (f_number_unsigned_t i = range.start; i <= range.stop; ++i) { status = f_utf_is_word_dash(data.argv[index].string + i, length, F_true); @@ -216,7 +216,7 @@ extern "C" { } if (F_status_is_error_not(status)) { - for (f_array_length_t i = 0; i < main->parameters.remaining.used; ++i) { + for (f_number_unsigned_t i = 0; i < main->parameters.remaining.used; ++i) { if (!((++main->signal_check) % fss_identify_signal_check_d)) { if (fll_program_standard_signal_received(&main->program)) { diff --git a/level_3/fss_identify/c/private-common.h b/level_3/fss_identify/c/private-common.h index 72491fa..96acf55 100644 --- a/level_3/fss_identify/c/private-common.h +++ b/level_3/fss_identify/c/private-common.h @@ -23,9 +23,9 @@ extern "C" { */ #ifndef _di_fss_identify_data_t_ typedef struct { - f_array_length_t current; - f_array_length_t line; - f_array_length_t total; + f_number_unsigned_t current; + f_number_unsigned_t line; + f_number_unsigned_t total; f_string_static_t *argv; diff --git a/level_3/fss_identify/c/private-identify.c b/level_3/fss_identify/c/private-identify.c index 57d9d9e..3e43b5c 100644 --- a/level_3/fss_identify/c/private-identify.c +++ b/level_3/fss_identify/c/private-identify.c @@ -83,7 +83,7 @@ extern "C" { // 0 = is name, 1 = is type, 2 = is full. uint8_t mode = 1; - f_array_length_t i = 0; + f_number_unsigned_t i = 0; if (data->name.used) { for (; i < data->name.used; ++i) { @@ -156,10 +156,10 @@ extern "C" { f_status_t fss_identify_process_name_compare(fss_identify_data_t * const data, const f_fll_id_t id, const uint8_t mode) { if (mode) { - f_array_length_t number = 0; + f_number_unsigned_t number = 0; f_string_range_t range = macro_f_string_range_t_initialize_2(data->name.used); - for (f_array_length_t i = 0; i < data->name.used; ++i) { + for (f_number_unsigned_t i = 0; i < data->name.used; ++i) { if (data->name.string[i] == f_string_ascii_minus_s.string[0] && i + 1 < data->name.used) { range.start = i + 1; diff --git a/level_3/fss_read/c/main/common.c b/level_3/fss_read/c/main/common.c index 7f50795..a945069 100644 --- a/level_3/fss_read/c/main/common.c +++ b/level_3/fss_read/c/main/common.c @@ -7,8 +7,8 @@ extern "C" { #ifndef _di_fss_read_ensure_quotes_length_ void fss_read_ensure_quotes_length(fss_read_main_t * const main) { - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; if (main->setting.quotes_object.used < main->setting.objects.used) { main->setting.state.status = f_uint8s_resize(main->setting.objects.used, &main->setting.quotes_object); @@ -154,11 +154,11 @@ extern "C" { if (parameters->array[fss_read_parameter_help_e].result & f_console_result_found_e) return; if (parameters->array[fss_read_parameter_version_e].result & f_console_result_found_e) return; - f_array_length_t i = 0; - f_array_length_t index = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t index = 0; { - static const f_array_length_t parameter_code[] = { + static const f_number_unsigned_t parameter_code[] = { fss_read_parameter_at_e, fss_read_parameter_depth_e, fss_read_parameter_line_e, @@ -239,7 +239,7 @@ extern "C" { } if (parameters->array[fss_read_parameter_columns_e].result & f_console_result_found_e) { - static const f_array_length_t parameter_code[] = { + static const f_number_unsigned_t parameter_code[] = { fss_read_parameter_depth_e, fss_read_parameter_line_e, fss_read_parameter_pipe_e, @@ -307,7 +307,7 @@ extern "C" { } if (parameters->array[fss_read_parameter_delimit_e].result & f_console_result_value_e) { - f_array_length_t length = 0; + f_number_unsigned_t length = 0; // Set the value to 0 to allow for detecting mode based on what is provided. main->setting.delimit_mode = 0; @@ -664,7 +664,7 @@ extern "C" { fss_read_main_t * const main = (fss_read_main_t *) void_main; - f_array_length_t i = 1; + f_number_unsigned_t i = 1; if (parameters->array[fss_read_parameter_depth_e].result & f_console_result_value_e) { i = parameters->array[fss_read_parameter_depth_e].values.used; @@ -686,9 +686,9 @@ extern "C" { main->setting.depths.used = i; - f_array_length_t position_depth = 0; - f_array_length_t position_at = 0; - f_array_length_t position_name = 0; + f_number_unsigned_t position_depth = 0; + f_number_unsigned_t position_at = 0; + f_number_unsigned_t position_name = 0; fss_read_depth_t *current = 0; for (i = 0; i < main->setting.depths.used; ++i) { @@ -781,7 +781,7 @@ extern "C" { } } // for - f_array_length_t j = 0; + f_number_unsigned_t j = 0; for (i = 0; i < main->setting.depths.used; ++i) { diff --git a/level_3/fss_read/c/main/common/static.c b/level_3/fss_read/c/main/common/static.c index e33f99c..51e04f0 100644 --- a/level_3/fss_read/c/main/common/static.c +++ b/level_3/fss_read/c/main/common/static.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fss_read_except_none_c_ - const f_array_lengths_t fss_read_except_none_c = macro_f_array_lengths_t_initialize_1(0, 0, 0); + const f_number_unsigneds_t fss_read_except_none_c = macro_f_number_unsigneds_t_initialize_1(0, 0, 0); #endif // _di_fss_read_except_none_c_ #ifdef __cplusplus diff --git a/level_3/fss_read/c/main/common/static.h b/level_3/fss_read/c/main/common/static.h index f496fe4..7760676 100644 --- a/level_3/fss_read/c/main/common/static.h +++ b/level_3/fss_read/c/main/common/static.h @@ -22,7 +22,7 @@ extern "C" { * This is intended to represent an empty array lengths structure. */ #ifndef _di_fss_read_except_none_c_ - extern const f_array_lengths_t fss_read_except_none_c; + extern const f_number_unsigneds_t fss_read_except_none_c; #endif // _di_fss_read_except_none_c_ #ifdef __cplusplus diff --git a/level_3/fss_read/c/main/common/type.c b/level_3/fss_read/c/main/common/type.c index 26162dd..58659a3 100644 --- a/level_3/fss_read/c/main/common/type.c +++ b/level_3/fss_read/c/main/common/type.c @@ -14,12 +14,12 @@ extern "C" { #endif // _di_fss_read_depth_delete_ #ifndef _di_fss_read_depths_resize_ - f_status_t fss_read_depths_resize(const f_array_length_t length, fss_read_depths_t * const depths) { + f_status_t fss_read_depths_resize(const f_number_unsigned_t length, fss_read_depths_t * const depths) { if (!depths) return F_status_set_error(F_parameter); - if (depths->used + length > F_array_length_t_size_d) return F_status_set_error(F_array_too_large); + if (depths->used + length > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large); - for (f_array_length_t i = length; i < depths->size; ++i) { + for (f_number_unsigned_t i = length; i < depths->size; ++i) { fss_read_depth_delete(&depths->array[i]); } // for @@ -37,10 +37,10 @@ extern "C" { #endif // _di_fss_read_depths_resize_ #ifndef _di_fss_read_files_resize_ - f_status_t fss_read_files_resize(const f_array_length_t length, fss_read_files_t * const files) { + f_status_t fss_read_files_resize(const f_number_unsigned_t length, fss_read_files_t * const files) { if (!files) return F_status_set_error(F_parameter); - if (files->used + length > F_array_length_t_size_d) return F_status_set_error(F_array_too_large); + if (files->used + length > F_number_t_size_unsigned_d) return F_status_set_error(F_array_too_large); const f_status_t status = f_memory_adjust(files->size, length, sizeof(fss_read_file_t), (void **) & files->array); if (F_status_is_error(status)) return status; @@ -81,8 +81,8 @@ extern "C" { f_fss_nest_resize(0, &setting->nest); - f_array_lengths_resize(0, &setting->delimits_object); - f_array_lengths_resize(0, &setting->delimits_content); + f_number_unsigneds_resize(0, &setting->delimits_object); + f_number_unsigneds_resize(0, &setting->delimits_content); f_uint8s_resize(0, &setting->quotes_object); f_uint8ss_resize(0, &setting->quotes_content); diff --git a/level_3/fss_read/c/main/common/type.h b/level_3/fss_read/c/main/common/type.h index 30cbe5b..a1090c2 100644 --- a/level_3/fss_read/c/main/common/type.h +++ b/level_3/fss_read/c/main/common/type.h @@ -29,10 +29,10 @@ extern "C" { */ #ifndef _di_fss_read_depth_t_ typedef struct { - f_array_length_t depth; + f_number_unsigned_t depth; - f_array_length_t index_at; - f_array_length_t index_name; + f_number_unsigned_t index_at; + f_number_unsigned_t index_name; f_number_unsigned_t value_at; f_string_dynamic_t value_name; @@ -66,8 +66,8 @@ extern "C" { typedef struct { fss_read_depth_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } fss_read_depths_t; #define fss_read_depths_t_initialize { 0, 0, 0 } @@ -109,8 +109,8 @@ extern "C" { typedef struct { fss_read_file_t *array; - f_array_length_t size; - f_array_length_t used; + f_number_unsigned_t size; + f_number_unsigned_t used; } fss_read_files_t; #define fss_read_files_t_initialize { 0, 0, 0 } @@ -145,14 +145,14 @@ extern "C" { void (*process_normal)(void * const main); void (*process_at)(void * const main, const bool names[], const f_fss_delimits_t delimits_object, const f_fss_delimits_t delimits_content); - void (*process_at_line)(void * const void_main, const f_array_length_t at, const f_array_lengths_t delimits_object, const f_array_lengths_t delimits_content, f_number_unsigned_t * const line); + void (*process_at_line)(void * const void_main, const f_number_unsigned_t at, const f_number_unsigneds_t delimits_object, const f_number_unsigneds_t delimits_content, f_number_unsigned_t * const line); void (*process_columns)(void * const main, const bool names[]); void (*process_load)(void * const main); void (*process_name)(void * const main, bool names[]); void (*process_total)(void * const main, const bool names[]); - f_status_t (*print_at)(fl_print_t * const print, const f_array_length_t at, const f_fss_delimits_t delimits_object, const f_fss_delimits_t delimits_content); - f_status_t (*print_object)(fl_print_t * const print, const f_array_length_t at, const f_fss_delimits_t delimits); + f_status_t (*print_at)(fl_print_t * const print, const f_number_unsigned_t at, const f_fss_delimits_t delimits_object, const f_fss_delimits_t delimits_content); + f_status_t (*print_object)(fl_print_t * const print, const f_number_unsigned_t at, const f_fss_delimits_t delimits); f_status_t (*print_content)(fl_print_t * const print, const f_string_range_t range, const uint8_t quote, const f_fss_delimits_t delimits); f_status_t (*print_content_ignore)(fl_print_t * const print); f_status_t (*print_content_next)(fl_print_t * const print); @@ -224,7 +224,7 @@ extern "C" { f_status_t status_thread; f_state_t state; - f_array_length_t delimit_depth; + f_number_unsigned_t delimit_depth; f_number_unsigned_t select; f_number_unsigned_t line; @@ -326,7 +326,7 @@ extern "C" { * @see f_memory_resize() */ #ifndef _di_fss_read_depths_resize_ - extern f_status_t fss_read_depths_resize(const f_array_length_t length, fss_read_depths_t * const depths); + extern f_status_t fss_read_depths_resize(const f_number_unsigned_t length, fss_read_depths_t * const depths); #endif // _di_fss_read_depths_resize_ /** @@ -351,7 +351,7 @@ extern "C" { * @see f_string_ranges_resize() */ #ifndef _di_fss_read_files_resize_ - extern f_status_t fss_read_files_resize(const f_array_length_t length, fss_read_files_t * const files); + extern f_status_t fss_read_files_resize(const f_number_unsigned_t length, fss_read_files_t * const files); #endif // _di_fss_read_files_resize_ /** diff --git a/level_3/fss_read/c/main/fss_read.c b/level_3/fss_read/c/main/fss_read.c index 19bbe73..ba42f8f 100644 --- a/level_3/fss_read/c/main/fss_read.c +++ b/level_3/fss_read/c/main/fss_read.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fss_read_delimit_content_is_ - f_status_t fss_read_delimit_content_is(fss_read_main_t * const main, const f_array_length_t depth) { + f_status_t fss_read_delimit_content_is(fss_read_main_t * const main, const f_number_unsigned_t depth) { if (!main) return F_false; @@ -19,7 +19,7 @@ extern "C" { #endif // _di_fss_read_delimit_content_is_ #ifndef _di_fss_read_delimit_object_is_ - f_status_t fss_read_delimit_object_is(fss_read_main_t * const main, const f_array_length_t depth) { + f_status_t fss_read_delimit_object_is(fss_read_main_t * const main, const f_number_unsigned_t depth) { if (!main) return F_false; @@ -102,9 +102,9 @@ extern "C" { #endif // _di_fss_read_main_ #ifndef _di_fss_read_file_identify_ - f_string_static_t fss_read_file_identify(const f_array_length_t at, const fss_read_files_t files) { + f_string_static_t fss_read_file_identify(const f_number_unsigned_t at, const fss_read_files_t files) { - for (f_array_length_t i = 0; i < files.used; ++i) { + for (f_number_unsigned_t i = 0; i < files.used; ++i) { if (at >= files.array[i].range.start && at <= files.array[i].range.stop) return files.array[i].name; } // for diff --git a/level_3/fss_read/c/main/fss_read.h b/level_3/fss_read/c/main/fss_read.h index 388bbd4..40bf80f 100644 --- a/level_3/fss_read/c/main/fss_read.h +++ b/level_3/fss_read/c/main/fss_read.h @@ -82,7 +82,7 @@ extern "C" { * F_false if to not apply delimits (fallback when main is NULL). */ #ifndef _di_fss_read_delimit_content_is_ - extern f_status_t fss_read_delimit_content_is(fss_read_main_t * const main, const f_array_length_t depth); + extern f_status_t fss_read_delimit_content_is(fss_read_main_t * const main, const f_number_unsigned_t depth); #endif // _di_fss_read_delimit_content_is_ /** @@ -102,7 +102,7 @@ extern "C" { * F_false if to not apply delimits (fallback when main is NULL). */ #ifndef _di_fss_read_delimit_object_is_ - extern f_status_t fss_read_delimit_object_is(fss_read_main_t * const main, const f_array_length_t depth); + extern f_status_t fss_read_delimit_object_is(fss_read_main_t * const main, const f_number_unsigned_t depth); #endif // _di_fss_read_delimit_object_is_ /** @@ -149,7 +149,7 @@ extern "C" { * On failure to identify, an empty string is returned. */ #ifndef _di_fss_read_file_identify_ - extern f_string_static_t fss_read_file_identify(const f_array_length_t at, const fss_read_files_t files); + extern f_string_static_t fss_read_file_identify(const f_number_unsigned_t at, const fss_read_files_t files); #endif // _di_fss_read_file_identify_ /** diff --git a/level_3/fss_read/c/main/main.c b/level_3/fss_read/c/main/main.c index 9f9a1bf..31aa4db 100644 --- a/level_3/fss_read/c/main/main.c +++ b/level_3/fss_read/c/main/main.c @@ -119,10 +119,10 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { if (main->program.parameters.array[fss_read_parameter_as_e].result & f_console_result_value_e && main->program.parameters.array[fss_read_parameter_as_e].values.used) { - f_array_length_t index = 0; + f_number_unsigned_t index = 0; f_string_static_t *argv = main->program.parameters.arguments.array; - for (f_array_length_t i = 0; i < main->program.parameters.array[fss_read_parameter_as_e].values.used; ++i) { + for (f_number_unsigned_t i = 0; i < main->program.parameters.array[fss_read_parameter_as_e].values.used; ++i) { index = main->program.parameters.array[fss_read_parameter_as_e].values.array[i]; diff --git a/level_3/fss_read/c/main/print/data.c b/level_3/fss_read/c/main/print/data.c index 5f08856..5efc827 100644 --- a/level_3/fss_read/c/main/print/data.c +++ b/level_3/fss_read/c/main/print/data.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fss_read_print_at_ - f_status_t fss_read_print_at(fl_print_t * const print, const f_array_length_t at, const f_fss_delimits_t delimits_object, const f_fss_delimits_t delimits_content) { + f_status_t fss_read_print_at(fl_print_t * const print, const f_number_unsigned_t at, const f_fss_delimits_t delimits_object, const f_fss_delimits_t delimits_content) { if (!print || !print->custom) return F_status_set_error(F_output_not); @@ -42,7 +42,7 @@ extern "C" { print_set_end = F_true; if (main->callback.print_content) { - for (f_array_length_t i = 0; i < main->setting.contents.array[at].used; ++i) { + for (f_number_unsigned_t i = 0; i < main->setting.contents.array[at].used; ++i) { main->callback.print_content(&main->program.output, main->setting.contents.array[at].array[i], main->setting.quotes_content.array[at].used ? main->setting.quotes_content.array[at].array[i] : 0, delimits_content); @@ -123,7 +123,7 @@ extern "C" { #endif // _di_fss_read_print_number_ #ifndef _di_fss_read_print_object_ - f_status_t fss_read_print_object(fl_print_t * const print, const f_array_length_t at, const f_fss_delimits_t delimits) { + f_status_t fss_read_print_object(fl_print_t * const print, const f_number_unsigned_t at, const f_fss_delimits_t delimits) { if (!print || !print->custom) return F_status_set_error(F_output_not); diff --git a/level_3/fss_read/c/main/print/data.h b/level_3/fss_read/c/main/print/data.h index 479f303..80ce133 100644 --- a/level_3/fss_read/c/main/print/data.h +++ b/level_3/fss_read/c/main/print/data.h @@ -55,7 +55,7 @@ extern "C" { * @see main.callback.print_set_end() */ #ifndef _di_fss_read_print_at_ - extern f_status_t fss_read_print_at(fl_print_t * const print, const f_array_length_t at, const f_fss_delimits_t delimits_object, const f_fss_delimits_t delimits_content); + extern f_status_t fss_read_print_at(fl_print_t * const print, const f_number_unsigned_t at, const f_fss_delimits_t delimits_object, const f_fss_delimits_t delimits_content); #endif // _di_fss_read_print_at_ /** @@ -177,7 +177,7 @@ extern "C" { * @see fss_read_print_quote() */ #ifndef _di_fss_read_print_object_ - extern f_status_t fss_read_print_object(fl_print_t * const print, const f_array_length_t at, const f_fss_delimits_t delimits); + extern f_status_t fss_read_print_object(fl_print_t * const print, const f_number_unsigned_t at, const f_fss_delimits_t delimits); #endif // _di_fss_read_print_object_ /** diff --git a/level_3/fss_read/c/main/print/error.c b/level_3/fss_read/c/main/print/error.c index d2eb25d..8b55ab5 100644 --- a/level_3/fss_read/c/main/print/error.c +++ b/level_3/fss_read/c/main/print/error.c @@ -47,7 +47,7 @@ extern "C" { #endif // _di_fss_read_print_error_parameter_requires_message_ #ifndef _di_fss_read_print_error_parameter_value_before_value_number_ - f_status_t fss_read_print_error_parameter_value_before_value_number(fl_print_t * const print, const f_string_static_t symbol, const f_string_static_t name, const f_array_length_t value, const f_array_length_t before) { + f_status_t fss_read_print_error_parameter_value_before_value_number(fl_print_t * const print, const f_string_static_t symbol, const f_string_static_t name, const f_number_unsigned_t value, const f_number_unsigned_t before) { if (!print) return F_status_set_error(F_output_not); if (print->verbosity == f_console_verbosity_quiet_e) return F_output_not; @@ -69,7 +69,7 @@ extern "C" { #endif // _di_fss_read_print_error_parameter_value_before_value_number_ #ifndef _di_fss_read_print_error_parameter_value_once_only_number_ - f_status_t fss_read_print_error_parameter_value_once_only_number(fl_print_t * const print, const f_string_static_t symbol, const f_string_static_t name, const f_array_length_t value) { + f_status_t fss_read_print_error_parameter_value_once_only_number(fl_print_t * const print, const f_string_static_t symbol, const f_string_static_t name, const f_number_unsigned_t value) { if (!print) return F_status_set_error(F_output_not); if (print->verbosity == f_console_verbosity_quiet_e) return F_output_not; diff --git a/level_3/fss_read/c/main/print/error.h b/level_3/fss_read/c/main/print/error.h index 20666a0..28efcc2 100644 --- a/level_3/fss_read/c/main/print/error.h +++ b/level_3/fss_read/c/main/print/error.h @@ -122,7 +122,7 @@ extern "C" { * F_output_not (with error bit) if a parameter is NULL. */ #ifndef _di_fss_read_print_error_parameter_value_before_value_number_ - extern f_status_t fss_read_print_error_parameter_value_before_value_number(fl_print_t * const print, const f_string_static_t symbol, const f_string_static_t name, const f_array_length_t value, const f_array_length_t before); + extern f_status_t fss_read_print_error_parameter_value_before_value_number(fl_print_t * const print, const f_string_static_t symbol, const f_string_static_t name, const f_number_unsigned_t value, const f_number_unsigned_t before); #endif // _di_fss_read_print_error_parameter_value_before_value_number_ /** @@ -149,7 +149,7 @@ extern "C" { * F_output_not (with error bit) if a parameter is NULL. */ #ifndef _di_fss_read_print_error_parameter_value_once_only_number_ - extern f_status_t fss_read_print_error_parameter_value_once_only_number(fl_print_t * const print, const f_string_static_t symbol, const f_string_static_t name, const f_array_length_t value); + extern f_status_t fss_read_print_error_parameter_value_once_only_number(fl_print_t * const print, const f_string_static_t symbol, const f_string_static_t name, const f_number_unsigned_t value); #endif // _di_fss_read_print_error_parameter_value_once_only_number_ /** diff --git a/level_3/fss_read/c/main/process_normal.c b/level_3/fss_read/c/main/process_normal.c index b699b45..66d87d5 100644 --- a/level_3/fss_read/c/main/process_normal.c +++ b/level_3/fss_read/c/main/process_normal.c @@ -50,8 +50,8 @@ extern "C" { main->callback.process_load(main); if (F_status_is_error(main->setting.state.status)) return; - const f_array_lengths_t * const delimits_object = !(main->setting.flag & fss_read_main_flag_original_e) && fss_read_delimit_object_is(main, 0) ? &main->setting.delimits_object : &fss_read_except_none_c; - const f_array_lengths_t * const delimits_content = !(main->setting.flag & fss_read_main_flag_original_e) && fss_read_delimit_content_is(main, 0) ? &main->setting.delimits_content : &fss_read_except_none_c; + const f_number_unsigneds_t * const delimits_object = !(main->setting.flag & fss_read_main_flag_original_e) && fss_read_delimit_object_is(main, 0) ? &main->setting.delimits_object : &fss_read_except_none_c; + const f_number_unsigneds_t * const delimits_content = !(main->setting.flag & fss_read_main_flag_original_e) && fss_read_delimit_content_is(main, 0) ? &main->setting.delimits_content : &fss_read_except_none_c; bool names[main->setting.objects.used]; @@ -81,7 +81,7 @@ extern "C" { } } else { - f_array_length_t i = 0; + f_number_unsigned_t i = 0; if (main->setting.flag & fss_read_main_flag_line_e) { if (main->callback.process_at_line) { @@ -115,7 +115,7 @@ extern "C" { #endif // _di_fss_read_process_normal_ #ifndef _di_fss_read_process_normal_at_ - void fss_read_process_normal_at(void * const void_main, const bool names[], const f_array_lengths_t delimits_object, f_array_lengths_t delimits_content) { + void fss_read_process_normal_at(void * const void_main, const bool names[], const f_number_unsigneds_t delimits_object, f_number_unsigneds_t delimits_content) { if (!void_main) return; @@ -140,8 +140,8 @@ extern "C" { } } - f_array_length_t i = 0; - f_array_length_t at = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t at = 0; for (; i < main->setting.objects.used; ++i) { @@ -155,7 +155,7 @@ extern "C" { if ((main->setting.flag & fss_read_main_flag_line_single_e) && !at) break; if (main->callback.process_at_line) { - f_array_length_t line = 0; + f_number_unsigned_t line = 0; main->callback.process_at_line(void_main, i, delimits_object, delimits_content, &line); } @@ -188,7 +188,7 @@ extern "C" { #endif // _di_fss_read_process_normal_at_ #ifndef _di_fss_read_process_normal_at_line_ - void fss_read_process_normal_at_line(void * const void_main, const f_array_length_t at, const f_array_lengths_t delimits_object, const f_array_lengths_t delimits_content, f_number_unsigned_t * const line) { + void fss_read_process_normal_at_line(void * const void_main, const f_number_unsigned_t at, const f_number_unsigneds_t delimits_object, const f_number_unsigneds_t delimits_content, f_number_unsigned_t * const line) { if (!void_main || !line) return; @@ -241,7 +241,7 @@ extern "C" { return; } - f_array_length_t i = 0; + f_number_unsigned_t i = 0; if (main->setting.flag & fss_read_main_flag_line_single_e) { if (*line == main->setting.line) { @@ -266,9 +266,9 @@ extern "C" { ++(*line); } else { - f_array_length_t line_original = 0; - f_array_length_t j = 0; - f_array_length_t k = 0; + f_number_unsigned_t line_original = 0; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; for (; i < main->setting.contents.array[at].used; ++i) { @@ -365,10 +365,10 @@ extern "C" { return; } - f_array_length_t max = 0; + f_number_unsigned_t max = 0; if (main->setting.flag & fss_read_main_flag_content_multiple_e) { - for (f_array_length_t at = 0; at < main->setting.contents.used; ++at) { + for (f_number_unsigned_t at = 0; at < main->setting.contents.used; ++at) { if (!names[at]) continue; if (fss_read_signal_check(main)) return; @@ -379,7 +379,7 @@ extern "C" { } // for } else { - for (f_array_length_t at = 0; at < main->setting.contents.used; ++at) { + for (f_number_unsigned_t at = 0; at < main->setting.contents.used; ++at) { if (names[at]) { max = 1; @@ -405,7 +405,7 @@ extern "C" { fss_read_main_t * const main = (fss_read_main_t *) void_main; if (main->setting.depths.array[0].index_name) { - f_array_length_t i = 0; + f_number_unsigned_t i = 0; memset(names, F_false, sizeof(bool) * main->setting.objects.used); @@ -445,8 +445,8 @@ extern "C" { fss_read_main_t * const main = (fss_read_main_t *) void_main; - f_array_length_t total = 0; - f_array_length_t i = 0; + f_number_unsigned_t total = 0; + f_number_unsigned_t i = 0; if (main->setting.flag & fss_read_main_flag_select_e) { for (; i < main->setting.contents.used; ++i) { @@ -499,13 +499,13 @@ extern "C" { fss_read_main_t * const main = (fss_read_main_t *) void_main; - f_array_length_t total = 0; + f_number_unsigned_t total = 0; f_string_range_t range = f_string_range_t_initialize; - f_array_length_t i = 0; - f_array_length_t j = 0; - f_array_length_t k = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; - for (f_array_length_t at = 0; at < main->setting.contents.used; ++at) { + for (f_number_unsigned_t at = 0; at < main->setting.contents.used; ++at) { if (!names[at]) continue; if (fss_read_signal_check(main)) return; diff --git a/level_3/fss_read/c/main/process_normal.h b/level_3/fss_read/c/main/process_normal.h index d42d4ad..4a37ea4 100644 --- a/level_3/fss_read/c/main/process_normal.h +++ b/level_3/fss_read/c/main/process_normal.h @@ -111,7 +111,7 @@ extern "C" { * Must not be NULL. */ #ifndef _di_fss_read_process_normal_at_line_ - extern void fss_read_process_normal_at_line(void * const main, const f_array_length_t at, const f_array_lengths_t delimits_object, const f_array_lengths_t delimits_content, f_number_unsigned_t * const line); + extern void fss_read_process_normal_at_line(void * const main, const f_number_unsigned_t at, const f_number_unsigneds_t delimits_object, const f_number_unsigneds_t delimits_content, f_number_unsigned_t * const line); #endif // _di_fss_read_process_normal_at_line_ /** diff --git a/level_3/fss_read/c/main/signal.c b/level_3/fss_read/c/main/signal.c index 5015838..28866d3 100644 --- a/level_3/fss_read/c/main/signal.c +++ b/level_3/fss_read/c/main/signal.c @@ -50,7 +50,7 @@ extern "C" { if (!main) return; siginfo_t information; - f_array_length_t failsafe = 0; + f_number_unsigned_t failsafe = 0; memset(&information, 0, sizeof(siginfo_t)); diff --git a/level_3/fss_read/c/payload/fss_read.c b/level_3/fss_read/c/payload/fss_read.c index 35cb7f8..58bff92 100644 --- a/level_3/fss_read/c/payload/fss_read.c +++ b/level_3/fss_read/c/payload/fss_read.c @@ -93,11 +93,11 @@ extern "C" { if (!main) return; - f_array_lengths_t * const values = &main->program.parameters.array[fss_read_parameter_object_e].values; + f_number_unsigneds_t * const values = &main->program.parameters.array[fss_read_parameter_object_e].values; f_string_static_t * const argv = main->program.parameters.arguments.array; if ((main->program.parameters.array[fss_read_parameter_object_e].result & f_console_result_value_e) && values->used) { - for (f_array_length_t i = 0; i < values->used; ++i) { + for (f_number_unsigned_t i = 0; i < values->used; ++i) { if (fss_read_signal_check(main)) return; diff --git a/level_3/fss_write/c/main/common.c b/level_3/fss_write/c/main/common.c index fed315f..ee59d68 100644 --- a/level_3/fss_write/c/main/common.c +++ b/level_3/fss_write/c/main/common.c @@ -129,7 +129,7 @@ extern "C" { return; } - const f_array_length_t index = main->program.parameters.array[fss_write_parameter_file_e].values.array[0]; + const f_number_unsigned_t index = main->program.parameters.array[fss_write_parameter_file_e].values.array[0]; main->program.output.to.id = -1; main->program.output.to.stream = 0; @@ -161,7 +161,7 @@ extern "C" { } if ((main->program.parameters.array[fss_write_parameter_object_e].result & f_console_result_value_e) && main->program.parameters.array[fss_write_parameter_object_e].values.used) { - f_array_lengths_t * const values = &main->program.parameters.array[fss_write_parameter_object_e].values; + f_number_unsigneds_t * const values = &main->program.parameters.array[fss_write_parameter_object_e].values; main->setting.objects.used = 0; @@ -178,7 +178,7 @@ extern "C" { } // Construct the array without allocating any more memory for the string data by setting this as a static string (used > 0, size = 0). - for (f_array_length_t index = 0; main->setting.objects.used < values->used; ) { + for (f_number_unsigned_t index = 0; main->setting.objects.used < values->used; ) { index = values->array[main->setting.objects.used]; @@ -219,11 +219,11 @@ extern "C" { } } - f_array_length_t stub_object_array[1] = { 0 }; - f_array_lengths_t stub_object = macro_f_array_lengths_t_initialize_1(stub_object_array, 0, 1); + f_number_unsigned_t stub_object_array[1] = { 0 }; + f_number_unsigneds_t stub_object = macro_f_number_unsigneds_t_initialize_1(stub_object_array, 0, 1); - f_array_lengths_t * const values_content = &main->program.parameters.array[fss_write_parameter_content_e].values; - f_array_lengths_t * const values_object = main->program.parameters.array[fss_write_parameter_object_e].values.used + f_number_unsigneds_t * const values_content = &main->program.parameters.array[fss_write_parameter_content_e].values; + f_number_unsigneds_t * const values_object = main->program.parameters.array[fss_write_parameter_object_e].values.used ? &main->program.parameters.array[fss_write_parameter_object_e].values : &stub_object; @@ -241,11 +241,11 @@ extern "C" { return; } - f_array_length_t i = 0; // For Contents. - f_array_length_t j = 0; // For Objects. - f_array_length_t k = 0; - f_array_length_t total = 0; - f_array_length_t index = 0; + f_number_unsigned_t i = 0; // For Contents. + f_number_unsigned_t j = 0; // For Objects. + f_number_unsigned_t k = 0; + f_number_unsigned_t total = 0; + f_number_unsigned_t index = 0; // Construct the array without allocating any more memory for the string data by setting this as a static string (used > 0, size = 0). while (i < values_content->used) { @@ -305,7 +305,7 @@ extern "C" { } if ((main->program.parameters.array[fss_write_parameter_prepend_e].result & f_console_result_value_e) && main->program.parameters.array[fss_write_parameter_prepend_e].values.used) { - const f_array_length_t index = main->program.parameters.array[fss_write_parameter_prepend_e].values.array[main->program.parameters.array[fss_write_parameter_prepend_e].location]; + const f_number_unsigned_t index = main->program.parameters.array[fss_write_parameter_prepend_e].values.array[main->program.parameters.array[fss_write_parameter_prepend_e].location]; main->setting.prepend.used = 0; @@ -374,11 +374,11 @@ extern "C" { // Only process if the standard designates that the ingore is supported. if (main->setting.flag & fss_write_main_flag_ignore_e) { - f_array_length_t stub_data_array[1] = { 0 }; - f_array_lengths_t stub_data = macro_f_array_lengths_t_initialize_1(stub_data_array, 0, 1); + f_number_unsigned_t stub_data_array[1] = { 0 }; + f_number_unsigneds_t stub_data = macro_f_number_unsigneds_t_initialize_1(stub_data_array, 0, 1); - f_array_lengths_t * const values_ignore = &main->program.parameters.array[fss_write_parameter_ignore_e].values; - f_array_lengths_t * const values_data = main->program.parameters.array[fss_write_parameter_object_e].values.used + f_number_unsigneds_t * const values_ignore = &main->program.parameters.array[fss_write_parameter_ignore_e].values; + f_number_unsigneds_t * const values_data = main->program.parameters.array[fss_write_parameter_object_e].values.used ? &main->program.parameters.array[fss_write_parameter_object_e].values : main->program.parameters.array[fss_write_parameter_content_e].values.used ? &main->program.parameters.array[fss_write_parameter_content_e].values @@ -398,11 +398,11 @@ extern "C" { return; } - f_array_length_t i = 0; // For Ignores. - f_array_length_t j = 0; // For Objects/Contents. - f_array_length_t k = 0; - f_array_length_t total = 0; - f_array_length_t index = 0; + f_number_unsigned_t i = 0; // For Ignores. + f_number_unsigned_t j = 0; // For Objects/Contents. + f_number_unsigned_t k = 0; + f_number_unsigned_t total = 0; + f_number_unsigned_t index = 0; // Construct the array without allocating any more memory for the string data by setting this as a static string (used > 0, size = 0). while (i < values_ignore->used) { @@ -491,8 +491,8 @@ extern "C" { else { // Still validate the parameters, even if not being used. - f_array_length_t i = 0; - f_array_length_t index = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t index = 0; f_string_range_t number = f_string_range_t_initialize; while (i < main->program.parameters.array[fss_write_parameter_ignore_e].values.used) { diff --git a/level_3/fss_write/c/main/fss_write.c b/level_3/fss_write/c/main/fss_write.c index a85cce6..e0a8519 100644 --- a/level_3/fss_write/c/main/fss_write.c +++ b/level_3/fss_write/c/main/fss_write.c @@ -83,7 +83,7 @@ extern "C" { #endif // _di_fss_write_process_normal_ #ifndef _di_fss_write_process_normal_data_ - void fss_write_process_normal_data(void * const void_main, const f_array_length_t length) { + void fss_write_process_normal_data(void * const void_main, const f_number_unsigned_t length) { if (!void_main) return; @@ -95,7 +95,7 @@ extern "C" { main->setting.contents = 0; if (length) { - for (f_array_length_t i = 0; i < length; ++i) { + for (f_number_unsigned_t i = 0; i < length; ++i) { // @todo replace all signal checks with forked main process that independently checks and assigns main->program.signal_received. if (!((++main->program.signal_check) % fss_write_signal_check_d)) { @@ -149,9 +149,9 @@ extern "C" { fll_print_dynamic_raw(f_string_eol_s, main->program.message.to); } - const f_array_length_t used_objects = main->setting.objects.used; - const f_array_length_t used_contentss = main->setting.contentss.used; - const f_array_length_t used_ignoress = main->setting.ignoress.used; + const f_number_unsigned_t used_objects = main->setting.objects.used; + const f_number_unsigned_t used_contentss = main->setting.contentss.used; + const f_number_unsigned_t used_ignoress = main->setting.ignoress.used; main->setting.object = &main->setting.objects.array[used_objects]; main->setting.contents = &main->setting.contentss.array[used_contentss]; @@ -204,8 +204,8 @@ extern "C" { input.id = F_type_descriptor_input_d; input.size_read = main->setting.state.step_large; - f_array_length_t total = 0; - f_array_length_t ignore = 0; + f_number_unsigned_t total = 0; + f_number_unsigned_t ignore = 0; f_string_range_t range = f_string_range_t_initialize; // Reset all of the used data before starting the loop. @@ -483,7 +483,7 @@ extern "C" { if (main->callback.process_content) { if (main->setting.contents && main->setting.contents->used) { - for (f_array_length_t i = 0; i < main->setting.contents->used; ++i) { + for (f_number_unsigned_t i = 0; i < main->setting.contents->used; ++i) { if (main->setting.contents->array[i].used) { main->setting.range.start = 0; diff --git a/level_3/fss_write/c/main/fss_write.h b/level_3/fss_write/c/main/fss_write.h index d4b2725..04d4a9d 100644 --- a/level_3/fss_write/c/main/fss_write.h +++ b/level_3/fss_write/c/main/fss_write.h @@ -127,7 +127,7 @@ extern "C" { * F_parameter (with error bit) if main is NULL or setting is NULL. */ #ifndef _di_fss_write_process_normal_data_ - void fss_write_process_normal_data(void * const main, const f_array_length_t length); + void fss_write_process_normal_data(void * const main, const f_number_unsigned_t length); #endif // _di_fss_write_process_normal_data_ /** diff --git a/level_3/fss_write/c/main/main.c b/level_3/fss_write/c/main/main.c index 78f5d98..cd04c61 100644 --- a/level_3/fss_write/c/main/main.c +++ b/level_3/fss_write/c/main/main.c @@ -107,10 +107,10 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { if (main->program.parameters.array[fss_write_parameter_as_e].result & f_console_result_value_e && main->program.parameters.array[fss_write_parameter_as_e].values.used) { - f_array_length_t index = 0; + f_number_unsigned_t index = 0; f_string_static_t *argv = main->program.parameters.arguments.array; - for (f_array_length_t i = 0; i < main->program.parameters.array[fss_write_parameter_as_e].values.used; ++i) { + for (f_number_unsigned_t i = 0; i < main->program.parameters.array[fss_write_parameter_as_e].values.used; ++i) { index = main->program.parameters.array[fss_write_parameter_as_e].values.array[i]; diff --git a/level_3/fss_write/c/main/signal.c b/level_3/fss_write/c/main/signal.c index 661b69f..7b559fe 100644 --- a/level_3/fss_write/c/main/signal.c +++ b/level_3/fss_write/c/main/signal.c @@ -50,7 +50,7 @@ extern "C" { if (!main) return; siginfo_t information; - f_array_length_t failsafe = 0; + f_number_unsigned_t failsafe = 0; memset(&information, 0, sizeof(siginfo_t)); diff --git a/level_3/fss_write/c/payload/fss_write.c b/level_3/fss_write/c/payload/fss_write.c index 6b2b4c8..db76431 100644 --- a/level_3/fss_write/c/payload/fss_write.c +++ b/level_3/fss_write/c/payload/fss_write.c @@ -26,13 +26,13 @@ extern "C" { input.id = F_type_descriptor_input_d; input.size_read = fss_write_allocation_large_d; - f_array_length_t total = 0; - f_array_length_t length = 0; + f_number_unsigned_t total = 0; + f_number_unsigned_t length = 0; f_string_range_t range = f_string_range_t_initialize; - const f_array_length_t used_objects = main->setting.objects.used; - const f_array_length_t used_contentss = main->setting.contentss.used; - const f_array_length_t used_ignoress = main->setting.ignoress.used; + const f_number_unsigned_t used_objects = main->setting.objects.used; + const f_number_unsigned_t used_contentss = main->setting.contentss.used; + const f_number_unsigned_t used_ignoress = main->setting.ignoress.used; main->setting.object = &main->setting.objects.array[used_objects]; main->setting.contents = &main->setting.contentss.array[used_contentss]; @@ -486,7 +486,7 @@ extern "C" { const f_string_static_t *prepend = 0; if (main->setting.flag & fss_write_main_flag_prepend_e) { - const f_array_length_t index = main->program.parameters.array[fss_write_parameter_prepend_e].values.array[main->program.parameters.array[fss_write_parameter_prepend_e].values.used - 1]; + const f_number_unsigned_t index = main->program.parameters.array[fss_write_parameter_prepend_e].values.array[main->program.parameters.array[fss_write_parameter_prepend_e].values.used - 1]; prepend = &main->program.parameters.arguments.array[index]; } @@ -544,11 +544,11 @@ extern "C" { if (!main) return; - f_array_lengths_t * const values = &main->program.parameters.array[fss_write_parameter_object_e].values; + f_number_unsigneds_t * const values = &main->program.parameters.array[fss_write_parameter_object_e].values; f_string_static_t * const argv = main->program.parameters.arguments.array; if ((main->program.parameters.array[fss_write_parameter_object_e].result & f_console_result_value_e) && values->used) { - for (f_array_length_t i = 0; i < values->used; ++i) { + for (f_number_unsigned_t i = 0; i < values->used; ++i) { if (f_compare_dynamic(argv[values->array[i]], fss_write_payload_s) == F_equal_to && i + 1 < values->used) { main->setting.state.status = F_status_set_error(F_parameter); diff --git a/level_3/iki_read/c/main/common.c b/level_3/iki_read/c/main/common.c index 29aa088..3dfe8e4 100644 --- a/level_3/iki_read/c/main/common.c +++ b/level_3/iki_read/c/main/common.c @@ -129,7 +129,7 @@ extern "C" { return; } - const f_array_length_t index = main->program.parameters.array[iki_read_parameter_at_e].values.array[main->program.parameters.array[iki_read_parameter_at_e].values.used - 1]; + const f_number_unsigned_t index = main->program.parameters.array[iki_read_parameter_at_e].values.array[main->program.parameters.array[iki_read_parameter_at_e].values.used - 1]; main->setting.at = 0; @@ -162,7 +162,7 @@ extern "C" { } if (main->program.parameters.array[iki_read_parameter_line_e].result & f_console_result_value_e) { - const f_array_length_t index = main->program.parameters.array[iki_read_parameter_line_e].values.array[main->program.parameters.array[iki_read_parameter_line_e].values.used - 1]; + const f_number_unsigned_t index = main->program.parameters.array[iki_read_parameter_line_e].values.array[main->program.parameters.array[iki_read_parameter_line_e].values.used - 1]; main->setting.line = 0; @@ -210,9 +210,9 @@ extern "C" { } // Distinctly append all names. - f_array_length_t i = 0; - f_array_length_t j = 0; - f_array_lengths_t *values = &main->program.parameters.array[iki_read_parameter_name_e].values; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; + f_number_unsigneds_t *values = &main->program.parameters.array[iki_read_parameter_name_e].values; for (; i < values->used; ++i) { @@ -285,10 +285,10 @@ extern "C" { return; } - f_array_length_t at = 0; - f_array_length_t index = 0; - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t at = 0; + f_number_unsigned_t index = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; for (; i < main->program.parameters.array[iki_read_parameter_replace_e].values.used; ++i) { @@ -380,10 +380,10 @@ extern "C" { return; } - f_array_length_t at = 0; - f_array_length_t index = 0; - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t at = 0; + f_number_unsigned_t index = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; for (; i < main->program.parameters.array[iki_read_parameter_wrap_e].values.used; ++i) { @@ -559,9 +559,9 @@ extern "C" { return; } - f_array_length_t index = 0; + f_number_unsigned_t index = 0; - for (f_array_length_t i = 0; i < main->program.parameters.remaining.used; ++i, ++main->setting.files.used) { + for (f_number_unsigned_t i = 0; i < main->program.parameters.remaining.used; ++i, ++main->setting.files.used) { // Static strings are being used, so if a dynamic string exists (size > 0), then de-allocate it. if (main->setting.files.array[main->setting.files.used].size) { @@ -631,10 +631,10 @@ extern "C" { return F_false; } - f_array_length_t at = 0; - f_array_length_t index = 0; - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t at = 0; + f_number_unsigned_t index = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; for (; i < parameter.values.used; ++i) { diff --git a/level_3/iki_read/c/main/common/type.h b/level_3/iki_read/c/main/common/type.h index 39929f3..962fb39 100644 --- a/level_3/iki_read/c/main/common/type.h +++ b/level_3/iki_read/c/main/common/type.h @@ -51,8 +51,8 @@ extern "C" { f_status_t status_thread; f_state_t state; - f_array_length_t at; - f_array_length_t line; + f_number_unsigned_t at; + f_number_unsigned_t line; f_string_dynamic_t buffer; f_string_dynamics_t names; @@ -63,8 +63,8 @@ extern "C" { f_string_triples_t substitute; f_string_triples_t wrap; - f_array_length_t *map_replaces; - f_array_length_t *map_wraps; + f_number_unsigned_t *map_replaces; + f_number_unsigned_t *map_wraps; f_iki_data_t data; } iki_read_setting_t; diff --git a/level_3/iki_read/c/main/identify.c b/level_3/iki_read/c/main/identify.c index 1781087..ca40a46 100644 --- a/level_3/iki_read/c/main/identify.c +++ b/level_3/iki_read/c/main/identify.c @@ -9,10 +9,10 @@ extern "C" { if (!main || !(main->setting.replace.used || main->setting.wrap.used)) return; - f_array_length_t i = 0; + f_number_unsigned_t i = 0; if (main->setting.flag & (iki_read_main_flag_content_e | iki_read_main_flag_literal_e)) { - f_array_length_t j = 0; + f_number_unsigned_t j = 0; for (i = 0; i < main->setting.data.vocabulary.used; ++i) { @@ -63,9 +63,9 @@ extern "C" { #endif // _di_iki_read_identify_alteration_ #ifndef _di_iki_read_identify_substitution_ - f_array_length_t iki_read_identify_substitution(iki_read_main_t * const main, const f_string_range_t name, const f_string_range_t value, f_string_triples_t *triple) { + f_number_unsigned_t iki_read_identify_substitution(iki_read_main_t * const main, const f_string_range_t name, const f_string_range_t value, f_string_triples_t *triple) { - f_array_length_t i = triple->used - 1; + f_number_unsigned_t i = triple->used - 1; do { if (f_compare_dynamic_partial_string(triple->array[i].a.string, main->setting.buffer, triple->array[i].a.used, name) == F_equal_to) { diff --git a/level_3/iki_read/c/main/identify.h b/level_3/iki_read/c/main/identify.h index 3eb1f7f..1908842 100644 --- a/level_3/iki_read/c/main/identify.h +++ b/level_3/iki_read/c/main/identify.h @@ -57,7 +57,7 @@ extern "C" { * The value of the triple.used is returned on no match. */ #ifndef _di_iki_read_identify_substitution_ - extern f_array_length_t iki_read_identify_substitution(iki_read_main_t * const main, const f_string_range_t name, const f_string_range_t value, f_string_triples_t *triple); + extern f_number_unsigned_t iki_read_identify_substitution(iki_read_main_t * const main, const f_string_range_t name, const f_string_range_t value, f_string_triples_t *triple); #endif // _di_iki_read_identify_substitution_ #ifdef __cplusplus diff --git a/level_3/iki_read/c/main/iki_read.c b/level_3/iki_read/c/main/iki_read.c index 8c06fda..dd540fe 100644 --- a/level_3/iki_read/c/main/iki_read.c +++ b/level_3/iki_read/c/main/iki_read.c @@ -64,7 +64,7 @@ extern "C" { off_t size_file = 0; off_t size_read = 0; - for (f_array_length_t i = 0; i < main->setting.files.used; ++i) { + for (f_number_unsigned_t i = 0; i < main->setting.files.used; ++i) { if (!((++main->program.signal_check) % iki_read_signal_check_d)) { if (fll_program_standard_signal_received(&main->program)) { diff --git a/level_3/iki_read/c/main/print/data.c b/level_3/iki_read/c/main/print/data.c index 84f09e4..8f66977 100644 --- a/level_3/iki_read/c/main/print/data.c +++ b/level_3/iki_read/c/main/print/data.c @@ -5,13 +5,13 @@ extern "C" { #endif #ifndef _di_iki_read_print_data_ - void iki_read_print_data(fl_print_t * const print, const f_array_length_t index) { + void iki_read_print_data(fl_print_t * const print, const f_number_unsigned_t index) { if (!print || !print->custom) return; iki_read_main_t * const main = (iki_read_main_t *) print->custom; - f_array_length_t at = main->setting.reassign.used; + f_number_unsigned_t at = main->setting.reassign.used; if (main->setting.reassign.used && (main->setting.flag & (iki_read_main_flag_content_e | iki_read_main_flag_literal_e))) { at = iki_read_identify_substitution(main, main->setting.data.vocabulary.array[index], main->setting.data.content.array[index], &main->setting.reassign); @@ -126,7 +126,7 @@ extern "C" { #endif // _di_iki_read_print_data_ #ifndef _di_iki_read_print_data_wrap_append_ - void iki_read_print_data_wrap_append(fl_print_t * const print, const f_array_length_t index) { + void iki_read_print_data_wrap_append(fl_print_t * const print, const f_number_unsigned_t index) { if (!print || !print->custom) return; @@ -144,7 +144,7 @@ extern "C" { #endif // _di_iki_read_print_data_wrap_append_ #ifndef _di_iki_read_print_data_wrap_prepend_ - void iki_read_print_data_wrap_prepend(fl_print_t * const print, const f_array_length_t index) { + void iki_read_print_data_wrap_prepend(fl_print_t * const print, const f_number_unsigned_t index) { if (!print || !print->custom) return; diff --git a/level_3/iki_read/c/main/print/data.h b/level_3/iki_read/c/main/print/data.h index a4d3f98..0c04458 100644 --- a/level_3/iki_read/c/main/print/data.h +++ b/level_3/iki_read/c/main/print/data.h @@ -42,7 +42,7 @@ extern "C" { * @see iki_read_print_data_wrap_append() */ #ifndef _di_iki_read_print_data_ - extern void iki_read_print_data(fl_print_t * const print, const f_array_length_t index) F_attribute_visibility_internal_d; + extern void iki_read_print_data(fl_print_t * const print, const f_number_unsigned_t index) F_attribute_visibility_internal_d; #endif // _di_iki_read_print_data_ /** @@ -60,7 +60,7 @@ extern "C" { * @see f_print_dynamic() */ #ifndef _di_iki_read_print_data_wrap_append_ - extern void iki_read_print_data_wrap_append(fl_print_t * const print, const f_array_length_t index) F_attribute_visibility_internal_d; + extern void iki_read_print_data_wrap_append(fl_print_t * const print, const f_number_unsigned_t index) F_attribute_visibility_internal_d; #endif // _di_iki_read_print_data_wrap_append_ /** @@ -78,7 +78,7 @@ extern "C" { * @see f_print_dynamic() */ #ifndef _di_iki_read_print_data_wrap_prepend_ - extern void iki_read_print_data_wrap_prepend(fl_print_t * const print, const f_array_length_t index) F_attribute_visibility_internal_d; + extern void iki_read_print_data_wrap_prepend(fl_print_t * const print, const f_number_unsigned_t index) F_attribute_visibility_internal_d; #endif // _di_iki_read_print_data_wrap_prepend_ #ifdef __cplusplus diff --git a/level_3/iki_read/c/main/process.c b/level_3/iki_read/c/main/process.c index 3bf5c2c..a9d16db 100644 --- a/level_3/iki_read/c/main/process.c +++ b/level_3/iki_read/c/main/process.c @@ -13,7 +13,7 @@ extern "C" { return; } - f_array_length_t line = 0; + f_number_unsigned_t line = 0; range->start = 0; if (main->setting.line) { @@ -91,12 +91,12 @@ extern "C" { return; } - f_array_length_t i = 0; - f_array_length_t replaces[main->setting.data.vocabulary.used]; - f_array_length_t wraps[main->setting.data.vocabulary.used]; + f_number_unsigned_t i = 0; + f_number_unsigned_t replaces[main->setting.data.vocabulary.used]; + f_number_unsigned_t wraps[main->setting.data.vocabulary.used]; - memset(replaces, 0, sizeof(f_array_length_t) * main->setting.data.vocabulary.used); - memset(wraps, 0, sizeof(f_array_length_t) * main->setting.data.vocabulary.used); + memset(replaces, 0, sizeof(f_number_unsigned_t) * main->setting.data.vocabulary.used); + memset(wraps, 0, sizeof(f_number_unsigned_t) * main->setting.data.vocabulary.used); main->setting.map_replaces = replaces; main->setting.map_wraps = wraps; @@ -108,8 +108,8 @@ extern "C" { iki_read_identify_alteration(main); if (main->setting.flag & iki_read_main_flag_name_e) { - f_array_length_t j = 0; - f_array_length_t matches = 0; + f_number_unsigned_t j = 0; + f_number_unsigned_t matches = 0; bool unmatched = F_true; f_file_stream_lock(main->program.output.to); @@ -200,7 +200,7 @@ extern "C" { return; } - f_array_length_t i = 0; + f_number_unsigned_t i = 0; for (; i < main->setting.data.delimits.used; ++i) { main->setting.buffer.string[main->setting.data.delimits.array[i]] = f_iki_syntax_placeholder_s.string[0]; @@ -214,11 +214,11 @@ extern "C" { return; } - f_array_length_t replaces[main->setting.data.vocabulary.used]; - f_array_length_t wraps[main->setting.data.vocabulary.used]; + f_number_unsigned_t replaces[main->setting.data.vocabulary.used]; + f_number_unsigned_t wraps[main->setting.data.vocabulary.used]; - memset(replaces, 0, sizeof(f_array_length_t) * main->setting.data.vocabulary.used); - memset(wraps, 0, sizeof(f_array_length_t) * main->setting.data.vocabulary.used); + memset(replaces, 0, sizeof(f_number_unsigned_t) * main->setting.data.vocabulary.used); + memset(wraps, 0, sizeof(f_number_unsigned_t) * main->setting.data.vocabulary.used); main->setting.map_replaces = replaces; main->setting.map_wraps = wraps; @@ -226,9 +226,9 @@ extern "C" { iki_read_identify_alteration(main); { - f_array_length_t j = 0; - f_array_length_t k = 0; - f_array_length_t stop = main->setting.data.variable.used; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; + f_number_unsigned_t stop = main->setting.data.variable.used; i = buffer_range.start; range = buffer_range; @@ -310,8 +310,8 @@ extern "C" { return; } - f_array_length_t i = 0; - f_array_length_t total = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t total = 0; for (; i < main->setting.data.delimits.used; ++i) { main->setting.buffer.string[main->setting.data.delimits.array[i]] = f_iki_syntax_placeholder_s.string[0]; @@ -320,8 +320,8 @@ extern "C" { if (main->program.parameters.array[iki_read_parameter_name_e].result & f_console_result_value_e) { f_string_dynamic_t name = f_string_dynamic_t_initialize; - f_array_length_t index = 0; - f_array_length_t j = 0; + f_number_unsigned_t index = 0; + f_number_unsigned_t j = 0; range.start = 0; diff --git a/level_3/iki_read/c/main/signal.c b/level_3/iki_read/c/main/signal.c index e79b3cd..1466235 100644 --- a/level_3/iki_read/c/main/signal.c +++ b/level_3/iki_read/c/main/signal.c @@ -50,7 +50,7 @@ extern "C" { if (!main) return; siginfo_t information; - f_array_length_t failsafe = 0; + f_number_unsigned_t failsafe = 0; memset(&information, 0, sizeof(siginfo_t)); diff --git a/level_3/iki_write/c/main/common.c b/level_3/iki_write/c/main/common.c index cd0fc22..eb5ec9b 100644 --- a/level_3/iki_write/c/main/common.c +++ b/level_3/iki_write/c/main/common.c @@ -121,7 +121,7 @@ extern "C" { return; } - const f_array_length_t index = main->program.parameters.array[iki_write_parameter_file_e].values.array[0]; + const f_number_unsigned_t index = main->program.parameters.array[iki_write_parameter_file_e].values.array[0]; main->program.output.to.id = -1; main->program.output.to.stream = 0; @@ -153,7 +153,7 @@ extern "C" { } if (main->program.parameters.array[iki_write_parameter_object_e].result & f_console_result_value_e) { - f_array_lengths_t * const values = &main->program.parameters.array[iki_write_parameter_object_e].values; + f_number_unsigneds_t * const values = &main->program.parameters.array[iki_write_parameter_object_e].values; main->setting.objects.used = 0; @@ -170,7 +170,7 @@ extern "C" { } // Construct the array without allocating any more memory by setting this as a static string (used > 0, size = 0). - for (f_array_length_t index = 0; main->setting.objects.used < values->used; ) { + for (f_number_unsigned_t index = 0; main->setting.objects.used < values->used; ) { index = values->array[main->setting.objects.used]; @@ -194,7 +194,7 @@ extern "C" { } if (main->program.parameters.array[iki_write_parameter_content_e].result & f_console_result_value_e) { - f_array_lengths_t * const values = &main->program.parameters.array[iki_write_parameter_content_e].values; + f_number_unsigneds_t * const values = &main->program.parameters.array[iki_write_parameter_content_e].values; main->setting.contents.used = 0; @@ -211,7 +211,7 @@ extern "C" { } // Construct the array without allocating any more memory by setting this as a static string (used > 0, size = 0). - for (f_array_length_t index = 0; main->setting.contents.used < values->used; ) { + for (f_number_unsigned_t index = 0; main->setting.contents.used < values->used; ) { index = values->array[main->setting.contents.used]; diff --git a/level_3/iki_write/c/main/iki_write.c b/level_3/iki_write/c/main/iki_write.c index 666db8e..bb07819 100644 --- a/level_3/iki_write/c/main/iki_write.c +++ b/level_3/iki_write/c/main/iki_write.c @@ -46,7 +46,7 @@ extern "C" { if (main->program.pipe & fll_program_data_pipe_input_e) { bool object_ended = F_false; - f_array_length_t previous = 0; + f_number_unsigned_t previous = 0; f_string_range_t range = f_string_range_t_initialize; f_status_t status = F_none; f_file_t pipe = f_file_t_initialize; @@ -190,7 +190,7 @@ extern "C" { } if (F_status_is_error_not(main->setting.state.status) && F_status_set_fine(main->setting.state.status) != F_interrupt) { - for (f_array_length_t i = 0; i < main->setting.objects.used; ++i) { + for (f_number_unsigned_t i = 0; i < main->setting.objects.used; ++i) { if (!((++main->program.signal_check) % iki_write_signal_check_d)) { if (fll_program_standard_signal_received(&main->program)) { diff --git a/level_3/iki_write/c/main/signal.c b/level_3/iki_write/c/main/signal.c index f6b4327..36db0a8 100644 --- a/level_3/iki_write/c/main/signal.c +++ b/level_3/iki_write/c/main/signal.c @@ -50,7 +50,7 @@ extern "C" { if (!main) return; siginfo_t information; - f_array_length_t failsafe = 0; + f_number_unsigned_t failsafe = 0; memset(&information, 0, sizeof(siginfo_t)); diff --git a/level_3/status_code/c/main/signal.c b/level_3/status_code/c/main/signal.c index 419a292..4d14be9 100644 --- a/level_3/status_code/c/main/signal.c +++ b/level_3/status_code/c/main/signal.c @@ -50,7 +50,7 @@ extern "C" { if (!main) return; siginfo_t information; - f_array_length_t failsafe = 0; + f_number_unsigned_t failsafe = 0; memset(&information, 0, sizeof(siginfo_t)); diff --git a/level_3/status_code/c/main/status_code.c b/level_3/status_code/c/main/status_code.c index f1e1af1..d975149 100644 --- a/level_3/status_code/c/main/status_code.c +++ b/level_3/status_code/c/main/status_code.c @@ -69,7 +69,7 @@ extern "C" { if (main->program.parameters.remaining.used) { f_file_stream_lock(main->program.output.to); - for (f_array_length_t i = 0; i < main->program.parameters.remaining.used; ++i) { + for (f_number_unsigned_t i = 0; i < main->program.parameters.remaining.used; ++i) { if (!((++main->program.signal_check) % status_code_signal_check_d)) { if (fll_program_standard_signal_received(&main->program)) { @@ -101,7 +101,7 @@ extern "C" { if (main->program.parameters.remaining.used) { f_file_stream_lock(main->program.output.to); - for (f_array_length_t i = 0; i < main->program.parameters.remaining.used; ++i) { + for (f_number_unsigned_t i = 0; i < main->program.parameters.remaining.used; ++i) { if (!((++main->program.signal_check) % status_code_signal_check_d)) { if (fll_program_standard_signal_received(&main->program)) { @@ -133,7 +133,7 @@ extern "C" { if (main->program.parameters.remaining.used) { f_file_stream_lock(main->program.output.to); - for (f_array_length_t i = 0; i < main->program.parameters.remaining.used; ++i) { + for (f_number_unsigned_t i = 0; i < main->program.parameters.remaining.used; ++i) { if (!((++main->program.signal_check) % status_code_signal_check_d)) { if (fll_program_standard_signal_received(&main->program)) { diff --git a/level_3/utf8/c/main/bytesequence.c b/level_3/utf8/c/main/bytesequence.c index 3435e7a..3795c92 100644 --- a/level_3/utf8/c/main/bytesequence.c +++ b/level_3/utf8/c/main/bytesequence.c @@ -66,8 +66,8 @@ extern "C" { bool next = F_true; uint8_t mode_codepoint = utf8_codepoint_mode_ready_e; - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; f_char_t block[4] = { 0, 0, 0, 0 }; f_string_static_t sequence = macro_f_string_static_t_initialize_1(block, 0, 4); diff --git a/level_3/utf8/c/main/codepoint.c b/level_3/utf8/c/main/codepoint.c index c218242..599731c 100644 --- a/level_3/utf8/c/main/codepoint.c +++ b/level_3/utf8/c/main/codepoint.c @@ -19,7 +19,7 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) return; } - for (f_array_length_t i = 0; i < unicode.used; ++i) { + for (f_number_unsigned_t i = 0; i < unicode.used; ++i) { main->setting.text.string[main->setting.text.used++] = unicode.string[i]; } // for } @@ -112,7 +112,7 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) return; } - for (f_array_length_t i = 0; i < hex.used; ++i) { + for (f_number_unsigned_t i = 0; i < hex.used; ++i) { main->setting.text.string[main->setting.text.used++] = hex.string[i]; } // for } @@ -311,8 +311,8 @@ extern "C" { bool next = F_true; uint8_t mode_codepoint = utf8_codepoint_mode_ready_e; - f_array_length_t i = 0; - f_array_length_t j = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t j = 0; f_char_t block[5] = { 0, 0, 0, 0, 0 }; f_string_static_t sequence = macro_f_string_static_t_initialize_1(block, 0, 0); diff --git a/level_3/utf8/c/main/common.c b/level_3/utf8/c/main/common.c index f2aad01..a0baca5 100644 --- a/level_3/utf8/c/main/common.c +++ b/level_3/utf8/c/main/common.c @@ -41,7 +41,7 @@ extern "C" { } { - f_array_length_t choice = 0; + f_number_unsigned_t choice = 0; f_uint16s_t choices = f_uint16s_t_initialize; // Identify and prioritize "color context" parameters. @@ -293,8 +293,8 @@ extern "C" { main->setting.path_files_from.used = main->program.parameters.array[utf8_parameter_from_file_e].values.used; - f_array_length_t i = 0; - f_array_length_t index = 0; + f_number_unsigned_t i = 0; + f_number_unsigned_t index = 0; for (; i < main->setting.path_files_from.used; ++i) { @@ -372,7 +372,7 @@ extern "C" { } // Construct the array without allocating any more memory by setting this as a static string (used > 0, size = 0). - for (f_array_length_t index = 0; main->setting.remaining.used < main->program.parameters.remaining.used; ) { + for (f_number_unsigned_t index = 0; main->setting.remaining.used < main->program.parameters.remaining.used; ) { index = main->program.parameters.remaining.array[main->setting.remaining.used]; diff --git a/level_3/utf8/c/main/print/data.c b/level_3/utf8/c/main/print/data.c index 368baab..0cd577d 100644 --- a/level_3/utf8/c/main/print/data.c +++ b/level_3/utf8/c/main/print/data.c @@ -228,7 +228,7 @@ extern "C" { #endif // _di_utf8_print_data_raw_combining_or_width_ #ifndef _di_utf8_print_data_section_header_file_ - f_status_t utf8_print_data_section_header_file(fl_print_t * const print, const f_string_static_t name, const f_array_length_t index) { + f_status_t utf8_print_data_section_header_file(fl_print_t * const print, const f_string_static_t name, const f_number_unsigned_t index) { if (!print->custom) return F_status_set_error(F_output_not); @@ -261,7 +261,7 @@ extern "C" { #endif // _di_utf8_print_data_section_header_file_ #ifndef _di_utf8_print_data_section_header_parameter_ - f_status_t utf8_print_data_section_header_parameter(fl_print_t * const print, const f_array_length_t index) { + f_status_t utf8_print_data_section_header_parameter(fl_print_t * const print, const f_number_unsigned_t index) { if (!print->custom) return F_status_set_error(F_output_not); diff --git a/level_3/utf8/c/main/print/data.h b/level_3/utf8/c/main/print/data.h index 27e4f8f..bef76ee 100644 --- a/level_3/utf8/c/main/print/data.h +++ b/level_3/utf8/c/main/print/data.h @@ -204,7 +204,7 @@ extern "C" { * F_output_not (with error bit) if setting is NULL. */ #ifndef _di_utf8_print_data_section_header_file_ - extern f_status_t utf8_print_data_section_header_file(fl_print_t * const print, const f_string_static_t name, const f_array_length_t index); + extern f_status_t utf8_print_data_section_header_file(fl_print_t * const print, const f_string_static_t name, const f_number_unsigned_t index); #endif // _di_utf8_print_data_section_header_file_ /** @@ -224,7 +224,7 @@ extern "C" { * F_output_not (with error bit) if setting is NULL. */ #ifndef _di_utf8_print_data_section_header_parameter_ - extern f_status_t utf8_print_data_section_header_parameter(fl_print_t * const print, const f_array_length_t index); + extern f_status_t utf8_print_data_section_header_parameter(fl_print_t * const print, const f_number_unsigned_t index); #endif // _di_utf8_print_data_section_header_parameter_ /** diff --git a/level_3/utf8/c/main/print/error.c b/level_3/utf8/c/main/print/error.c index 79f8c54..f9b73fb 100644 --- a/level_3/utf8/c/main/print/error.c +++ b/level_3/utf8/c/main/print/error.c @@ -109,7 +109,7 @@ extern "C" { #endif // _di_utf8_print_error_no_from_ #ifndef _di_utf8_print_error_parameter_file_name_empty_ - f_status_t utf8_print_error_parameter_file_name_empty(fl_print_t * const print, const f_array_length_t index) { + f_status_t utf8_print_error_parameter_file_name_empty(fl_print_t * const print, const f_number_unsigned_t index) { if (print->verbosity < f_console_verbosity_error_e) return F_output_not; diff --git a/level_3/utf8/c/main/print/error.h b/level_3/utf8/c/main/print/error.h index ab70b29..5082487 100644 --- a/level_3/utf8/c/main/print/error.h +++ b/level_3/utf8/c/main/print/error.h @@ -150,7 +150,7 @@ extern "C" { * @see fl_print_format() */ #ifndef _di_utf8_print_error_parameter_file_name_empty_ - extern f_status_t utf8_print_error_parameter_file_name_empty(fl_print_t * const print, const f_array_length_t index); + extern f_status_t utf8_print_error_parameter_file_name_empty(fl_print_t * const print, const f_number_unsigned_t index); #endif // _di_utf8_print_error_parameter_file_name_empty_ /** diff --git a/level_3/utf8/c/main/signal.c b/level_3/utf8/c/main/signal.c index 6635d04..9ab459a 100644 --- a/level_3/utf8/c/main/signal.c +++ b/level_3/utf8/c/main/signal.c @@ -50,7 +50,7 @@ extern "C" { if (!main) return; siginfo_t information; - f_array_length_t failsafe = 0; + f_number_unsigned_t failsafe = 0; memset(&information, 0, sizeof(siginfo_t)); diff --git a/level_3/utf8/c/main/utf8.c b/level_3/utf8/c/main/utf8.c index f404586..f70ea2c 100644 --- a/level_3/utf8/c/main/utf8.c +++ b/level_3/utf8/c/main/utf8.c @@ -75,7 +75,7 @@ extern "C" { if (F_status_is_error_not(main->setting.state.status) && (main->setting.flag & utf8_main_flag_file_from_e)) { f_file_t file = macro_f_file_t_initialize_1(0, -1, F_file_flag_read_only_d, 32768, F_file_default_size_write_d); - for (f_array_length_t i = 0; i < main->setting.path_files_from.used && F_status_is_error_not(main->setting.state.status); ++i) { + for (f_number_unsigned_t i = 0; i < main->setting.path_files_from.used && F_status_is_error_not(main->setting.state.status); ++i) { if (!((++main->program.signal_check) % utf8_signal_check_d)) { if (fll_program_standard_signal_received(&main->program)) { @@ -147,7 +147,7 @@ extern "C" { // Process remaining parameters. if (F_status_is_error_not(main->setting.state.status) && main->setting.remaining.used) { - for (f_array_length_t i = 0; F_status_is_error_not(main->setting.state.status) && i < main->setting.remaining.used; ++i) { + for (f_number_unsigned_t i = 0; F_status_is_error_not(main->setting.state.status) && i < main->setting.remaining.used; ++i) { if (!((++main->program.signal_check) % utf8_signal_check_d)) { if (fll_program_standard_signal_received(&main->program)) { -- 1.8.3.1