From 24adddffc0b490587b2a8d62d14630342b8cfe85 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sat, 9 Jan 2021 15:00:23 -0600 Subject: [PATCH] Update: Remove *_decrease() and *_decimate() macros and functions. My general design goal is "completeness". I originally looked at the *_decrease() or *_decimate() macros and functions as a completeness compliment of the increase() macros and functions. There *incease_by() macros and functions as well as their compliments can already resize by 1 (or any given amount). This means that the *_increase() (and similar) are not needed. This puts the *_increase() in the position of an "exception" case. As an exception case, I believe it does not necessarily need a completeness compliment. Unlike the *_increase_by() macros and functions, the *_increase() increases by 1 or more (depending on the definition of the macro f_memory_default_allocation_step). There is no logical compliment of this behavior for a decrease() macro/function. Therefore, I believe it is more appropriate to remove all *_decrease() and *_decimate() macros and functions. --- level_0/f_account/c/account-common.h | 17 ------ level_0/f_fss/c/fss_comment.h | 5 +- level_0/f_fss/c/fss_delimit.h | 5 +- level_0/f_fss/c/fss_quote.h | 5 +- level_0/f_limit/c/limit-common.h | 10 +--- level_0/f_memory/c/memory-common.h | 72 ------------------------ level_0/f_memory/c/memory_structure.c | 34 ------------ level_0/f_memory/c/memory_structure.h | 60 -------------------- level_0/f_memory/c/private-memory.h | 15 ++--- level_0/f_status/c/status_array.h | 5 +- level_0/f_string/c/private-string.c | 32 +++++------ level_0/f_string/c/private-string.h | 100 ++++++++++++++-------------------- level_0/f_string/c/string-common.h | 8 +-- level_0/f_string/c/string_dynamic.c | 56 ------------------- level_0/f_string/c/string_dynamic.h | 54 ------------------ level_0/f_string/c/string_map.c | 28 ---------- level_0/f_string/c/string_map.h | 36 ------------ level_0/f_string/c/string_quantity.c | 28 ---------- level_0/f_string/c/string_quantity.h | 46 +--------------- level_0/f_string/c/string_range.c | 28 ---------- level_0/f_string/c/string_range.h | 46 +--------------- level_0/f_string/c/string_triple.c | 28 ---------- level_0/f_string/c/string_triple.h | 36 ------------ level_0/f_thread/c/thread-common.h | 45 +++------------ level_0/f_type/c/type_array.h | 70 +++++------------------- level_0/f_utf/c/utf-common.h | 15 +---- 26 files changed, 101 insertions(+), 783 deletions(-) diff --git a/level_0/f_account/c/account-common.h b/level_0/f_account/c/account-common.h index b5116c5..1c7aa0c 100644 --- a/level_0/f_account/c/account-common.h +++ b/level_0/f_account/c/account-common.h @@ -179,23 +179,6 @@ extern "C" { accounts.size = 0; #define f_macro_string_accounts_t_increase(status, values) f_macro_memory_structure_increase(status, values, f_account_t); - - #define f_macro_accounts_t_decrease(status, accounts) \ - status = F_none; \ - if (accounts.size) { \ - f_macro_account_t_delete(status, accounts.array[accounts.size - 1]); \ - if (status != F_none) break; \ - } \ - f_macro_memory_structure_destroy(status, accounts, sizeof(f_account_t)); - - #define f_macro_accounts_t_decimate(status, accounts) \ - status = F_none; \ - if (accounts.size) { \ - f_macro_account_t_destroy(status, accounts.array[accounts.size - 1]); \ - if (status != F_none) break; \ - } \ - f_macro_memory_structure_decimate(status, accounts, sizeof(f_account_t)); - #define f_macro_string_accounts_t_increase_by(status, values, amount) f_macro_memory_structure_increase_by(status, values, f_account_t), amount); #define f_macro_accounts_t_decrease_by(status, accounts, amount) \ diff --git a/level_0/f_fss/c/fss_comment.h b/level_0/f_fss/c/fss_comment.h index e48e0d7..1938d11 100644 --- a/level_0/f_fss/c/fss_comment.h +++ b/level_0/f_fss/c/fss_comment.h @@ -46,10 +46,7 @@ extern "C" { #define f_macro_fss_comments_t_delete_simple(ranges) f_macro_string_ranges_t_delete_simple(ranges); #define f_macro_fss_comments_t_destroy_simple(ranges) f_macro_string_ranges_t_destroy_simple(ranges); - #define f_macro_fss_comments_t_increase(status, ranges) f_macro_string_ranges_t_increase(status, ranges); - #define f_macro_fss_comments_t_decrease(status, ranges) f_macro_string_ranges_t_decrease(status, ranges); - #define f_macro_fss_comments_t_decimate(status, ranges) f_macro_string_ranges_t_decimate(status, ranges); - + #define f_macro_fss_comments_t_increase(status, ranges) f_macro_string_ranges_t_increase(status, ranges); #define f_macro_fss_comments_t_increase_by(status, ranges, amount) f_macro_string_ranges_t_increase_by(status, ranges, amount); #define f_macro_fss_comments_t_decrease_by(status, ranges, amount) f_macro_string_ranges_t_decrease_by(status, ranges, amount); #define f_macro_fss_comments_t_decimate_by(status, ranges, amount) f_macro_string_ranges_t_decimate_by(status, ranges, amount); diff --git a/level_0/f_fss/c/fss_delimit.h b/level_0/f_fss/c/fss_delimit.h index a946acc..191bc93 100644 --- a/level_0/f_fss/c/fss_delimit.h +++ b/level_0/f_fss/c/fss_delimit.h @@ -46,10 +46,7 @@ extern "C" { #define f_macro_fss_delimits_t_delete_simple(lengths) f_macro_string_lengths_t_delete_simple(lengths); #define f_macro_fss_delimits_t_destroy_simple(lengths) f_macro_string_lengths_t_destroy_simple(lengths); - #define f_macro_fss_delimits_t_increase(status, lengths) f_macro_string_lengths_t_increase(status, lengths); - #define f_macro_fss_delimits_t_decrease(status, lengths) f_macro_string_lengths_t_decrease(status, lengths); - #define f_macro_fss_delimits_t_decimate(status, lengths) f_macro_string_lengths_t_decimate(status, lengths); - + #define f_macro_fss_delimits_t_increase(status, lengths) f_macro_string_lengths_t_increase(status, lengths); #define f_macro_fss_delimits_t_increase_by(status, lengths, amount) f_macro_string_lengths_t_increase_by(status, lengths, amount); #define f_macro_fss_delimits_t_decrease_by(status, lengths, amount) f_macro_string_lengths_t_decrease_by(status, lengths, amount); #define f_macro_fss_delimits_t_decimate_by(status, lengths, amount) f_macro_string_lengths_t_decimate_by(status, lengths, amount); diff --git a/level_0/f_fss/c/fss_quote.h b/level_0/f_fss/c/fss_quote.h index cb055e4..8321438 100644 --- a/level_0/f_fss/c/fss_quote.h +++ b/level_0/f_fss/c/fss_quote.h @@ -58,10 +58,7 @@ extern "C" { #define f_macro_fss_quotes_t_delete_simple(quotes) f_macro_uint8s_t_delete_simple(quotes); #define f_macro_fss_quotes_t_destroy_simple(quotes) f_macro_uint8s_t_destroy_simple(quotes); - #define f_macro_fss_quotes_t_increase(status, quotes) f_macro_uint8s_t_increase(status, quotes); - #define f_macro_fss_quotes_t_decrease(status, quotes) f_macro_uint8s_t_decrease(status, quotes); - #define f_macro_fss_quotes_t_decimate(status, quotes) f_macro_uint8s_t_decimate(status, quotes); - + #define f_macro_fss_quotes_t_increase(status, quotes) f_macro_uint8s_t_increase(status, quotes); #define f_macro_fss_quotes_t_increase_by(status, quotes, amount) f_macro_uint8s_t_increase_by(status, quotes, amount); #define f_macro_fss_quotes_t_decrease_by(status, quotes, amount) f_macro_uint8s_t_decrease_by(status, quotes, amount); #define f_macro_fss_quotes_t_decimate_by(status, quotes, amount) f_macro_uint8s_t_decimate_by(status, quotes, amount); diff --git a/level_0/f_limit/c/limit-common.h b/level_0/f_limit/c/limit-common.h index 6433e77..440d767 100644 --- a/level_0/f_limit/c/limit-common.h +++ b/level_0/f_limit/c/limit-common.h @@ -62,10 +62,7 @@ extern "C" { #define f_macro_limit_values_t_delete_simple(values) f_macro_memory_structure_delete_simple(values, f_limit_value_t); #define f_macro_limit_values_t_destroy_simple(values) f_macro_memory_structure_destroy_simple(values, f_limit_value_t); - #define f_macro_limit_values_t_increase(status, values) f_macro_memory_structure_increase(status, values, f_limit_value_t); - #define f_macro_limit_values_t_decrease(status, values) f_macro_memory_structure_decrease(status, values, f_limit_value_t); - #define f_macro_limit_values_t_decimate(status, values) f_macro_memory_structure_decimate(status, values, f_limit_value_t); - + #define f_macro_limit_values_t_increase(status, values) f_macro_memory_structure_increase(status, values, f_limit_value_t); #define f_macro_limit_values_t_increase_by(status, values, amount) f_macro_memory_structure_increase_by(status, values, f_limit_value_t, amount); #define f_macro_limit_values_t_decrease_by(status, values, amount) f_macro_memory_structure_decrease_by(status, values, f_limit_value_t, amount); #define f_macro_limit_values_t_decimate_by(status, values, amount) f_macro_memory_structure_decimate_by(status, values, f_limit_value_t, amount); @@ -120,10 +117,7 @@ extern "C" { #define f_macro_limit_sets_t_delete_simple(sets) f_macro_memory_structure_delete_simple(sets, f_limit_set_t); #define f_macro_limit_sets_t_destroy_simple(sets) f_macro_memory_structure_destroy_simple(sets, f_limit_set_t); - #define f_macro_limit_sets_t_increase(status, sets) f_macro_memory_structure_increase(status, sets, f_limit_set_t); - #define f_macro_limit_sets_t_decrease(status, sets) f_macro_memory_structure_decrease(status, sets, f_limit_set_t); - #define f_macro_limit_sets_t_decimate(status, sets) f_macro_memory_structure_decimate(status, sets, f_limit_set_t); - + #define f_macro_limit_sets_t_increase(status, sets) f_macro_memory_structure_increase(status, sets, f_limit_set_t); #define f_macro_limit_sets_t_increase_by(status, sets, amount) f_macro_memory_structure_increase_by(status, sets, f_limit_set_t, amount); #define f_macro_limit_sets_t_decrease_by(status, sets, amount) f_macro_memory_structure_decrease_by(status, sets, f_limit_set_t, amount); #define f_macro_limit_sets_t_decimate_by(status, sets, amount) f_macro_memory_structure_decimate_by(status, sets, f_limit_set_t, amount); diff --git a/level_0/f_memory/c/memory-common.h b/level_0/f_memory/c/memory-common.h index a53b00c..ef63804 100644 --- a/level_0/f_memory/c/memory-common.h +++ b/level_0/f_memory/c/memory-common.h @@ -167,30 +167,6 @@ extern "C" { #endif // _di_f_macro_memory_structure_increase_ /** - * Decrease a generic memory structure. - * - * status: the status to return. - * structure: the structure to operate on. - * type: the structure type. - */ -#ifndef _di_f_macro_memory_structure_decrease_ - #define f_macro_memory_structure_decrease(status, structure, type) \ - status = f_memory_structure_decrease(sizeof(type), (void **) &structure.array, &structure.used, &structure.size); -#endif // _di_f_macro_memory_structure_decrease_ - -/** - * Decimate a generic memory structure. - * - * status: the status to return. - * structure: the structure to operate on. - * type: the structure type. - */ -#ifndef _di_f_macro_memory_structure_decimate_ - #define f_macro_memory_structure_decimate(status, structure, type) \ - status = f_memory_structure_decimate(sizeof(type), (void **) &structure.array, &structure.used, &structure.size); -#endif // _di_f_macro_memory_structure_decimate_ - -/** * Increase a generic memory structure by some amount. * * status: the status to return. @@ -427,54 +403,6 @@ extern "C" { #endif // _di_f_macro_memory_structures_increase_ /** - * Decrease a generic memory structures by 1. - * - * status: the status to return. - * structures: the structures to operate on. - * type_stucture: the structure type. - * type_stuctures: the structures type. - */ -#ifndef _di_f_macro_memory_structures_decrease_ - #define f_macro_memory_structures_decrease(status, structures, type_structure, type_structures) \ - status = F_none; \ - if (structures.size) { \ - f_macro_memory_structure_delete(status, structures.array[structures.size - 1], type_structure); \ - if (status == F_none) status = f_memory_resize((void **) & structures.array, sizeof(type_structures), structures.size, structures.size - 1); \ - if (status == F_none) { \ - structures.size--; \ - if (structures.used > structures.size) structures.used = structures.size; \ - } \ - } \ - else { \ - status = F_data_not; \ - } -#endif // _di_f_macro_memory_structures_decrease_ - -/** - * Decimate a generic memory structures by 1. - * - * status: the status to return. - * structures: the structures to operate on. - * type_stucture: the structure type. - * type_stuctures: the structures type. - */ -#ifndef _di_f_macro_memory_structures_decimate_ - #define f_macro_memory_structures_decimate(status, structures, type_structure, type_structures) \ - status = F_none; \ - if (structures.size) { \ - f_macro_memory_structure_destroy(status, structures.array[structures.size - 1], type_structure); \ - if (status == F_none) status = f_memory_adjust((void **) & structures.array, sizeof(type_structures), structures.size, structures.size - 1); \ - if (status == F_none) { \ - structures.size--; \ - if (structures.used > structures.size) structures.used = structures.size; \ - } \ - } \ - else { \ - status = F_data_not; \ - } -#endif // _di_f_macro_memory_structures_decimate_ - -/** * Increase a generic memory structures by the given amount. * * This only increases if the structure.used + amount is greater than structure.size. diff --git a/level_0/f_memory/c/memory_structure.c b/level_0/f_memory/c/memory_structure.c index 73b1028..c98212e 100644 --- a/level_0/f_memory/c/memory_structure.c +++ b/level_0/f_memory/c/memory_structure.c @@ -18,23 +18,6 @@ extern "C" { } #endif // _di_f_memory_structure_adjust_ -#ifndef _di_f_memory_structure_decimate_ - f_status_t f_memory_structure_decimate(const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size) { - #ifndef _di_level_0_parameter_checking_ - if (!type_size) return F_status_set_error(F_parameter); - if (!structure) return F_status_set_error(F_parameter); - if (!used) return F_status_set_error(F_parameter); - if (!size) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (*size) { - return private_f_memory_structure_adjust(*size - 1, type_size, structure, used, size); - } - - return F_data_not; - } -#endif // _di_f_memory_structure_decimate_ - #ifndef _di_f_memory_structure_decimate_by_ f_status_t f_memory_structure_decimate_by(const f_array_length_t amount, const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size) { #ifndef _di_level_0_parameter_checking_ @@ -52,23 +35,6 @@ extern "C" { } #endif // _di_f_memory_structure_decimate_by_ -#ifndef _di_f_memory_structure_decrease_ - f_status_t f_memory_structure_decrease(const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size) { - #ifndef _di_level_0_parameter_checking_ - if (!type_size) return F_status_set_error(F_parameter); - if (!structure) return F_status_set_error(F_parameter); - if (!used) return F_status_set_error(F_parameter); - if (!size) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (*size) { - return private_f_memory_structure_resize(*size - 1, type_size, structure, used, size); - } - - return F_data_not; - } -#endif // _di_f_memory_structure_decrease_ - #ifndef _di_f_memory_structure_decrease_by_ f_status_t f_memory_structure_decrease_by(const f_array_length_t amount, const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size) { #ifndef _di_level_0_parameter_checking_ diff --git a/level_0/f_memory/c/memory_structure.h b/level_0/f_memory/c/memory_structure.h index ff94e4f..581d5a8 100644 --- a/level_0/f_memory/c/memory_structure.h +++ b/level_0/f_memory/c/memory_structure.h @@ -48,36 +48,6 @@ extern "C" { #endif // _di_f_memory_structure_adjust_ /** - * Resize the structure to a smaller size, by 1. - * - * This will not shrink the size to less than 0. - * Memory being deleted will be wiped. - * - * @param type_size - * The size of the structure type (such as: sizeof(structure_size)). - * Must be greater than 0. - * @param structure - * The structure to delete. - * @param used - * The amount of data used by the structure. - * @param size - * The amount of data allocated to the structure. - * - * @return - * F_none on success. - * F_data_not on success, but size is already 0 so there is nothing to do. - * - * F_memory_not (with error bit) on out of memory. - * - * @see calloc() - * @see free() - * @see memset() - */ -#ifndef _di_f_memory_structure_decimate_ - extern f_status_t f_memory_structure_decimate(const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size); -#endif // _di_f_memory_structure_decimate_ - -/** * Resize the structure to a smaller size, by the given amount. * * This will not shrink the size to less than 0. @@ -110,36 +80,6 @@ extern "C" { #endif // _di_f_memory_structure_decimate_by_ /** - * Resize the structure to a smaller size, by 1. - * - * This will not shrink the size to less than 0. - * Memory being deleted will not be wiped. - * - * @param type_size - * The size of the structure type (such as: sizeof(structure_size)). - * Must be greater than 0. - * @param structure - * The structure to delete. - * @param used - * The amount of data used by the structure. - * @param size - * The amount of data allocated to the structure. - * - * @return - * F_none on success. - * F_data_not on success, but size is already 0 so there is nothing to do. - * - * F_memory_not (with error bit) on allocation error. - * - * @see calloc() - * @see free() - * @see memset() - */ -#ifndef _di_f_memory_structure_decrease_ - extern f_status_t f_memory_structure_decrease(const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size); -#endif // _di_f_memory_structure_decrease_ - -/** * Resize the structure to a smaller size, by the given amount. * * This will not shrink the size to less than 0. diff --git a/level_0/f_memory/c/private-memory.h b/level_0/f_memory/c/private-memory.h index 7917e2c..4e546f6 100644 --- a/level_0/f_memory/c/private-memory.h +++ b/level_0/f_memory/c/private-memory.h @@ -74,7 +74,6 @@ extern "C" { * @see free() * @see memset() * - * @see f_memory_structure_decrease() * @see f_memory_structure_decrease_by() * @see f_memory_structure_delete() * @see f_memory_structure_increase() @@ -84,9 +83,9 @@ extern "C" { * * @see private_f_memory_structure_resize() */ -#if !defined(_di_memory_structure_decrease_) || !defined(_di_memory_structure_decrease_by_) || !defined(_di_memory_structure_delete_by_) || !defined(_di_memory_structure_increase_) || !defined(_di_memory_structure_increase_by_) || !defined(_di_f_memory_structure_new_) || !defined(_di_f_memory_structure_resize_) +#if !defined(_di_memory_structure_decrease_by_) || !defined(_di_memory_structure_delete_by_) || !defined(_di_memory_structure_increase_) || !defined(_di_memory_structure_increase_by_) || !defined(_di_f_memory_structure_new_) || !defined(_di_f_memory_structure_resize_) extern f_status_t private_f_memory_resize(const size_t length_old, const size_t length_new, const size_t type_size, void **pointer) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_memory_structure_decrease_) || !defined(_di_memory_structure_decrease_by_) || !defined(_di_memory_structure_delete_by_) || !defined(_di_memory_structure_increase_) || !defined(_di_memory_structure_increase_by_) || !defined(_di_f_memory_structure_new_) || !defined(_di_f_memory_structure_resize_) +#endif // !defined(_di_memory_structure_decrease_by_) || !defined(_di_memory_structure_delete_by_) || !defined(_di_memory_structure_increase_) || !defined(_di_memory_structure_increase_by_) || !defined(_di_f_memory_structure_new_) || !defined(_di_f_memory_structure_resize_) /** * Private implementation for resizing a structure. @@ -111,15 +110,14 @@ extern "C" { * Errors (with error bit) from: private_f_memory_adjust(). * * @see f_memory_structure_adjust() - * @see f_memory_structure_decimate() * @see f_memory_structure_decimate_by() * @see f_memory_structure_destroy() * * @see private_f_memory_adjust() */ -#if !defined(_di_f_memory_structure_adjust_) || !defined(_di_f_memory_structure_decimate_) || !defined(_di_f_memory_structure_decimate_by_) || !defined(_di_f_memory_structure_destroy_) +#if !defined(_di_f_memory_structure_adjust_) || !defined(_di_f_memory_structure_decimate_by_) || !defined(_di_f_memory_structure_destroy_) f_status_t private_f_memory_structure_adjust(const size_t length_new, const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_memory_structure_adjust_) || !defined(_di_f_memory_structure_decimate_) || !defined(_di_f_memory_structure_decimate_by_) || !defined(_di_f_memory_structure_destroy_) +#endif // !defined(_di_f_memory_structure_adjust_) || !defined(_di_f_memory_structure_decimate_by_) || !defined(_di_f_memory_structure_destroy_) /** * Private implementation for resizing a structure. @@ -143,7 +141,6 @@ extern "C" { * * Errors (with error bit) from: private_f_memory_structure_resize(). * - * @see f_memory_structure_decrease() * @see f_memory_structure_decrease_by() * @see f_memory_structure_delete() * @see f_memory_structure_increase() @@ -153,9 +150,9 @@ extern "C" { * * @see private_f_memory_resize() */ -#if !defined(_di_memory_structure_decrease_) || !defined(_di_memory_structure_decrease_by_) || !defined(_di_memory_structure_delete_by_) || !defined(_di_memory_structure_increase_) || !defined(_di_memory_structure_increase_by_) || !defined(_di_f_memory_structure_new_) || !defined(_di_f_memory_structure_resize_) +#if !defined(_di_memory_structure_decrease_by_) || !defined(_di_memory_structure_delete_by_) || !defined(_di_memory_structure_increase_) || !defined(_di_memory_structure_increase_by_) || !defined(_di_f_memory_structure_new_) || !defined(_di_f_memory_structure_resize_) f_status_t private_f_memory_structure_resize(const size_t length_new, const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_memory_structure_decrease_) || !defined(_di_memory_structure_decrease_by_) || !defined(_di_memory_structure_delete_by_) || !defined(_di_memory_structure_increase_) || !defined(_di_memory_structure_increase_by_) || !defined(_di_f_memory_structure_new_) || !defined(_di_f_memory_structure_resize_) +#endif // !defined(_di_memory_structure_decrease_by_) || !defined(_di_memory_structure_delete_by_) || !defined(_di_memory_structure_increase_) || !defined(_di_memory_structure_increase_by_) || !defined(_di_f_memory_structure_new_) || !defined(_di_f_memory_structure_resize_) #ifdef __cplusplus } // extern "C" diff --git a/level_0/f_status/c/status_array.h b/level_0/f_status/c/status_array.h index 85e4be5..f034890 100644 --- a/level_0/f_status/c/status_array.h +++ b/level_0/f_status/c/status_array.h @@ -49,10 +49,7 @@ extern "C" { #define f_macro_statuss_t_delete_simple(statuss) f_macro_memory_structure_delete_simple(statuss, f_status_t); #define f_macro_statuss_t_destroy_simple(statuss) f_macro_memory_structure_destroy_simple(statuss, f_status_t); - #define f_macro_statuss_t_increase(status, statuss) f_macro_memory_structure_increase(status, statuss, f_status_t); - #define f_macro_statuss_t_decrease(status, statuss) f_macro_memory_structure_decrease(status, statuss, f_status_t); - #define f_macro_statuss_t_decimate(status, statuss) f_macro_memory_structure_decimate(status, statuss, f_status_t); - + #define f_macro_statuss_t_increase(status, statuss) f_macro_memory_structure_increase(status, statuss, f_status_t); #define f_macro_statuss_t_increase_by(status, statuss, amount) f_macro_memory_structure_increase_by(status, statuss, f_status_t, amount); #define f_macro_statuss_t_decrease_by(status, statuss, amount) f_macro_memory_structure_decrease_by(status, statuss, f_status_t, amount); #define f_macro_statuss_t_decimate_by(status, statuss, amount) f_macro_memory_structure_decimate_by(status, statuss, f_status_t, amount); diff --git a/level_0/f_string/c/private-string.c b/level_0/f_string/c/private-string.c index e19b305..60d13a0 100644 --- a/level_0/f_string/c/private-string.c +++ b/level_0/f_string/c/private-string.c @@ -5,7 +5,7 @@ extern "C" { #endif -#if !defined(_di_f_string_dynamic_adjust_) +#if !defined(_di_f_string_dynamic_adjust_) || !defined(_di_f_string_dynamic_decimate_by_) f_status_t private_f_string_dynamic_adjust(const f_string_length_t length, f_string_dynamic_t *string) { f_status_t status = F_none; @@ -13,7 +13,7 @@ extern "C" { return status; } -#endif // !defined(_di_f_string_dynamic_adjust_) +#endif // !defined(_di_f_string_dynamic_adjust_) || !defined(_di_f_string_dynamic_decimate_by_) #if !defined(_di_f_string_append_) || !defined(_di_f_string_dynamic_append_) || !defined(_di_f_string_dynamic_mash_) || !defined(_di_f_string_mash_) f_status_t private_f_string_append(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) { @@ -83,7 +83,7 @@ extern "C" { } #endif // !defined(_di_f_string_append_nulless_) || !defined(_di_f_string_dynamic_append_nulless_) || !defined(_di_f_string_dynamic_mash_nulless_) || !defined(_di_f_string_mash_nulless_) -#if !defined(_di_f_string_dynamic_decrease_) || !defined(_di_f_string_dynamic_decrease_by_) || !defined(_di_f_string_dynamic_delete_) +#if !defined(_di_f_string_dynamic_decrease_by_) || !defined(_di_f_string_dynamic_delete_) f_status_t private_f_string_dynamic_delete(f_string_dynamic_t *string) { f_status_t status = F_none; @@ -91,9 +91,9 @@ extern "C" { return status; } -#endif // !defined(_di_f_string_dynamic_decrease_) || !defined(_di_f_string_dynamic_decrease_by_) || !defined(_di_f_string_dynamic_delete_) +#endif // !defined(_di_f_string_dynamic_decrease_by_) || !defined(_di_f_string_dynamic_delete_) -#if !defined(_di_f_string_dynamic_decimate_) || !defined(_di_f_string_dynamic_decimate_by_) || !defined(_di_f_string_dynamic_delete_) +#if !defined(_di_f_string_dynamic_decimate_by_) || !defined(_di_f_string_dynamic_delete_) f_status_t private_f_string_dynamic_destroy(f_string_dynamic_t *string) { f_status_t status = F_none; @@ -101,7 +101,7 @@ extern "C" { return status; } -#endif // !defined(_di_f_string_dynamic_decimate_) || !defined(_di_f_string_dynamic_decimate_by_) || !defined(_di_f_string_dynamic_delete_) +#endif // !defined(_di_f_string_dynamic_decimate_by_) || !defined(_di_f_string_dynamic_delete_) #if !defined(_di_f_string_dynamic_increase_by_) || !defined(_di_f_string_append_) || !defined(_di_f_string_dynamic_append_) || !defined(_di_f_string_append_mash_) || !defined(_di_f_string_dynamic_mash_) || !defined(_di_f_string_append_nulless_) || !defined(_di_f_string_dynamic_append_nulless_) || !defined(_di_f_string_mash_nulless_) || !defined(_di_f_string_dynamic_mash_nulless_) || !defined(_di_f_string_prepend_) || !defined(_di_f_string_dynamic_prepend_) || !defined(_di_f_string_prepend_nulless_) || !defined(_di_f_string_dynamic_prepend_nulless_) f_status_t private_f_string_dynamic_increase_by(const f_string_length_t amount, f_string_dynamic_t *string) { @@ -118,7 +118,7 @@ extern "C" { } #endif // !defined(_di_f_string_dynamic_increase_by_) || !defined(_di_f_string_append_) || !defined(_di_f_string_dynamic_append_) || !defined(_di_f_string_append_mash_) || !defined(_di_f_string_dynamic_mash_) || !defined(_di_f_string_append_nulless_) || !defined(_di_f_string_dynamic_append_nulless_) || !defined(_di_f_string_mash_nulless_) || !defined(_di_f_string_dynamic_mash_nulless_) || !defined(_di_f_string_prepend_) || !defined(_di_f_string_dynamic_prepend_) || !defined(_di_f_string_prepend_nulless_) || !defined(_di_f_string_dynamic_prepend_nulless_) -#if !defined(_di_f_string_dynamic_decrease_) || !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_terminate_) || !defined(_di_f_string_dynamic_terminate_after_) +#if !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_terminate_) || !defined(_di_f_string_dynamic_terminate_after_) f_status_t private_f_string_dynamic_resize(const f_string_length_t length, f_string_dynamic_t *string) { f_status_t status = F_none; @@ -126,9 +126,9 @@ extern "C" { return status; } -#endif // !defined(_di_f_string_dynamic_decrease_) || !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_terminate_) || !defined(_di_f_string_dynamic_terminate_after_) +#endif // !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_terminate_) || !defined(_di_f_string_dynamic_terminate_after_) -#if !defined(_di_f_string_dynamics_adjust_) +#if !defined(_di_f_string_dynamics_adjust_) || !defined(_di_f_string_dynamics_decimate_by_) f_status_t private_f_string_dynamics_adjust(const f_string_length_t length, f_string_dynamics_t *strings) { f_status_t status = F_none; @@ -136,9 +136,9 @@ extern "C" { return status; } -#endif // !defined(_di_f_string_dynamics_adjust_) +#endif // !defined(_di_f_string_dynamics_adjust_) || !defined(_di_f_string_dynamics_decimate_by_) -#if !defined(_di_f_string_dynamics_decrease_) || !defined(_di_f_string_dynamics_decrease_by_) || !defined(_di_f_string_dynamics_delete_) +#if !defined(_di_f_string_dynamics_decrease_by_) || !defined(_di_f_string_dynamics_delete_) f_status_t private_f_string_dynamics_delete(f_string_dynamics_t *string) { f_status_t status = F_none; @@ -146,9 +146,9 @@ extern "C" { return status; } -#endif // !defined(_di_f_string_dynamics_decrease_) || !defined(_di_f_string_dynamics_decrease_by_) || !defined(_di_f_string_dynamics_delete_) +#endif // !defined(_di_f_string_dynamics_decrease_by_) || !defined(_di_f_string_dynamics_delete_) -#if !defined(_di_f_string_dynamics_decimate_) || !defined(_di_f_string_dynamics_decimate_by_) || !defined(_di_f_string_dynamics_destroy_) +#if !defined(_di_f_string_dynamics_decimate_by_) || !defined(_di_f_string_dynamics_destroy_) f_status_t private_f_string_dynamics_destroy(f_string_dynamics_t *string) { f_status_t status = F_none; @@ -156,9 +156,9 @@ extern "C" { return status; } -#endif // !defined(_di_f_string_dynamics_decimate_) || !defined(_di_f_string_dynamics_decimate_by_) || !defined(_di_f_string_dynamics_destroy_) +#endif // !defined(_di_f_string_dynamics_decimate_by_) || !defined(_di_f_string_dynamics_destroy_) -#if !defined(_di_f_string_dynamics_decrease_) || !defined(_di_f_string_dynamics_decrease_by_) || !defined(_di_f_string_dynamics_increase_) || !defined(_di_f_string_dynamics_increase_by_) +#if !defined(_di_f_string_dynamics_decrease_by_) || !defined(_di_f_string_dynamics_increase_) || !defined(_di_f_string_dynamics_increase_by_) f_status_t private_f_string_dynamics_resize(const f_string_length_t length, f_string_dynamics_t *strings) { f_status_t status = F_none; @@ -166,7 +166,7 @@ extern "C" { return status; } -#endif // !defined(_di_f_string_dynamics_decrease_) || !defined(_di_f_string_dynamics_decrease_by_) || !defined(_di_f_string_dynamics_increase_) || !defined(_di_f_string_dynamics_increase_by_) +#endif // !defined(_di_f_string_dynamics_decrease_by_) || !defined(_di_f_string_dynamics_increase_) || !defined(_di_f_string_dynamics_increase_by_) #if !defined(_di_f_string_maps_adjust_) f_status_t private_f_string_maps_adjust(const f_string_length_t length, f_string_maps_t *maps) { diff --git a/level_0/f_string/c/private-string.h b/level_0/f_string/c/private-string.h index 2a9a52b..7e46de6 100644 --- a/level_0/f_string/c/private-string.h +++ b/level_0/f_string/c/private-string.h @@ -32,10 +32,11 @@ extern "C" { * * @see f_macro_string_dynamic_t_adjust() * @see f_string_dynamic_adjust() + * @see f_string_dynamic_decimate_by() */ -#if !defined(_di_f_string_dynamic_adjust_) +#if !defined(_di_f_string_dynamic_adjust_) || !defined(_di_f_string_dynamic_decimate_by_) extern f_status_t private_f_string_dynamic_adjust(const f_string_length_t length, f_string_dynamic_t *string) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_string_dynamic_adjust_) +#endif // !defined(_di_f_string_dynamic_adjust_) || !defined(_di_f_string_dynamic_decimate_by_) /** * Private implementation of f_string_append(). @@ -115,13 +116,12 @@ extern "C" { * * Errors (with error bit) from: f_macro_string_dynamic_t_delete(). * - * @see f_string_dynamic_decrease() * @see f_string_dynamic_decrease_by() * @see f_string_dynamic_delete() */ -#if !defined(_di_f_string_dynamic_decrease_) || !defined(_di_f_string_dynamic_decrease_by_) || !defined(_di_f_string_dynamic_delete_) +#if !defined(_di_f_string_dynamic_decrease_by_) || !defined(_di_f_string_dynamic_delete_) extern f_status_t private_f_string_dynamic_delete(f_string_dynamic_t *string) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_string_dynamic_decrease_) || !defined(_di_f_string_dynamic_decrease_by_) || !defined(_di_f_string_dynamic_delete_) +#endif // !defined(_di_f_string_dynamic_decrease_by_) || !defined(_di_f_string_dynamic_delete_) /** * Private implementation of f_string_dynamic_destroy(). @@ -136,13 +136,12 @@ extern "C" { * * Errors (with error bit) from: f_macro_string_dynamic_t_destroy(). * - * @see f_string_dynamic_decimate() * @see f_string_dynamic_decimate_by() * @see f_string_dynamic_destroy() */ -#if !defined(_di_f_string_dynamic_decimate_) || !defined(_di_f_string_dynamic_decimate_by_) || !defined(_di_f_string_dynamic_destroy_) +#if !defined(_di_f_string_dynamic_decimate_by_) || !defined(_di_f_string_dynamic_destroy_) extern f_status_t private_f_string_dynamic_destroy(f_string_dynamic_t *string) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_string_dynamic_decimate_) || !defined(_di_f_string_dynamic_decimate_by_) || !defined(_di_f_string_dynamic_destroy_) +#endif // !defined(_di_f_string_dynamic_decimate_by_) || !defined(_di_f_string_dynamic_destroy_) /** * Private implementation of f_string_dynamic_increase_by(). @@ -196,16 +195,15 @@ extern "C" { * Errors (with error bit) from: f_macro_string_dynamic_t_resize(). * * @see f_macro_string_dynamic_t_resize() - * @see f_string_dynamic_decrease() * @see f_string_dynamic_decrease_by() * @see f_string_dynamic_increase() * @see f_string_dynamic_increase_by() * @see f_string_dynamic_terminate() * @see f_string_dynamic_terminate_after() */ -#if !defined(_di_f_string_dynamic_decrease_) || !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_terminate_) || !defined(_di_f_string_dynamic_terminate_after_) +#if !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_terminate_) || !defined(_di_f_string_dynamic_terminate_after_) extern f_status_t private_f_string_dynamic_resize(const f_string_length_t length, f_string_dynamic_t *string) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_string_dynamic_decrease_) || !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_terminate_) || !defined(_di_f_string_dynamic_terminate_after_) +#endif // !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_terminate_) || !defined(_di_f_string_dynamic_terminate_after_) /** * Private implementation for resizing. @@ -224,10 +222,11 @@ extern "C" { * * @see f_macro_string_dynamics_t_adjust() * @see f_string_dynamics_adjust() + * @see f_string_dynamics_decimate_by() */ -#if !defined(_di_f_string_dynamics_adjust_) +#if !defined(_di_f_string_dynamics_adjust_) || !defined(_di_f_string_dynamics_decimate_by_) extern f_status_t private_f_string_dynamics_adjust(const f_string_length_t length, f_string_dynamics_t *strings) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_string_dynamics_adjust_) +#endif // !defined(_di_f_string_dynamics_adjust_) || !defined(_di_f_string_dynamics_decimate_by_) /** * Private implementation of f_string_dynamics_delete(). @@ -242,13 +241,12 @@ extern "C" { * * Errors (with error bit) from: f_macro_string_dynamics_t_delete(). * - * @see f_string_dynamics_decrease() * @see f_string_dynamics_decrease_by() * @see f_string_dynamics_delete() */ -#if !defined(_di_f_string_dynamics_decrease_) || !defined(_di_f_string_dynamics_decrease_by_) || !defined(_di_f_string_dynamics_delete_) +#if !defined(_di_f_string_dynamics_decrease_by_) || !defined(_di_f_string_dynamics_delete_) extern f_status_t private_f_string_dynamics_delete(f_string_dynamics_t *strings) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_string_dynamics_decrease_) || !defined(_di_f_string_dynamics_decrease_by_) || !defined(_di_f_string_dynamics_delete_) +#endif // !defined(_di_f_string_dynamics_decrease_by_) || !defined(_di_f_string_dynamics_delete_) /** * Private implementation of f_string_dynamics_destroy(). @@ -263,13 +261,12 @@ extern "C" { * * Errors (with error bit) from: f_macro_string_dynamics_t_destroy(). * - * @see f_string_dynamics_decimate() * @see f_string_dynamics_decimate_by() * @see f_string_dynamics_destroy() */ -#if !defined(_di_f_string_dynamics_decimate_) || !defined(_di_f_string_dynamics_decimate_by_) || !defined(_di_f_string_dynamics_delete_) +#if !defined(_di_f_string_dynamics_decimate_by_) || !defined(_di_f_string_dynamics_delete_) extern f_status_t private_f_string_dynamics_destroy(f_string_dynamics_t *strings) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_string_dynamics_decimate_) || !defined(_di_f_string_dynamics_decimate_by_) || !defined(_di_f_string_dynamics_delete_) +#endif // !defined(_di_f_string_dynamics_decimate_by_) || !defined(_di_f_string_dynamics_delete_) /** * Private implementation for resizing. @@ -287,14 +284,13 @@ extern "C" { * Errors (with error bit) from: f_macro_string_dynamics_t_resize(). * * @see f_macro_string_dynamics_t_resize() - * @see f_string_dynamics_decrease() * @see f_string_dynamics_decrease_by() * @see f_string_dynamics_increase() * @see f_string_dynamics_increase_by() */ -#if !defined(_di_f_string_dynamics_decrease_) || !defined(_di_f_string_dynamics_decrease_by_) || !defined(_di_f_string_dynamics_increase_) || !defined(_di_f_string_dynamics_increase_by_) +#if !defined(_di_f_string_dynamics_decrease_by_) || !defined(_di_f_string_dynamics_increase_) || !defined(_di_f_string_dynamics_increase_by_) extern f_status_t private_f_string_dynamics_resize(const f_string_length_t length, f_string_dynamics_t *strings) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_string_dynamics_decrease_) || !defined(_di_f_string_dynamics_decrease_by_) || !defined(_di_f_string_dynamics_increase_) || !defined(_di_f_string_dynamics_increase_by_) +#endif // !defined(_di_f_string_dynamics_decrease_by_) || !defined(_di_f_string_dynamics_increase_) || !defined(_di_f_string_dynamics_increase_by_) /** * Private implementation for resizing. @@ -331,13 +327,12 @@ extern "C" { * * Errors (with error bit) from: f_macro_string_maps_t_delete(). * - * @see f_string_maps_decrease() * @see f_string_maps_decrease_by() * @see f_string_maps_delete() */ -#if !defined(f_string_maps_decrease) || !defined(f_string_maps_decrease_by) || !defined(_di_f_string_maps_delete_) +#if !defined(f_string_maps_decrease_by) || !defined(_di_f_string_maps_delete_) extern f_status_t private_f_string_maps_delete(f_string_maps_t *maps) f_gcc_attribute_visibility_internal; -#endif // !defined(f_string_maps_decrease) || !defined(f_string_maps_decrease_by) || !defined(_di_f_string_maps_delete_) +#endif // !defined(f_string_maps_decrease_by) || !defined(_di_f_string_maps_delete_) /** * Private implementation of f_string_maps_destroy(). @@ -352,13 +347,12 @@ extern "C" { * * Errors (with error bit) from: f_macro_string_maps_t_destroy(). * - * @see f_string_maps_decimate() * @see f_string_maps_decimate_by() * @see f_string_maps_destroy() */ -#if !defined(f_string_maps_decimate) || !defined(f_string_maps_decimate_by) || !defined(_di_f_string_maps_destroy_) +#if !defined(f_string_maps_decimate_by) || !defined(_di_f_string_maps_destroy_) extern f_status_t private_f_string_maps_destroy(f_string_maps_t *maps) f_gcc_attribute_visibility_internal; -#endif // !defined(f_string_maps_decimate) || !defined(f_string_maps_decimate_by) || !defined(_di_f_string_maps_destroy_) +#endif // !defined(f_string_maps_decimate_by) || !defined(_di_f_string_maps_destroy_) /** * Private implementation for resizing. @@ -376,16 +370,15 @@ extern "C" { * Errors (with error bit) from: f_macro_string_maps_t_resize(). * * @see f_macro_string_dynamic_t_resize() - * @see f_string_maps_decrease() * @see f_string_maps_decrease_by() * @see f_string_maps_increase() * @see f_string_maps_increase_by() * @see f_string_maps_terminate() * @see f_string_maps_terminate_after() */ -#if !defined(_di_f_string_maps_decrease_) || !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_terminate_) || !defined(_di_f_string_maps_terminate_after_) +#if !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_terminate_) || !defined(_di_f_string_maps_terminate_after_) extern f_status_t private_f_string_maps_resize(const f_string_length_t length, f_string_maps_t *maps) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_string_maps_decrease_) || !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_terminate_) || !defined(_di_f_string_maps_terminate_after_) +#endif // !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_terminate_) || !defined(_di_f_string_maps_terminate_after_) /** * Private implementation of f_string_prepend(). @@ -492,13 +485,12 @@ extern "C" { * * Errors (with error bit) from: f_macro_string_quantitys_t_delete(). * - * @see f_string_quantitys_decrease() * @see f_string_quantitys_decrease_by() * @see f_string_quantitys_delete() */ -#if !defined(f_string_quantitys_decrease) || !defined(f_string_quantitys_decrease_by) || !defined(_di_f_string_quantitys_delete_) +#if !defined(f_string_quantitys_decrease_by) || !defined(_di_f_string_quantitys_delete_) extern f_status_t private_f_string_quantitys_delete(f_string_quantitys_t *quantitys) f_gcc_attribute_visibility_internal; -#endif // !defined(f_string_quantitys_decrease) || !defined(f_string_quantitys_decrease_by) || !defined(_di_f_string_quantitys_delete_) +#endif // !defined(f_string_quantitys_decrease_by) || !defined(_di_f_string_quantitys_delete_) /** * Private implementation of f_string_quantitys_destroy(). @@ -513,13 +505,12 @@ extern "C" { * * Errors (with error bit) from: f_macro_string_quantitys_t_destroy(). * - * @see f_string_quantitys_decimate() * @see f_string_quantitys_decimate_by() * @see f_string_quantitys_destroy() */ -#if !defined(f_string_quantitys_decimate) || !defined(f_string_quantitys_decimate_by) || !defined(_di_f_string_quantitys_destroy_) +#if !defined(f_string_quantitys_decimate_by) || !defined(_di_f_string_quantitys_destroy_) extern f_status_t private_f_string_quantitys_destroy(f_string_quantitys_t *quantitys) f_gcc_attribute_visibility_internal; -#endif // !defined(f_string_quantitys_decimate) || !defined(f_string_quantitys_decimate_by) || !defined(_di_f_string_quantitys_destroy_) +#endif // !defined(f_string_quantitys_decimate_by) || !defined(_di_f_string_quantitys_destroy_) /** * Private implementation for resizing. @@ -537,16 +528,15 @@ extern "C" { * Errors (with error bit) from: f_macro_string_quantitys_t_resize(). * * @see f_macro_string_dynamic_t_resize() - * @see f_string_quantitys_decrease() * @see f_string_quantitys_decrease_by() * @see f_string_quantitys_increase() * @see f_string_quantitys_increase_by() * @see f_string_quantitys_terminate() * @see f_string_quantitys_terminate_after() */ -#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_) || !defined(_di_f_string_quantitys_terminate_) || !defined(_di_f_string_quantitys_terminate_after_) +#if !defined(_di_f_string_quantitys_decrease_by_) || !defined(_di_f_string_quantitys_increase_) || !defined(_di_f_string_quantitys_increase_by_) || !defined(_di_f_string_quantitys_terminate_) || !defined(_di_f_string_quantitys_terminate_after_) extern f_status_t private_f_string_quantitys_resize(const f_string_length_t length, f_string_quantitys_t *quantitys) f_gcc_attribute_visibility_internal; -#endif // !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_) || !defined(_di_f_string_quantitys_terminate_) || !defined(_di_f_string_quantitys_terminate_after_) +#endif // !defined(_di_f_string_quantitys_decrease_by_) || !defined(_di_f_string_quantitys_increase_) || !defined(_di_f_string_quantitys_increase_by_) || !defined(_di_f_string_quantitys_terminate_) || !defined(_di_f_string_quantitys_terminate_after_) /** * Private implementation for resizing. @@ -583,13 +573,12 @@ extern "C" { * * Errors (with error bit) from: f_macro_string_ranges_t_delete(). * - * @see f_string_ranges_decrease() * @see f_string_ranges_decrease_by() * @see f_string_ranges_delete() */ -#if !defined(f_string_ranges_decrease) || !defined(f_string_ranges_decrease_by) || !defined(_di_f_string_ranges_delete_) +#if !defined(f_string_ranges_decrease_by) || !defined(_di_f_string_ranges_delete_) extern f_status_t private_f_string_ranges_delete(f_string_ranges_t *ranges) f_gcc_attribute_visibility_internal; -#endif // !defined(f_string_ranges_decrease) || !defined(f_string_ranges_decrease_by) || !defined(_di_f_string_ranges_delete_) +#endif // !defined(f_string_ranges_decrease_by) || !defined(_di_f_string_ranges_delete_) /** * Private implementation of f_string_ranges_destroy(). @@ -604,13 +593,12 @@ extern "C" { * * Errors (with error bit) from: f_macro_string_ranges_t_destroy(). * - * @see f_string_ranges_decimate() * @see f_string_ranges_decimate_by() * @see f_string_ranges_destroy() */ -#if !defined(f_string_ranges_decimate) || !defined(f_string_ranges_decimate_by) || !defined(_di_f_string_ranges_destroy_) +#if !defined(f_string_ranges_decimate_by) || !defined(_di_f_string_ranges_destroy_) extern f_status_t private_f_string_ranges_destroy(f_string_ranges_t *ranges) f_gcc_attribute_visibility_internal; -#endif // !defined(f_string_ranges_decimate) || !defined(f_string_ranges_decimate_by) || !defined(_di_f_string_ranges_destroy_) +#endif // !defined(f_string_ranges_decimate_by) || !defined(_di_f_string_ranges_destroy_) /** * Private implementation for resizing. @@ -628,16 +616,15 @@ extern "C" { * Errors (with error bit) from: f_macro_string_ranges_t_resize(). * * @see f_macro_string_dynamic_t_resize() - * @see f_string_ranges_decrease() * @see f_string_ranges_decrease_by() * @see f_string_ranges_increase() * @see f_string_ranges_increase_by() * @see f_string_ranges_terminate() * @see f_string_ranges_terminate_after() */ -#if !defined(_di_f_string_ranges_decrease_) || !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_terminate_) || !defined(_di_f_string_ranges_terminate_after_) +#if !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_terminate_) || !defined(_di_f_string_ranges_terminate_after_) extern f_status_t private_f_string_ranges_resize(const f_string_length_t length, f_string_ranges_t *ranges) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_string_ranges_decrease_) || !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_terminate_) || !defined(_di_f_string_ranges_terminate_after_) +#endif // !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_terminate_) || !defined(_di_f_string_ranges_terminate_after_) /** * Private implementation for resizing. @@ -674,13 +661,12 @@ extern "C" { * * Errors (with error bit) from: f_macro_string_triples_t_delete(). * - * @see f_string_triples_decrease() * @see f_string_triples_decrease_by() * @see f_string_triples_delete() */ -#if !defined(f_string_triples_decrease) || !defined(f_string_triples_decrease_by) || !defined(_di_f_string_triples_delete_) +#if !defined(f_string_triples_decrease_by) || !defined(_di_f_string_triples_delete_) extern f_status_t private_f_string_triples_delete(f_string_triples_t *triples) f_gcc_attribute_visibility_internal; -#endif // !defined(f_string_triples_decrease) || !defined(f_string_triples_decrease_by) || !defined(_di_f_string_triples_delete_) +#endif // !defined(f_string_triples_decrease_by) || !defined(_di_f_string_triples_delete_) /** * Private implementation of f_string_triples_destroy(). @@ -695,13 +681,12 @@ extern "C" { * * Errors (with error bit) from: f_macro_string_triples_t_destroy(). * - * @see f_string_triples_decimate() * @see f_string_triples_decimate_by() * @see f_string_triples_destroy() */ -#if !defined(f_string_triples_decimate) || !defined(f_string_triples_decimate_by) || !defined(_di_f_string_triples_destroy_) +#if !defined(f_string_triples_decimate_by) || !defined(_di_f_string_triples_destroy_) extern f_status_t private_f_string_triples_destroy(f_string_triples_t *triples) f_gcc_attribute_visibility_internal; -#endif // !defined(f_string_triples_decimate) || !defined(f_string_triples_decimate_by) || !defined(_di_f_string_triples_destroy_) +#endif // !defined(f_string_triples_decimate_by) || !defined(_di_f_string_triples_destroy_) /** * Private implementation for resizing. @@ -719,16 +704,15 @@ extern "C" { * Errors (with error bit) from: f_macro_string_triples_t_resize(). * * @see f_macro_string_dynamic_t_resize() - * @see f_string_triples_decrease() * @see f_string_triples_decrease_by() * @see f_string_triples_increase() * @see f_string_triples_increase_by() * @see f_string_triples_terminate() * @see f_string_triples_terminate_after() */ -#if !defined(_di_f_string_triples_decrease_) || !defined(_di_f_string_triples_decrease_by_) || !defined(_di_f_string_triples_increase_) || !defined(_di_f_string_triples_increase_by_) || !defined(_di_f_string_triples_terminate_) || !defined(_di_f_string_triples_terminate_after_) +#if !defined(_di_f_string_triples_decrease_by_) || !defined(_di_f_string_triples_increase_) || !defined(_di_f_string_triples_increase_by_) || !defined(_di_f_string_triples_terminate_) || !defined(_di_f_string_triples_terminate_after_) extern f_status_t private_f_string_triples_resize(const f_string_length_t length, f_string_triples_t *triples) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_string_triples_decrease_) || !defined(_di_f_string_triples_decrease_by_) || !defined(_di_f_string_triples_increase_) || !defined(_di_f_string_triples_increase_by_) || !defined(_di_f_string_triples_terminate_) || !defined(_di_f_string_triples_terminate_after_) +#endif // !defined(_di_f_string_triples_decrease_by_) || !defined(_di_f_string_triples_increase_) || !defined(_di_f_string_triples_increase_by_) || !defined(_di_f_string_triples_terminate_) || !defined(_di_f_string_triples_terminate_after_) #ifdef __cplusplus } // extern "C" diff --git a/level_0/f_string/c/string-common.h b/level_0/f_string/c/string-common.h index 89d9639..1c4e1c3 100644 --- a/level_0/f_string/c/string-common.h +++ b/level_0/f_string/c/string-common.h @@ -86,10 +86,7 @@ extern "C" { #define f_macro_string_lengths_t_delete_simple(string_lengths) f_macro_memory_structure_delete_simple(string_lengths, f_string_length_t); #define f_macro_string_lengths_t_destroy_simple(string_lengths) f_macro_memory_structure_destroy_simple(string_lengths, f_string_length_t); - #define f_macro_string_lengths_t_increase(status, string_lengths) f_macro_memory_structure_increase(status, string_lengths, f_string_length_t); - #define f_macro_string_lengths_t_decrease(status, string_lengths) f_macro_memory_structure_decrease(status, string_lengths, f_string_length_t); - #define f_macro_string_lengths_t_decimate(status, string_lengths) f_macro_memory_structure_decimate(status, string_lengths, f_string_length_t); - + #define f_macro_string_lengths_t_increase(status, string_lengths) f_macro_memory_structure_increase(status, string_lengths, f_string_length_t); #define f_macro_string_lengths_t_increase_by(status, string_lengths, amount) f_macro_memory_structure_increase_by(status, string_lengths, f_string_length_t, amount); #define f_macro_string_lengths_t_decrease_by(status, string_lengths, amount) f_macro_memory_structure_decrease_by(status, string_lengths, f_string_length_t, amount); #define f_macro_string_lengths_t_decimate_by(status, string_lengths, amount) f_macro_memory_structure_decimate_by(status, string_lengths, f_string_length_t, amount); @@ -126,9 +123,6 @@ extern "C" { #define f_macro_string_lengthss_t_destroy_simple(lengthss) f_macro_memory_structures_destroy_simple(lengthss, f_string_length_t, f_string_lengths_t); #define f_macro_string_lengthss_t_increase(status, string_lengths) f_macro_memory_structures_increase(status, string_lengths, f_string_length_t, f_array_length_t); - #define f_macro_string_lengthss_t_decrease(status, string_lengths) f_macro_memory_structures_decrease(status, string_lengths, f_string_length_t, f_string_lengths_t); - #define f_macro_string_lengthss_t_decimate(status, string_lengths) f_macro_memory_structures_decimate(status, string_lengths, f_string_length_t, f_string_lengths_t); - #define f_macro_string_lengthss_t_increase_by(status, string_lengths, amount) f_macro_memory_structures_increase_by(status, string_lengths, f_string_length_t, f_array_length_t, amount); #define f_macro_string_lengthss_t_decrease_by(status, string_lengths, amount) f_macro_memory_structures_decrease_by(status, string_lengths, f_string_length_t, f_string_lengths_t, f_array_length_t, amount); #define f_macro_string_lengthss_t_decimate_by(status, string_lengths, amount) f_macro_memory_structures_decimate_by(status, string_lengths, f_string_length_t, f_string_lengths_t, f_array_length_t, amount); diff --git a/level_0/f_string/c/string_dynamic.c b/level_0/f_string/c/string_dynamic.c index 1c21c93..2ac33f4 100644 --- a/level_0/f_string/c/string_dynamic.c +++ b/level_0/f_string/c/string_dynamic.c @@ -19,20 +19,6 @@ extern "C" { } #endif // _di_f_string_dynamic_adjust_ -#ifndef _di_f_string_dynamic_decimate_ - f_status_t f_string_dynamic_decimate(f_string_dynamic_t *string) { - #ifndef _di_level_0_parameter_checking_ - if (!string) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (string->size > 1) { - return private_f_string_dynamic_adjust(string->size - 1, string); - } - - return private_f_string_dynamic_destroy(string); - } -#endif // _di_f_string_dynamic_decimate_ - #ifndef _di_f_string_dynamic_decimate_by_ f_status_t f_string_dynamic_decimate_by(const f_string_length_t amount, f_string_dynamic_t *string) { #ifndef _di_level_0_parameter_checking_ @@ -48,20 +34,6 @@ extern "C" { } #endif // _di_f_string_dynamic_decimate_by_ -#ifndef _di_f_string_dynamic_decrease_ - f_status_t f_string_dynamic_decrease(f_string_dynamic_t *string) { - #ifndef _di_level_0_parameter_checking_ - if (!string) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (string->size > 1) { - return private_f_string_dynamic_resize(string->size - 1, string); - } - - return private_f_string_dynamic_delete(string); - } -#endif // _di_f_string_dynamic_decrease_ - #ifndef _di_f_string_dynamic_decrease_by_ f_status_t f_string_dynamic_decrease_by(const f_string_length_t amount, f_string_dynamic_t *string) { #ifndef _di_level_0_parameter_checking_ @@ -151,20 +123,6 @@ extern "C" { } #endif // _di_f_string_dynamics_adjust_ -#ifndef _di_f_string_dynamics_decimate_ - f_status_t f_string_dynamics_decimate(f_string_dynamics_t *strings) { - #ifndef _di_level_0_parameter_checking_ - if (!strings) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (strings->size > 1) { - return private_f_string_dynamics_adjust(strings->size - 1, strings); - } - - return private_f_string_dynamics_destroy(strings); - } -#endif // _di_f_string_dynamics_decimate_ - #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 *strings) { #ifndef _di_level_0_parameter_checking_ @@ -180,20 +138,6 @@ extern "C" { } #endif // _di_f_string_dynamics_decimate_by_ -#ifndef _di_f_string_dynamics_decrease_ - f_status_t f_string_dynamics_decrease(f_string_dynamics_t *strings) { - #ifndef _di_level_0_parameter_checking_ - if (!strings) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (strings->size > 1) { - return private_f_string_dynamics_resize(strings->size - 1, strings); - } - - return private_f_string_dynamics_delete(strings); - } -#endif // _di_f_string_dynamics_decrease_ - #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 *strings) { #ifndef _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 4968bf4..6a37527 100644 --- a/level_0/f_string/c/string_dynamic.h +++ b/level_0/f_string/c/string_dynamic.h @@ -249,24 +249,6 @@ extern "C" { #endif // _di_f_string_dynamic_adjust_ /** - * Resize the dynamic string to a smaller size, by 1. - * - * This will shrink the size by size - 1. - * This will not shrink the size to less than 0. - * - * @param string - * The string to resize. - * - * @return - * F_none on success. - * F_memory_not (with error bit) on out of memory. - * F_parameter (with error bit) if a parameter is invalid. - */ -#ifndef _di_f_string_dynamic_decrease_ - extern f_status_t f_string_dynamic_decrease(f_string_dynamic_t *string); -#endif // _di_f_string_dynamic_decrease_ - -/** * Resize the dynamic string to a smaller size. * * This will resize making the string smaller based on (size - given length). @@ -394,24 +376,6 @@ extern "C" { #endif // _di_f_string_dynamics_adjust_ /** - * Resize the dynamic string array to a smaller size, by 1. - * - * This will shrink the size by size - 1. - * This will not shrink the size to less than 0. - * - * @param strings - * The string array to resize. - * - * @return - * F_none on success. - * F_memory_not (with error bit) on out of memory. - * F_parameter (with error bit) if a parameter is invalid. - */ -#ifndef _di_f_string_dynamics_decimate_ - extern f_status_t f_string_dynamics_decimate(f_string_dynamics_t *strings); -#endif // _di_f_string_dynamics_decimate_ - -/** * Resize the dynamic string array to a smaller size. * * This will resize making the array smaller based on (size - given length). @@ -433,24 +397,6 @@ extern "C" { #endif // _di_f_string_dynamics_decimate_by_ /** - * Resize the dynamic string array to a smaller size, by 1. - * - * This will shrink the size by size - 1. - * This will not shrink the size to less than 0. - * - * @param strings - * The string array to resize. - * - * @return - * F_none on success. - * F_memory_not (with error bit) on out of memory. - * F_parameter (with error bit) if a parameter is invalid. - */ -#ifndef _di_f_string_dynamics_decrease_ - extern f_status_t f_string_dynamics_decrease(f_string_dynamics_t *strings); -#endif // _di_f_string_dynamics_decrease_ - -/** * Resize the dynamic string array to a smaller size. * * This will resize making the array smaller based on (size - given length). diff --git a/level_0/f_string/c/string_map.c b/level_0/f_string/c/string_map.c index b02fcfd..0a551c2 100644 --- a/level_0/f_string/c/string_map.c +++ b/level_0/f_string/c/string_map.c @@ -15,20 +15,6 @@ extern "C" { } #endif // _di_f_string_maps_adjust_ -#ifndef _di_f_string_maps_decimate_ - f_status_t f_string_maps_decimate(f_string_maps_t *maps) { - #ifndef _di_level_0_parameter_checking_ - if (!maps) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (maps->size > 1) { - return private_f_string_maps_adjust(maps->size - 1, maps); - } - - return private_f_string_maps_destroy(maps); - } -#endif // _di_f_string_maps_decimate_ - #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 *maps) { #ifndef _di_level_0_parameter_checking_ @@ -44,20 +30,6 @@ extern "C" { } #endif // _di_f_string_maps_decimate_by_ -#ifndef _di_f_string_maps_decrease_ - f_status_t f_string_maps_decrease(f_string_maps_t *maps) { - #ifndef _di_level_0_parameter_checking_ - if (!maps) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (maps->size > 1) { - return private_f_string_maps_resize(maps->size - 1, maps); - } - - return private_f_string_maps_delete(maps); - } -#endif // _di_f_string_maps_decrease_ - #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 *maps) { #ifndef _di_level_0_parameter_checking_ diff --git a/level_0/f_string/c/string_map.h b/level_0/f_string/c/string_map.h index 96431c2..84a08b6 100644 --- a/level_0/f_string/c/string_map.h +++ b/level_0/f_string/c/string_map.h @@ -315,24 +315,6 @@ extern "C" { #endif // _di_f_string_maps_adjust_ /** - * Resize the string maps array to a smaller size, by 1. - * - * This will shrink the size by size - 1. - * This will not shrink the size to less than 0. - * - * @param maps - * The string maps array to resize. - * - * @return - * F_none on success. - * F_memory_not (with error bit) on out of memory. - * F_parameter (with error bit) if a parameter is invalid. - */ -#ifndef _di_f_string_maps_decimate_ - extern f_status_t f_string_maps_decimate(f_string_maps_t *maps); -#endif // _di_f_string_maps_decimate_ - -/** * Resize the string maps array to a smaller size. * * This will resize making the array smaller based on (size - given length). @@ -354,24 +336,6 @@ extern "C" { #endif // _di_f_string_maps_decimate_by_ /** - * Resize the string maps array to a smaller size, by 1. - * - * This will shrink the size by size - 1. - * This will not shrink the size to less than 0. - * - * @param maps - * The string maps array to resize. - * - * @return - * F_none on success. - * F_memory_not (with error bit) on out of memory. - * F_parameter (with error bit) if a parameter is invalid. - */ -#ifndef _di_f_string_maps_decrease_ - extern f_status_t f_string_maps_decrease(f_string_maps_t *maps); -#endif // _di_f_string_maps_decrease_ - -/** * Resize the string maps array to a smaller size. * * This will resize making the array smaller based on (size - given length). diff --git a/level_0/f_string/c/string_quantity.c b/level_0/f_string/c/string_quantity.c index 9b7c600..88dd7b2 100644 --- a/level_0/f_string/c/string_quantity.c +++ b/level_0/f_string/c/string_quantity.c @@ -15,20 +15,6 @@ extern "C" { } #endif // _di_f_string_quantitys_adjust_ -#ifndef _di_f_string_quantitys_decimate_ - f_status_t f_string_quantitys_decimate(f_string_quantitys_t *quantitys) { - #ifndef _di_level_0_parameter_checking_ - if (!quantitys) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (quantitys->size > 1) { - return private_f_string_quantitys_adjust(quantitys->size - 1, quantitys); - } - - return private_f_string_quantitys_destroy(quantitys); - } -#endif // _di_f_string_quantitys_decimate_ - #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 *quantitys) { #ifndef _di_level_0_parameter_checking_ @@ -44,20 +30,6 @@ extern "C" { } #endif // _di_f_string_quantitys_decimate_by_ -#ifndef _di_f_string_quantitys_decrease_ - f_status_t f_string_quantitys_decrease(f_string_quantitys_t *quantitys) { - #ifndef _di_level_0_parameter_checking_ - if (!quantitys) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (quantitys->size > 1) { - return private_f_string_quantitys_resize(quantitys->size - 1, quantitys); - } - - return private_f_string_quantitys_delete(quantitys); - } -#endif // _di_f_string_quantitys_decrease_ - #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 *quantitys) { #ifndef _di_level_0_parameter_checking_ diff --git a/level_0/f_string/c/string_quantity.h b/level_0/f_string/c/string_quantity.h index 58d9580..34113f3 100644 --- a/level_0/f_string/c/string_quantity.h +++ b/level_0/f_string/c/string_quantity.h @@ -67,10 +67,7 @@ extern "C" { #define f_macro_string_quantitys_t_delete_simple(quantitys) f_macro_memory_structure_delete_simple(quantitys, f_string_quantity_t); #define f_macro_string_quantitys_t_destroy_simple(quantitys) f_macro_memory_structure_destroy_simple(quantitys, f_string_quantity_t); - #define f_macro_string_quantitys_t_increase(status, quantitys) f_macro_memory_structure_increase(status, quantitys, f_string_quantity_t); - #define f_macro_string_quantitys_t_decrease(status, quantitys) f_macro_memory_structure_decrease(status, quantitys, f_string_quantity_t); - #define f_macro_string_quantitys_t_decimate(status, quantitys) f_macro_memory_structure_decimate(status, quantitys, f_string_quantity_t); - + #define f_macro_string_quantitys_t_increase(status, quantitys) f_macro_memory_structure_increase(status, quantitys, f_string_quantity_t); #define f_macro_string_quantitys_t_increase_by(status, quantitys, amount) f_macro_memory_structure_increase_by(status, quantitys, f_string_quantity_t, amount); #define f_macro_string_quantitys_t_decrease_by(status, quantitys, amount) f_macro_memory_structure_decrease_by(status, quantitys, f_string_quantity_t, amount); #define f_macro_string_quantitys_t_decimate_by(status, quantitys, amount) f_macro_memory_structure_decimate_by(status, quantitys, f_string_quantity_t, amount); @@ -106,10 +103,7 @@ extern "C" { #define f_macro_string_quantityss_t_delete_simple(quantityss) f_macro_memory_structures_delete_simple(quantityss, f_string_quantity_t, f_string_quantitys_t); #define f_macro_string_quantityss_t_destroy_simple(quantityss) f_macro_memory_structures_destroy_simple(quantityss, f_string_quantity_t, f_string_quantitys_t); - #define f_macro_string_quantityss_t_increase(status, string_quantitys) f_macro_memory_structures_increase(status, string_quantitys, f_string_quantity_t, f_array_length_t); - #define f_macro_string_quantityss_t_decrease(status, string_quantitys) f_macro_memory_structures_decrease(status, string_quantitys, f_string_quantity_t, f_string_quantity_t); - #define f_macro_string_quantityss_t_decimate(status, string_quantitys) f_macro_memory_structures_decimate(status, string_quantitys, f_string_quantity_t, f_string_quantity_t); - + #define f_macro_string_quantityss_t_increase(status, string_quantitys) f_macro_memory_structures_increase(status, string_quantitys, f_string_quantity_t, f_array_length_t); #define f_macro_string_quantityss_t_increase_by(status, string_quantitys, amount) f_macro_memory_structures_increase_by(status, string_quantitys, f_string_quantity_t, f_array_length_t, amount); #define f_macro_string_quantityss_t_decrease_by(status, string_quantitys, amount) f_macro_memory_structures_decrease_by(status, string_quantitys, f_string_quantity_t, f_string_quantitys_t, f_array_length_t, amount); #define f_macro_string_quantityss_t_decimate_by(status, string_quantitys, amount) f_macro_memory_structures_decimate_by(status, string_quantitys, f_string_quantity_t, f_string_quantitys_t, f_array_length_t, amount); @@ -133,24 +127,6 @@ extern "C" { #endif // _di_f_string_quantitys_adjust_ /** - * Resize the string quantitys array to a smaller size, by 1. - * - * This will shrink the size by size - 1. - * This will not shrink the size to less than 0. - * - * @param quantitys - * The string quantitys array to resize. - * - * @return - * F_none on success. - * F_memory_not (with error bit) on out of memory. - * F_parameter (with error bit) if a parameter is invalid. - */ -#ifndef _di_f_string_quantitys_decimate_ - extern f_status_t f_string_quantitys_decimate(f_string_quantitys_t *quantitys); -#endif // _di_f_string_quantitys_decimate_ - -/** * Resize the string quantitys array to a smaller size. * * This will resize making the array smaller based on (size - given length). @@ -172,24 +148,6 @@ extern "C" { #endif // _di_f_string_quantitys_decimate_by_ /** - * Resize the string quantitys array to a smaller size, by 1. - * - * This will shrink the size by size - 1. - * This will not shrink the size to less than 0. - * - * @param quantitys - * The string quantitys array to resize. - * - * @return - * F_none on success. - * F_memory_not (with error bit) on out of memory. - * F_parameter (with error bit) if a parameter is invalid. - */ -#ifndef _di_f_string_quantitys_decrease_ - extern f_status_t f_string_quantitys_decrease(f_string_quantitys_t *quantitys); -#endif // _di_f_string_quantitys_decrease_ - -/** * Resize the string quantitys array to a smaller size. * * This will resize making the array smaller based on (size - given length). diff --git a/level_0/f_string/c/string_range.c b/level_0/f_string/c/string_range.c index 5001f9f..1950c7d 100644 --- a/level_0/f_string/c/string_range.c +++ b/level_0/f_string/c/string_range.c @@ -15,20 +15,6 @@ extern "C" { } #endif // _di_f_string_ranges_adjust_ -#ifndef _di_f_string_ranges_decimate_ - f_status_t f_string_ranges_decimate(f_string_ranges_t *ranges) { - #ifndef _di_level_0_parameter_checking_ - if (!ranges) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (ranges->size > 1) { - return private_f_string_ranges_adjust(ranges->size - 1, ranges); - } - - return private_f_string_ranges_destroy(ranges); - } -#endif // _di_f_string_ranges_decimate_ - #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 *ranges) { #ifndef _di_level_0_parameter_checking_ @@ -44,20 +30,6 @@ extern "C" { } #endif // _di_f_string_ranges_decimate_by_ -#ifndef _di_f_string_ranges_decrease_ - f_status_t f_string_ranges_decrease(f_string_ranges_t *ranges) { - #ifndef _di_level_0_parameter_checking_ - if (!ranges) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (ranges->size > 1) { - return private_f_string_ranges_resize(ranges->size - 1, ranges); - } - - return private_f_string_ranges_delete(ranges); - } -#endif // _di_f_string_ranges_decrease_ - #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 *ranges) { #ifndef _di_level_0_parameter_checking_ diff --git a/level_0/f_string/c/string_range.h b/level_0/f_string/c/string_range.h index 6a1f44e..bd482fa 100644 --- a/level_0/f_string/c/string_range.h +++ b/level_0/f_string/c/string_range.h @@ -73,10 +73,7 @@ extern "C" { #define f_macro_string_ranges_t_delete_simple(ranges) f_macro_memory_structure_delete_simple(ranges, f_string_range_t); #define f_macro_string_ranges_t_destroy_simple(ranges) f_macro_memory_structure_destroy_simple(ranges, f_string_range_t); - #define f_macro_string_ranges_t_increase(status, ranges) f_macro_memory_structure_increase(status, ranges, f_string_range_t); - #define f_macro_string_ranges_t_decrease(status, ranges) f_macro_memory_structure_decrease(status, ranges, f_string_range_t); - #define f_macro_string_ranges_t_decimate(status, ranges) f_macro_memory_structure_decimate(status, ranges, f_string_range_t); - + #define f_macro_string_ranges_t_increase(status, ranges) f_macro_memory_structure_increase(status, ranges, f_string_range_t); #define f_macro_string_ranges_t_increase_by(status, ranges, amount) f_macro_memory_structure_increase_by(status, ranges, f_string_range_t, amount); #define f_macro_string_ranges_t_decrease_by(status, ranges, amount) f_macro_memory_structure_decrease_by(status, ranges, f_string_range_t, amount); #define f_macro_string_ranges_t_decimate_by(status, ranges, amount) f_macro_memory_structure_decimate_by(status, ranges, f_string_range_t, amount); @@ -112,10 +109,7 @@ extern "C" { #define f_macro_string_rangess_t_delete_simple(rangess) f_macro_memory_structures_delete_simple(rangess, f_string_range_t, f_string_ranges_t); #define f_macro_string_rangess_t_destroy_simple(rangess) f_macro_memory_structures_destroy_simple(rangess, f_string_range_t, f_string_ranges_t); - #define f_macro_string_rangess_t_increase(status, string_ranges) f_macro_memory_structures_increase(status, string_ranges, f_string_range_t, f_array_length_t); - #define f_macro_string_rangess_t_decrease(status, string_ranges) f_macro_memory_structures_decrease(status, string_ranges, f_string_range_t, f_string_range_t); - #define f_macro_string_rangess_t_decimate(status, string_ranges) f_macro_memory_structures_decimate(status, string_ranges, f_string_range_t, f_string_range_t); - + #define f_macro_string_rangess_t_increase(status, string_ranges) f_macro_memory_structures_increase(status, string_ranges, f_string_range_t, f_array_length_t); #define f_macro_string_rangess_t_increase_by(status, string_ranges, amount) f_macro_memory_structures_increase_by(status, string_ranges, f_string_range_t, f_array_length_t, amount); #define f_macro_string_rangess_t_decrease_by(status, string_ranges, amount) f_macro_memory_structures_decrease_by(status, string_ranges, f_string_range_t, f_string_ranges_t, f_array_length_t, amount); #define f_macro_string_rangess_t_decimate_by(status, string_ranges, amount) f_macro_memory_structures_decimate_by(status, string_ranges, f_string_range_t, f_string_ranges_t, f_array_length_t, amount); @@ -139,24 +133,6 @@ extern "C" { #endif // _di_f_string_ranges_adjust_ /** - * Resize the string ranges array to a smaller size, by 1. - * - * This will shrink the size by size - 1. - * This will not shrink the size to less than 0. - * - * @param ranges - * The string ranges array to resize. - * - * @return - * F_none on success. - * F_memory_not (with error bit) on out of memory. - * F_parameter (with error bit) if a parameter is invalid. - */ -#ifndef _di_f_string_ranges_decimate_ - extern f_status_t f_string_ranges_decimate(f_string_ranges_t *ranges); -#endif // _di_f_string_ranges_decimate_ - -/** * Resize the string ranges array to a smaller size. * * This will resize making the array smaller based on (size - given length). @@ -178,24 +154,6 @@ extern "C" { #endif // _di_f_string_ranges_decimate_by_ /** - * Resize the string ranges array to a smaller size, by 1. - * - * This will shrink the size by size - 1. - * This will not shrink the size to less than 0. - * - * @param ranges - * The string ranges array to resize. - * - * @return - * F_none on success. - * F_memory_not (with error bit) on out of memory. - * F_parameter (with error bit) if a parameter is invalid. - */ -#ifndef _di_f_string_ranges_decrease_ - extern f_status_t f_string_ranges_decrease(f_string_ranges_t *ranges); -#endif // _di_f_string_ranges_decrease_ - -/** * Resize the string ranges array to a smaller size. * * This will resize making the array smaller based on (size - given length). diff --git a/level_0/f_string/c/string_triple.c b/level_0/f_string/c/string_triple.c index 7c4295d..3a3e15f 100644 --- a/level_0/f_string/c/string_triple.c +++ b/level_0/f_string/c/string_triple.c @@ -15,20 +15,6 @@ extern "C" { } #endif // _di_f_string_triples_adjust_ -#ifndef _di_f_string_triples_decimate_ - f_status_t f_string_triples_decimate(f_string_triples_t *triples) { - #ifndef _di_level_0_parameter_checking_ - if (!triples) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (triples->size > 1) { - return private_f_string_triples_adjust(triples->size - 1, triples); - } - - return private_f_string_triples_destroy(triples); - } -#endif // _di_f_string_triples_decimate_ - #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 *triples) { #ifndef _di_level_0_parameter_checking_ @@ -44,20 +30,6 @@ extern "C" { } #endif // _di_f_string_triples_decimate_by_ -#ifndef _di_f_string_triples_decrease_ - f_status_t f_string_triples_decrease(f_string_triples_t *triples) { - #ifndef _di_level_0_parameter_checking_ - if (!triples) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (triples->size > 1) { - return private_f_string_triples_resize(triples->size - 1, triples); - } - - return private_f_string_triples_delete(triples); - } -#endif // _di_f_string_triples_decrease_ - #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 *triples) { #ifndef _di_level_0_parameter_checking_ diff --git a/level_0/f_string/c/string_triple.h b/level_0/f_string/c/string_triple.h index 175c9b9..b040061 100644 --- a/level_0/f_string/c/string_triple.h +++ b/level_0/f_string/c/string_triple.h @@ -191,24 +191,6 @@ extern "C" { #endif // _di_f_string_triples_adjust_ /** - * Resize the string triples array to a smaller size, by 1. - * - * This will shrink the size by size - 1. - * This will not shrink the size to less than 0. - * - * @param triples - * The string triples array to resize. - * - * @return - * F_none on success. - * F_memory_not (with error bit) on out of memory. - * F_parameter (with error bit) if a parameter is invalid. - */ -#ifndef _di_f_string_triples_decimate_ - extern f_status_t f_string_triples_decimate(f_string_triples_t *triples); -#endif // _di_f_string_triples_decimate_ - -/** * Resize the string triples array to a smaller size. * * This will resize making the array smaller based on (size - given length). @@ -230,24 +212,6 @@ extern "C" { #endif // _di_f_string_triples_decimate_by_ /** - * Resize the string triples array to a smaller size, by 1. - * - * This will shrink the size by size - 1. - * This will not shrink the size to less than 0. - * - * @param triples - * The string triples array to resize. - * - * @return - * F_none on success. - * F_memory_not (with error bit) on out of memory. - * F_parameter (with error bit) if a parameter is invalid. - */ -#ifndef _di_f_string_triples_decrease_ - extern f_status_t f_string_triples_decrease(f_string_triples_t *triples); -#endif // _di_f_string_triples_decrease_ - -/** * Resize the string triples array to a smaller size. * * This will resize making the array smaller based on (size - given length). diff --git a/level_0/f_thread/c/thread-common.h b/level_0/f_thread/c/thread-common.h index f52eb67..5064ef6 100644 --- a/level_0/f_thread/c/thread-common.h +++ b/level_0/f_thread/c/thread-common.h @@ -56,10 +56,7 @@ extern "C" { #define f_macro_thread_attributes_t_delete_simple(attributes) f_macro_memory_structure_delete_simple(attributes, f_thread_attribute_t); #define f_macro_thread_attributes_t_destroy_simple(attributes) f_macro_memory_structure_destroy_simple(attributes, f_thread_attribute_t); - #define f_macro_thread_attributes_t_increase(status, attributes) f_macro_memory_structure_increase(status, attributes, f_thread_attribute_t); - #define f_macro_thread_attributes_t_decrease(status, attributes) f_macro_memory_structure_decrease(status, attributes, f_thread_attribute_t); - #define f_macro_thread_attributes_t_decimate(status, attributes) f_macro_memory_structure_decimate(status, attributes, f_thread_attribute_t); - + #define f_macro_thread_attributes_t_increase(status, attributes) f_macro_memory_structure_increase(status, attributes, f_thread_attribute_t); #define f_macro_thread_attributes_t_increase_by(status, attributes, amount) f_macro_memory_structure_increase_by(status, attributes, f_thread_attribute_t, amount); #define f_macro_thread_attributes_t_decrease_by(status, attributes, amount) f_macro_memory_structure_decrease_by(status, attributes, f_thread_attribute_t, amount); #define f_macro_thread_attributes_t_decimate_by(status, attributes, amount) f_macro_memory_structure_decimate_by(status, attributes, f_thread_attribute_t, amount); @@ -104,10 +101,7 @@ extern "C" { #define f_macro_thread_conditions_t_delete_simple(conditions) f_macro_memory_structure_delete_simple(conditions, f_thread_condition_t); #define f_macro_thread_conditions_t_destroy_simple(conditions) f_macro_memory_structure_destroy_simple(conditions, f_thread_condition_t); - #define f_macro_thread_conditions_t_increase(status, conditions) f_macro_memory_structure_increase(status, conditions, f_thread_condition_t); - #define f_macro_thread_conditions_t_decrease(status, conditions) f_macro_memory_structure_decrease(status, conditions, f_thread_condition_t); - #define f_macro_thread_conditions_t_decimate(status, conditions) f_macro_memory_structure_decimate(status, conditions, f_thread_condition_t); - + #define f_macro_thread_conditions_t_increase(status, conditions) f_macro_memory_structure_increase(status, conditions, f_thread_condition_t); #define f_macro_thread_conditions_t_increase_by(status, conditions, amount) f_macro_memory_structure_increase_by(status, conditions, f_thread_condition_t, amount); #define f_macro_thread_conditions_t_decrease_by(status, conditions, amount) f_macro_memory_structure_decrease_by(status, conditions, f_thread_condition_t, amount); #define f_macro_thread_conditions_t_decimate_by(status, conditions, amount) f_macro_memory_structure_decimate_by(status, conditions, f_thread_condition_t, amount); @@ -152,10 +146,7 @@ extern "C" { #define f_macro_thread_ids_t_delete_simple(ids) f_macro_memory_structure_delete_simple(ids, f_thread_id_t); #define f_macro_thread_ids_t_destroy_simple(ids) f_macro_memory_structure_destroy_simple(ids, f_thread_id_t); - #define f_macro_thread_ids_t_increase(status, ids) f_macro_memory_structure_increase(status, ids, f_thread_id_t); - #define f_macro_thread_ids_t_decrease(status, ids) f_macro_memory_structure_decrease(status, ids, f_thread_id_t); - #define f_macro_thread_ids_t_decimate(status, ids) f_macro_memory_structure_decimate(status, ids, f_thread_id_t); - + #define f_macro_thread_ids_t_increase(status, ids) f_macro_memory_structure_increase(status, ids, f_thread_id_t); #define f_macro_thread_ids_t_increase_by(status, ids, amount) f_macro_memory_structure_increase_by(status, ids, f_thread_id_t, amount); #define f_macro_thread_ids_t_decrease_by(status, ids, amount) f_macro_memory_structure_decrease_by(status, ids, f_thread_id_t, amount); #define f_macro_thread_ids_t_decimate_by(status, ids, amount) f_macro_memory_structure_decimate_by(status, ids, f_thread_id_t, amount); @@ -200,10 +191,7 @@ extern "C" { #define f_macro_thread_keys_t_delete_simple(keys) f_macro_memory_structure_delete_simple(keys, f_thread_key_t); #define f_macro_thread_keys_t_destroy_simple(keys) f_macro_memory_structure_destroy_simple(keys, f_thread_key_t); - #define f_macro_thread_keys_t_increase(status, keys) f_macro_memory_structure_increase(status, keys, f_thread_key_t); - #define f_macro_thread_keys_t_decrease(status, keys) f_macro_memory_structure_decrease(status, keys, f_thread_key_t); - #define f_macro_thread_keys_t_decimate(status, keys) f_macro_memory_structure_decimate(status, keys, f_thread_key_t); - + #define f_macro_thread_keys_t_increase(status, keys) f_macro_memory_structure_increase(status, keys, f_thread_key_t); #define f_macro_thread_keys_t_increase_by(status, keys, amount) f_macro_memory_structure_increase_by(status, keys, f_thread_key_t, amount); #define f_macro_thread_keys_t_decrease_by(status, keys, amount) f_macro_memory_structure_decrease_by(status, keys, f_thread_key_t, amount); #define f_macro_thread_keys_t_decimate_by(status, keys, amount) f_macro_memory_structure_decimate_by(status, keys, f_thread_key_t, amount); @@ -248,10 +236,7 @@ extern "C" { #define f_macro_thread_locks_t_delete_simple(locks) f_macro_memory_structure_delete_simple(locks, f_thread_lock_t); #define f_macro_thread_locks_t_destroy_simple(locks) f_macro_memory_structure_destroy_simple(locks, f_thread_lock_t); - #define f_macro_thread_locks_t_increase(status, locks) f_macro_memory_structure_increase(status, locks, f_thread_lock_t); - #define f_macro_thread_locks_t_decrease(status, locks) f_macro_memory_structure_decrease(status, locks, f_thread_lock_t); - #define f_macro_thread_locks_t_decimate(status, locks) f_macro_memory_structure_decimate(status, locks, f_thread_lock_t); - + #define f_macro_thread_locks_t_increase(status, locks) f_macro_memory_structure_increase(status, locks, f_thread_lock_t); #define f_macro_thread_locks_t_increase_by(status, locks, amount) f_macro_memory_structure_increase_by(status, locks, f_thread_lock_t, amount); #define f_macro_thread_locks_t_decrease_by(status, locks, amount) f_macro_memory_structure_decrease_by(status, locks, f_thread_lock_t, amount); #define f_macro_thread_locks_t_decimate_by(status, locks, amount) f_macro_memory_structure_decimate_by(status, locks, f_thread_lock_t, amount); @@ -296,10 +281,7 @@ extern "C" { #define f_macro_thread_mutexs_t_delete_simple(mutexs) f_macro_memory_structure_delete_simple(mutexs, f_thread_mutex_t); #define f_macro_thread_mutexs_t_destroy_simple(mutexs) f_macro_memory_structure_destroy_simple(mutexs, f_thread_mutex_t); - #define f_macro_thread_mutexs_t_increase(status, mutexs) f_macro_memory_structure_increase(status, mutexs, f_thread_mutex_t); - #define f_macro_thread_mutexs_t_decrease(status, mutexs) f_macro_memory_structure_decrease(status, mutexs, f_thread_mutex_t); - #define f_macro_thread_mutexs_t_decimate(status, mutexs) f_macro_memory_structure_decimate(status, mutexs, f_thread_mutex_t); - + #define f_macro_thread_mutexs_t_increase(status, mutexs) f_macro_memory_structure_increase(status, mutexs, f_thread_mutex_t); #define f_macro_thread_mutexs_t_increase_by(status, mutexs, amount) f_macro_memory_structure_increase_by(status, mutexs, f_thread_mutex_t, amount); #define f_macro_thread_mutexs_t_decrease_by(status, mutexs, amount) f_macro_memory_structure_decrease_by(status, mutexs, f_thread_mutex_t, amount); #define f_macro_thread_mutexs_t_decimate_by(status, mutexs, amount) f_macro_memory_structure_decimate_by(status, mutexs, f_thread_mutex_t, amount); @@ -344,10 +326,7 @@ extern "C" { #define f_macro_thread_mutex_attributes_t_delete_simple(mutex_attributes) f_macro_memory_structure_delete_simple(mutex_attributes, f_thread_mutex_attribute_t); #define f_macro_thread_mutex_attributes_t_destroy_simple(mutex_attributes) f_macro_memory_structure_destroy_simple(mutex_attributes, f_thread_mutex_attribute_t); - #define f_macro_thread_mutex_attributes_t_increase(status, mutex_attributes) f_macro_memory_structure_increase(status, mutex_attributes, f_thread_mutex_attribute_t); - #define f_macro_thread_mutex_attributes_t_decrease(status, mutex_attributes) f_macro_memory_structure_decrease(status, mutex_attributes, f_thread_mutex_attribute_t); - #define f_macro_thread_mutex_attributes_t_decimate(status, mutex_attributes) f_macro_memory_structure_decimate(status, mutex_attributes, f_thread_mutex_attribute_t); - + #define f_macro_thread_mutex_attributes_t_increase(status, mutex_attributes) f_macro_memory_structure_increase(status, mutex_attributes, f_thread_mutex_attribute_t); #define f_macro_thread_mutex_attributes_t_increase_by(status, mutex_attributes, amount) f_macro_memory_structure_increase_by(status, mutex_attributes, f_thread_mutex_attribute_t, amount); #define f_macro_thread_mutex_attributes_t_decrease_by(status, mutex_attributes, amount) f_macro_memory_structure_decrease_by(status, mutex_attributes, f_thread_mutex_attribute_t, amount); #define f_macro_thread_mutex_attributes_t_decimate_by(status, mutex_attributes, amount) f_macro_memory_structure_decimate_by(status, mutex_attributes, f_thread_mutex_attribute_t, amount); @@ -392,10 +371,7 @@ extern "C" { #define f_macro_thread_onces_t_delete_simple(onces) f_macro_memory_structure_delete_simple(onces, f_thread_once_t); #define f_macro_thread_onces_t_destroy_simple(onces) f_macro_memory_structure_destroy_simple(onces, f_thread_once_t); - #define f_macro_thread_onces_t_increase(status, onces) f_macro_memory_structure_increase(status, onces, f_thread_once_t); - #define f_macro_thread_onces_t_decrease(status, onces) f_macro_memory_structure_decrease(status, onces, f_thread_once_t); - #define f_macro_thread_onces_t_decimate(status, onces) f_macro_memory_structure_decimate(status, onces, f_thread_once_t); - + #define f_macro_thread_onces_t_increase(status, onces) f_macro_memory_structure_increase(status, onces, f_thread_once_t); #define f_macro_thread_onces_t_increase_by(status, onces, amount) f_macro_memory_structure_increase_by(status, onces, f_thread_once_t, amount); #define f_macro_thread_onces_t_decrease_by(status, onces, amount) f_macro_memory_structure_decrease_by(status, onces, f_thread_once_t, amount); #define f_macro_thread_onces_t_decimate_by(status, onces, amount) f_macro_memory_structure_decimate_by(status, onces, f_thread_once_t, amount); @@ -450,10 +426,7 @@ extern "C" { #define f_macro_thread_sets_t_delete_simple(sets) f_macro_memory_structure_delete_simple(sets, f_thread_set_t); #define f_macro_thread_sets_t_destroy_simple(sets) f_macro_memory_structure_destroy_simple(sets, f_thread_set_t); - #define f_macro_thread_sets_t_increase(status, sets) f_macro_memory_structure_increase(status, sets, f_thread_set_t); - #define f_macro_thread_sets_t_decrease(status, sets) f_macro_memory_structure_decrease(status, sets, f_thread_set_t); - #define f_macro_thread_sets_t_decimate(status, sets) f_macro_memory_structure_decimate(status, sets, f_thread_set_t); - + #define f_macro_thread_sets_t_increase(status, sets) f_macro_memory_structure_increase(status, sets, f_thread_set_t); #define f_macro_thread_sets_t_increase_by(status, sets, amount) f_macro_memory_structure_increase_by(status, sets, f_thread_set_t, amount); #define f_macro_thread_sets_t_decrease_by(status, sets, amount) f_macro_memory_structure_decrease_by(status, sets, f_thread_set_t, amount); #define f_macro_thread_sets_t_decimate_by(status, sets, amount) f_macro_memory_structure_decimate_by(status, sets, f_thread_set_t, amount); diff --git a/level_0/f_type/c/type_array.h b/level_0/f_type/c/type_array.h index 53c3551..00f6a55 100644 --- a/level_0/f_type/c/type_array.h +++ b/level_0/f_type/c/type_array.h @@ -44,10 +44,7 @@ extern "C" { #define f_macro_array_lengths_t_resize(status, lengths, length) f_macro_memory_structure_resize(status, lengths, f_array_length_t, length); #define f_macro_array_lengths_t_adjust(status, lengths, length) f_macro_memory_structure_adjust(status, lengths, f_array_length_t, length); - #define f_macro_array_lengths_t_increase(status, lengths) f_macro_memory_structure_increase(status, lengths, f_array_length_t); - #define f_macro_array_lengths_t_decrease(status, lengths) f_macro_memory_structure_decrease(status, lengths, f_array_length_t); - #define f_macro_array_lengths_t_decimate(status, lengths) f_macro_memory_structure_decimate(status, lengths, f_array_length_t); - + #define f_macro_array_lengths_t_increase(status, lengths) f_macro_memory_structure_increase(status, lengths, f_array_length_t); #define f_macro_array_lengths_t_increase_by(status, lengths, amount) f_macro_memory_structure_increase_by(status, lengths, f_array_length_t, amount); #define f_macro_array_lengths_t_decrease_by(status, lengths, amount) f_macro_memory_structure_decrease_by(status, lengths, f_array_length_t, amount); #define f_macro_array_lengths_t_decimate_by(status, lengths, amount) f_macro_memory_structure_decimate_by(status, lengths, f_array_length_t, amount); @@ -114,10 +111,7 @@ extern "C" { #define f_macro_cells_t_resize(status, cells, length) f_macro_memory_structure_resize(status, cells, f_cell_t, length); #define f_macro_cells_t_adjust(status, cells, length) f_macro_memory_structure_adjust(status, cells, f_cell_t, length); - #define f_macro_cells_t_increase(status, cells) f_macro_memory_structure_increase(status, cells, f_cell_t); - #define f_macro_cells_t_decrease(status, cells) f_macro_memory_structure_decrease(status, cells, f_cell_t); - #define f_macro_cells_t_decimate(status, cells) f_macro_memory_structure_decimate(status, cells, f_cell_t); - + #define f_macro_cells_t_increase(status, cells) f_macro_memory_structure_increase(status, cells, f_cell_t); #define f_macro_cells_t_increase_by(status, cells, amount) f_macro_memory_structure_increase_by(status, cells, f_cell_t, amount); #define f_macro_cells_t_decrease_by(status, cells, amount) f_macro_memory_structure_decrease_by(status, cells, f_cell_t, amount); #define f_macro_cells_t_decimate_by(status, cells, amount) f_macro_memory_structure_decimate_by(status, cells, f_cell_t, amount); @@ -192,10 +186,7 @@ extern "C" { #define f_macro_int8s_t_delete_simple(int8s) f_macro_memory_structure_delete_simple(int8s, int8_t); #define f_macro_int8s_t_destroy_simple(int8s) f_macro_memory_structure_destroy_simple(int8s, int8_t); - #define f_macro_int8s_t_increase(status, int8s) f_macro_memory_structure_increase(status, int8s, int8_t); - #define f_macro_int8s_t_decrease(status, int8s) f_macro_memory_structure_decrease(status, int8s, int8_t); - #define f_macro_int8s_t_decimate(status, int8s) f_macro_memory_structure_decimate(status, int8s, int8_t); - + #define f_macro_int8s_t_increase(status, int8s) f_macro_memory_structure_increase(status, int8s, int8_t); #define f_macro_int8s_t_increase_by(status, int8s, amount) f_macro_memory_structure_increase_by(status, int8s, int8_t, amount); #define f_macro_int8s_t_decrease_by(status, int8s, amount) f_macro_memory_structure_decrease_by(status, int8s, int8_t, amount); #define f_macro_int8s_t_decimate_by(status, int8s, amount) f_macro_memory_structure_decimate_by(status, int8s, int8_t, amount); @@ -256,10 +247,7 @@ extern "C" { #define f_macro_uint8s_t_adjust(status, uint8s, length) f_macro_memory_structure_adjust(status, uint8s, uint8_t, length); #define f_macro_uint8s_t_resize(status, uint8s, length) f_macro_memory_structure_resize(status, uint8s, uint8_t, length); - #define f_macro_uint8s_t_increase(status, uint8s) f_macro_memory_structure_increase(status, uint8s, uint8_t); - #define f_macro_uint8s_t_decimate(status, uint8s) f_macro_memory_structure_decimate(status, uint8s, uint8_t); - #define f_macro_uint8s_t_decrease(status, uint8s) f_macro_memory_structure_decrease(status, uint8s, uint8_t); - + #define f_macro_uint8s_t_increase(status, uint8s) f_macro_memory_structure_increase(status, uint8s, uint8_t); #define f_macro_uint8s_t_increase_by(status, uint8s, amount) f_macro_memory_structure_increase_by(status, uint8s, uint8_t, amount); #define f_macro_uint8s_t_decrease_by(status, uint8s, amount) f_macro_memory_structure_decrease_by(status, uint8s, uint8_t, amount); #define f_macro_uint8s_t_decimate_by(status, uint8s, amount) f_macro_memory_structure_decimate_by(status, uint8s, uint8_t, amount); @@ -327,10 +315,7 @@ extern "C" { #define f_macro_int16s_t_adjust(status, int16s, length) f_macro_memory_structure_adjust(status, int16s, int16_t, length); #define f_macro_int16s_t_resize(status, int16s, length) f_macro_memory_structure_resize(status, int16s, int16_t, length); - #define f_macro_int16s_t_increase(status, int16s) f_macro_memory_structure_increase(status, int16s, int16_t); - #define f_macro_int16s_t_decimate(status, int16s) f_macro_memory_structure_decimate(status, int16s, int16_t); - #define f_macro_int16s_t_decrease(status, int16s) f_macro_memory_structure_decrease(status, int16s, int16_t); - + #define f_macro_int16s_t_increase(status, int16s) f_macro_memory_structure_increase(status, int16s, int16_t); #define f_macro_int16s_t_increase_by(status, int16s, amount) f_macro_memory_structure_increase_by(status, int16s, int16_t, amount); #define f_macro_int16s_t_decrease_by(status, int16s, amount) f_macro_memory_structure_decrease_by(status, int16s, int16_t, amount); #define f_macro_int16s_t_decimate_by(status, int16s, amount) f_macro_memory_structure_decimate_by(status, int16s, int16_t, amount); @@ -397,10 +382,7 @@ extern "C" { #define f_macro_uint16s_t_adjust(status, uint16s, length) f_macro_memory_structure_adjust(status, uint16s, uint16_t, length); #define f_macro_uint16s_t_resize(status, uint16s, length) f_macro_memory_structure_resize(status, uint16s, uint16_t, length); - #define f_macro_uint16s_t_increase(status, uint16s) f_macro_memory_structure_increase(status, uint16s, uint16_t); - #define f_macro_uint16s_t_decimate(status, uint16s) f_macro_memory_structure_decimate(status, uint16s, uint16_t); - #define f_macro_uint16s_t_decrease(status, uint16s) f_macro_memory_structure_decrease(status, uint16s, uint16_t); - + #define f_macro_uint16s_t_increase(status, uint16s) f_macro_memory_structure_increase(status, uint16s, uint16_t); #define f_macro_uint16s_t_increase_by(status, uint16s, amount) f_macro_memory_structure_increase_by(status, uint16s, uint16_t, amount); #define f_macro_uint16s_t_decrease_by(status, uint16s, amount) f_macro_memory_structure_decrease_by(status, uint16s, uint16_t, amount); #define f_macro_uint16s_t_decimate_by(status, uint16s, amount) f_macro_memory_structure_decimate_by(status, uint16s, uint16_t, amount); @@ -467,10 +449,7 @@ extern "C" { #define f_macro_int32s_t_adjust(status, int32s, length) f_macro_memory_structure_adjust(status, int32s, int32_t, length); #define f_macro_int32s_t_resize(status, int32s, length) f_macro_memory_structure_resize(status, int32s, int32_t, length); - #define f_macro_int32s_t_increase(status, int32s) f_macro_memory_structure_increase(status, int32s, int32_t); - #define f_macro_int32s_t_decimate(status, int32s) f_macro_memory_structure_decimate(status, int32s, int32_t); - #define f_macro_int32s_t_decrease(status, int32s) f_macro_memory_structure_decrease(status, int32s, int32_t); - + #define f_macro_int32s_t_increase(status, int32s) f_macro_memory_structure_increase(status, int32s, int32_t); #define f_macro_int32s_t_increase_by(status, int32s, amount) f_macro_memory_structure_increase_by(status, int32s, int32_t, amount); #define f_macro_int32s_t_decrease_by(status, int32s, amount) f_macro_memory_structure_decrease_by(status, int32s, int32_t, amount); #define f_macro_int32s_t_decimate_by(status, int32s, amount) f_macro_memory_structure_decimate_by(status, int32s, int32_t, amount); @@ -537,10 +516,7 @@ extern "C" { #define f_macro_uint32s_t_adjust(status, uint32s, length) f_macro_memory_structure_adjust(status, uint32s, uint32_t, length); #define f_macro_uint32s_t_resize(status, uint32s, length) f_macro_memory_structure_resize(status, uint32s, uint32_t, length); - #define f_macro_uint32s_t_increase(status, uint32s) f_macro_memory_structure_increase(status, uint32s, uint32_t); - #define f_macro_uint32s_t_decimate(status, uint32s) f_macro_memory_structure_decimate(status, uint32s, uint32_t); - #define f_macro_uint32s_t_decrease(status, uint32s) f_macro_memory_structure_decrease(status, uint32s, uint32_t); - + #define f_macro_uint32s_t_increase(status, uint32s) f_macro_memory_structure_increase(status, uint32s, uint32_t); #define f_macro_uint32s_t_increase_by(status, uint32s, amount) f_macro_memory_structure_increase_by(status, uint32s, uint32_t, amount); #define f_macro_uint32s_t_decrease_by(status, uint32s, amount) f_macro_memory_structure_decrease_by(status, uint32s, uint32_t, amount); #define f_macro_uint32s_t_decimate_by(status, uint32s, amount) f_macro_memory_structure_decimate_by(status, uint32s, uint32_t, amount); @@ -607,10 +583,7 @@ extern "C" { #define f_macro_int64s_t_adjust(status, int64s, length) f_macro_memory_structure_adjust(status, int64s, int64_t, length); #define f_macro_int64s_t_resize(status, int64s, length) f_macro_memory_structure_resize(status, int64s, int64_t, length); - #define f_macro_int64s_t_increase(status, int64s) f_macro_memory_structure_increase(status, int64s, int64_t); - #define f_macro_int64s_t_decimate(status, int64s) f_macro_memory_structure_decimate(status, int64s, int64_t); - #define f_macro_int64s_t_decrease(status, int64s) f_macro_memory_structure_decrease(status, int64s, int64_t); - + #define f_macro_int64s_t_increase(status, int64s) f_macro_memory_structure_increase(status, int64s, int64_t); #define f_macro_int64s_t_increase_by(status, int64s, amount) f_macro_memory_structure_increase_by(status, int64s, int64_t, amount); #define f_macro_int64s_t_decrease_by(status, int64s, amount) f_macro_memory_structure_decrease_by(status, int64s, int64_t, amount); #define f_macro_int64s_t_decimate_by(status, int64s, amount) f_macro_memory_structure_decimate_by(status, int64s, int64_t, amount); @@ -677,10 +650,7 @@ extern "C" { #define f_macro_uint64s_t_adjust(status, uint64s, length) f_macro_memory_structure_adjust(status, uint64s, uint64_t, length); #define f_macro_uint64s_t_resize(status, uint64s, length) f_macro_memory_structure_resize(status, uint64s, uint64_t, length); - #define f_macro_uint64s_t_increase(status, uint64s) f_macro_memory_structure_increase(status, uint64s, uint64_t); - #define f_macro_uint64s_t_decimate(status, uint64s) f_macro_memory_structure_decimate(status, uint64s, uint64_t); - #define f_macro_uint64s_t_decrease(status, uint64s) f_macro_memory_structure_decrease(status, uint64s, uint64_t); - + #define f_macro_uint64s_t_increase(status, uint64s) f_macro_memory_structure_increase(status, uint64s, uint64_t); #define f_macro_uint64s_t_increase_by(status, uint64s, amount) f_macro_memory_structure_increase_by(status, uint64s, uint64_t, amount); #define f_macro_uint64s_t_decrease_by(status, uint64s, amount) f_macro_memory_structure_decrease_by(status, uint64s, uint64_t, amount); #define f_macro_uint64s_t_decimate_by(status, uint64s, amount) f_macro_memory_structure_decimate_by(status, uint64s, uint64_t, amount); @@ -748,10 +718,7 @@ extern "C" { #define f_macro_int128s_t_adjust(status, int128s, length) f_macro_memory_structure_adjust(status, int128s, __int128_t, length); #define f_macro_int128s_t_resize(status, int128s, length) f_macro_memory_structure_resize(status, int128s, __int128_t, length); - #define f_macro_int128s_t_increase(status, int128s) f_macro_memory_structure_increase(status, int128s, __int128_t); - #define f_macro_int128s_t_decimate(status, int128s) f_macro_memory_structure_decimate(status, int128s, __int128_t); - #define f_macro_int128s_t_decrease(status, int128s) f_macro_memory_structure_decrease(status, int128s, __int128_t); - + #define f_macro_int128s_t_increase(status, int128s) f_macro_memory_structure_increase(status, int128s, __int128_t); #define f_macro_int128s_t_increase_by(status, int128s, amount) f_macro_memory_structure_increase_by(status, int128s, __int128_t, amount); #define f_macro_int128s_t_decrease_by(status, int128s, amount) f_macro_memory_structure_decrease_by(status, int128s, __int128_t, amount); #define f_macro_int128s_t_decimate_by(status, int128s, amount) f_macro_memory_structure_decimate_by(status, int128s, __int128_t, amount); @@ -818,10 +785,7 @@ extern "C" { #define f_macro_uint128s_t_adjust(status, uint128s, length) f_macro_memory_structure_adjust(status, uint128s, __uint128_t, length); #define f_macro_uint128s_t_resize(status, uint128s, length) f_macro_memory_structure_resize(status, uint128s, __uint128_t, length); - #define f_macro_uint128s_t_increase(status, uint128s) f_macro_memory_structure_increase(status, uint128s, __uint128_t); - #define f_macro_uint128s_t_decimate(status, uint128s) f_macro_memory_structure_decimate(status, uint128s, __uint128_t); - #define f_macro_uint128s_t_decrease(status, uint128s) f_macro_memory_structure_decrease(status, uint128s, __uint128_t); - + #define f_macro_uint128s_t_increase(status, uint128s) f_macro_memory_structure_increase(status, uint128s, __uint128_t); #define f_macro_uint128s_t_increase_by(status, uint128s, amount) f_macro_memory_structure_increase_by(status, uint128s, __uint128_t, amount); #define f_macro_uint128s_t_decrease_by(status, uint128s, amount) f_macro_memory_structure_decrease_by(status, uint128s, __uint128_t, amount); #define f_macro_uint128s_t_decimate_by(status, uint128s, amount) f_macro_memory_structure_decimate_by(status, uint128s, __uint128_t, amount); @@ -888,10 +852,7 @@ extern "C" { #define f_macro_int128s_t_adjust(status, int128s, length) f_macro_memory_structure_adjust(status, int128s, int64_t, length); #define f_macro_int128s_t_resize(status, int128s, length) f_macro_memory_structure_resize(status, int128s, int64_t, length); - #define f_macro_int128s_t_increase(status, int128s) f_macro_memory_structure_increase(status, int128s, int64_t); - #define f_macro_int128s_t_decimate(status, int128s) f_macro_memory_structure_decimate(status, int128s, int64_t); - #define f_macro_int128s_t_decrease(status, int128s) f_macro_memory_structure_decrease(status, int128s, int64_t); - + #define f_macro_int128s_t_increase(status, int128s) f_macro_memory_structure_increase(status, int128s, int64_t); #define f_macro_int128s_t_increase_by(status, int128s, amount) f_macro_memory_structure_increase_by(status, int128s, int64_t, amount); #define f_macro_int128s_t_decrease_by(status, int128s, amount) f_macro_memory_structure_decrease_by(status, int128s, int64_t, amount); #define f_macro_int128s_t_decimate_by(status, int128s, amount) f_macro_memory_structure_decimate_by(status, int128s, int64_t, amount); @@ -958,10 +919,7 @@ extern "C" { #define f_macro_uint128s_t_adjust(status, uint128s, length) f_macro_memory_structure_adjust(status, uint128s, uint64_t, length); #define f_macro_uint128s_t_resize(status, uint128s, length) f_macro_memory_structure_resize(status, uint128s, uint64_t, length); - #define f_macro_uint128s_t_increase(status, uint128s) f_macro_memory_structure_increase(status, uint128s, uint64_t); - #define f_macro_uint128s_t_decimate(status, uint128s) f_macro_memory_structure_decimate(status, uint128s, uint64_t); - #define f_macro_uint128s_t_decrease(status, uint128s) f_macro_memory_structure_decrease(status, uint128s, uint64_t); - + #define f_macro_uint128s_t_increase(status, uint128s) f_macro_memory_structure_increase(status, uint128s, uint64_t); #define f_macro_uint128s_t_increase_by(status, uint128s, amount) f_macro_memory_structure_increase_by(status, uint128s, uint64_t, amount); #define f_macro_uint128s_t_decrease_by(status, uint128s, amount) f_macro_memory_structure_decrease_by(status, uint128s, uint64_t, amount); #define f_macro_uint128s_t_decimate_by(status, uint128s, amount) f_macro_memory_structure_decimate_by(status, uint128s, uint64_t, amount); diff --git a/level_0/f_utf/c/utf-common.h b/level_0/f_utf/c/utf-common.h index 31243d5..5880973 100644 --- a/level_0/f_utf/c/utf-common.h +++ b/level_0/f_utf/c/utf-common.h @@ -175,10 +175,7 @@ extern "C" { #define f_macro_utf_string_lengths_t_delete_simple(string_lengths) f_macro_memory_structure_delete_simple(string_lengths, f_utf_string_length_t); #define f_macro_utf_string_lengths_t_destroy_simple(string_lengths) f_macro_memory_structure_destroy_simple(string_lengths, f_utf_string_length_t); - #define f_macro_utf_string_lengths_t_increase(status, string_lengths) f_macro_memory_structure_increase(status, string_lengths, f_utf_string_length_t); - #define f_macro_utf_string_lengths_t_decrease(status, string_lengths) f_macro_memory_structure_decrease(status, string_lengths, f_utf_string_length_t); - #define f_macro_utf_string_lengths_t_decimate(status, string_lengths) f_macro_memory_structure_decimate(status, string_lengths, f_utf_string_length_t); - + #define f_macro_utf_string_lengths_t_increase(status, string_lengths) f_macro_memory_structure_increase(status, string_lengths, f_utf_string_length_t); #define f_macro_utf_string_lengths_t_increase_by(status, string_lengths, amount) f_macro_memory_structure_increase_by(status, string_lengths, f_utf_string_length_t, amount); #define f_macro_utf_string_lengths_t_decrease_by(status, string_lengths, amount) f_macro_memory_structure_decrease_by(status, string_lengths, f_utf_string_length_t, amount); #define f_macro_utf_string_lengths_t_decimate_by(status, string_lengths, amount) f_macro_memory_structure_decimate_by(status, string_lengths, f_utf_string_length_t, amount); @@ -238,10 +235,7 @@ extern "C" { #define f_macro_utf_string_ranges_t_delete_simple(string_ranges) f_macro_memory_structure_delete_simple(string_ranges, f_utf_string_range_t); #define f_macro_utf_string_ranges_t_destroy_simple(string_ranges) f_macro_memory_structure_destroy_simple(string_ranges, f_utf_string_range_t); - #define f_macro_utf_string_ranges_t_increase(status, string_ranges) f_macro_memory_structure_increase(status, string_ranges, f_utf_string_range_t); - #define f_macro_utf_string_ranges_t_decrease(status, string_ranges) f_macro_memory_structure_decrease(status, string_ranges, f_utf_string_range_t); - #define f_macro_utf_string_ranges_t_decimate(status, string_ranges) f_macro_memory_structure_decimate(status, string_ranges, f_utf_string_range_t); - + #define f_macro_utf_string_ranges_t_increase(status, string_ranges) f_macro_memory_structure_increase(status, string_ranges, f_utf_string_range_t); #define f_macro_utf_string_ranges_t_increase_by(status, string_ranges, amount) f_macro_memory_structure_increase_by(status, string_ranges, f_utf_string_range_t, amount); #define f_macro_utf_string_ranges_t_decrease_by(status, string_ranges, amount) f_macro_memory_structure_decrease_by(status, string_ranges, f_utf_string_range_t, amount); #define f_macro_utf_string_ranges_t_decimate_by(status, string_ranges, amount) f_macro_memory_structure_decimate_by(status, string_ranges, f_utf_string_range_t, amount); @@ -298,10 +292,7 @@ extern "C" { #define f_macro_utf_string_quantitys_t_delete_simple(quantitys) f_macro_memory_structure_delete_simple(quantitys, f_utf_string_quantity_t); #define f_macro_utf_string_quantitys_t_destroy_simple(quantitys) f_macro_memory_structure_destroy_simple(quantitys, f_utf_string_quantity_t); - #define f_macro_utf_string_quantitys_t_increase(status, quantitys) f_macro_memory_structure_increase(status, quantitys, f_utf_string_quantity_t); - #define f_macro_utf_string_quantitys_t_decrease(status, quantitys) f_macro_memory_structure_decrease(status, quantitys, f_utf_string_quantity_t); - #define f_macro_utf_string_quantitys_t_decimate(status, quantitys) f_macro_memory_structure_decimate(status, quantitys, f_utf_string_quantity_t); - + #define f_macro_utf_string_quantitys_t_increase(status, quantitys) f_macro_memory_structure_increase(status, quantitys, f_utf_string_quantity_t); #define f_macro_utf_string_quantitys_t_increase_by(status, quantitys, amount) f_macro_memory_structure_increase_by(status, quantitys, f_utf_string_quantity_t, amount); #define f_macro_utf_string_quantitys_t_decrease_by(status, quantitys, amount) f_macro_memory_structure_decrease_by(status, quantitys, f_utf_string_quantity_t, amount); #define f_macro_utf_string_quantitys_t_decimate_by(status, quantitys, amount) f_macro_memory_structure_decimate_by(status, quantitys, f_utf_string_quantity_t, amount); -- 1.8.3.1