From: Kevin Day Date: Sat, 6 Dec 2025 21:37:23 +0000 (-0600) Subject: Cleanup: Reduce extra blocks in delete and destroy call backs. X-Git-Tag: 0.8.0~55 X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=50d3e14751d61b539ff5d75121eafdc7ffc30c24;p=fll Cleanup: Reduce extra blocks in delete and destroy call backs. Early on I was uncertain at how I should handle this. I wanted the block design, with anticipation that there would be cases where other code might operate after the first scope ended. This made for easy and copy and paste (as well as some level of consistency) when switching between different types. There has been massive changes over time regarding the structure of the delete and destroy functions (which are now call backs). Most of the blocks end right before the function ends. Simplify the design in these cases by removing one level of block structure. --- diff --git a/level_0/f_abstruse/c/abstruse/abstruse.c b/level_0/f_abstruse/c/abstruse/abstruse.c index 150e92029..032cf00de 100644 --- a/level_0/f_abstruse/c/abstruse/abstruse.c +++ b/level_0/f_abstruse/c/abstruse/abstruse.c @@ -22,16 +22,14 @@ extern "C" { #ifndef _di_f_abstruses_delete_callback_ f_status_t f_abstruses_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_abstruse_t * const array = (f_abstruse_t *) void_array; - f_status_t status = F_okay; + f_abstruse_t * const array = (f_abstruse_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - status = private_f_abstruses_delete_switch(&array[i]); - if (F_status_is_error(status)) return status; - } // for - } + status = private_f_abstruses_delete_switch(&array[i]); + if (F_status_is_error(status)) return status; + } // for return F_okay; } @@ -40,16 +38,14 @@ extern "C" { #ifndef _di_f_abstruses_destroy_callback_ f_status_t f_abstruses_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_abstruse_t * const array = (f_abstruse_t *) void_array; - f_status_t status = F_okay; + f_abstruse_t * const array = (f_abstruse_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - status = private_f_abstruses_destroy_switch(&array[i]); - if (F_status_is_error(status)) return status; - } // for - } + status = private_f_abstruses_destroy_switch(&array[i]); + if (F_status_is_error(status)) return status; + } // for return F_okay; } @@ -58,26 +54,24 @@ extern "C" { #ifndef _di_f_abstrusess_delete_callback_ f_status_t f_abstrusess_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_abstruses_t * const array = (f_abstruses_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t i = start; - f_number_unsigned_t j = 0; + f_abstruses_t * const array = (f_abstruses_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t i = start; + f_number_unsigned_t j = 0; - for (; i < stop; ++i) { + for (; i < stop; ++i) { - if (array[i].size) { - for (j = 0; j < array[i].size; ++j) { + if (array[i].size) { + for (j = 0; j < array[i].size; ++j) { - status = private_f_abstruses_delete_switch(&array[i].array[j]); - if (F_status_is_error(status)) return status; - } // for - - status = f_memory_array_resize(0, sizeof(f_abstruse_t), (void **) &array[i].array, &array[i].used, &array[i].size); + status = private_f_abstruses_delete_switch(&array[i].array[j]); if (F_status_is_error(status)) return status; - } - } // for - } + } // for + + status = f_memory_array_resize(0, sizeof(f_abstruse_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -86,26 +80,24 @@ extern "C" { #ifndef _di_f_abstrusess_destroy_callback_ f_status_t f_abstrusess_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_abstruses_t * const array = (f_abstruses_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t i = start; - f_number_unsigned_t j = 0; - - for (; i < stop; ++i) { + f_abstruses_t * const array = (f_abstruses_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t i = start; + f_number_unsigned_t j = 0; - if (array[i].size) { - for (j = 0; j < array[i].size; ++j) { + for (; i < stop; ++i) { - status = private_f_abstruses_destroy_switch(&array[i].array[j]); - if (F_status_is_error(status)) return status; - } // for + if (array[i].size) { + for (j = 0; j < array[i].size; ++j) { - status = f_memory_array_adjust(0, sizeof(f_abstruse_t), (void **) &array[i].array, &array[i].used, &array[i].size); + status = private_f_abstruses_destroy_switch(&array[i].array[j]); if (F_status_is_error(status)) return status; - } - } // for - } + } // for + + status = f_memory_array_adjust(0, sizeof(f_abstruse_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_abstruse/c/abstruse/map.c b/level_0/f_abstruse/c/abstruse/map.c index 07e3ac467..a4ad76626 100644 --- a/level_0/f_abstruse/c/abstruse/map.c +++ b/level_0/f_abstruse/c/abstruse/map.c @@ -32,19 +32,17 @@ extern "C" { #ifndef _di_f_abstruse_maps_delete_callback_ f_status_t f_abstruse_maps_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_abstruse_map_t * const array = (f_abstruse_map_t *) void_array; - f_status_t status = F_okay; + f_abstruse_map_t * const array = (f_abstruse_map_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].key.string, &array[i].key.used, &array[i].key.size); - if (F_status_is_error(status)) return status; + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].key.string, &array[i].key.used, &array[i].key.size); + if (F_status_is_error(status)) return status; - status = private_f_abstruses_delete_switch(&array[i].value); - if (F_status_is_error(status)) return status; - } // for - } + status = private_f_abstruses_delete_switch(&array[i].value); + if (F_status_is_error(status)) return status; + } // for return F_okay; } @@ -53,19 +51,17 @@ extern "C" { #ifndef _di_f_abstruse_maps_destroy_callback_ f_status_t f_abstruse_maps_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_abstruse_map_t * const array = (f_abstruse_map_t *) void_array; - f_status_t status = F_okay; + f_abstruse_map_t * const array = (f_abstruse_map_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].key.string, &array[i].key.used, &array[i].key.size); - if (F_status_is_error(status)) return status; + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].key.string, &array[i].key.used, &array[i].key.size); + if (F_status_is_error(status)) return status; - status = private_f_abstruses_destroy_switch(&array[i].value); - if (F_status_is_error(status)) return status; - } // for - } + status = private_f_abstruses_destroy_switch(&array[i].value); + if (F_status_is_error(status)) return status; + } // for return F_okay; } @@ -74,29 +70,27 @@ extern "C" { #ifndef _di_f_abstruse_mapss_delete_callback_ f_status_t f_abstruse_mapss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_abstruse_maps_t * const array = (f_abstruse_maps_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t i = start; - f_number_unsigned_t j = 0; - - for (; i < stop; ++i) { + f_abstruse_maps_t * const array = (f_abstruse_maps_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t i = start; + f_number_unsigned_t j = 0; - if (array[i].size) { - for (j = 0; j < array[i].size; ++j) { + for (; i < stop; ++i) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].key.string, &array[i].array[j].key.used, &array[i].array[j].key.size); - if (F_status_is_error(status)) return status; + if (array[i].size) { + for (j = 0; j < array[i].size; ++j) { - status = private_f_abstruses_delete_switch(&array[i].array[j].value); - if (F_status_is_error(status)) return status; - } // for + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].key.string, &array[i].array[j].key.used, &array[i].array[j].key.size); + if (F_status_is_error(status)) return status; - status = f_memory_array_resize(0, sizeof(f_abstruse_map_t), (void **) &array[i].array, &array[i].used, &array[i].size); + status = private_f_abstruses_delete_switch(&array[i].array[j].value); if (F_status_is_error(status)) return status; - } - } // for - } + } // for + + status = f_memory_array_resize(0, sizeof(f_abstruse_map_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -105,29 +99,27 @@ extern "C" { #ifndef _di_f_abstruse_mapss_destroy_callback_ f_status_t f_abstruse_mapss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_abstruse_maps_t * const array = (f_abstruse_maps_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t i = start; - f_number_unsigned_t j = 0; - - for (; i < stop; ++i) { + f_abstruse_maps_t * const array = (f_abstruse_maps_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t i = start; + f_number_unsigned_t j = 0; - if (array[i].size) { - for (j = 0; j < array[i].size; ++j) { + for (; i < stop; ++i) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].key.string, &array[i].array[j].key.used, &array[i].array[j].key.size); - if (F_status_is_error(status)) return status; + if (array[i].size) { + for (j = 0; j < array[i].size; ++j) { - status = private_f_abstruses_destroy_switch(&array[i].array[j].value); - if (F_status_is_error(status)) return status; - } // for + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].key.string, &array[i].array[j].key.used, &array[i].array[j].key.size); + if (F_status_is_error(status)) return status; - status = f_memory_array_adjust(0, sizeof(f_abstruse_map_t), (void **) &array[i].array, &array[i].used, &array[i].size); + status = private_f_abstruses_destroy_switch(&array[i].array[j].value); if (F_status_is_error(status)) return status; - } - } // for - } + } // for + + status = f_memory_array_adjust(0, sizeof(f_abstruse_map_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_account/c/account/accounts.c b/level_0/f_account/c/account/accounts.c index 1d03cbddd..ce3f8f5fc 100644 --- a/level_0/f_account/c/account/accounts.c +++ b/level_0/f_account/c/account/accounts.c @@ -86,38 +86,36 @@ extern "C" { #ifndef _di_f_accounts_delete_callback_ f_status_t f_accounts_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_account_t * const array = (f_account_t *) void_array; - f_status_t status = F_okay; + f_account_t * const array = (f_account_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].home.size && array[i].home.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].home.string, &array[i].home.used, &array[i].home.size); - if (F_status_is_error(status)) return status; - } + if (array[i].home.size && array[i].home.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].home.string, &array[i].home.used, &array[i].home.size); + if (F_status_is_error(status)) return status; + } - if (array[i].label.size && array[i].label.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].label.string, &array[i].label.used, &array[i].label.size); - if (F_status_is_error(status)) return status; - } + if (array[i].label.size && array[i].label.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].label.string, &array[i].label.used, &array[i].label.size); + if (F_status_is_error(status)) return status; + } - if (array[i].name.size && array[i].name.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].name.string, &array[i].name.used, &array[i].name.size); - if (F_status_is_error(status)) return status; - } + if (array[i].name.size && array[i].name.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].name.string, &array[i].name.used, &array[i].name.size); + if (F_status_is_error(status)) return status; + } - if (array[i].password.size && array[i].password.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].password.string, &array[i].password.used, &array[i].password.size); - if (F_status_is_error(status)) return status; - } + if (array[i].password.size && array[i].password.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].password.string, &array[i].password.used, &array[i].password.size); + if (F_status_is_error(status)) return status; + } - if (array[i].shell.size && array[i].shell.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].shell.string, &array[i].shell.used, &array[i].shell.size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].shell.size && array[i].shell.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].shell.string, &array[i].shell.used, &array[i].shell.size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -166,47 +164,45 @@ extern "C" { #ifndef _di_f_accountss_delete_callback_ f_status_t f_accountss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_accounts_t * const array = (f_accounts_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; + f_accounts_t * const array = (f_accounts_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - for (j = 0; j < array[i].size; ++j) { + for (j = 0; j < array[i].size; ++j) { - if (array[i].array[j].home.size && array[i].array[j].home.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].home.string, &array[i].array[j].home.used, &array[i].array[j].home.size); - if (F_status_is_error(status)) return status; - } - - if (array[i].array[j].label.size && array[i].array[j].label.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].label.string, &array[i].array[j].label.used, &array[i].array[j].label.size); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].home.size && array[i].array[j].home.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].home.string, &array[i].array[j].home.used, &array[i].array[j].home.size); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].name.size && array[i].array[j].name.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].name.string, &array[i].array[j].name.used, &array[i].array[j].name.size); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].label.size && array[i].array[j].label.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].label.string, &array[i].array[j].label.used, &array[i].array[j].label.size); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].password.size && array[i].array[j].password.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].password.string, &array[i].array[j].password.used, &array[i].array[j].password.size); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].name.size && array[i].array[j].name.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].name.string, &array[i].array[j].name.used, &array[i].array[j].name.size); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].shell.size && array[i].array[j].shell.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].shell.string, &array[i].array[j].shell.used, &array[i].array[j].shell.size); - if (F_status_is_error(status)) return status; - } - } // for + if (array[i].array[j].password.size && array[i].array[j].password.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].password.string, &array[i].array[j].password.used, &array[i].array[j].password.size); + if (F_status_is_error(status)) return status; + } - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_account_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (array[i].array[j].shell.size && array[i].array[j].shell.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].shell.string, &array[i].array[j].shell.used, &array[i].array[j].shell.size); if (F_status_is_error(status)) return status; } } // for - } + + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(f_account_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_directory/c/directory/listing.c b/level_0/f_directory/c/directory/listing.c index 94b7985a6..042b00db4 100644 --- a/level_0/f_directory/c/directory/listing.c +++ b/level_0/f_directory/c/directory/listing.c @@ -115,53 +115,51 @@ extern "C" { #ifndef _di_f_directory_listings_delete_callback_ f_status_t f_directory_listings_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_directory_listing_t * const array = (f_directory_listing_t *) void_array; - f_status_t status = F_okay; + f_directory_listing_t * const array = (f_directory_listing_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].block.size && array[i].block.array) { - status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].block.array, &array[i].block.used, &array[i].block.size, &f_string_dynamics_delete_callback); - if (F_status_is_error(status)) return status; - } + if (array[i].block.size && array[i].block.array) { + status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].block.array, &array[i].block.used, &array[i].block.size, &f_string_dynamics_delete_callback); + if (F_status_is_error(status)) return status; + } - if (array[i].character.size && array[i].character.array) { - status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].character.array, &array[i].character.used, &array[i].character.size, &f_string_dynamics_delete_callback); - if (F_status_is_error(status)) return status; - } + if (array[i].character.size && array[i].character.array) { + status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].character.array, &array[i].character.used, &array[i].character.size, &f_string_dynamics_delete_callback); + if (F_status_is_error(status)) return status; + } - if (array[i].directory.size && array[i].directory.array) { - status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].directory.array, &array[i].directory.used, &array[i].directory.size, &f_string_dynamics_delete_callback); - if (F_status_is_error(status)) return status; - } + if (array[i].directory.size && array[i].directory.array) { + status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].directory.array, &array[i].directory.used, &array[i].directory.size, &f_string_dynamics_delete_callback); + if (F_status_is_error(status)) return status; + } - if (array[i].regular.size && array[i].regular.array) { - status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].regular.array, &array[i].regular.used, &array[i].regular.size, &f_string_dynamics_delete_callback); - if (F_status_is_error(status)) return status; - } + if (array[i].regular.size && array[i].regular.array) { + status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].regular.array, &array[i].regular.used, &array[i].regular.size, &f_string_dynamics_delete_callback); + if (F_status_is_error(status)) return status; + } - if (array[i].link.size && array[i].link.array) { - status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].link.array, &array[i].link.used, &array[i].link.size, &f_string_dynamics_delete_callback); - if (F_status_is_error(status)) return status; - } + if (array[i].link.size && array[i].link.array) { + status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].link.array, &array[i].link.used, &array[i].link.size, &f_string_dynamics_delete_callback); + if (F_status_is_error(status)) return status; + } - if (array[i].fifo.size && array[i].fifo.array) { - status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].fifo.array, &array[i].fifo.used, &array[i].fifo.size, &f_string_dynamics_delete_callback); - if (F_status_is_error(status)) return status; - } + if (array[i].fifo.size && array[i].fifo.array) { + status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].fifo.array, &array[i].fifo.used, &array[i].fifo.size, &f_string_dynamics_delete_callback); + if (F_status_is_error(status)) return status; + } - if (array[i].socket.size && array[i].socket.array) { - status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].socket.array, &array[i].socket.used, &array[i].socket.size, &f_string_dynamics_delete_callback); - if (F_status_is_error(status)) return status; - } + if (array[i].socket.size && array[i].socket.array) { + status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].socket.array, &array[i].socket.used, &array[i].socket.size, &f_string_dynamics_delete_callback); + if (F_status_is_error(status)) return status; + } - if (array[i].unknown.size && array[i].unknown.array) { - status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].unknown.array, &array[i].unknown.used, &array[i].unknown.size, &f_string_dynamics_delete_callback); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].unknown.size && array[i].unknown.array) { + status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].unknown.array, &array[i].unknown.used, &array[i].unknown.size, &f_string_dynamics_delete_callback); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -225,62 +223,60 @@ extern "C" { #ifndef _di_f_directory_listingss_delete_callback_ f_status_t f_directory_listingss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_directory_listings_t * const array = (f_directory_listings_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; - - for (f_number_unsigned_t i = start; i < stop; ++i) { + f_directory_listings_t * const array = (f_directory_listings_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (j = 0; j < array[i].size; ++j) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].array[j].block.size && array[i].array[j].block.array) { - status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].array[j].block.array, &array[i].array[j].block.used, &array[i].array[j].block.size, &f_string_dynamics_delete_callback); - if (F_status_is_error(status)) return status; - } + for (j = 0; j < array[i].size; ++j) { - if (array[i].array[j].character.size && array[i].array[j].character.array) { - status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].array[j].character.array, &array[i].array[j].character.used, &array[i].array[j].character.size, &f_string_dynamics_delete_callback); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].block.size && array[i].array[j].block.array) { + status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].array[j].block.array, &array[i].array[j].block.used, &array[i].array[j].block.size, &f_string_dynamics_delete_callback); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].directory.size && array[i].array[j].directory.array) { - status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].array[j].directory.array, &array[i].array[j].directory.used, &array[i].array[j].directory.size, &f_string_dynamics_delete_callback); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].character.size && array[i].array[j].character.array) { + status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].array[j].character.array, &array[i].array[j].character.used, &array[i].array[j].character.size, &f_string_dynamics_delete_callback); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].regular.size && array[i].array[j].regular.array) { - status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].array[j].regular.array, &array[i].array[j].regular.used, &array[i].array[j].regular.size, &f_string_dynamics_delete_callback); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].directory.size && array[i].array[j].directory.array) { + status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].array[j].directory.array, &array[i].array[j].directory.used, &array[i].array[j].directory.size, &f_string_dynamics_delete_callback); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].link.size && array[i].array[j].link.array) { - status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].array[j].link.array, &array[i].array[j].link.used, &array[i].array[j].link.size, &f_string_dynamics_delete_callback); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].regular.size && array[i].array[j].regular.array) { + status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].array[j].regular.array, &array[i].array[j].regular.used, &array[i].array[j].regular.size, &f_string_dynamics_delete_callback); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].fifo.size && array[i].array[j].fifo.array) { - status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].array[j].fifo.array, &array[i].array[j].fifo.used, &array[i].array[j].fifo.size, &f_string_dynamics_delete_callback); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].link.size && array[i].array[j].link.array) { + status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].array[j].link.array, &array[i].array[j].link.used, &array[i].array[j].link.size, &f_string_dynamics_delete_callback); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].socket.size && array[i].array[j].socket.array) { - status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].array[j].socket.array, &array[i].array[j].socket.used, &array[i].array[j].socket.size, &f_string_dynamics_delete_callback); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].fifo.size && array[i].array[j].fifo.array) { + status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].array[j].fifo.array, &array[i].array[j].fifo.used, &array[i].array[j].fifo.size, &f_string_dynamics_delete_callback); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].unknown.size && array[i].array[j].unknown.array) { - status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].array[j].unknown.array, &array[i].array[j].unknown.used, &array[i].array[j].unknown.size, &f_string_dynamics_delete_callback); - if (F_status_is_error(status)) return status; - } - } // for + if (array[i].array[j].socket.size && array[i].array[j].socket.array) { + status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].array[j].socket.array, &array[i].array[j].socket.used, &array[i].array[j].socket.size, &f_string_dynamics_delete_callback); + if (F_status_is_error(status)) return status; + } - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_directory_listing_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (array[i].array[j].unknown.size && array[i].array[j].unknown.array) { + status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].array[j].unknown.array, &array[i].array[j].unknown.used, &array[i].array[j].unknown.size, &f_string_dynamics_delete_callback); if (F_status_is_error(status)) return status; } } // for - } + + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(f_directory_listing_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_directory/c/directory/recurse_do.c b/level_0/f_directory/c/directory/recurse_do.c index abff1b5ba..4cbc41034 100644 --- a/level_0/f_directory/c/directory/recurse_do.c +++ b/level_0/f_directory/c/directory/recurse_do.c @@ -55,23 +55,21 @@ extern "C" { #ifndef _di_f_directory_recurse_dos_delete_callback_ f_status_t f_directory_recurse_dos_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_directory_recurse_do_t * const array = (f_directory_recurse_do_t *) void_array; - f_status_t status = F_okay; + f_directory_recurse_do_t * const array = (f_directory_recurse_do_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].path.size && array[i].path.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].path.string, &array[i].path.used, &array[i].path.size); - if (F_status_is_error(status)) return status; - } + if (array[i].path.size && array[i].path.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].path.string, &array[i].path.used, &array[i].path.size); + if (F_status_is_error(status)) return status; + } - if (array[i].path_cache.size && array[i].path_cache.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].path_cache.string, &array[i].path_cache.used, &array[i].path_cache.size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].path_cache.size && array[i].path_cache.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].path_cache.string, &array[i].path_cache.used, &array[i].path_cache.size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -80,23 +78,21 @@ extern "C" { #ifndef _di_f_directory_recurse_dos_destroy_callback_ f_status_t f_directory_recurse_dos_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_directory_recurse_do_t * const array = (f_directory_recurse_do_t *) void_array; - f_status_t status = F_okay; + f_directory_recurse_do_t * const array = (f_directory_recurse_do_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].path.size && array[i].path.string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].path.string, &array[i].path.used, &array[i].path.size); - if (F_status_is_error(status)) return status; - } + if (array[i].path.size && array[i].path.string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].path.string, &array[i].path.used, &array[i].path.size); + if (F_status_is_error(status)) return status; + } - if (array[i].path_cache.size && array[i].path_cache.string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].path_cache.string, &array[i].path_cache.used, &array[i].path_cache.size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].path_cache.size && array[i].path_cache.string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].path_cache.string, &array[i].path_cache.used, &array[i].path_cache.size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -105,32 +101,30 @@ extern "C" { #ifndef _di_f_directory_recurse_doss_delete_callback_ f_status_t f_directory_recurse_doss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_directory_recurse_dos_t * const array = (f_directory_recurse_dos_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; - - for (f_number_unsigned_t i = start; i < stop; ++i) { + f_directory_recurse_dos_t * const array = (f_directory_recurse_dos_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (j = 0; j < array[i].size; ++j) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].array[j].path.size && array[i].array[j].path.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].path.string, &array[i].array[j].path.used, &array[i].array[j].path.size); - if (F_status_is_error(status)) return status; - } + for (j = 0; j < array[i].size; ++j) { - if (array[i].array[j].path_cache.size && array[i].array[j].path_cache.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].path_cache.string, &array[i].array[j].path_cache.used, &array[i].array[j].path_cache.size); - if (F_status_is_error(status)) return status; - } - } // for + if (array[i].array[j].path.size && array[i].array[j].path.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].path.string, &array[i].array[j].path.used, &array[i].array[j].path.size); + if (F_status_is_error(status)) return status; + } - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_directory_recurse_do_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (array[i].array[j].path_cache.size && array[i].array[j].path_cache.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].path_cache.string, &array[i].array[j].path_cache.used, &array[i].array[j].path_cache.size); if (F_status_is_error(status)) return status; } } // for - } + + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(f_directory_recurse_do_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -139,32 +133,30 @@ extern "C" { #ifndef _di_f_directory_recurse_doss_destroy_callback_ f_status_t f_directory_recurse_doss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_directory_recurse_dos_t * const array = (f_directory_recurse_dos_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; + f_directory_recurse_dos_t * const array = (f_directory_recurse_dos_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - for (j = 0; j < array[i].size; ++j) { + for (j = 0; j < array[i].size; ++j) { - if (array[i].array[j].path.size && array[i].array[j].path.string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].path.string, &array[i].array[j].path.used, &array[i].array[j].path.size); - if (F_status_is_error(status)) return status; - } - - if (array[i].array[j].path_cache.size && array[i].array[j].path_cache.string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].path_cache.string, &array[i].array[j].path_cache.used, &array[i].array[j].path_cache.size); - if (F_status_is_error(status)) return status; - } - } // for + if (array[i].array[j].path.size && array[i].array[j].path.string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].path.string, &array[i].array[j].path.used, &array[i].array[j].path.size); + if (F_status_is_error(status)) return status; + } - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(f_directory_recurse_do_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (array[i].array[j].path_cache.size && array[i].array[j].path_cache.string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].path_cache.string, &array[i].array[j].path_cache.used, &array[i].array[j].path_cache.size); if (F_status_is_error(status)) return status; } } // for - } + + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(f_directory_recurse_do_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_directory/c/directory/status.c b/level_0/f_directory/c/directory/status.c index cc0a03bc8..906df3d4d 100644 --- a/level_0/f_directory/c/directory/status.c +++ b/level_0/f_directory/c/directory/status.c @@ -37,18 +37,16 @@ extern "C" { #ifndef _di_f_directory_statuss_delete_callback_ f_status_t f_directory_statuss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_directory_status_t * const array = (f_directory_status_t *) void_array; - f_status_t status = F_okay; + f_directory_status_t * const array = (f_directory_status_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].path.size && array[i].path.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].path.string, &array[i].path.used, &array[i].path.size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].path.size && array[i].path.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].path.string, &array[i].path.used, &array[i].path.size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -57,18 +55,16 @@ extern "C" { #ifndef _di_f_directory_statuss_destroy_callback_ f_status_t f_directory_statuss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_directory_status_t * const array = (f_directory_status_t *) void_array; - f_status_t status = F_okay; + f_directory_status_t * const array = (f_directory_status_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].path.size && array[i].path.string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].path.string, &array[i].path.used, &array[i].path.size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].path.size && array[i].path.string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].path.string, &array[i].path.used, &array[i].path.size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -77,27 +73,25 @@ extern "C" { #ifndef _di_f_directory_statusss_delete_callback_ f_status_t f_directory_statusss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_directory_statuss_t * const array = (f_directory_statuss_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; - - for (f_number_unsigned_t i = start; i < stop; ++i) { + f_directory_statuss_t * const array = (f_directory_statuss_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (j = 0; j < array[i].size; ++j) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].array[j].path.size && array[i].array[j].path.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].path.string, &array[i].array[j].path.used, &array[i].array[j].path.size); - if (F_status_is_error(status)) return status; - } - } // for + for (j = 0; j < array[i].size; ++j) { - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_directory_status_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (array[i].array[j].path.size && array[i].array[j].path.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].path.string, &array[i].array[j].path.used, &array[i].array[j].path.size); if (F_status_is_error(status)) return status; } } // for - } + + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(f_directory_status_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -106,27 +100,25 @@ extern "C" { #ifndef _di_f_directory_statusss_destroy_callback_ f_status_t f_directory_statusss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_directory_statuss_t * const array = (f_directory_statuss_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; - - for (f_number_unsigned_t i = start; i < stop; ++i) { + f_directory_statuss_t * const array = (f_directory_statuss_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (j = 0; j < array[i].size; ++j) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].array[j].path.size && array[i].array[j].path.string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].path.string, &array[i].array[j].path.used, &array[i].array[j].path.size); - if (F_status_is_error(status)) return status; - } - } // for + for (j = 0; j < array[i].size; ++j) { - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(f_directory_status_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (array[i].array[j].path.size && array[i].array[j].path.string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].path.string, &array[i].array[j].path.used, &array[i].array[j].path.size); if (F_status_is_error(status)) return status; } } // for - } + + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(f_directory_status_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_fss/c/fss/item.c b/level_0/f_fss/c/fss/item.c index bdc5eca0b..418b88877 100644 --- a/level_0/f_fss/c/fss/item.c +++ b/level_0/f_fss/c/fss/item.c @@ -27,18 +27,16 @@ extern "C" { #ifndef _di_f_fss_items_delete_callback_ f_status_t f_fss_items_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_fss_item_t * const array = (f_fss_item_t *) void_array; - f_status_t status = F_okay; + f_fss_item_t * const array = (f_fss_item_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].content.size && array[i].content.array) { - status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].content.array, &array[i].content.used, &array[i].content.size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].content.size && array[i].content.array) { + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].content.array, &array[i].content.used, &array[i].content.size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -67,27 +65,25 @@ extern "C" { #ifndef _di_f_fss_itemss_delete_callback_ f_status_t f_fss_itemss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_fss_items_t * const array = (f_fss_items_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; + f_fss_items_t * const array = (f_fss_items_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (f_number_unsigned_t i = start; i < stop; ++i) { - - for (j = 0; j < array[i].size; ++j) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].array[j].content.size && array[i].array[j].content.array) { - status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].array[j].content.array, &array[i].array[j].content.used, &array[i].array[j].content.size); - if (F_status_is_error(status)) return status; - } - } // for + for (j = 0; j < array[i].size; ++j) { - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_fss_item_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (array[i].array[j].content.size && array[i].array[j].content.array) { + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].array[j].content.array, &array[i].array[j].content.used, &array[i].array[j].content.size); if (F_status_is_error(status)) return status; } } // for - } + + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(f_fss_item_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -96,27 +92,25 @@ extern "C" { #ifndef _di_f_fss_itemss_destroy_callback_ f_status_t f_fss_itemss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_fss_items_t * const array = (f_fss_items_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; - - for (f_number_unsigned_t i = start; i < stop; ++i) { + f_fss_items_t * const array = (f_fss_items_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (j = 0; j < array[i].size; ++j) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].array[j].content.size && array[i].array[j].content.array) { - status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].array[j].content.array, &array[i].array[j].content.used, &array[i].array[j].content.size); - if (F_status_is_error(status)) return status; - } - } // for + for (j = 0; j < array[i].size; ++j) { - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(f_fss_item_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (array[i].array[j].content.size && array[i].array[j].content.array) { + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].array[j].content.array, &array[i].array[j].content.used, &array[i].array[j].content.size); if (F_status_is_error(status)) return status; } } // for - } + + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(f_fss_item_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_fss/c/fss/named.c b/level_0/f_fss/c/fss/named.c index b6e9f0418..9c16a912e 100644 --- a/level_0/f_fss/c/fss/named.c +++ b/level_0/f_fss/c/fss/named.c @@ -65,28 +65,26 @@ extern "C" { #ifndef _di_f_fss_nameds_delete_callback_ f_status_t f_fss_nameds_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_fss_named_t * const array = (f_fss_named_t *) void_array; - f_status_t status = F_okay; + f_fss_named_t * const array = (f_fss_named_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].objects.size && array[i].objects.array) { - status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].objects.array, &array[i].objects.used, &array[i].objects.size); - if (F_status_is_error(status)) return status; - } + if (array[i].objects.size && array[i].objects.array) { + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].objects.array, &array[i].objects.used, &array[i].objects.size); + if (F_status_is_error(status)) return status; + } - if (array[i].contents.size && array[i].contents.array) { - status = f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &array[i].contents.array, &array[i].contents.used, &array[i].contents.size, &f_rangess_delete_callback); - if (F_status_is_error(status)) return status; - } + if (array[i].contents.size && array[i].contents.array) { + status = f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &array[i].contents.array, &array[i].contents.used, &array[i].contents.size, &f_rangess_delete_callback); + if (F_status_is_error(status)) return status; + } - if (array[i].quotess.size && array[i].quotess.array) { - status = f_memory_arrays_resize(0, sizeof(f_uint8s_t), (void **) &array[i].quotess.array, &array[i].quotess.used, &array[i].quotess.size, &f_uint8ss_delete_callback); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].quotess.size && array[i].quotess.array) { + status = f_memory_arrays_resize(0, sizeof(f_uint8s_t), (void **) &array[i].quotess.array, &array[i].quotess.used, &array[i].quotess.size, &f_uint8ss_delete_callback); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -95,28 +93,26 @@ extern "C" { #ifndef _di_f_fss_nameds_destroy_callback_ f_status_t f_fss_nameds_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_fss_named_t * const array = (f_fss_named_t *) void_array; - f_status_t status = F_okay; + f_fss_named_t * const array = (f_fss_named_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].objects.size && array[i].objects.array) { - status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].objects.array, &array[i].objects.used, &array[i].objects.size); - if (F_status_is_error(status)) return status; - } + if (array[i].objects.size && array[i].objects.array) { + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].objects.array, &array[i].objects.used, &array[i].objects.size); + if (F_status_is_error(status)) return status; + } - if (array[i].contents.size && array[i].contents.array) { - status = f_memory_arrays_adjust(0, sizeof(f_ranges_t), (void **) &array[i].contents.array, &array[i].contents.used, &array[i].contents.size, &f_rangess_destroy_callback); - if (F_status_is_error(status)) return status; - } + if (array[i].contents.size && array[i].contents.array) { + status = f_memory_arrays_adjust(0, sizeof(f_ranges_t), (void **) &array[i].contents.array, &array[i].contents.used, &array[i].contents.size, &f_rangess_destroy_callback); + if (F_status_is_error(status)) return status; + } - if (array[i].quotess.size && array[i].quotess.array) { - status = f_memory_arrays_adjust(0, sizeof(f_uint8s_t), (void **) &array[i].quotess.array, &array[i].quotess.used, &array[i].quotess.size, &f_uint8ss_destroy_callback); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].quotess.size && array[i].quotess.array) { + status = f_memory_arrays_adjust(0, sizeof(f_uint8s_t), (void **) &array[i].quotess.array, &array[i].quotess.used, &array[i].quotess.size, &f_uint8ss_destroy_callback); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -125,37 +121,35 @@ extern "C" { #ifndef _di_f_fss_namedss_delete_callback_ f_status_t f_fss_namedss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_fss_nameds_t * const array = (f_fss_nameds_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; - - for (f_number_unsigned_t i = start; i < stop; ++i) { + f_fss_nameds_t * const array = (f_fss_nameds_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (j = 0; j < array[i].size; ++j) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].array[j].objects.size && array[i].array[j].objects.array) { - status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].array[j].objects.array, &array[i].array[j].objects.used, &array[i].array[j].objects.size); - if (F_status_is_error(status)) return status; - } + for (j = 0; j < array[i].size; ++j) { - if (array[i].array[j].contents.size && array[i].array[j].contents.array) { - status = f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &array[i].array[j].contents.array, &array[i].array[j].contents.used, &array[i].array[j].contents.size, &f_rangess_delete_callback); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].objects.size && array[i].array[j].objects.array) { + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].array[j].objects.array, &array[i].array[j].objects.used, &array[i].array[j].objects.size); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].quotess.size && array[i].array[j].quotess.array) { - status = f_memory_arrays_resize(0, sizeof(f_uint8s_t), (void **) &array[i].array[j].quotess.array, &array[i].array[j].quotess.used, &array[i].array[j].quotess.size, &f_uint8ss_delete_callback); - if (F_status_is_error(status)) return status; - } - } // for + if (array[i].array[j].contents.size && array[i].array[j].contents.array) { + status = f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &array[i].array[j].contents.array, &array[i].array[j].contents.used, &array[i].array[j].contents.size, &f_rangess_delete_callback); + if (F_status_is_error(status)) return status; + } - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_fss_named_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (array[i].array[j].quotess.size && array[i].array[j].quotess.array) { + status = f_memory_arrays_resize(0, sizeof(f_uint8s_t), (void **) &array[i].array[j].quotess.array, &array[i].array[j].quotess.used, &array[i].array[j].quotess.size, &f_uint8ss_delete_callback); if (F_status_is_error(status)) return status; } } // for - } + + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(f_fss_named_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -164,37 +158,35 @@ extern "C" { #ifndef _di_f_fss_namedss_destroy_callback_ f_status_t f_fss_namedss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_fss_nameds_t * const array = (f_fss_nameds_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; + f_fss_nameds_t * const array = (f_fss_nameds_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - for (j = 0; j < array[i].size; ++j) { + for (j = 0; j < array[i].size; ++j) { - if (array[i].array[j].objects.size && array[i].array[j].objects.array) { - status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].array[j].objects.array, &array[i].array[j].objects.used, &array[i].array[j].objects.size); - if (F_status_is_error(status)) return status; - } - - if (array[i].array[j].contents.size && array[i].array[j].contents.array) { - status = f_memory_arrays_adjust(0, sizeof(f_ranges_t), (void **) &array[i].array[j].contents.array, &array[i].array[j].contents.used, &array[i].array[j].contents.size, &f_rangess_destroy_callback); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].objects.size && array[i].array[j].objects.array) { + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].array[j].objects.array, &array[i].array[j].objects.used, &array[i].array[j].objects.size); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].quotess.size && array[i].array[j].quotess.array) { - status = f_memory_arrays_adjust(0, sizeof(f_uint8s_t), (void **) &array[i].array[j].quotess.array, &array[i].array[j].quotess.used, &array[i].array[j].quotess.size, &f_uint8ss_destroy_callback); - if (F_status_is_error(status)) return status; - } - } // for + if (array[i].array[j].contents.size && array[i].array[j].contents.array) { + status = f_memory_arrays_adjust(0, sizeof(f_ranges_t), (void **) &array[i].array[j].contents.array, &array[i].array[j].contents.used, &array[i].array[j].contents.size, &f_rangess_destroy_callback); + if (F_status_is_error(status)) return status; + } - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(f_fss_named_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (array[i].array[j].quotess.size && array[i].array[j].quotess.array) { + status = f_memory_arrays_adjust(0, sizeof(f_uint8s_t), (void **) &array[i].array[j].quotess.array, &array[i].array[j].quotess.used, &array[i].array[j].quotess.size, &f_uint8ss_destroy_callback); if (F_status_is_error(status)) return status; } } // for - } + + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(f_fss_named_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_fss/c/fss/nest.c b/level_0/f_fss/c/fss/nest.c index 96b112aa5..fce9ac61f 100644 --- a/level_0/f_fss/c/fss/nest.c +++ b/level_0/f_fss/c/fss/nest.c @@ -77,36 +77,34 @@ extern "C" { #ifndef _di_f_fss_nests_delete_callback_ f_status_t f_fss_nests_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_fss_nest_t * const array = (f_fss_nest_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; - f_number_unsigned_t k = 0; - - for (f_number_unsigned_t i = start; i < stop; ++i) { + f_fss_nest_t * const array = (f_fss_nest_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; - for (j = 0; j < array[i].size; ++j) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - for (k = 0; k < array[i].depth[j].size; ++k) { + for (j = 0; j < array[i].size; ++j) { - if (array[i].depth[j].array[k].content.size && array[i].depth[j].array[k].content.array) { - status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].depth[j].array[k].content.array, &array[i].depth[j].array[k].content.used, &array[i].depth[j].array[k].content.size); - if (F_status_is_error(status)) return status; - } - } // for + for (k = 0; k < array[i].depth[j].size; ++k) { - if (array[i].depth[j].size && array[i].depth[j].array) { - status = f_memory_array_resize(0, sizeof(f_fss_item_t), (void **) &array[i].depth[j].array, &array[i].depth[j].used, &array[i].depth[j].size); + if (array[i].depth[j].array[k].content.size && array[i].depth[j].array[k].content.array) { + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].depth[j].array[k].content.array, &array[i].depth[j].array[k].content.used, &array[i].depth[j].array[k].content.size); if (F_status_is_error(status)) return status; } } // for - if (array[i].size && array[i].depth) { - status = f_memory_array_resize(0, sizeof(f_fss_items_t), (void **) &array[i].depth, &array[i].used, &array[i].size); + if (array[i].depth[j].size && array[i].depth[j].array) { + status = f_memory_array_resize(0, sizeof(f_fss_item_t), (void **) &array[i].depth[j].array, &array[i].depth[j].used, &array[i].depth[j].size); if (F_status_is_error(status)) return status; } } // for - } + + if (array[i].size && array[i].depth) { + status = f_memory_array_resize(0, sizeof(f_fss_items_t), (void **) &array[i].depth, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -115,36 +113,34 @@ extern "C" { #ifndef _di_f_fss_nests_destroy_callback_ f_status_t f_fss_nests_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_fss_nest_t * const array = (f_fss_nest_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; - f_number_unsigned_t k = 0; + f_fss_nest_t * const array = (f_fss_nest_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - for (j = 0; j < array[i].size; ++j) { + for (j = 0; j < array[i].size; ++j) { - for (k = 0; k < array[i].depth[j].size; ++k) { - - if (array[i].depth[j].array[k].content.size && array[i].depth[j].array[k].content.array) { - status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].depth[j].array[k].content.array, &array[i].depth[j].array[k].content.used, &array[i].depth[j].array[k].content.size); - if (F_status_is_error(status)) return status; - } - } // for + for (k = 0; k < array[i].depth[j].size; ++k) { - if (array[i].depth[j].size && array[i].depth[j].array) { - status = f_memory_array_adjust(0, sizeof(f_fss_item_t), (void **) &array[i].depth[j].array, &array[i].depth[j].used, &array[i].depth[j].size); + if (array[i].depth[j].array[k].content.size && array[i].depth[j].array[k].content.array) { + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].depth[j].array[k].content.array, &array[i].depth[j].array[k].content.used, &array[i].depth[j].array[k].content.size); if (F_status_is_error(status)) return status; } } // for - if (array[i].size && array[i].depth) { - status = f_memory_array_adjust(0, sizeof(f_fss_items_t), (void **) &array[i].depth, &array[i].used, &array[i].size); + if (array[i].depth[j].size && array[i].depth[j].array) { + status = f_memory_array_adjust(0, sizeof(f_fss_item_t), (void **) &array[i].depth[j].array, &array[i].depth[j].used, &array[i].depth[j].size); if (F_status_is_error(status)) return status; } } // for - } + + if (array[i].size && array[i].depth) { + status = f_memory_array_adjust(0, sizeof(f_fss_items_t), (void **) &array[i].depth, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -153,45 +149,43 @@ extern "C" { #ifndef _di_f_fss_nestss_delete_callback_ f_status_t f_fss_nestss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_fss_nests_t * const array = (f_fss_nests_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; - f_number_unsigned_t k = 0; - f_number_unsigned_t l = 0; - - for (f_number_unsigned_t i = start; i < stop; ++i) { + f_fss_nests_t * const array = (f_fss_nests_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; + f_number_unsigned_t l = 0; - for (j = 0; j < array[i].size; ++j) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - for (k = 0; k < array[i].array[j].size; ++k) { + for (j = 0; j < array[i].size; ++j) { - for (l = 0; l < array[i].array[j].depth[k].size; ++l) { + for (k = 0; k < array[i].array[j].size; ++k) { - if (array[i].array[j].depth[k].array[l].content.size && array[i].array[j].depth[k].array[l].content.array) { - status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].array[j].depth[k].array[l].content.array, &array[i].array[j].depth[k].array[l].content.used, &array[i].array[j].depth[k].array[l].content.size); - if (F_status_is_error(status)) return status; - } - } // for + for (l = 0; l < array[i].array[j].depth[k].size; ++l) { - if (array[i].array[j].depth[k].size && array[i].array[j].depth[k].array) { - status = f_memory_array_resize(0, sizeof(f_fss_item_t), (void **) &array[i].array[j].depth[k].array, &array[i].array[j].depth[k].used, &array[i].array[j].depth[k].size); + if (array[i].array[j].depth[k].array[l].content.size && array[i].array[j].depth[k].array[l].content.array) { + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].array[j].depth[k].array[l].content.array, &array[i].array[j].depth[k].array[l].content.used, &array[i].array[j].depth[k].array[l].content.size); if (F_status_is_error(status)) return status; } } // for - if (array[i].array[j].size && array[i].array[j].depth) { - status = f_memory_array_resize(0, sizeof(f_fss_items_t), (void **) &array[i].array[j].depth, &array[i].array[j].used, &array[i].array[j].size); + if (array[i].array[j].depth[k].size && array[i].array[j].depth[k].array) { + status = f_memory_array_resize(0, sizeof(f_fss_item_t), (void **) &array[i].array[j].depth[k].array, &array[i].array[j].depth[k].used, &array[i].array[j].depth[k].size); if (F_status_is_error(status)) return status; } } // for - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_fss_nest_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (array[i].array[j].size && array[i].array[j].depth) { + status = f_memory_array_resize(0, sizeof(f_fss_items_t), (void **) &array[i].array[j].depth, &array[i].array[j].used, &array[i].array[j].size); if (F_status_is_error(status)) return status; } } // for - } + + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(f_fss_nest_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -200,45 +194,43 @@ extern "C" { #ifndef _di_f_fss_nestss_destroy_callback_ f_status_t f_fss_nestss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_fss_nests_t * const array = (f_fss_nests_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; - f_number_unsigned_t k = 0; - f_number_unsigned_t l = 0; + f_fss_nests_t * const array = (f_fss_nests_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; + f_number_unsigned_t l = 0; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - for (j = 0; j < array[i].size; ++j) { + for (j = 0; j < array[i].size; ++j) { - for (k = 0; k < array[i].array[j].size; ++k) { + for (k = 0; k < array[i].array[j].size; ++k) { - for (l = 0; l < array[i].array[j].depth[k].size; ++l) { + for (l = 0; l < array[i].array[j].depth[k].size; ++l) { - if (array[i].array[j].depth[k].array[l].content.size && array[i].array[j].depth[k].array[l].content.array) { - status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].array[j].depth[k].array[l].content.array, &array[i].array[j].depth[k].array[l].content.used, &array[i].array[j].depth[k].array[l].content.size); - if (F_status_is_error(status)) return status; - } - } // for - - if (array[i].array[j].depth[k].size && array[i].array[j].depth[k].array) { - status = f_memory_array_adjust(0, sizeof(f_fss_item_t), (void **) &array[i].array[j].depth[k].array, &array[i].array[j].depth[k].used, &array[i].array[j].depth[k].size); + if (array[i].array[j].depth[k].array[l].content.size && array[i].array[j].depth[k].array[l].content.array) { + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].array[j].depth[k].array[l].content.array, &array[i].array[j].depth[k].array[l].content.used, &array[i].array[j].depth[k].array[l].content.size); if (F_status_is_error(status)) return status; } } // for - if (array[i].array[j].size && array[i].array[j].depth) { - status = f_memory_array_adjust(0, sizeof(f_fss_items_t), (void **) &array[i].array[j].depth, &array[i].array[j].used, &array[i].array[j].size); + if (array[i].array[j].depth[k].size && array[i].array[j].depth[k].array) { + status = f_memory_array_adjust(0, sizeof(f_fss_item_t), (void **) &array[i].array[j].depth[k].array, &array[i].array[j].depth[k].used, &array[i].array[j].depth[k].size); if (F_status_is_error(status)) return status; } } // for - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(f_fss_nest_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (array[i].array[j].size && array[i].array[j].depth) { + status = f_memory_array_adjust(0, sizeof(f_fss_items_t), (void **) &array[i].array[j].depth, &array[i].array[j].used, &array[i].array[j].size); if (F_status_is_error(status)) return status; } } // for - } + + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(f_fss_nest_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_fss/c/fss/set.c b/level_0/f_fss/c/fss/set.c index a18d0a63b..c7ad059a9 100644 --- a/level_0/f_fss/c/fss/set.c +++ b/level_0/f_fss/c/fss/set.c @@ -55,23 +55,21 @@ extern "C" { #ifndef _di_f_fss_sets_delete_callback_ f_status_t f_fss_sets_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_fss_set_t * const array = (f_fss_set_t *) void_array; - f_status_t status = F_okay; + f_fss_set_t * const array = (f_fss_set_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].objects.size && array[i].objects.array) { - status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].objects.array, &array[i].objects.used, &array[i].objects.size); - if (F_status_is_error(status)) return status; - } + if (array[i].objects.size && array[i].objects.array) { + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].objects.array, &array[i].objects.used, &array[i].objects.size); + if (F_status_is_error(status)) return status; + } - if (array[i].contents.size && array[i].contents.array) { - status = f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &array[i].contents.array, &array[i].contents.used, &array[i].contents.size, &f_rangess_delete_callback); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].contents.size && array[i].contents.array) { + status = f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &array[i].contents.array, &array[i].contents.used, &array[i].contents.size, &f_rangess_delete_callback); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -80,23 +78,21 @@ extern "C" { #ifndef _di_f_fss_sets_destroy_callback_ f_status_t f_fss_sets_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_fss_set_t * const array = (f_fss_set_t *) void_array; - f_status_t status = F_okay; + f_fss_set_t * const array = (f_fss_set_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].objects.size && array[i].objects.array) { - status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].objects.array, &array[i].objects.used, &array[i].objects.size); - if (F_status_is_error(status)) return status; - } + if (array[i].objects.size && array[i].objects.array) { + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].objects.array, &array[i].objects.used, &array[i].objects.size); + if (F_status_is_error(status)) return status; + } - if (array[i].contents.size && array[i].contents.array) { - status = f_memory_arrays_adjust(0, sizeof(f_ranges_t), (void **) &array[i].contents.array, &array[i].contents.used, &array[i].contents.size, &f_rangess_destroy_callback); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].contents.size && array[i].contents.array) { + status = f_memory_arrays_adjust(0, sizeof(f_ranges_t), (void **) &array[i].contents.array, &array[i].contents.used, &array[i].contents.size, &f_rangess_destroy_callback); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -105,32 +101,30 @@ extern "C" { #ifndef _di_f_fss_setss_delete_callback_ f_status_t f_fss_setss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_fss_sets_t * const array = (f_fss_sets_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; - - for (f_number_unsigned_t i = start; i < stop; ++i) { + f_fss_sets_t * const array = (f_fss_sets_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (j = 0; j < array[i].size; ++j) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].array[j].objects.size && array[i].array[j].objects.array) { - status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].array[j].objects.array, &array[i].array[j].objects.used, &array[i].array[j].objects.size); - if (F_status_is_error(status)) return status; - } + for (j = 0; j < array[i].size; ++j) { - if (array[i].array[j].contents.size && array[i].array[j].contents.array) { - status = f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &array[i].array[j].contents.array, &array[i].array[j].contents.used, &array[i].array[j].contents.size, &f_rangess_delete_callback); - if (F_status_is_error(status)) return status; - } - } // for + if (array[i].array[j].objects.size && array[i].array[j].objects.array) { + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].array[j].objects.array, &array[i].array[j].objects.used, &array[i].array[j].objects.size); + if (F_status_is_error(status)) return status; + } - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_fss_set_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (array[i].array[j].contents.size && array[i].array[j].contents.array) { + status = f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &array[i].array[j].contents.array, &array[i].array[j].contents.used, &array[i].array[j].contents.size, &f_rangess_delete_callback); if (F_status_is_error(status)) return status; } } // for - } + + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(f_fss_set_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -139,32 +133,30 @@ extern "C" { #ifndef _di_f_fss_setss_destroy_callback_ f_status_t f_fss_setss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_fss_sets_t * const array = (f_fss_sets_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; + f_fss_sets_t * const array = (f_fss_sets_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - for (j = 0; j < array[i].size; ++j) { + for (j = 0; j < array[i].size; ++j) { - if (array[i].array[j].objects.size && array[i].array[j].objects.array) { - status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].array[j].objects.array, &array[i].array[j].objects.used, &array[i].array[j].objects.size); - if (F_status_is_error(status)) return status; - } - - if (array[i].array[j].contents.size && array[i].array[j].contents.array) { - status = f_memory_arrays_adjust(0, sizeof(f_ranges_t), (void **) &array[i].array[j].contents.array, &array[i].array[j].contents.used, &array[i].array[j].contents.size, &f_rangess_destroy_callback); - if (F_status_is_error(status)) return status; - } - } // for + if (array[i].array[j].objects.size && array[i].array[j].objects.array) { + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].array[j].objects.array, &array[i].array[j].objects.used, &array[i].array[j].objects.size); + if (F_status_is_error(status)) return status; + } - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(f_fss_set_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (array[i].array[j].contents.size && array[i].array[j].contents.array) { + status = f_memory_arrays_adjust(0, sizeof(f_ranges_t), (void **) &array[i].array[j].contents.array, &array[i].array[j].contents.used, &array[i].array[j].contents.size, &f_rangess_destroy_callback); if (F_status_is_error(status)) return status; } } // for - } + + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(f_fss_set_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_fss/c/fss/set_quote.c b/level_0/f_fss/c/fss/set_quote.c index 62f7a793b..22dab69a0 100644 --- a/level_0/f_fss/c/fss/set_quote.c +++ b/level_0/f_fss/c/fss/set_quote.c @@ -75,33 +75,31 @@ extern "C" { #ifndef _di_f_fss_set_quotes_delete_callback_ f_status_t f_fss_set_quotes_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_fss_set_quote_t * const array = (f_fss_set_quote_t *) void_array; - f_status_t status = F_okay; + f_fss_set_quote_t * const array = (f_fss_set_quote_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].objects.size && array[i].objects.array) { - status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].objects.array, &array[i].objects.used, &array[i].objects.size); - if (F_status_is_error(status)) return status; - } + if (array[i].objects.size && array[i].objects.array) { + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].objects.array, &array[i].objects.used, &array[i].objects.size); + if (F_status_is_error(status)) return status; + } - if (array[i].contents.size && array[i].contents.array) { - status = f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &array[i].contents.array, &array[i].contents.used, &array[i].contents.size, &f_rangess_delete_callback); - if (F_status_is_error(status)) return status; - } + if (array[i].contents.size && array[i].contents.array) { + status = f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &array[i].contents.array, &array[i].contents.used, &array[i].contents.size, &f_rangess_delete_callback); + if (F_status_is_error(status)) return status; + } - if (array[i].objects_quote.size && array[i].objects_quote.array) { - status = f_memory_array_resize(0, sizeof(uint8_t), (void **) &array[i].objects_quote.array, &array[i].objects_quote.used, &array[i].objects_quote.size); - if (F_status_is_error(status)) return status; - } + if (array[i].objects_quote.size && array[i].objects_quote.array) { + status = f_memory_array_resize(0, sizeof(uint8_t), (void **) &array[i].objects_quote.array, &array[i].objects_quote.used, &array[i].objects_quote.size); + if (F_status_is_error(status)) return status; + } - if (array[i].contents_quote.size && array[i].contents_quote.array) { - status = f_memory_arrays_resize(0, sizeof(f_uint8s_t), (void **) &array[i].contents_quote.array, &array[i].contents_quote.used, &array[i].contents_quote.size, &f_uint8ss_delete_callback); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].contents_quote.size && array[i].contents_quote.array) { + status = f_memory_arrays_resize(0, sizeof(f_uint8s_t), (void **) &array[i].contents_quote.array, &array[i].contents_quote.used, &array[i].contents_quote.size, &f_uint8ss_delete_callback); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -145,42 +143,40 @@ extern "C" { #ifndef _di_f_fss_set_quotess_delete_callback_ f_status_t f_fss_set_quotess_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_fss_set_quotes_t * const array = (f_fss_set_quotes_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; - - for (f_number_unsigned_t i = start; i < stop; ++i) { + f_fss_set_quotes_t * const array = (f_fss_set_quotes_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (j = 0; j < array[i].size; ++j) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].array[j].objects.size && array[i].array[j].objects.array) { - status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].array[j].objects.array, &array[i].array[j].objects.used, &array[i].array[j].objects.size); - if (F_status_is_error(status)) return status; - } + for (j = 0; j < array[i].size; ++j) { - if (array[i].array[j].contents.size && array[i].array[j].contents.array) { - status = f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &array[i].array[j].contents.array, &array[i].array[j].contents.used, &array[i].array[j].contents.size, &f_rangess_delete_callback); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].objects.size && array[i].array[j].objects.array) { + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].array[j].objects.array, &array[i].array[j].objects.used, &array[i].array[j].objects.size); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].objects_quote.size && array[i].array[j].objects_quote.array) { - status = f_memory_array_resize(0, sizeof(uint8_t), (void **) &array[i].array[j].objects_quote.array, &array[i].array[j].objects_quote.used, &array[i].array[j].objects_quote.size); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].contents.size && array[i].array[j].contents.array) { + status = f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &array[i].array[j].contents.array, &array[i].array[j].contents.used, &array[i].array[j].contents.size, &f_rangess_delete_callback); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].contents_quote.size && array[i].array[j].contents_quote.array) { - status = f_memory_arrays_resize(0, sizeof(f_uint8s_t), (void **) &array[i].array[j].contents_quote.array, &array[i].array[j].contents_quote.used, &array[i].array[j].contents_quote.size, &f_uint8ss_delete_callback); - if (F_status_is_error(status)) return status; - } - } // for + if (array[i].array[j].objects_quote.size && array[i].array[j].objects_quote.array) { + status = f_memory_array_resize(0, sizeof(uint8_t), (void **) &array[i].array[j].objects_quote.array, &array[i].array[j].objects_quote.used, &array[i].array[j].objects_quote.size); + if (F_status_is_error(status)) return status; + } - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_fss_set_quote_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (array[i].array[j].contents_quote.size && array[i].array[j].contents_quote.array) { + status = f_memory_arrays_resize(0, sizeof(f_uint8s_t), (void **) &array[i].array[j].contents_quote.array, &array[i].array[j].contents_quote.used, &array[i].array[j].contents_quote.size, &f_uint8ss_delete_callback); if (F_status_is_error(status)) return status; } } // for - } + + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(f_fss_set_quote_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -189,42 +185,40 @@ extern "C" { #ifndef _di_f_fss_set_quotess_destroy_callback_ f_status_t f_fss_set_quotess_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_fss_set_quotes_t * const array = (f_fss_set_quotes_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; - - for (f_number_unsigned_t i = start; i < stop; ++i) { + f_fss_set_quotes_t * const array = (f_fss_set_quotes_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (j = 0; j < array[i].size; ++j) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].array[j].objects.size && array[i].array[j].objects.array) { - status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].array[j].objects.array, &array[i].array[j].objects.used, &array[i].array[j].objects.size); - if (F_status_is_error(status)) return status; - } + for (j = 0; j < array[i].size; ++j) { - if (array[i].array[j].contents.size && array[i].array[j].contents.array) { - status = f_memory_arrays_adjust(0, sizeof(f_ranges_t), (void **) &array[i].array[j].contents.array, &array[i].array[j].contents.used, &array[i].array[j].contents.size, &f_rangess_destroy_callback); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].objects.size && array[i].array[j].objects.array) { + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].array[j].objects.array, &array[i].array[j].objects.used, &array[i].array[j].objects.size); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].objects_quote.size && array[i].array[j].objects_quote.array) { - status = f_memory_array_adjust(0, sizeof(uint8_t), (void **) &array[i].array[j].objects_quote.array, &array[i].array[j].objects_quote.used, &array[i].array[j].objects_quote.size); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].contents.size && array[i].array[j].contents.array) { + status = f_memory_arrays_adjust(0, sizeof(f_ranges_t), (void **) &array[i].array[j].contents.array, &array[i].array[j].contents.used, &array[i].array[j].contents.size, &f_rangess_destroy_callback); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].contents_quote.size && array[i].array[j].contents_quote.array) { - status = f_memory_arrays_adjust(0, sizeof(f_uint8s_t), (void **) &array[i].array[j].contents_quote.array, &array[i].array[j].contents_quote.used, &array[i].array[j].contents_quote.size, &f_uint8ss_destroy_callback); - if (F_status_is_error(status)) return status; - } - } // for + if (array[i].array[j].objects_quote.size && array[i].array[j].objects_quote.array) { + status = f_memory_array_adjust(0, sizeof(uint8_t), (void **) &array[i].array[j].objects_quote.array, &array[i].array[j].objects_quote.used, &array[i].array[j].objects_quote.size); + if (F_status_is_error(status)) return status; + } - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(f_fss_set_quote_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (array[i].array[j].contents_quote.size && array[i].array[j].contents_quote.array) { + status = f_memory_arrays_adjust(0, sizeof(f_uint8s_t), (void **) &array[i].array[j].contents_quote.array, &array[i].array[j].contents_quote.used, &array[i].array[j].contents_quote.size, &f_uint8ss_destroy_callback); if (F_status_is_error(status)) return status; } } // for - } + + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(f_fss_set_quote_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_fss/c/fss/simple_packet.c b/level_0/f_fss/c/fss/simple_packet.c index 5a2c70b17..a4f556422 100644 --- a/level_0/f_fss/c/fss/simple_packet.c +++ b/level_0/f_fss/c/fss/simple_packet.c @@ -181,18 +181,16 @@ extern "C" { #ifndef _di_f_fss_simple_packets_delete_callback_ f_status_t f_fss_simple_packets_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_fss_simple_packet_t * const array = (f_fss_simple_packet_t *) void_array; - f_status_t status = F_okay; + f_fss_simple_packet_t * const array = (f_fss_simple_packet_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].payload.size && array[i].payload.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].payload.string, &array[i].payload.used, &array[i].payload.size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].payload.size && array[i].payload.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].payload.string, &array[i].payload.used, &array[i].payload.size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -201,18 +199,16 @@ extern "C" { #ifndef _di_f_fss_simple_packets_destroy_callback_ f_status_t f_fss_simple_packets_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_fss_simple_packet_t * const array = (f_fss_simple_packet_t *) void_array; - f_status_t status = F_okay; + f_fss_simple_packet_t * const array = (f_fss_simple_packet_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].payload.size && array[i].payload.string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].payload.string, &array[i].payload.used, &array[i].payload.size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].payload.size && array[i].payload.string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].payload.string, &array[i].payload.used, &array[i].payload.size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -221,27 +217,25 @@ extern "C" { #ifndef _di_f_fss_simple_packetss_delete_callback_ f_status_t f_fss_simple_packetss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_fss_simple_packets_t * const array = (f_fss_simple_packets_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; - - for (f_number_unsigned_t i = start; i < stop; ++i) { + f_fss_simple_packets_t * const array = (f_fss_simple_packets_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (j = 0; j < array[i].size; ++j) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].array[j].payload.size && array[i].array[j].payload.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].payload.string, &array[i].array[j].payload.used, &array[i].array[j].payload.size); - if (F_status_is_error(status)) return status; - } - } // for + for (j = 0; j < array[i].size; ++j) { - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_fss_simple_packet_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (array[i].array[j].payload.size && array[i].array[j].payload.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].payload.string, &array[i].array[j].payload.used, &array[i].array[j].payload.size); if (F_status_is_error(status)) return status; } } // for - } + + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(f_fss_simple_packet_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -250,27 +244,25 @@ extern "C" { #ifndef _di_f_fss_simple_packetss_destroy_callback_ f_status_t f_fss_simple_packetss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_fss_simple_packets_t * const array = (f_fss_simple_packets_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; - - for (f_number_unsigned_t i = start; i < stop; ++i) { + f_fss_simple_packets_t * const array = (f_fss_simple_packets_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (j = 0; j < array[i].size; ++j) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].array[j].payload.size && array[i].array[j].payload.string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].payload.string, &array[i].array[j].payload.used, &array[i].array[j].payload.size); - if (F_status_is_error(status)) return status; - } - } // for + for (j = 0; j < array[i].size; ++j) { - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(f_fss_simple_packet_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (array[i].array[j].payload.size && array[i].array[j].payload.string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].payload.string, &array[i].array[j].payload.used, &array[i].array[j].payload.size); if (F_status_is_error(status)) return status; } } // for - } + + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(f_fss_simple_packet_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_iki/c/iki/data.c b/level_0/f_iki/c/iki/data.c index 95d532253..d1fe0ef55 100644 --- a/level_0/f_iki/c/iki/data.c +++ b/level_0/f_iki/c/iki/data.c @@ -133,33 +133,31 @@ extern "C" { #ifndef _di_f_iki_datas_delete_callback_ f_status_t f_iki_datas_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_iki_data_t * const array = (f_iki_data_t *) void_array; - f_status_t status = F_okay; + f_iki_data_t * const array = (f_iki_data_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].content.size && array[i].content.array) { - status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].content.array, &array[i].content.used, &array[i].content.size); - if (F_status_is_error(status)) return status; - } + if (array[i].content.size && array[i].content.array) { + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].content.array, &array[i].content.used, &array[i].content.size); + if (F_status_is_error(status)) return status; + } - if (array[i].delimits.size && array[i].delimits.array) { - status = f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &array[i].delimits.array, &array[i].delimits.used, &array[i].delimits.size); - if (F_status_is_error(status)) return status; - } + if (array[i].delimits.size && array[i].delimits.array) { + status = f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &array[i].delimits.array, &array[i].delimits.used, &array[i].delimits.size); + if (F_status_is_error(status)) return status; + } - if (array[i].variable.size && array[i].variable.array) { - status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].variable.array, &array[i].variable.used, &array[i].variable.size); - if (F_status_is_error(status)) return status; - } + if (array[i].variable.size && array[i].variable.array) { + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].variable.array, &array[i].variable.used, &array[i].variable.size); + if (F_status_is_error(status)) return status; + } - if (array[i].vocabulary.size && array[i].vocabulary.array) { - status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].vocabulary.array, &array[i].vocabulary.used, &array[i].vocabulary.size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].vocabulary.size && array[i].vocabulary.array) { + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].vocabulary.array, &array[i].vocabulary.used, &array[i].vocabulary.size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -168,33 +166,31 @@ extern "C" { #ifndef _di_f_iki_datas_destroy_callback_ f_status_t f_iki_datas_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_iki_data_t * const array = (f_iki_data_t *) void_array; - f_status_t status = F_okay; + f_iki_data_t * const array = (f_iki_data_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].content.size && array[i].content.array) { - status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].content.array, &array[i].content.used, &array[i].content.size); - if (F_status_is_error(status)) return status; - } + if (array[i].content.size && array[i].content.array) { + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].content.array, &array[i].content.used, &array[i].content.size); + if (F_status_is_error(status)) return status; + } - if (array[i].delimits.size && array[i].delimits.array) { - status = f_memory_array_adjust(0, sizeof(f_number_unsigned_t), (void **) &array[i].delimits.array, &array[i].delimits.used, &array[i].delimits.size); - if (F_status_is_error(status)) return status; - } + if (array[i].delimits.size && array[i].delimits.array) { + status = f_memory_array_adjust(0, sizeof(f_number_unsigned_t), (void **) &array[i].delimits.array, &array[i].delimits.used, &array[i].delimits.size); + if (F_status_is_error(status)) return status; + } - if (array[i].variable.size && array[i].variable.array) { - status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].variable.array, &array[i].variable.used, &array[i].variable.size); - if (F_status_is_error(status)) return status; - } + if (array[i].variable.size && array[i].variable.array) { + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].variable.array, &array[i].variable.used, &array[i].variable.size); + if (F_status_is_error(status)) return status; + } - if (array[i].vocabulary.size && array[i].vocabulary.array) { - status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].vocabulary.array, &array[i].vocabulary.used, &array[i].vocabulary.size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].vocabulary.size && array[i].vocabulary.array) { + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].vocabulary.array, &array[i].vocabulary.used, &array[i].vocabulary.size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -208,13 +204,11 @@ extern "C" { if (!source.used) return F_data_not; - { - f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_iki_datas_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_iki_datas_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - status = private_f_iki_datas_append_all(source, &destination->array[destination->used]); - if (F_status_is_error(status)) return status; - } + status = private_f_iki_datas_append_all(source, &destination->array[destination->used]); + if (F_status_is_error(status)) return status; ++destination->used; @@ -230,20 +224,18 @@ extern "C" { if (!source.used) return F_data_not; - { - f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_iki_datas_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_iki_datas_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { - destination->array[destination->used].used = 0; + destination->array[destination->used].used = 0; - if (source.array[i].used) { - status = private_f_iki_datas_append_all(source.array[i], &destination->array[destination->used]); - if (F_status_is_error(status)) return status; - } - } // for - } + if (source.array[i].used) { + status = private_f_iki_datas_append_all(source.array[i], &destination->array[destination->used]); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -252,42 +244,40 @@ extern "C" { #ifndef _di_f_iki_datass_delete_callback_ f_status_t f_iki_datass_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_iki_datas_t * const array = (f_iki_datas_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; - - for (f_number_unsigned_t i = start; i < stop; ++i) { + f_iki_datas_t * const array = (f_iki_datas_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (j = 0; j < array[i].size; ++j) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].array[j].content.size && array[i].array[j].content.array) { - status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].array[j].content.array, &array[i].array[j].content.used, &array[i].array[j].content.size); - if (F_status_is_error(status)) return status; - } + for (j = 0; j < array[i].size; ++j) { - if (array[i].array[j].delimits.size && array[i].array[j].delimits.array) { - status = f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &array[i].array[j].delimits.array, &array[i].array[j].delimits.used, &array[i].array[j].delimits.size); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].content.size && array[i].array[j].content.array) { + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].array[j].content.array, &array[i].array[j].content.used, &array[i].array[j].content.size); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].variable.size && array[i].array[j].variable.array) { - status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].array[j].variable.array, &array[i].array[j].variable.used, &array[i].array[j].variable.size); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].delimits.size && array[i].array[j].delimits.array) { + status = f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &array[i].array[j].delimits.array, &array[i].array[j].delimits.used, &array[i].array[j].delimits.size); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].vocabulary.size && array[i].array[j].vocabulary.array) { - status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].array[j].vocabulary.array, &array[i].array[j].vocabulary.used, &array[i].array[j].vocabulary.size); - if (F_status_is_error(status)) return status; - } - } // for + if (array[i].array[j].variable.size && array[i].array[j].variable.array) { + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].array[j].variable.array, &array[i].array[j].variable.used, &array[i].array[j].variable.size); + if (F_status_is_error(status)) return status; + } - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_iki_data_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (array[i].array[j].vocabulary.size && array[i].array[j].vocabulary.array) { + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].array[j].vocabulary.array, &array[i].array[j].vocabulary.used, &array[i].array[j].vocabulary.size); if (F_status_is_error(status)) return status; } } // for - } + + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(f_iki_data_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -296,42 +286,40 @@ extern "C" { #ifndef _di_f_iki_datass_destroy_callback_ f_status_t f_iki_datass_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_iki_datas_t * const array = (f_iki_datas_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; + f_iki_datas_t * const array = (f_iki_datas_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - for (j = 0; j < array[i].size; ++j) { + for (j = 0; j < array[i].size; ++j) { - if (array[i].array[j].content.size && array[i].array[j].content.array) { - status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].array[j].content.array, &array[i].array[j].content.used, &array[i].array[j].content.size); - if (F_status_is_error(status)) return status; - } - - if (array[i].array[j].delimits.size && array[i].array[j].delimits.array) { - status = f_memory_array_adjust(0, sizeof(f_number_unsigned_t), (void **) &array[i].array[j].delimits.array, &array[i].array[j].delimits.used, &array[i].array[j].delimits.size); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].content.size && array[i].array[j].content.array) { + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].array[j].content.array, &array[i].array[j].content.used, &array[i].array[j].content.size); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].variable.size && array[i].array[j].variable.array) { - status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].array[j].variable.array, &array[i].array[j].variable.used, &array[i].array[j].variable.size); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].delimits.size && array[i].array[j].delimits.array) { + status = f_memory_array_adjust(0, sizeof(f_number_unsigned_t), (void **) &array[i].array[j].delimits.array, &array[i].array[j].delimits.used, &array[i].array[j].delimits.size); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].vocabulary.size && array[i].array[j].vocabulary.array) { - status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].array[j].vocabulary.array, &array[i].array[j].vocabulary.used, &array[i].array[j].vocabulary.size); - if (F_status_is_error(status)) return status; - } - } // for + if (array[i].array[j].variable.size && array[i].array[j].variable.array) { + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].array[j].variable.array, &array[i].array[j].variable.used, &array[i].array[j].variable.size); + if (F_status_is_error(status)) return status; + } - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(f_iki_data_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (array[i].array[j].vocabulary.size && array[i].array[j].vocabulary.array) { + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].array[j].vocabulary.array, &array[i].array[j].vocabulary.used, &array[i].array[j].vocabulary.size); if (F_status_is_error(status)) return status; } } // for - } + + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(f_iki_data_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_iki/c/iki/eki.c b/level_0/f_iki/c/iki/eki.c index 163fefc4b..f691d6357 100644 --- a/level_0/f_iki/c/iki/eki.c +++ b/level_0/f_iki/c/iki/eki.c @@ -11,28 +11,26 @@ extern "C" { if (!data) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ - { - f_status_t status = F_okay; + f_status_t status = F_okay; - if (data->content.size && data->content.array) { - status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &data->content.array, &data->content.used, &data->content.size); - if (F_status_is_error(status)) return status; - } + if (data->content.size && data->content.array) { + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &data->content.array, &data->content.used, &data->content.size); + if (F_status_is_error(status)) return status; + } - if (data->delimits.size && data->delimits.array) { - status = f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &data->delimits.array, &data->delimits.used, &data->delimits.size); - if (F_status_is_error(status)) return status; - } + if (data->delimits.size && data->delimits.array) { + status = f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &data->delimits.array, &data->delimits.used, &data->delimits.size); + if (F_status_is_error(status)) return status; + } - if (data->variable.size && data->variable.array) { - status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &data->variable.array, &data->variable.used, &data->variable.size); - if (F_status_is_error(status)) return status; - } + if (data->variable.size && data->variable.array) { + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &data->variable.array, &data->variable.used, &data->variable.size); + if (F_status_is_error(status)) return status; + } - if (data->vocabularys.size && data->vocabularys.array) { - status = f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &data->vocabularys.array, &data->vocabularys.used, &data->vocabularys.size, &f_rangess_delete_callback); - if (F_status_is_error(status)) return status; - } + if (data->vocabularys.size && data->vocabularys.array) { + status = f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &data->vocabularys.array, &data->vocabularys.used, &data->vocabularys.size, &f_rangess_delete_callback); + if (F_status_is_error(status)) return status; } return F_okay; @@ -45,28 +43,26 @@ extern "C" { if (!data) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ - { - f_status_t status = F_okay; + f_status_t status = F_okay; - if (data->content.size && data->content.array) { - status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &data->content.array, &data->content.used, &data->content.size); - if (F_status_is_error(status)) return status; - } + if (data->content.size && data->content.array) { + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &data->content.array, &data->content.used, &data->content.size); + if (F_status_is_error(status)) return status; + } - if (data->delimits.size && data->delimits.array) { - status = f_memory_array_adjust(0, sizeof(f_number_unsigned_t), (void **) &data->delimits.array, &data->delimits.used, &data->delimits.size); - if (F_status_is_error(status)) return status; - } + if (data->delimits.size && data->delimits.array) { + status = f_memory_array_adjust(0, sizeof(f_number_unsigned_t), (void **) &data->delimits.array, &data->delimits.used, &data->delimits.size); + if (F_status_is_error(status)) return status; + } - if (data->variable.size && data->variable.array) { - status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &data->variable.array, &data->variable.used, &data->variable.size); - if (F_status_is_error(status)) return status; - } + if (data->variable.size && data->variable.array) { + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &data->variable.array, &data->variable.used, &data->variable.size); + if (F_status_is_error(status)) return status; + } - if (data->vocabularys.size && data->vocabularys.array) { - status = f_memory_arrays_adjust(0, sizeof(f_ranges_t), (void **) &data->vocabularys.array, &data->vocabularys.used, &data->vocabularys.size, &f_rangess_destroy_callback); - if (F_status_is_error(status)) return status; - } + if (data->vocabularys.size && data->vocabularys.array) { + status = f_memory_arrays_adjust(0, sizeof(f_ranges_t), (void **) &data->vocabularys.array, &data->vocabularys.used, &data->vocabularys.size, &f_rangess_destroy_callback); + if (F_status_is_error(status)) return status; } return F_okay; @@ -79,37 +75,35 @@ extern "C" { if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ - { - f_status_t status = f_memory_array_increase(F_iki_default_allocation_small_d, sizeof(f_iki_eki_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase(F_iki_default_allocation_small_d, sizeof(f_iki_eki_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - destination->array[destination->used].content.used = 0; - destination->array[destination->used].delimits.used = 0; - destination->array[destination->used].variable.used = 0; - destination->array[destination->used].vocabularys.used = 0; + destination->array[destination->used].content.used = 0; + destination->array[destination->used].delimits.used = 0; + destination->array[destination->used].variable.used = 0; + destination->array[destination->used].vocabularys.used = 0; - if (source.content.used) { - status = f_ranges_append_all(source.content, &destination->array[destination->used].content); - if (F_status_is_error(status)) return status; - } + if (source.content.used) { + status = f_ranges_append_all(source.content, &destination->array[destination->used].content); + if (F_status_is_error(status)) return status; + } - if (source.delimits.used) { - for (f_number_unsigned_t i = 0; i < source.delimits.used; ++i) { + if (source.delimits.used) { + for (f_number_unsigned_t i = 0; i < source.delimits.used; ++i) { - status = f_memory_array_append(source.delimits.array + i, sizeof(f_number_unsigned_t), (void **) &destination->array[destination->used].delimits.array, &destination->array[destination->used].delimits.used, &destination->array[destination->used].delimits.size); - if (F_status_is_error(status)) return status; - } // for - } - - if (source.variable.used) { - status = f_ranges_append_all(source.variable, &destination->array[destination->used].variable); + status = f_memory_array_append(source.delimits.array + i, sizeof(f_number_unsigned_t), (void **) &destination->array[destination->used].delimits.array, &destination->array[destination->used].delimits.used, &destination->array[destination->used].delimits.size); if (F_status_is_error(status)) return status; - } + } // for + } - if (source.vocabularys.used) { - status = f_rangess_append_all(source.vocabularys, &destination->array[destination->used].vocabularys); - if (F_status_is_error(status)) return status; - } + if (source.variable.used) { + status = f_ranges_append_all(source.variable, &destination->array[destination->used].variable); + if (F_status_is_error(status)) return status; + } + + if (source.vocabularys.used) { + status = f_rangess_append_all(source.vocabularys, &destination->array[destination->used].vocabularys); + if (F_status_is_error(status)) return status; } ++destination->used; @@ -133,33 +127,31 @@ extern "C" { #ifndef _di_f_iki_ekis_delete_callback_ f_status_t f_iki_ekis_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_iki_eki_t * const array = (f_iki_eki_t *) void_array; - f_status_t status = F_okay; + f_iki_eki_t * const array = (f_iki_eki_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].content.size && array[i].content.array) { - status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].content.array, &array[i].content.used, &array[i].content.size); - if (F_status_is_error(status)) return status; - } + if (array[i].content.size && array[i].content.array) { + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].content.array, &array[i].content.used, &array[i].content.size); + if (F_status_is_error(status)) return status; + } - if (array[i].delimits.size && array[i].delimits.array) { - status = f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &array[i].delimits.array, &array[i].delimits.used, &array[i].delimits.size); - if (F_status_is_error(status)) return status; - } + if (array[i].delimits.size && array[i].delimits.array) { + status = f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &array[i].delimits.array, &array[i].delimits.used, &array[i].delimits.size); + if (F_status_is_error(status)) return status; + } - if (array[i].variable.size && array[i].variable.array) { - status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].variable.array, &array[i].variable.used, &array[i].variable.size); - if (F_status_is_error(status)) return status; - } + if (array[i].variable.size && array[i].variable.array) { + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].variable.array, &array[i].variable.used, &array[i].variable.size); + if (F_status_is_error(status)) return status; + } - if (array[i].vocabularys.size && array[i].vocabularys.array) { - status = f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &array[i].vocabularys.array, &array[i].vocabularys.used, &array[i].vocabularys.size, &f_rangess_delete_callback); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].vocabularys.size && array[i].vocabularys.array) { + status = f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &array[i].vocabularys.array, &array[i].vocabularys.used, &array[i].vocabularys.size, &f_rangess_delete_callback); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -168,33 +160,31 @@ extern "C" { #ifndef _di_f_iki_ekis_destroy_callback_ f_status_t f_iki_ekis_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_iki_eki_t * const array = (f_iki_eki_t *) void_array; - f_status_t status = F_okay; + f_iki_eki_t * const array = (f_iki_eki_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].content.size && array[i].content.array) { - status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].content.array, &array[i].content.used, &array[i].content.size); - if (F_status_is_error(status)) return status; - } + if (array[i].content.size && array[i].content.array) { + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].content.array, &array[i].content.used, &array[i].content.size); + if (F_status_is_error(status)) return status; + } - if (array[i].delimits.size && array[i].delimits.array) { - status = f_memory_array_adjust(0, sizeof(f_number_unsigned_t), (void **) &array[i].delimits.array, &array[i].delimits.used, &array[i].delimits.size); - if (F_status_is_error(status)) return status; - } + if (array[i].delimits.size && array[i].delimits.array) { + status = f_memory_array_adjust(0, sizeof(f_number_unsigned_t), (void **) &array[i].delimits.array, &array[i].delimits.used, &array[i].delimits.size); + if (F_status_is_error(status)) return status; + } - if (array[i].variable.size && array[i].variable.array) { - status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].variable.array, &array[i].variable.used, &array[i].variable.size); - if (F_status_is_error(status)) return status; - } + if (array[i].variable.size && array[i].variable.array) { + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].variable.array, &array[i].variable.used, &array[i].variable.size); + if (F_status_is_error(status)) return status; + } - if (array[i].vocabularys.size && array[i].vocabularys.array) { - status = f_memory_arrays_adjust(0, sizeof(f_ranges_t), (void **) &array[i].vocabularys.array, &array[i].vocabularys.used, &array[i].vocabularys.size, &f_rangess_destroy_callback); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].vocabularys.size && array[i].vocabularys.array) { + status = f_memory_arrays_adjust(0, sizeof(f_ranges_t), (void **) &array[i].vocabularys.array, &array[i].vocabularys.used, &array[i].vocabularys.size, &f_rangess_destroy_callback); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -208,13 +198,11 @@ extern "C" { if (!source.used) return F_data_not; - { - f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_iki_ekis_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_iki_ekis_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - status = private_f_iki_ekis_append_all(source, &destination->array[destination->used]); - if (F_status_is_error(status)) return status; - } + status = private_f_iki_ekis_append_all(source, &destination->array[destination->used]); + if (F_status_is_error(status)) return status; ++destination->used; @@ -230,20 +218,18 @@ extern "C" { if (!source.used) return F_data_not; - { - f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_iki_ekis_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_iki_ekis_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { - destination->array[destination->used].used = 0; + destination->array[destination->used].used = 0; - if (source.array[i].used) { - status = private_f_iki_ekis_append_all(source.array[i], &destination->array[destination->used]); - if (F_status_is_error(status)) return status; - } - } // for - } + if (source.array[i].used) { + status = private_f_iki_ekis_append_all(source.array[i], &destination->array[destination->used]); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -252,42 +238,40 @@ extern "C" { #ifndef _di_f_iki_ekiss_delete_callback_ f_status_t f_iki_ekiss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_iki_ekis_t * const array = (f_iki_ekis_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; - - for (f_number_unsigned_t i = start; i < stop; ++i) { + f_iki_ekis_t * const array = (f_iki_ekis_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (j = 0; j < array[i].size; ++j) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].array[j].content.size && array[i].array[j].content.array) { - status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].array[j].content.array, &array[i].array[j].content.used, &array[i].array[j].content.size); - if (F_status_is_error(status)) return status; - } + for (j = 0; j < array[i].size; ++j) { - if (array[i].array[j].delimits.size && array[i].array[j].delimits.array) { - status = f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &array[i].array[j].delimits.array, &array[i].array[j].delimits.used, &array[i].array[j].delimits.size); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].content.size && array[i].array[j].content.array) { + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].array[j].content.array, &array[i].array[j].content.used, &array[i].array[j].content.size); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].variable.size && array[i].array[j].variable.array) { - status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].array[j].variable.array, &array[i].array[j].variable.used, &array[i].array[j].variable.size); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].delimits.size && array[i].array[j].delimits.array) { + status = f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &array[i].array[j].delimits.array, &array[i].array[j].delimits.used, &array[i].array[j].delimits.size); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].vocabularys.size && array[i].array[j].vocabularys.array) { - status = f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &array[i].array[j].vocabularys.array, &array[i].array[j].vocabularys.used, &array[i].array[j].vocabularys.size, &f_rangess_delete_callback); - if (F_status_is_error(status)) return status; - } - } // for + if (array[i].array[j].variable.size && array[i].array[j].variable.array) { + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].array[j].variable.array, &array[i].array[j].variable.used, &array[i].array[j].variable.size); + if (F_status_is_error(status)) return status; + } - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_iki_eki_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (array[i].array[j].vocabularys.size && array[i].array[j].vocabularys.array) { + status = f_memory_arrays_resize(0, sizeof(f_ranges_t), (void **) &array[i].array[j].vocabularys.array, &array[i].array[j].vocabularys.used, &array[i].array[j].vocabularys.size, &f_rangess_delete_callback); if (F_status_is_error(status)) return status; } } // for - } + + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(f_iki_eki_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -296,42 +280,40 @@ extern "C" { #ifndef _di_f_iki_ekiss_destroy_callback_ f_status_t f_iki_ekiss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_iki_ekis_t * const array = (f_iki_ekis_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; - - for (f_number_unsigned_t i = start; i < stop; ++i) { + f_iki_ekis_t * const array = (f_iki_ekis_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (j = 0; j < array[i].size; ++j) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].array[j].content.size && array[i].array[j].content.array) { - status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].array[j].content.array, &array[i].array[j].content.used, &array[i].array[j].content.size); - if (F_status_is_error(status)) return status; - } + for (j = 0; j < array[i].size; ++j) { - if (array[i].array[j].delimits.size && array[i].array[j].delimits.array) { - status = f_memory_array_adjust(0, sizeof(f_number_unsigned_t), (void **) &array[i].array[j].delimits.array, &array[i].array[j].delimits.used, &array[i].array[j].delimits.size); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].content.size && array[i].array[j].content.array) { + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].array[j].content.array, &array[i].array[j].content.used, &array[i].array[j].content.size); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].variable.size && array[i].array[j].variable.array) { - status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].array[j].variable.array, &array[i].array[j].variable.used, &array[i].array[j].variable.size); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].delimits.size && array[i].array[j].delimits.array) { + status = f_memory_array_adjust(0, sizeof(f_number_unsigned_t), (void **) &array[i].array[j].delimits.array, &array[i].array[j].delimits.used, &array[i].array[j].delimits.size); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].vocabularys.size && array[i].array[j].vocabularys.array) { - status = f_memory_arrays_adjust(0, sizeof(f_ranges_t), (void **) &array[i].array[j].vocabularys.array, &array[i].array[j].vocabularys.used, &array[i].array[j].vocabularys.size, &f_rangess_destroy_callback); - if (F_status_is_error(status)) return status; - } - } // for + if (array[i].array[j].variable.size && array[i].array[j].variable.array) { + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].array[j].variable.array, &array[i].array[j].variable.used, &array[i].array[j].variable.size); + if (F_status_is_error(status)) return status; + } - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(f_iki_eki_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (array[i].array[j].vocabularys.size && array[i].array[j].vocabularys.array) { + status = f_memory_arrays_adjust(0, sizeof(f_ranges_t), (void **) &array[i].array[j].vocabularys.array, &array[i].array[j].vocabularys.used, &array[i].array[j].vocabularys.size, &f_rangess_destroy_callback); if (F_status_is_error(status)) return status; } } // for - } + + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(f_iki_eki_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_limit/c/limit/set.c b/level_0/f_limit/c/limit/set.c index 9d0f895f1..6e088003b 100644 --- a/level_0/f_limit/c/limit/set.c +++ b/level_0/f_limit/c/limit/set.c @@ -8,18 +8,16 @@ extern "C" { #ifndef _di_f_limit_setss_delete_callback_ f_status_t f_limit_setss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_limit_sets_t * const array = (f_limit_sets_t *) void_array; - f_status_t status = F_okay; + f_limit_sets_t * const array = (f_limit_sets_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_limit_set_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(f_limit_set_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -28,18 +26,16 @@ extern "C" { #ifndef _di_f_limit_setss_destroy_callback_ f_status_t f_limit_setss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_limit_sets_t * const array = (f_limit_sets_t *) void_array; - f_status_t status = F_okay; + f_limit_sets_t * const array = (f_limit_sets_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(f_limit_set_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(f_limit_set_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_limit/c/limit/value.c b/level_0/f_limit/c/limit/value.c index 7bbcafef1..21fd1895d 100644 --- a/level_0/f_limit/c/limit/value.c +++ b/level_0/f_limit/c/limit/value.c @@ -8,18 +8,16 @@ extern "C" { #ifndef _di_f_limit_valuess_delete_callback_ f_status_t f_limit_valuess_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_limit_values_t * const array = (f_limit_values_t *) void_array; - f_status_t status = F_okay; + f_limit_values_t * const array = (f_limit_values_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_limit_value_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(f_limit_value_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -28,18 +26,16 @@ extern "C" { #ifndef _di_f_limit_valuess_destroy_callback_ f_status_t f_limit_valuess_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_limit_values_t * const array = (f_limit_values_t *) void_array; - f_status_t status = F_okay; + f_limit_values_t * const array = (f_limit_values_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(f_limit_value_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(f_limit_value_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_socket/c/socket/address.c b/level_0/f_socket/c/socket/address.c index 84a25f2dc..377bb9870 100644 --- a/level_0/f_socket/c/socket/address.c +++ b/level_0/f_socket/c/socket/address.c @@ -8,18 +8,16 @@ extern "C" { #ifndef _di_f_socket_addressss_delete_callback_ f_status_t f_socket_addressss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_socket_addresss_t * const array = (f_socket_addresss_t *) void_array; - f_status_t status = F_okay; + f_socket_addresss_t * const array = (f_socket_addresss_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_socket_address_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(f_socket_address_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -28,18 +26,16 @@ extern "C" { #ifndef _di_f_socket_addressss_destroy_callback_ f_status_t f_socket_addressss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_socket_addresss_t * const array = (f_socket_addresss_t *) void_array; - f_status_t status = F_okay; + f_socket_addresss_t * const array = (f_socket_addresss_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(f_socket_address_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(f_socket_address_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_socket/c/socket/socket.c b/level_0/f_socket/c/socket/socket.c index 25fc8c155..ca416e2e9 100644 --- a/level_0/f_socket/c/socket/socket.c +++ b/level_0/f_socket/c/socket/socket.c @@ -8,18 +8,16 @@ extern "C" { #ifndef _di_f_socketss_delete_callback_ f_status_t f_socketss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_sockets_t * const array = (f_sockets_t *) void_array; - f_status_t status = F_okay; + f_sockets_t * const array = (f_sockets_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_socket_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(f_socket_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -28,18 +26,16 @@ extern "C" { #ifndef _di_f_socketss_destroy_callback_ f_status_t f_socketss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_sockets_t * const array = (f_sockets_t *) void_array; - f_status_t status = F_okay; + f_sockets_t * const array = (f_sockets_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(f_socket_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(f_socket_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_string/c/string/dynamics.c b/level_0/f_string/c/string/dynamics.c index 326e24dcb..849ae2017 100644 --- a/level_0/f_string/c/string/dynamics.c +++ b/level_0/f_string/c/string/dynamics.c @@ -13,16 +13,14 @@ extern "C" { if (!source.used) return F_data_not; - { - f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_string_dynamic_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_string_dynamic_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - destination->array[destination->used].used = 0; + destination->array[destination->used].used = 0; - if (source.used) { - status = private_f_string_append(source.string, source.used, &destination->array[destination->used]); - if (F_status_is_error(status)) return status; - } + if (source.used) { + status = private_f_string_append(source.string, source.used, &destination->array[destination->used]); + if (F_status_is_error(status)) return status; } ++destination->used; @@ -39,20 +37,18 @@ extern "C" { if (!source.used) return F_data_not; - { - f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_string_dynamic_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_string_dynamic_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { - destination->array[destination->used].used = 0; + destination->array[destination->used].used = 0; - if (source.array[i].used) { - status = private_f_string_append(source.array[i].string, source.array[i].used, &destination->array[destination->used]); - if (F_status_is_error(status)) return status; - } - } // for - } + if (source.array[i].used) { + status = private_f_string_append(source.array[i].string, source.array[i].used, &destination->array[destination->used]); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -61,18 +57,16 @@ extern "C" { #ifndef _di_f_string_dynamics_delete_callback_ f_status_t f_string_dynamics_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_string_dynamic_t * const array = (f_string_dynamic_t *) void_array; - f_status_t status = F_okay; + f_string_dynamic_t * const array = (f_string_dynamic_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].string, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].string, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -81,18 +75,16 @@ extern "C" { #ifndef _di_f_string_dynamics_destroy_callback_ f_status_t f_string_dynamics_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_string_dynamic_t * const array = (f_string_dynamic_t *) void_array; - f_status_t status = F_okay; + f_string_dynamic_t * const array = (f_string_dynamic_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].string, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].string, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_string/c/string/dynamicss.c b/level_0/f_string/c/string/dynamicss.c index 7c9aec3e7..4e81f36ff 100644 --- a/level_0/f_string/c/string/dynamicss.c +++ b/level_0/f_string/c/string/dynamicss.c @@ -13,27 +13,25 @@ extern "C" { if (!source.used) return F_data_not; - { - f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_string_dynamics_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_string_dynamics_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - f_string_dynamics_t * const destination_inner = &destination->array[destination->used]; - destination_inner->used = 0; + f_string_dynamics_t * const destination_inner = &destination->array[destination->used]; + destination_inner->used = 0; - if (source.used) { - status = f_memory_array_increase_by(source.used, sizeof(f_string_dynamic_t), (void **) &destination_inner->array, &destination_inner->used, &destination_inner->size); - if (F_status_is_error(status)) return status; + if (source.used) { + status = f_memory_array_increase_by(source.used, sizeof(f_string_dynamic_t), (void **) &destination_inner->array, &destination_inner->used, &destination_inner->size); + if (F_status_is_error(status)) return status; - for (f_number_unsigned_t j = 0; j < source.used; ++j, ++destination_inner->used) { + for (f_number_unsigned_t j = 0; j < source.used; ++j, ++destination_inner->used) { - destination_inner->array[destination_inner->used].used = 0; + destination_inner->array[destination_inner->used].used = 0; - if (source.array[j].used) { - status = private_f_string_append(source.array[j].string, source.array[j].used, &destination_inner->array[destination_inner->used]); - if (F_status_is_error(status)) return status; - } - } // for - } + if (source.array[j].used) { + status = private_f_string_append(source.array[j].string, source.array[j].used, &destination_inner->array[destination_inner->used]); + if (F_status_is_error(status)) return status; + } + } // for } ++destination->used; @@ -50,30 +48,28 @@ extern "C" { if (!source.used) return F_data_not; - { - f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_string_dynamics_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_string_dynamics_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { - destination->array[destination->used].used = 0; + destination->array[destination->used].used = 0; - if (source.array[i].used) { - status = f_memory_array_increase_by(source.array[i].used, sizeof(f_string_dynamic_t), (void **) &destination->array[destination->used].array, &destination->array[destination->used].used, &destination->array[destination->used].size); - if (F_status_is_error(status)) return status; + if (source.array[i].used) { + status = f_memory_array_increase_by(source.array[i].used, sizeof(f_string_dynamic_t), (void **) &destination->array[destination->used].array, &destination->array[destination->used].used, &destination->array[destination->used].size); + if (F_status_is_error(status)) return status; - for (f_number_unsigned_t j = 0; j < source.array[i].used; ++j, ++destination->array[destination->used].used) { + for (f_number_unsigned_t j = 0; j < source.array[i].used; ++j, ++destination->array[destination->used].used) { - destination->array[destination->used].array[destination->array[destination->used].used].used = 0; + destination->array[destination->used].array[destination->array[destination->used].used].used = 0; - if (source.array[i].array[j].used) { - status = private_f_string_append(source.array[i].array[j].string, source.array[i].array[j].used, &destination->array[destination->used].array[destination->array[destination->used].used]); - if (F_status_is_error(status)) return status; - } - } // for - } - } // for - } + if (source.array[i].array[j].used) { + status = private_f_string_append(source.array[i].array[j].string, source.array[i].array[j].used, &destination->array[destination->used].array[destination->array[destination->used].used]); + if (F_status_is_error(status)) return status; + } + } // for + } + } // for return F_okay; } @@ -82,27 +78,25 @@ extern "C" { #ifndef _di_f_string_dynamicss_delete_callback_ f_status_t f_string_dynamicss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_string_dynamics_t * const array = (f_string_dynamics_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; - - for (f_number_unsigned_t i = start; i < stop; ++i) { + f_string_dynamics_t * const array = (f_string_dynamics_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - if (array[i].size && array[i].array) { - for (j = 0; j < array[i].size; ++j) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].array[j].size && array[i].array[j].string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].string, &array[i].array[j].used, &array[i].array[j].size); - if (F_status_is_error(status)) return status; - } + if (array[i].size && array[i].array) { + for (j = 0; j < array[i].size; ++j) { - status = f_memory_array_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (array[i].array[j].size && array[i].array[j].string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].string, &array[i].array[j].used, &array[i].array[j].size); if (F_status_is_error(status)) return status; - } // for - } - } // for - } + } + + status = f_memory_array_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } // for + } + } // for return F_okay; } @@ -111,27 +105,25 @@ extern "C" { #ifndef _di_f_string_dynamicss_destroy_callback_ f_status_t f_string_dynamicss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_string_dynamics_t * const array = (f_string_dynamics_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; + f_string_dynamics_t * const array = (f_string_dynamics_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - for (j = 0; j < array[i].size; ++j) { + if (array[i].size && array[i].array) { + for (j = 0; j < array[i].size; ++j) { - if (array[i].array[j].size && array[i].array[j].string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].string, &array[i].array[j].used, &array[i].array[j].size); - if (F_status_is_error(status)) return status; - } - - status = f_memory_array_adjust(0, sizeof(f_string_dynamic_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (array[i].array[j].size && array[i].array[j].string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].string, &array[i].array[j].used, &array[i].array[j].size); if (F_status_is_error(status)) return status; - } // for - } - } // for - } + } + + status = f_memory_array_adjust(0, sizeof(f_string_dynamic_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } // for + } + } // for return F_okay; } diff --git a/level_0/f_string/c/string/map_multis.c b/level_0/f_string/c/string/map_multis.c index 7f73516c2..43ce3f3fb 100644 --- a/level_0/f_string/c/string/map_multis.c +++ b/level_0/f_string/c/string/map_multis.c @@ -11,34 +11,32 @@ extern "C" { if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ - { - f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_string_map_multi_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_string_map_multi_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - f_string_map_multi_t * const destination_inner = &destination->array[destination->used]; + f_string_map_multi_t * const destination_inner = &destination->array[destination->used]; - destination_inner->key.used = 0; - destination_inner->value.used = 0; + destination_inner->key.used = 0; + destination_inner->value.used = 0; - if (source.key.used) { - status = private_f_string_append(source.key.string, source.key.used, &destination_inner->key); - if (F_status_is_error(status)) return status; - } + if (source.key.used) { + status = private_f_string_append(source.key.string, source.key.used, &destination_inner->key); + if (F_status_is_error(status)) return status; + } - if (source.value.used) { - status = f_memory_array_increase_by(source.value.used, sizeof(f_string_dynamic_t), (void **) &destination_inner->value.array, &destination_inner->value.used, &destination_inner->value.size); - if (F_status_is_error(status)) return status; + if (source.value.used) { + status = f_memory_array_increase_by(source.value.used, sizeof(f_string_dynamic_t), (void **) &destination_inner->value.array, &destination_inner->value.used, &destination_inner->value.size); + if (F_status_is_error(status)) return status; - for (f_number_unsigned_t j = 0; j < source.value.used; ++j, ++destination_inner->value.used) { + for (f_number_unsigned_t j = 0; j < source.value.used; ++j, ++destination_inner->value.used) { - destination_inner->value.array[destination_inner->value.used].used = 0; + destination_inner->value.array[destination_inner->value.used].used = 0; - if (source.value.array[j].used) { - status = private_f_string_append(source.value.array[j].string, source.value.array[j].used, &destination_inner->value.array[destination_inner->value.used]); - if (F_status_is_error(status)) return status; - } - } // for - } + if (source.value.array[j].used) { + status = private_f_string_append(source.value.array[j].string, source.value.array[j].used, &destination_inner->value.array[destination_inner->value.used]); + if (F_status_is_error(status)) return status; + } + } // for } ++destination->used; @@ -55,40 +53,38 @@ extern "C" { if (!source.used) return F_data_not; - { - f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_string_map_multi_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_string_map_multi_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - f_string_map_multi_t * destination_inner = 0; - f_number_unsigned_t j = 0; + f_string_map_multi_t * destination_inner = 0; + f_number_unsigned_t j = 0; - for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { - destination_inner = &destination->array[destination->used]; - destination_inner->key.used = 0; - destination_inner->value.used = 0; + destination_inner = &destination->array[destination->used]; + destination_inner->key.used = 0; + destination_inner->value.used = 0; - if (source.array[i].key.used) { - status = private_f_string_append(source.array[i].key.string, source.array[i].key.used, &destination_inner->key); - if (F_status_is_error(status)) return status; - } + if (source.array[i].key.used) { + status = private_f_string_append(source.array[i].key.string, source.array[i].key.used, &destination_inner->key); + if (F_status_is_error(status)) return status; + } - if (source.array[i].value.used) { - status = f_memory_array_increase_by(source.array[i].value.used, sizeof(f_string_dynamic_t), (void **) &destination_inner->value.array, &destination_inner->value.used, &destination_inner->value.size); - if (F_status_is_error(status)) return status; + if (source.array[i].value.used) { + status = f_memory_array_increase_by(source.array[i].value.used, sizeof(f_string_dynamic_t), (void **) &destination_inner->value.array, &destination_inner->value.used, &destination_inner->value.size); + if (F_status_is_error(status)) return status; - for (j = 0; j < source.array[i].value.used; ++j, ++destination_inner->value.used) { + for (j = 0; j < source.array[i].value.used; ++j, ++destination_inner->value.used) { - destination_inner->value.array[destination_inner->value.used].used = 0; + destination_inner->value.array[destination_inner->value.used].used = 0; - if (source.array[i].value.array[j].used) { - status = private_f_string_append(source.array[i].value.array[j].string, source.array[i].value.array[j].used, &destination_inner->value.array[destination_inner->value.used]); - if (F_status_is_error(status)) return status; - } - } // for - } - } // for - } + if (source.array[i].value.array[j].used) { + status = private_f_string_append(source.array[i].value.array[j].string, source.array[i].value.array[j].used, &destination_inner->value.array[destination_inner->value.used]); + if (F_status_is_error(status)) return status; + } + } // for + } + } // for return F_okay; } @@ -97,32 +93,30 @@ extern "C" { #ifndef _di_f_string_map_multis_delete_callback_ f_status_t f_string_map_multis_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_string_map_multi_t * const array = (f_string_map_multi_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; + f_string_map_multi_t * const array = (f_string_map_multi_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].key.size && array[i].key.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].key.string, &array[i].key.used, &array[i].key.size); - if (F_status_is_error(status)) return status; - } + if (array[i].key.size && array[i].key.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].key.string, &array[i].key.used, &array[i].key.size); + if (F_status_is_error(status)) return status; + } - if (array[i].value.size && array[i].value.array) { - for (j = 0; j < array[i].value.size; ++j) { + if (array[i].value.size && array[i].value.array) { + for (j = 0; j < array[i].value.size; ++j) { - if (array[i].value.array[j].size && array[i].value.array[j].string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].value.array[j].string, &array[i].value.array[j].used, &array[i].value.array[j].size); - if (F_status_is_error(status)) return status; - } - } // for + if (array[i].value.array[j].size && array[i].value.array[j].string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].value.array[j].string, &array[i].value.array[j].used, &array[i].value.array[j].size); + if (F_status_is_error(status)) return status; + } + } // for - status = f_memory_array_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].value.array, &array[i].value.used, &array[i].value.size); - if (F_status_is_error(status)) return status; - } - } // for - } + status = f_memory_array_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].value.array, &array[i].value.used, &array[i].value.size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -131,32 +125,30 @@ extern "C" { #ifndef _di_f_string_map_multis_destroy_callback_ f_status_t f_string_map_multis_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_string_map_multi_t * const array = (f_string_map_multi_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; + f_string_map_multi_t * const array = (f_string_map_multi_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].key.size && array[i].key.string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].key.string, &array[i].key.used, &array[i].key.size); - if (F_status_is_error(status)) return status; - } + if (array[i].key.size && array[i].key.string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].key.string, &array[i].key.used, &array[i].key.size); + if (F_status_is_error(status)) return status; + } - if (array[i].value.size && array[i].value.array) { - for (j = 0; j < array[i].value.size; ++j) { + if (array[i].value.size && array[i].value.array) { + for (j = 0; j < array[i].value.size; ++j) { - if (array[i].value.array[j].size && array[i].value.array[j].string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].value.array[j].string, &array[i].value.array[j].used, &array[i].value.array[j].size); - if (F_status_is_error(status)) return status; - } - } // for + if (array[i].value.array[j].size && array[i].value.array[j].string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].value.array[j].string, &array[i].value.array[j].used, &array[i].value.array[j].size); + if (F_status_is_error(status)) return status; + } + } // for - status = f_memory_array_adjust(0, sizeof(f_string_dynamic_t), (void **) &array[i].value.array, &array[i].value.used, &array[i].value.size); - if (F_status_is_error(status)) return status; - } - } // for - } + status = f_memory_array_adjust(0, sizeof(f_string_dynamic_t), (void **) &array[i].value.array, &array[i].value.used, &array[i].value.size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_string/c/string/map_multiss.c b/level_0/f_string/c/string/map_multiss.c index 5f5ffb906..8f4d0a228 100644 --- a/level_0/f_string/c/string/map_multiss.c +++ b/level_0/f_string/c/string/map_multiss.c @@ -13,49 +13,47 @@ extern "C" { if (!source.used) return F_data_not; - { - f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_string_map_multis_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_string_map_multis_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - f_string_map_multis_t * const destination_inner = &destination->array[destination->used]; + f_string_map_multis_t * const destination_inner = &destination->array[destination->used]; - destination_inner->used = 0; + destination_inner->used = 0; - if (source.used) { - status = f_memory_array_increase_by(source.used, sizeof(f_string_map_multi_t), (void **) &destination_inner->array, &destination_inner->used, &destination_inner->size); - if (F_status_is_error(status)) return status; + if (source.used) { + status = f_memory_array_increase_by(source.used, sizeof(f_string_map_multi_t), (void **) &destination_inner->array, &destination_inner->used, &destination_inner->size); + if (F_status_is_error(status)) return status; - f_string_map_multi_t * destination_inner_deep = 0; - f_number_unsigned_t j = 0; + f_string_map_multi_t * destination_inner_deep = 0; + f_number_unsigned_t j = 0; - for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination_inner->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination_inner->used) { - destination_inner->array[destination_inner->used].key.used = 0; - destination_inner->array[destination_inner->used].value.used = 0; + destination_inner->array[destination_inner->used].key.used = 0; + destination_inner->array[destination_inner->used].value.used = 0; - if (source.array[i].key.used) { - status = private_f_string_append(source.array[i].key.string, source.array[i].key.used, &destination_inner->array[destination_inner->used].key); - if (F_status_is_error(status)) return status; - } + if (source.array[i].key.used) { + status = private_f_string_append(source.array[i].key.string, source.array[i].key.used, &destination_inner->array[destination_inner->used].key); + if (F_status_is_error(status)) return status; + } - if (source.array[i].value.used) { - destination_inner_deep = &destination_inner->array[destination_inner->used]; + if (source.array[i].value.used) { + destination_inner_deep = &destination_inner->array[destination_inner->used]; - status = f_memory_array_increase_by(source.array[i].value.used, sizeof(f_string_dynamic_t), (void **) &destination_inner_deep->value.array, &destination_inner_deep->value.used, &destination_inner_deep->value.size); - if (F_status_is_error(status)) return status; + status = f_memory_array_increase_by(source.array[i].value.used, sizeof(f_string_dynamic_t), (void **) &destination_inner_deep->value.array, &destination_inner_deep->value.used, &destination_inner_deep->value.size); + if (F_status_is_error(status)) return status; - for (j = 0; j < source.array[i].value.used; ++j, ++destination_inner_deep->value.used) { + for (j = 0; j < source.array[i].value.used; ++j, ++destination_inner_deep->value.used) { - destination_inner_deep->value.array[destination_inner_deep->value.used].used = 0; + destination_inner_deep->value.array[destination_inner_deep->value.used].used = 0; - if (source.array[i].value.array[j].used) { - status = private_f_string_append(source.array[i].value.array[j].string, source.array[i].value.array[j].used, &destination_inner_deep->value.array[destination_inner_deep->value.used]); - if (F_status_is_error(status)) return status; - } - } // for - } - } // for - } + if (source.array[i].value.array[j].used) { + status = private_f_string_append(source.array[i].value.array[j].string, source.array[i].value.array[j].used, &destination_inner_deep->value.array[destination_inner_deep->value.used]); + if (F_status_is_error(status)) return status; + } + } // for + } + } // for } ++destination->used; @@ -72,54 +70,52 @@ extern "C" { if (!source.used) return F_data_not; - { - f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_string_map_multis_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_string_map_multis_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - f_number_unsigned_t j = 0; - f_number_unsigned_t k = 0; - f_string_map_multis_t * destination_inner = 0; - f_string_map_multi_t * destination_inner_deep = 0; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; + f_string_map_multis_t * destination_inner = 0; + f_string_map_multi_t * destination_inner_deep = 0; - for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { - destination_inner = &destination->array[destination->used]; - destination_inner->used = 0; + destination_inner = &destination->array[destination->used]; + destination_inner->used = 0; - if (source.array[i].used) { - status = f_memory_array_increase_by(source.array[i].used, sizeof(f_string_map_multi_t), (void **) &destination_inner->array, &destination_inner->used, &destination_inner->size); - if (F_status_is_error(status)) return status; + if (source.array[i].used) { + status = f_memory_array_increase_by(source.array[i].used, sizeof(f_string_map_multi_t), (void **) &destination_inner->array, &destination_inner->used, &destination_inner->size); + if (F_status_is_error(status)) return status; - for (j = 0; j < source.array[i].used; ++j, ++destination_inner->used) { + for (j = 0; j < source.array[i].used; ++j, ++destination_inner->used) { - destination_inner_deep = &destination_inner->array[destination_inner->used]; + destination_inner_deep = &destination_inner->array[destination_inner->used]; - destination_inner_deep->key.used = 0; - destination_inner_deep->value.used = 0; + destination_inner_deep->key.used = 0; + destination_inner_deep->value.used = 0; - if (source.array[i].array[j].key.used) { - status = private_f_string_append(source.array[i].array[j].key.string, source.array[i].array[j].key.used, &destination_inner_deep->key); - if (F_status_is_error(status)) return status; - } + if (source.array[i].array[j].key.used) { + status = private_f_string_append(source.array[i].array[j].key.string, source.array[i].array[j].key.used, &destination_inner_deep->key); + if (F_status_is_error(status)) return status; + } - if (source.array[i].array[j].value.used) { - status = f_memory_array_increase_by(source.array[i].array[j].value.used, sizeof(f_string_dynamic_t), (void **) &destination_inner_deep->value.array, &destination_inner_deep->value.used, &destination_inner_deep->value.size); - if (F_status_is_error(status)) return status; + if (source.array[i].array[j].value.used) { + status = f_memory_array_increase_by(source.array[i].array[j].value.used, sizeof(f_string_dynamic_t), (void **) &destination_inner_deep->value.array, &destination_inner_deep->value.used, &destination_inner_deep->value.size); + if (F_status_is_error(status)) return status; - for (k = 0; k < source.array[i].array[j].value.used; ++k, ++destination_inner_deep->value.used) { + for (k = 0; k < source.array[i].array[j].value.used; ++k, ++destination_inner_deep->value.used) { - destination_inner_deep->value.array[destination_inner_deep->value.used].used = 0; + destination_inner_deep->value.array[destination_inner_deep->value.used].used = 0; - if (source.array[i].array[j].value.array[k].used) { - status = private_f_string_append(source.array[i].array[j].value.array[k].string, source.array[i].array[j].value.array[k].used, &destination_inner_deep->value.array[destination_inner_deep->value.used]); - if (F_status_is_error(status)) return status; - } - } // for - } - } // for - } - } // for - } + if (source.array[i].array[j].value.array[k].used) { + status = private_f_string_append(source.array[i].array[j].value.array[k].string, source.array[i].array[j].value.array[k].used, &destination_inner_deep->value.array[destination_inner_deep->value.used]); + if (F_status_is_error(status)) return status; + } + } // for + } + } // for + } + } // for return F_okay; } @@ -128,38 +124,36 @@ extern "C" { #ifndef _di_f_string_map_multiss_delete_callback_ f_status_t f_string_map_multiss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_string_map_multis_t * const array = (f_string_map_multis_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; - f_number_unsigned_t k = 0; + f_string_map_multis_t * const array = (f_string_map_multis_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - if (array[i].array[j].key.size) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].key.string, &array[i].array[j].key.used, &array[i].array[j].key.size); - if (F_status_is_error(status)) return status; - } - - if (array[i].array[j].value.size && array[i].array[j].value.array) { - for (k = 0; k < array[i].array[j].value.size; ++k) { + if (array[i].size && array[i].array) { + if (array[i].array[j].key.size) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].key.string, &array[i].array[j].key.used, &array[i].array[j].key.size); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].value.array[k].size && array[i].array[j].value.array[k].string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].value.array[k].string, &array[i].array[j].value.array[k].used, &array[i].array[j].value.array[k].size); - if (F_status_is_error(status)) return status; - } - } // for + if (array[i].array[j].value.size && array[i].array[j].value.array) { + for (k = 0; k < array[i].array[j].value.size; ++k) { - status = f_memory_array_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].array[j].value.array, &array[i].array[j].value.used, &array[i].array[j].value.size); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].value.array[k].size && array[i].array[j].value.array[k].string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].value.array[k].string, &array[i].array[j].value.array[k].used, &array[i].array[j].value.array[k].size); + if (F_status_is_error(status)) return status; + } + } // for - status = f_memory_array_resize(0, sizeof(f_string_map_multi_t), (void **) &array[i].array, &array[i].used, &array[i].size); + status = f_memory_array_resize(0, sizeof(f_string_dynamic_t), (void **) &array[i].array[j].value.array, &array[i].array[j].value.used, &array[i].array[j].value.size); if (F_status_is_error(status)) return status; } - } // for - } + + status = f_memory_array_resize(0, sizeof(f_string_map_multi_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -168,38 +162,36 @@ extern "C" { #ifndef _di_f_string_map_multiss_destroy_callback_ f_status_t f_string_map_multiss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_string_map_multis_t * const array = (f_string_map_multis_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; - f_number_unsigned_t k = 0; - - for (f_number_unsigned_t i = start; i < stop; ++i) { + f_string_map_multis_t * const array = (f_string_map_multis_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; - if (array[i].size && array[i].array) { - if (array[i].array[j].key.size && array[i].array[j].key.string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].key.string, &array[i].array[j].key.used, &array[i].array[j].key.size); - if (F_status_is_error(status)) return status; - } + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].array[j].value.size && array[i].array[j].value.array) { - for (k = 0; k < array[i].array[j].value.size; ++k) { + if (array[i].size && array[i].array) { + if (array[i].array[j].key.size && array[i].array[j].key.string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].key.string, &array[i].array[j].key.used, &array[i].array[j].key.size); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].value.array[k].size && array[i].array[j].value.array[k].string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].value.array[k].string, &array[i].array[j].value.array[k].used, &array[i].array[j].value.array[k].size); - if (F_status_is_error(status)) return status; - } - } // for + if (array[i].array[j].value.size && array[i].array[j].value.array) { + for (k = 0; k < array[i].array[j].value.size; ++k) { - status = f_memory_array_adjust(0, sizeof(f_string_dynamic_t), (void **) &array[i].array[j].value.array, &array[i].array[j].value.used, &array[i].array[j].value.size); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].value.array[k].size && array[i].array[j].value.array[k].string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].value.array[k].string, &array[i].array[j].value.array[k].used, &array[i].array[j].value.array[k].size); + if (F_status_is_error(status)) return status; + } + } // for - status = f_memory_array_adjust(0, sizeof(f_string_map_multi_t), (void **) &array[i].array, &array[i].used, &array[i].size); + status = f_memory_array_adjust(0, sizeof(f_string_dynamic_t), (void **) &array[i].array[j].value.array, &array[i].array[j].value.used, &array[i].array[j].value.size); if (F_status_is_error(status)) return status; } - } // for - } + + status = f_memory_array_adjust(0, sizeof(f_string_map_multi_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_string/c/string/maps.c b/level_0/f_string/c/string/maps.c index 214bf51f7..8a4c1ab14 100644 --- a/level_0/f_string/c/string/maps.c +++ b/level_0/f_string/c/string/maps.c @@ -11,22 +11,20 @@ extern "C" { if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ - { - f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_string_map_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_string_map_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - destination->array[destination->used].key.used = 0; - destination->array[destination->used].value.used = 0; + destination->array[destination->used].key.used = 0; + destination->array[destination->used].value.used = 0; - if (source.key.used) { - status = private_f_string_append(source.key.string, source.key.used, &destination->array[destination->used].key); - if (F_status_is_error(status)) return status; - } + if (source.key.used) { + status = private_f_string_append(source.key.string, source.key.used, &destination->array[destination->used].key); + if (F_status_is_error(status)) return status; + } - if (source.value.used) { - status = private_f_string_append(source.value.string, source.value.used, &destination->array[destination->used].value); - if (F_status_is_error(status)) return status; - } + if (source.value.used) { + status = private_f_string_append(source.value.string, source.value.used, &destination->array[destination->used].value); + if (F_status_is_error(status)) return status; } ++destination->used; @@ -43,26 +41,24 @@ extern "C" { if (!source.used) return F_data_not; - { - f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_string_map_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_string_map_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { - destination->array[destination->used].key.used = 0; - destination->array[destination->used].value.used = 0; + destination->array[destination->used].key.used = 0; + destination->array[destination->used].value.used = 0; - if (source.array[i].key.used) { - status = private_f_string_append(source.array[i].key.string, source.array[i].key.used, &destination->array[destination->used].key); - if (F_status_is_error(status)) return status; - } + if (source.array[i].key.used) { + status = private_f_string_append(source.array[i].key.string, source.array[i].key.used, &destination->array[destination->used].key); + if (F_status_is_error(status)) return status; + } - if (source.array[i].value.used) { - status = private_f_string_append(source.array[i].value.string, source.array[i].value.used, &destination->array[destination->used].value); - if (F_status_is_error(status)) return status; - } - } // for - } + if (source.array[i].value.used) { + status = private_f_string_append(source.array[i].value.string, source.array[i].value.used, &destination->array[destination->used].value); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -71,23 +67,21 @@ extern "C" { #ifndef _di_f_string_maps_delete_callback_ f_status_t f_string_maps_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_string_map_t * const array = (f_string_map_t *) void_array; - f_status_t status = F_okay; + f_string_map_t * const array = (f_string_map_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].key.size && array[i].key.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].key.string, &array[i].key.used, &array[i].key.size); - if (F_status_is_error(status)) return status; - } + if (array[i].key.size && array[i].key.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].key.string, &array[i].key.used, &array[i].key.size); + if (F_status_is_error(status)) return status; + } - if (array[i].value.size && array[i].value.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].value.string, &array[i].value.used, &array[i].value.size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].value.size && array[i].value.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].value.string, &array[i].value.used, &array[i].value.size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -96,23 +90,21 @@ extern "C" { #ifndef _di_f_string_maps_destroy_callback_ f_status_t f_string_maps_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_string_map_t * const array = (f_string_map_t *) void_array; - f_status_t status = F_okay; + f_string_map_t * const array = (f_string_map_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].key.size && array[i].key.string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].key.string, &array[i].key.used, &array[i].key.size); - if (F_status_is_error(status)) return status; - } + if (array[i].key.size && array[i].key.string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].key.string, &array[i].key.used, &array[i].key.size); + if (F_status_is_error(status)) return status; + } - if (array[i].value.size && array[i].value.string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].value.string, &array[i].value.used, &array[i].value.size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].value.size && array[i].value.string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].value.string, &array[i].value.used, &array[i].value.size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_string/c/string/mapss.c b/level_0/f_string/c/string/mapss.c index d43edb11b..c1d7c0a32 100644 --- a/level_0/f_string/c/string/mapss.c +++ b/level_0/f_string/c/string/mapss.c @@ -13,34 +13,32 @@ extern "C" { if (!source.used) return F_data_not; - { - f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_string_maps_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_string_maps_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - f_string_maps_t * const destination_inner = &destination->array[destination->used]; + f_string_maps_t * const destination_inner = &destination->array[destination->used]; - destination_inner->used = 0; + destination_inner->used = 0; - if (source.used) { - status = f_memory_array_increase_by(source.used, sizeof(f_string_map_t), (void **) &destination_inner->array, &destination_inner->used, &destination_inner->size); - if (F_status_is_error(status)) return status; + if (source.used) { + status = f_memory_array_increase_by(source.used, sizeof(f_string_map_t), (void **) &destination_inner->array, &destination_inner->used, &destination_inner->size); + if (F_status_is_error(status)) return status; - for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination_inner->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination_inner->used) { - destination_inner->array[destination_inner->used].key.used = 0; - destination_inner->array[destination_inner->used].value.used = 0; + destination_inner->array[destination_inner->used].key.used = 0; + destination_inner->array[destination_inner->used].value.used = 0; - if (source.array[i].key.used) { - status = private_f_string_append(source.array[i].key.string, source.array[i].key.used, &destination_inner->array[destination_inner->used].key); - if (F_status_is_error(status)) return status; - } + if (source.array[i].key.used) { + status = private_f_string_append(source.array[i].key.string, source.array[i].key.used, &destination_inner->array[destination_inner->used].key); + if (F_status_is_error(status)) return status; + } - if (source.array[i].value.used) { - status = private_f_string_append(source.array[i].value.string, source.array[i].value.used, &destination_inner->array[destination_inner->used].value); - if (F_status_is_error(status)) return status; - } - } // for - } + if (source.array[i].value.used) { + status = private_f_string_append(source.array[i].value.string, source.array[i].value.used, &destination_inner->array[destination_inner->used].value); + if (F_status_is_error(status)) return status; + } + } // for } ++destination->used; @@ -57,40 +55,38 @@ extern "C" { if (!source.used) return F_data_not; - { - f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_string_maps_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_string_maps_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - f_number_unsigned_t j = 0; - f_string_maps_t * destination_inner = 0; + f_number_unsigned_t j = 0; + f_string_maps_t * destination_inner = 0; - for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { - destination_inner = &destination->array[destination->used]; - destination_inner->used = 0; + destination_inner = &destination->array[destination->used]; + destination_inner->used = 0; - if (source.array[i].used) { - status = f_memory_array_increase_by(source.array[i].used, sizeof(f_string_map_t), (void **) &destination_inner->array, &destination_inner->used, &destination_inner->size); - if (F_status_is_error(status)) return status; + if (source.array[i].used) { + status = f_memory_array_increase_by(source.array[i].used, sizeof(f_string_map_t), (void **) &destination_inner->array, &destination_inner->used, &destination_inner->size); + if (F_status_is_error(status)) return status; - for (j = 0; j < source.array[i].used; ++j, ++destination_inner->used) { + for (j = 0; j < source.array[i].used; ++j, ++destination_inner->used) { - destination_inner->array[destination_inner->used].key.used = 0; - destination_inner->array[destination_inner->used].value.used = 0; + destination_inner->array[destination_inner->used].key.used = 0; + destination_inner->array[destination_inner->used].value.used = 0; - if (source.array[i].array[j].key.used) { - status = private_f_string_append(source.array[i].array[j].key.string, source.array[i].array[j].key.used, &destination_inner->array[destination_inner->used].key); - if (F_status_is_error(status)) return status; - } + if (source.array[i].array[j].key.used) { + status = private_f_string_append(source.array[i].array[j].key.string, source.array[i].array[j].key.used, &destination_inner->array[destination_inner->used].key); + if (F_status_is_error(status)) return status; + } - if (source.array[i].array[j].value.used) { - status = private_f_string_append(source.array[i].array[j].value.string, source.array[i].array[j].value.used, &destination_inner->array[destination_inner->used].value); - if (F_status_is_error(status)) return status; - } - } // for - } - } // for - } + if (source.array[i].array[j].value.used) { + status = private_f_string_append(source.array[i].array[j].value.string, source.array[i].array[j].value.used, &destination_inner->array[destination_inner->used].value); + if (F_status_is_error(status)) return status; + } + } // for + } + } // for return F_okay; } @@ -99,32 +95,30 @@ extern "C" { #ifndef _di_f_string_mapss_delete_callback_ f_status_t f_string_mapss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_string_maps_t * const array = (f_string_maps_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; + f_string_maps_t * const array = (f_string_maps_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - for (j = 0; j < array[i].size; ++j) { + if (array[i].size && array[i].array) { + for (j = 0; j < array[i].size; ++j) { - if (array[i].array[j].key.size && array[i].array[j].key.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].key.string, &array[i].array[j].key.used, &array[i].array[j].key.size); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].key.size && array[i].array[j].key.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].key.string, &array[i].array[j].key.used, &array[i].array[j].key.size); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].value.size && array[i].array[j].value.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].value.string, &array[i].array[j].value.used, &array[i].array[j].value.size); - if (F_status_is_error(status)) return status; - } - } // for + if (array[i].array[j].value.size && array[i].array[j].value.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].value.string, &array[i].array[j].value.used, &array[i].array[j].value.size); + if (F_status_is_error(status)) return status; + } + } // for - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -133,32 +127,30 @@ extern "C" { #ifndef _di_f_string_mapss_destroy_callback_ f_status_t f_string_mapss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_string_maps_t * const array = (f_string_maps_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; + f_string_maps_t * const array = (f_string_maps_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - for (j = 0; j < array[i].size; ++j) { + if (array[i].size && array[i].array) { + for (j = 0; j < array[i].size; ++j) { - if (array[i].array[j].key.size && array[i].array[j].key.string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].key.string, &array[i].array[j].key.used, &array[i].array[j].key.size); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].key.size && array[i].array[j].key.string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].key.string, &array[i].array[j].key.used, &array[i].array[j].key.size); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].value.size && array[i].array[j].value.string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].value.string, &array[i].array[j].value.used, &array[i].array[j].value.size); - if (F_status_is_error(status)) return status; - } - } // for + if (array[i].array[j].value.size && array[i].array[j].value.string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].value.string, &array[i].array[j].value.used, &array[i].array[j].value.size); + if (F_status_is_error(status)) return status; + } + } // for - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_string/c/string/triples.c b/level_0/f_string/c/string/triples.c index b741012ad..22228bb3a 100644 --- a/level_0/f_string/c/string/triples.c +++ b/level_0/f_string/c/string/triples.c @@ -11,28 +11,26 @@ extern "C" { if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ - { - f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_string_triple_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_string_triple_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - destination->array[destination->used].a.used = 0; - destination->array[destination->used].b.used = 0; - destination->array[destination->used].c.used = 0; + destination->array[destination->used].a.used = 0; + destination->array[destination->used].b.used = 0; + destination->array[destination->used].c.used = 0; - if (source.a.used && source.a.string) { - status = private_f_string_append(source.a.string, source.a.used, &destination->array[destination->used].a); - if (F_status_is_error(status)) return status; - } + if (source.a.used && source.a.string) { + status = private_f_string_append(source.a.string, source.a.used, &destination->array[destination->used].a); + if (F_status_is_error(status)) return status; + } - if (source.b.used && source.b.string) { - status = private_f_string_append(source.b.string, source.b.used, &destination->array[destination->used].b); - if (F_status_is_error(status)) return status; - } + if (source.b.used && source.b.string) { + status = private_f_string_append(source.b.string, source.b.used, &destination->array[destination->used].b); + if (F_status_is_error(status)) return status; + } - if (source.c.used && source.c.string) { - status = private_f_string_append(source.c.string, source.c.used, &destination->array[destination->used].c); - if (F_status_is_error(status)) return status; - } + if (source.c.used && source.c.string) { + status = private_f_string_append(source.c.string, source.c.used, &destination->array[destination->used].c); + if (F_status_is_error(status)) return status; } ++destination->used; @@ -49,32 +47,30 @@ extern "C" { if (!source.used) return F_data_not; - { - f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_string_triple_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_string_triple_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { - destination->array[destination->used].a.used = 0; - destination->array[destination->used].b.used = 0; - destination->array[destination->used].c.used = 0; + destination->array[destination->used].a.used = 0; + destination->array[destination->used].b.used = 0; + destination->array[destination->used].c.used = 0; - if (source.array[i].a.used && source.array[i].a.string) { - status = private_f_string_append(source.array[i].a.string, source.array[i].a.used, &destination->array[destination->used].a); - if (F_status_is_error(status)) return status; - } + if (source.array[i].a.used && source.array[i].a.string) { + status = private_f_string_append(source.array[i].a.string, source.array[i].a.used, &destination->array[destination->used].a); + if (F_status_is_error(status)) return status; + } - if (source.array[i].b.used && source.array[i].b.string) { - status = private_f_string_append(source.array[i].b.string, source.array[i].b.used, &destination->array[destination->used].b); - if (F_status_is_error(status)) return status; - } + if (source.array[i].b.used && source.array[i].b.string) { + status = private_f_string_append(source.array[i].b.string, source.array[i].b.used, &destination->array[destination->used].b); + if (F_status_is_error(status)) return status; + } - if (source.array[i].c.used && source.array[i].c.string) { - status = private_f_string_append(source.array[i].c.string, source.array[i].c.used, &destination->array[destination->used].c); - if (F_status_is_error(status)) return status; - } - } // for - } + if (source.array[i].c.used && source.array[i].c.string) { + status = private_f_string_append(source.array[i].c.string, source.array[i].c.used, &destination->array[destination->used].c); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -83,28 +79,26 @@ extern "C" { #ifndef _di_f_string_triples_delete_callback_ f_status_t f_string_triples_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_string_triple_t * const array = (f_string_triple_t *) void_array; - f_status_t status = F_okay; + f_string_triple_t * const array = (f_string_triple_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].a.size && array[i].a.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].a.string, &array[i].a.used, &array[i].a.size); - if (F_status_is_error(status)) return status; - } + if (array[i].a.size && array[i].a.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].a.string, &array[i].a.used, &array[i].a.size); + if (F_status_is_error(status)) return status; + } - if (array[i].b.size && array[i].b.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].b.string, &array[i].b.used, &array[i].b.size); - if (F_status_is_error(status)) return status; - } + if (array[i].b.size && array[i].b.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].b.string, &array[i].b.used, &array[i].b.size); + if (F_status_is_error(status)) return status; + } - if (array[i].c.size && array[i].c.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].c.string, &array[i].c.used, &array[i].c.size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].c.size && array[i].c.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].c.string, &array[i].c.used, &array[i].c.size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -113,28 +107,26 @@ extern "C" { #ifndef _di_f_string_triples_destroy_callback_ f_status_t f_string_triples_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_string_triple_t * const array = (f_string_triple_t *) void_array; - f_status_t status = F_okay; + f_string_triple_t * const array = (f_string_triple_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].a.size && array[i].a.string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].a.string, &array[i].a.used, &array[i].a.size); - if (F_status_is_error(status)) return status; - } + if (array[i].a.size && array[i].a.string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].a.string, &array[i].a.used, &array[i].a.size); + if (F_status_is_error(status)) return status; + } - if (array[i].b.size && array[i].b.string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].b.string, &array[i].b.used, &array[i].b.size); - if (F_status_is_error(status)) return status; - } + if (array[i].b.size && array[i].b.string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].b.string, &array[i].b.used, &array[i].b.size); + if (F_status_is_error(status)) return status; + } - if (array[i].c.size && array[i].c.string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].c.string, &array[i].c.used, &array[i].c.size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].c.size && array[i].c.string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].c.string, &array[i].c.used, &array[i].c.size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_string/c/string/tripless.c b/level_0/f_string/c/string/tripless.c index bc00bf48c..6aefeaab3 100644 --- a/level_0/f_string/c/string/tripless.c +++ b/level_0/f_string/c/string/tripless.c @@ -13,39 +13,37 @@ extern "C" { if (!source.used) return F_data_not; - { - f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_ranges_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_ranges_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - f_string_triples_t * const destination_inner = &destination->array[destination->used]; - destination_inner->used = 0; + f_string_triples_t * const destination_inner = &destination->array[destination->used]; + destination_inner->used = 0; - if (source.used) { - status = f_memory_array_increase_by(source.used, sizeof(f_string_triple_t), (void **) &destination_inner->array, &destination_inner->used, &destination_inner->size); - if (F_status_is_error(status)) return status; + if (source.used) { + status = f_memory_array_increase_by(source.used, sizeof(f_string_triple_t), (void **) &destination_inner->array, &destination_inner->used, &destination_inner->size); + if (F_status_is_error(status)) return status; - for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination_inner->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination_inner->used) { - destination_inner->array[destination_inner->used].a.used = 0; - destination_inner->array[destination_inner->used].b.used = 0; - destination_inner->array[destination_inner->used].c.used = 0; + destination_inner->array[destination_inner->used].a.used = 0; + destination_inner->array[destination_inner->used].b.used = 0; + destination_inner->array[destination_inner->used].c.used = 0; - if (source.array[i].a.used) { - status = private_f_string_append(source.array[i].a.string, source.array[i].a.used, &destination_inner->array[destination_inner->used].a); - if (F_status_is_error(status)) return status; - } + if (source.array[i].a.used) { + status = private_f_string_append(source.array[i].a.string, source.array[i].a.used, &destination_inner->array[destination_inner->used].a); + if (F_status_is_error(status)) return status; + } - if (source.array[i].b.used) { - status = private_f_string_append(source.array[i].b.string, source.array[i].b.used, &destination_inner->array[destination_inner->used].b); - if (F_status_is_error(status)) return status; - } + if (source.array[i].b.used) { + status = private_f_string_append(source.array[i].b.string, source.array[i].b.used, &destination_inner->array[destination_inner->used].b); + if (F_status_is_error(status)) return status; + } - if (source.array[i].c.used) { - status = private_f_string_append(source.array[i].c.string, source.array[i].c.used, &destination_inner->array[destination_inner->used].c); - if (F_status_is_error(status)) return status; - } - } // for - } + if (source.array[i].c.used) { + status = private_f_string_append(source.array[i].c.string, source.array[i].c.used, &destination_inner->array[destination_inner->used].c); + if (F_status_is_error(status)) return status; + } + } // for } ++destination->used; @@ -62,46 +60,44 @@ extern "C" { if (!source.used) return F_data_not; - { - f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_string_triples_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_string_triples_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - f_string_triples_t * destination_inner = 0; - f_number_unsigned_t j = 0; + f_string_triples_t * destination_inner = 0; + f_number_unsigned_t j = 0; - for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { - destination_inner = &destination->array[destination->used]; - destination_inner->used = 0; + destination_inner = &destination->array[destination->used]; + destination_inner->used = 0; - if (source.array[i].used) { - status = f_memory_array_increase_by(source.array[i].used, sizeof(f_string_triple_t), (void **) &destination_inner->array, &destination_inner->used, &destination_inner->size); - if (F_status_is_error(status)) return status; + if (source.array[i].used) { + status = f_memory_array_increase_by(source.array[i].used, sizeof(f_string_triple_t), (void **) &destination_inner->array, &destination_inner->used, &destination_inner->size); + if (F_status_is_error(status)) return status; - for (j = 0; j < source.array[i].used; ++j, ++destination_inner->used) { + for (j = 0; j < source.array[i].used; ++j, ++destination_inner->used) { - destination_inner->array[destination_inner->used].a.used = 0; - destination_inner->array[destination_inner->used].b.used = 0; - destination_inner->array[destination_inner->used].c.used = 0; + destination_inner->array[destination_inner->used].a.used = 0; + destination_inner->array[destination_inner->used].b.used = 0; + destination_inner->array[destination_inner->used].c.used = 0; - if (source.array[i].array[j].a.used) { - status = private_f_string_append(source.array[i].array[j].a.string, source.array[i].array[j].a.used, &destination_inner->array[destination_inner->used].a); - if (F_status_is_error(status)) return status; - } + if (source.array[i].array[j].a.used) { + status = private_f_string_append(source.array[i].array[j].a.string, source.array[i].array[j].a.used, &destination_inner->array[destination_inner->used].a); + if (F_status_is_error(status)) return status; + } - if (source.array[i].array[j].b.used) { - status = private_f_string_append(source.array[i].array[j].b.string, source.array[i].array[j].b.used, &destination_inner->array[destination_inner->used].b); - if (F_status_is_error(status)) return status; - } + if (source.array[i].array[j].b.used) { + status = private_f_string_append(source.array[i].array[j].b.string, source.array[i].array[j].b.used, &destination_inner->array[destination_inner->used].b); + if (F_status_is_error(status)) return status; + } - if (source.array[i].array[j].c.used) { - status = private_f_string_append(source.array[i].array[j].c.string, source.array[i].array[j].c.used, &destination_inner->array[destination_inner->used].c); - if (F_status_is_error(status)) return status; - } - } // for - } - } // for - } + if (source.array[i].array[j].c.used) { + status = private_f_string_append(source.array[i].array[j].c.string, source.array[i].array[j].c.used, &destination_inner->array[destination_inner->used].c); + if (F_status_is_error(status)) return status; + } + } // for + } + } // for return F_okay; } @@ -110,37 +106,35 @@ extern "C" { #ifndef _di_f_string_tripless_delete_callback_ f_status_t f_string_tripless_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_string_triples_t * const array = (f_string_triples_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; + f_string_triples_t * const array = (f_string_triples_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - for (j = 0; j < array[i].size; ++j) { + if (array[i].size && array[i].array) { + for (j = 0; j < array[i].size; ++j) { - if (array[i].array[j].a.size && array[i].array[j].a.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].a.string, &array[i].array[j].a.used, &array[i].array[j].a.size); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].a.size && array[i].array[j].a.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].a.string, &array[i].array[j].a.used, &array[i].array[j].a.size); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].b.size && array[i].array[j].b.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].b.string, &array[i].array[j].b.used, &array[i].array[j].b.size); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].b.size && array[i].array[j].b.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].b.string, &array[i].array[j].b.used, &array[i].array[j].b.size); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].c.size && array[i].array[j].c.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].c.string, &array[i].array[j].c.used, &array[i].array[j].c.size); - if (F_status_is_error(status)) return status; - } - } // for + if (array[i].array[j].c.size && array[i].array[j].c.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].c.string, &array[i].array[j].c.used, &array[i].array[j].c.size); + if (F_status_is_error(status)) return status; + } + } // for - status = f_memory_array_resize(0, sizeof(f_string_triple_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + status = f_memory_array_resize(0, sizeof(f_string_triple_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -149,37 +143,35 @@ extern "C" { #ifndef _di_f_string_tripless_destroy_callback_ f_status_t f_string_tripless_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_string_triples_t * const array = (f_string_triples_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; + f_string_triples_t * const array = (f_string_triples_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - for (j = 0; j < array[i].size; ++j) { + if (array[i].size && array[i].array) { + for (j = 0; j < array[i].size; ++j) { - if (array[i].array[j].a.size && array[i].array[j].a.string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].a.string, &array[i].array[j].a.used, &array[i].array[j].a.size); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].a.size && array[i].array[j].a.string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].a.string, &array[i].array[j].a.used, &array[i].array[j].a.size); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].b.size && array[i].array[j].b.string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].b.string, &array[i].array[j].b.used, &array[i].array[j].b.size); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].b.size && array[i].array[j].b.string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].b.string, &array[i].array[j].b.used, &array[i].array[j].b.size); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].c.size && array[i].array[j].c.string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].c.string, &array[i].array[j].c.used, &array[i].array[j].c.size); - if (F_status_is_error(status)) return status; - } - } // for + if (array[i].array[j].c.size && array[i].array[j].c.string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].c.string, &array[i].array[j].c.used, &array[i].array[j].c.size); + if (F_status_is_error(status)) return status; + } + } // for - status = f_memory_array_adjust(0, sizeof(f_string_triple_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + status = f_memory_array_adjust(0, sizeof(f_string_triple_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_type_array/c/type_array/cell.c b/level_0/f_type_array/c/type_array/cell.c index 485ac8a55..f3b0893da 100644 --- a/level_0/f_type_array/c/type_array/cell.c +++ b/level_0/f_type_array/c/type_array/cell.c @@ -7,18 +7,16 @@ extern "C" { #ifndef _di_f_cellss_delete_callback_ f_status_t f_cellss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_cells_t * const array = (f_cells_t *) void_array; - f_status_t status = F_okay; + f_cells_t * const array = (f_cells_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_cell_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(f_cell_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -27,18 +25,16 @@ extern "C" { #ifndef _di_f_cellss_destroy_callback_ f_status_t f_cellss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_cells_t * const array = (f_cells_t *) void_array; - f_status_t status = F_okay; + f_cells_t * const array = (f_cells_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(f_cell_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(f_cell_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_type_array/c/type_array/date.c b/level_0/f_type_array/c/type_array/date.c index 6eff328ea..f67354583 100644 --- a/level_0/f_type_array/c/type_array/date.c +++ b/level_0/f_type_array/c/type_array/date.c @@ -8,18 +8,16 @@ extern "C" { #ifndef _di_f_datess_delete_callback_ f_status_t f_datess_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_dates_t * const array = (f_dates_t *) void_array; - f_status_t status = F_okay; + f_dates_t * const array = (f_dates_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_date_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(f_date_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -28,18 +26,16 @@ extern "C" { #ifndef _di_f_datess_destroy_callback_ f_status_t f_datess_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_dates_t * const array = (f_dates_t *) void_array; - f_status_t status = F_okay; + f_dates_t * const array = (f_dates_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(f_date_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(f_date_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -48,18 +44,16 @@ extern "C" { #ifndef _di_f_date_simpless_delete_callback_ f_status_t f_date_simpless_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_date_simples_t * const array = (f_date_simples_t *) void_array; - f_status_t status = F_okay; + f_date_simples_t * const array = (f_date_simples_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_date_simple_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(f_date_simple_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -68,18 +62,16 @@ extern "C" { #ifndef _di_f_date_simpless_destroy_callback_ f_status_t f_date_simpless_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_date_simples_t * const array = (f_date_simples_t *) void_array; - f_status_t status = F_okay; + f_date_simples_t * const array = (f_date_simples_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(f_date_simple_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(f_date_simple_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_type_array/c/type_array/file.c b/level_0/f_type_array/c/type_array/file.c index 8af413720..09e20cc93 100644 --- a/level_0/f_type_array/c/type_array/file.c +++ b/level_0/f_type_array/c/type_array/file.c @@ -8,18 +8,16 @@ extern "C" { #ifndef _di_f_filess_delete_callback_ f_status_t f_filess_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_files_t * const array = (f_files_t *) void_array; - f_status_t status = F_okay; + f_files_t * const array = (f_files_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_file_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(f_file_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -28,18 +26,16 @@ extern "C" { #ifndef _di_f_filess_destroy_callback_ f_status_t f_filess_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_files_t * const array = (f_files_t *) void_array; - f_status_t status = F_okay; + f_files_t * const array = (f_files_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(f_file_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(f_file_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_type_array/c/type_array/fll_id.c b/level_0/f_type_array/c/type_array/fll_id.c index 898c304cb..164c51587 100644 --- a/level_0/f_type_array/c/type_array/fll_id.c +++ b/level_0/f_type_array/c/type_array/fll_id.c @@ -7,18 +7,16 @@ extern "C" { #ifndef _di_f_fll_idss_delete_callback_ f_status_t f_fll_idss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_fll_ids_t * const array = (f_fll_ids_t *) void_array; - f_status_t status = F_okay; + f_fll_ids_t * const array = (f_fll_ids_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_fll_id_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(f_fll_id_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -27,18 +25,16 @@ extern "C" { #ifndef _di_f_fll_idss_destroy_callback_ f_status_t f_fll_idss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_fll_ids_t * const array = (f_fll_ids_t *) void_array; - f_status_t status = F_okay; + f_fll_ids_t * const array = (f_fll_ids_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(f_fll_id_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(f_fll_id_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_type_array/c/type_array/int128.c b/level_0/f_type_array/c/type_array/int128.c index 9ab78249a..641355307 100644 --- a/level_0/f_type_array/c/type_array/int128.c +++ b/level_0/f_type_array/c/type_array/int128.c @@ -7,18 +7,16 @@ extern "C" { #ifndef _di_f_int128ss_delete_callback_ f_status_t f_int128ss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_int128s_t * const array = (f_int128s_t *) void_array; - f_status_t status = F_okay; + f_int128s_t * const array = (f_int128s_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_int128_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(f_int128_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -27,18 +25,16 @@ extern "C" { #ifndef _di_f_int128ss_destroy_callback_ f_status_t f_int128ss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_int128s_t * const array = (f_int128s_t *) void_array; - f_status_t status = F_okay; + f_int128s_t * const array = (f_int128s_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(f_int128_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(f_int128_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_type_array/c/type_array/int16.c b/level_0/f_type_array/c/type_array/int16.c index b8fce7d2e..aba333560 100644 --- a/level_0/f_type_array/c/type_array/int16.c +++ b/level_0/f_type_array/c/type_array/int16.c @@ -7,18 +7,16 @@ extern "C" { #ifndef _di_f_int16ss_delete_callback_ f_status_t f_int16ss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_int16s_t * const array = (f_int16s_t *) void_array; - f_status_t status = F_okay; + f_int16s_t * const array = (f_int16s_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(int16_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(int16_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -27,18 +25,16 @@ extern "C" { #ifndef _di_f_int16ss_destroy_callback_ f_status_t f_int16ss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_int16s_t * const array = (f_int16s_t *) void_array; - f_status_t status = F_okay; + f_int16s_t * const array = (f_int16s_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(int16_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(int16_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_type_array/c/type_array/int32.c b/level_0/f_type_array/c/type_array/int32.c index 20308670d..48d5873a8 100644 --- a/level_0/f_type_array/c/type_array/int32.c +++ b/level_0/f_type_array/c/type_array/int32.c @@ -7,18 +7,16 @@ extern "C" { #ifndef _di_f_int32ss_delete_callback_ f_status_t f_int32ss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_int32s_t * const array = (f_int32s_t *) void_array; - f_status_t status = F_okay; + f_int32s_t * const array = (f_int32s_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(int32_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(int32_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -27,18 +25,16 @@ extern "C" { #ifndef _di_f_int32ss_destroy_callback_ f_status_t f_int32ss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_int32s_t * const array = (f_int32s_t *) void_array; - f_status_t status = F_okay; + f_int32s_t * const array = (f_int32s_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(int32_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(int32_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_type_array/c/type_array/int64.c b/level_0/f_type_array/c/type_array/int64.c index a36983540..c48cd40f3 100644 --- a/level_0/f_type_array/c/type_array/int64.c +++ b/level_0/f_type_array/c/type_array/int64.c @@ -7,18 +7,16 @@ extern "C" { #ifndef _di_f_int64ss_delete_callback_ f_status_t f_int64ss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_int64s_t * const array = (f_int64s_t *) void_array; - f_status_t status = F_okay; + f_int64s_t * const array = (f_int64s_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size) { - status = f_memory_array_resize(0, sizeof(int64_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size) { + status = f_memory_array_resize(0, sizeof(int64_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -27,18 +25,16 @@ extern "C" { #ifndef _di_f_int64ss_destroy_callback_ f_status_t f_int64ss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_int64s_t * const array = (f_int64s_t *) void_array; - f_status_t status = F_okay; + f_int64s_t * const array = (f_int64s_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size) { - status = f_memory_array_adjust(0, sizeof(int64_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size) { + status = f_memory_array_adjust(0, sizeof(int64_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_type_array/c/type_array/int8.c b/level_0/f_type_array/c/type_array/int8.c index 324fc1986..0162589aa 100644 --- a/level_0/f_type_array/c/type_array/int8.c +++ b/level_0/f_type_array/c/type_array/int8.c @@ -7,18 +7,16 @@ extern "C" { #ifndef _di_f_int8ss_delete_callback_ f_status_t f_int8ss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_int8s_t * const array = (f_int8s_t *) void_array; - f_status_t status = F_okay; + f_int8s_t * const array = (f_int8s_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(int8_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(int8_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -27,18 +25,16 @@ extern "C" { #ifndef _di_f_int8ss_destroy_callback_ f_status_t f_int8ss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_int8s_t * const array = (f_int8s_t *) void_array; - f_status_t status = F_okay; + f_int8s_t * const array = (f_int8s_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(int8_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(int8_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_type_array/c/type_array/number_signed.c b/level_0/f_type_array/c/type_array/number_signed.c index 77c4f4683..d448c4c5e 100644 --- a/level_0/f_type_array/c/type_array/number_signed.c +++ b/level_0/f_type_array/c/type_array/number_signed.c @@ -7,18 +7,16 @@ extern "C" { #ifndef _di_f_number_signedss_delete_callback_ f_status_t f_number_signedss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_number_signeds_t * const array = (f_number_signeds_t *) void_array; - f_status_t status = F_okay; + f_number_signeds_t * const array = (f_number_signeds_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_number_signed_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(f_number_signed_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -27,18 +25,16 @@ extern "C" { #ifndef _di_f_number_signedss_destroy_callback_ f_status_t f_number_signedss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_number_signeds_t * const array = (f_number_signeds_t *) void_array; - f_status_t status = F_okay; + f_number_signeds_t * const array = (f_number_signeds_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(f_number_signed_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(f_number_signed_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_type_array/c/type_array/number_unsigned.c b/level_0/f_type_array/c/type_array/number_unsigned.c index 24574360e..077c801da 100644 --- a/level_0/f_type_array/c/type_array/number_unsigned.c +++ b/level_0/f_type_array/c/type_array/number_unsigned.c @@ -7,18 +7,16 @@ extern "C" { #ifndef _di_f_number_unsignedss_delete_callback_ f_status_t f_number_unsignedss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_number_unsigneds_t * const array = (f_number_unsigneds_t *) void_array; - f_status_t status = F_okay; + f_number_unsigneds_t * const array = (f_number_unsigneds_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(f_number_unsigned_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -27,18 +25,16 @@ extern "C" { #ifndef _di_f_number_unsignedss_destroy_callback_ f_status_t f_number_unsignedss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_number_unsigneds_t * const array = (f_number_unsigneds_t *) void_array; - f_status_t status = F_okay; + f_number_unsigneds_t * const array = (f_number_unsigneds_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(f_number_unsigned_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(f_number_unsigned_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_type_array/c/type_array/pid.c b/level_0/f_type_array/c/type_array/pid.c index cb61dc290..2e0225992 100644 --- a/level_0/f_type_array/c/type_array/pid.c +++ b/level_0/f_type_array/c/type_array/pid.c @@ -7,18 +7,16 @@ extern "C" { #ifndef _di_f_pidss_delete_callback_ f_status_t f_pidss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_pids_t * const array = (f_pids_t *) void_array; - f_status_t status = F_okay; + f_pids_t * const array = (f_pids_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(pid_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(pid_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -27,18 +25,16 @@ extern "C" { #ifndef _di_f_pidss_destroy_callback_ f_status_t f_pidss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_pids_t * const array = (f_pids_t *) void_array; - f_status_t status = F_okay; + f_pids_t * const array = (f_pids_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(pid_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(pid_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_type_array/c/type_array/poll.c b/level_0/f_type_array/c/type_array/poll.c index 06f2819b1..b78358145 100644 --- a/level_0/f_type_array/c/type_array/poll.c +++ b/level_0/f_type_array/c/type_array/poll.c @@ -8,18 +8,16 @@ extern "C" { #ifndef _di_f_pollss_delete_callback_ f_status_t f_pollss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_polls_t * const array = (f_polls_t *) void_array; - f_status_t status = F_okay; + f_polls_t * const array = (f_polls_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_poll_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(f_poll_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -28,18 +26,16 @@ extern "C" { #ifndef _di_f_pollss_destroy_callback_ f_status_t f_pollss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_polls_t * const array = (f_polls_t *) void_array; - f_status_t status = F_okay; + f_polls_t * const array = (f_polls_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(f_poll_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(f_poll_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_type_array/c/type_array/quantityss.c b/level_0/f_type_array/c/type_array/quantityss.c index 4ac42c924..e69ba29b4 100644 --- a/level_0/f_type_array/c/type_array/quantityss.c +++ b/level_0/f_type_array/c/type_array/quantityss.c @@ -12,23 +12,21 @@ extern "C" { if (!source.used) return F_data_not; - { - f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_quantitys_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_quantitys_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - f_quantitys_t * const destination_inner = &destination->array[destination->used]; - destination_inner->used = 0; + f_quantitys_t * const destination_inner = &destination->array[destination->used]; + destination_inner->used = 0; - if (source.used) { - status = f_memory_array_increase_by(source.used, sizeof(f_quantity_t), (void **) &destination_inner->array, &destination_inner->used, &destination_inner->size); - if (F_status_is_error(status)) return status; + if (source.used) { + status = f_memory_array_increase_by(source.used, sizeof(f_quantity_t), (void **) &destination_inner->array, &destination_inner->used, &destination_inner->size); + if (F_status_is_error(status)) return status; - for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination_inner->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination_inner->used) { - destination_inner->array[destination_inner->used].start = source.array[i].start; - destination_inner->array[destination_inner->used].total = source.array[i].total; - } // for - } + destination_inner->array[destination_inner->used].start = source.array[i].start; + destination_inner->array[destination_inner->used].total = source.array[i].total; + } // for } ++destination->used; @@ -45,30 +43,28 @@ extern "C" { if (!source.used) return F_data_not; - { - f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_quantitys_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_quantitys_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - f_quantitys_t * destination_inner = 0; - f_number_unsigned_t j = 0; + f_quantitys_t * destination_inner = 0; + f_number_unsigned_t j = 0; - for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { - destination_inner = &destination->array[destination->used]; - destination_inner->used = 0; + destination_inner = &destination->array[destination->used]; + destination_inner->used = 0; - if (source.array[i].used) { - status = f_memory_array_increase_by(source.array[i].used, sizeof(f_quantity_t), (void **) &destination->array[destination->used].array, &destination->array[destination->used].used, &destination->array[destination->used].size); - if (F_status_is_error(status)) return status; + if (source.array[i].used) { + status = f_memory_array_increase_by(source.array[i].used, sizeof(f_quantity_t), (void **) &destination->array[destination->used].array, &destination->array[destination->used].used, &destination->array[destination->used].size); + if (F_status_is_error(status)) return status; - for (j = 0; j < source.array[i].used; ++j, ++destination_inner->used) { + for (j = 0; j < source.array[i].used; ++j, ++destination_inner->used) { - destination_inner->array[destination_inner->used].start = source.array[i].array[j].start; - destination_inner->array[destination_inner->used].total = source.array[i].array[j].total; - } // for - } - } // for - } + destination_inner->array[destination_inner->used].start = source.array[i].array[j].start; + destination_inner->array[destination_inner->used].total = source.array[i].array[j].total; + } // for + } + } // for return F_okay; } @@ -77,18 +73,16 @@ extern "C" { #ifndef _di_f_quantityss_delete_callback_ f_status_t f_quantityss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_quantitys_t * const array = (f_quantitys_t *) void_array; - f_status_t status = F_okay; + f_quantitys_t * const array = (f_quantitys_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_quantity_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(f_quantity_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -97,18 +91,16 @@ extern "C" { #ifndef _di_f_quantityss_destroy_callback_ f_status_t f_quantityss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_quantitys_t * const array = (f_quantitys_t *) void_array; - f_status_t status = F_okay; + f_quantitys_t * const array = (f_quantitys_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(f_quantity_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(f_quantity_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_type_array/c/type_array/range_doubless.c b/level_0/f_type_array/c/type_array/range_doubless.c index 665dd1f7e..9bfebc217 100644 --- a/level_0/f_type_array/c/type_array/range_doubless.c +++ b/level_0/f_type_array/c/type_array/range_doubless.c @@ -12,25 +12,23 @@ extern "C" { if (!source.used) return F_data_not; - { - f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_range_doubles_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_range_doubles_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - f_range_doubles_t * const destination_inner = &destination->array[destination->used]; - destination_inner->used = 0; + f_range_doubles_t * const destination_inner = &destination->array[destination->used]; + destination_inner->used = 0; - if (source.used) { - status = f_memory_array_increase_by(source.used, sizeof(f_range_double_t), (void **) &destination_inner->array, &destination_inner->used, &destination_inner->size); - if (F_status_is_error(status)) return status; + if (source.used) { + status = f_memory_array_increase_by(source.used, sizeof(f_range_double_t), (void **) &destination_inner->array, &destination_inner->used, &destination_inner->size); + if (F_status_is_error(status)) return status; - for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination_inner->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination_inner->used) { - destination_inner->array[destination_inner->used].start_1 = source.array[i].start_1; - destination_inner->array[destination_inner->used].stop_1 = source.array[i].stop_1; - destination_inner->array[destination_inner->used].start_2 = source.array[i].start_2; - destination_inner->array[destination_inner->used].stop_2 = source.array[i].stop_2; - } // for - } + destination_inner->array[destination_inner->used].start_1 = source.array[i].start_1; + destination_inner->array[destination_inner->used].stop_1 = source.array[i].stop_1; + destination_inner->array[destination_inner->used].start_2 = source.array[i].start_2; + destination_inner->array[destination_inner->used].stop_2 = source.array[i].stop_2; + } // for } ++destination->used; @@ -47,32 +45,30 @@ extern "C" { if (!source.used) return F_data_not; - { - f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_range_doubles_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_range_doubles_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - f_range_doubles_t * destination_inner = 0; - f_number_unsigned_t j = 0; + f_range_doubles_t * destination_inner = 0; + f_number_unsigned_t j = 0; - for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { - destination_inner = &destination->array[destination->used]; - destination_inner->used = 0; + destination_inner = &destination->array[destination->used]; + destination_inner->used = 0; - if (source.array[i].used) { - status = f_memory_array_increase_by(source.array[i].used, sizeof(f_range_double_t), (void **) &destination->array[destination->used].array, &destination->array[destination->used].used, &destination->array[destination->used].size); - if (F_status_is_error(status)) return status; + if (source.array[i].used) { + status = f_memory_array_increase_by(source.array[i].used, sizeof(f_range_double_t), (void **) &destination->array[destination->used].array, &destination->array[destination->used].used, &destination->array[destination->used].size); + if (F_status_is_error(status)) return status; - for (j = 0; j < source.array[i].used; ++j, ++destination_inner->used) { + for (j = 0; j < source.array[i].used; ++j, ++destination_inner->used) { - destination_inner->array[destination_inner->used].start_1 = source.array[i].array[j].start_1; - destination_inner->array[destination_inner->used].stop_1 = source.array[i].array[j].stop_1; - destination_inner->array[destination_inner->used].start_2 = source.array[i].array[j].start_2; - destination_inner->array[destination_inner->used].stop_2 = source.array[i].array[j].stop_2; - } // for - } - } // for - } + destination_inner->array[destination_inner->used].start_1 = source.array[i].array[j].start_1; + destination_inner->array[destination_inner->used].stop_1 = source.array[i].array[j].stop_1; + destination_inner->array[destination_inner->used].start_2 = source.array[i].array[j].start_2; + destination_inner->array[destination_inner->used].stop_2 = source.array[i].array[j].stop_2; + } // for + } + } // for return F_okay; } @@ -81,18 +77,16 @@ extern "C" { #ifndef _di_f_range_doubless_delete_callback_ f_status_t f_range_doubless_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_range_doubles_t * const array = (f_range_doubles_t *) void_array; - f_status_t status = F_okay; + f_range_doubles_t * const array = (f_range_doubles_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_range_double_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(f_range_double_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -101,19 +95,16 @@ extern "C" { #ifndef _di_f_range_doubless_destroy_callback_ f_status_t f_range_doubless_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_range_doubles_t * const array = (f_range_doubles_t *) void_array; - f_status_t status = F_okay; + f_range_doubles_t * const array = (f_range_doubles_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { - - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(f_range_double_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + for (f_number_unsigned_t i = start; i < stop; ++i) { + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(f_range_double_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } #endif // _di_f_range_doubless_destroy_callback_ diff --git a/level_0/f_type_array/c/type_array/rangess.c b/level_0/f_type_array/c/type_array/rangess.c index 1dba94995..268fb2b75 100644 --- a/level_0/f_type_array/c/type_array/rangess.c +++ b/level_0/f_type_array/c/type_array/rangess.c @@ -12,23 +12,21 @@ extern "C" { if (!source.used) return F_data_not; - { - f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_ranges_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_ranges_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - f_ranges_t * const destination_inner = &destination->array[destination->used]; - destination_inner->used = 0; + f_ranges_t * const destination_inner = &destination->array[destination->used]; + destination_inner->used = 0; - if (source.used) { - status = f_memory_array_increase_by(source.used, sizeof(f_range_t), (void **) &destination_inner->array, &destination_inner->used, &destination_inner->size); - if (F_status_is_error(status)) return status; + if (source.used) { + status = f_memory_array_increase_by(source.used, sizeof(f_range_t), (void **) &destination_inner->array, &destination_inner->used, &destination_inner->size); + if (F_status_is_error(status)) return status; - for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination_inner->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination_inner->used) { - destination_inner->array[destination_inner->used].start = source.array[i].start; - destination_inner->array[destination_inner->used].stop = source.array[i].stop; - } // for - } + destination_inner->array[destination_inner->used].start = source.array[i].start; + destination_inner->array[destination_inner->used].stop = source.array[i].stop; + } // for } ++destination->used; @@ -45,30 +43,28 @@ extern "C" { if (!source.used) return F_data_not; - { - f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_ranges_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_ranges_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - f_ranges_t * destination_inner = 0; - f_number_unsigned_t j = 0; + f_ranges_t * destination_inner = 0; + f_number_unsigned_t j = 0; - for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { - destination_inner = &destination->array[destination->used]; - destination_inner->used = 0; + destination_inner = &destination->array[destination->used]; + destination_inner->used = 0; - if (source.array[i].used) { - status = f_memory_array_increase_by(source.array[i].used, sizeof(f_range_t), (void **) &destination->array[destination->used].array, &destination->array[destination->used].used, &destination->array[destination->used].size); - if (F_status_is_error(status)) return status; + if (source.array[i].used) { + status = f_memory_array_increase_by(source.array[i].used, sizeof(f_range_t), (void **) &destination->array[destination->used].array, &destination->array[destination->used].used, &destination->array[destination->used].size); + if (F_status_is_error(status)) return status; - for (j = 0; j < source.array[i].used; ++j, ++destination_inner->used) { + for (j = 0; j < source.array[i].used; ++j, ++destination_inner->used) { - destination_inner->array[destination_inner->used].start = source.array[i].array[j].start; - destination_inner->array[destination_inner->used].stop = source.array[i].array[j].stop; - } // for - } - } // for - } + destination_inner->array[destination_inner->used].start = source.array[i].array[j].start; + destination_inner->array[destination_inner->used].stop = source.array[i].array[j].stop; + } // for + } + } // for return F_okay; } @@ -77,18 +73,16 @@ extern "C" { #ifndef _di_f_rangess_delete_callback_ f_status_t f_rangess_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_ranges_t * const array = (f_ranges_t *) void_array; - f_status_t status = F_okay; + f_ranges_t * const array = (f_ranges_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(f_range_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -97,18 +91,16 @@ extern "C" { #ifndef _di_f_rangess_destroy_callback_ f_status_t f_rangess_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_ranges_t * const array = (f_ranges_t *) void_array; - f_status_t status = F_okay; + f_ranges_t * const array = (f_ranges_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(f_range_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_type_array/c/type_array/state.c b/level_0/f_type_array/c/type_array/state.c index d32a4cb94..d36d6d5c8 100644 --- a/level_0/f_type_array/c/type_array/state.c +++ b/level_0/f_type_array/c/type_array/state.c @@ -7,18 +7,16 @@ extern "C" { #ifndef _di_f_statess_delete_callback_ f_status_t f_statess_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_states_t * const array = (f_states_t *) void_array; - f_status_t status = F_okay; + f_states_t * const array = (f_states_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_state_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(f_state_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -27,18 +25,16 @@ extern "C" { #ifndef _di_f_statess_destroy_callback_ f_status_t f_statess_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_states_t * const array = (f_states_t *) void_array; - f_status_t status = F_okay; + f_states_t * const array = (f_states_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(f_state_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(f_state_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_type_array/c/type_array/status.c b/level_0/f_type_array/c/type_array/status.c index 7498326fb..e3f3fa096 100644 --- a/level_0/f_type_array/c/type_array/status.c +++ b/level_0/f_type_array/c/type_array/status.c @@ -7,18 +7,16 @@ extern "C" { #ifndef _di_f_statusss_delete_callback_ f_status_t f_statusss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_statuss_t * const array = (f_statuss_t *) void_array; - f_status_t status = F_okay; + f_statuss_t * const array = (f_statuss_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_status_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(f_status_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -27,18 +25,16 @@ extern "C" { #ifndef _di_f_statusss_destroy_callback_ f_status_t f_statusss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_statuss_t * const array = (f_statuss_t *) void_array; - f_status_t status = F_okay; + f_statuss_t * const array = (f_statuss_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(f_status_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(f_status_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_type_array/c/type_array/time.c b/level_0/f_type_array/c/type_array/time.c index 6a3fc1fb7..d812d2cd2 100644 --- a/level_0/f_type_array/c/type_array/time.c +++ b/level_0/f_type_array/c/type_array/time.c @@ -8,18 +8,16 @@ extern "C" { #ifndef _di_f_time_simpless_delete_callback_ f_status_t f_time_simpless_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_time_simples_t * const array = (f_time_simples_t *) void_array; - f_status_t status = F_okay; + f_time_simples_t * const array = (f_time_simples_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(f_time_simple_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(f_time_simple_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -28,18 +26,16 @@ extern "C" { #ifndef _di_f_time_simpless_destroy_callback_ f_status_t f_time_simpless_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_time_simples_t * const array = (f_time_simples_t *) void_array; - f_status_t status = F_okay; + f_time_simples_t * const array = (f_time_simples_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(f_time_simple_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(f_time_simple_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_type_array/c/type_array/uint128.c b/level_0/f_type_array/c/type_array/uint128.c index 1088d216f..4071eb4be 100644 --- a/level_0/f_type_array/c/type_array/uint128.c +++ b/level_0/f_type_array/c/type_array/uint128.c @@ -7,18 +7,16 @@ extern "C" { #ifndef _di_f_uint128ss_delete_callback_ f_status_t f_uint128ss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_uint128s_t * const array = (f_uint128s_t *) void_array; - f_status_t status = F_okay; + f_uint128s_t * const array = (f_uint128s_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size) { - status = f_memory_array_resize(0, sizeof(f_uint128_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size) { + status = f_memory_array_resize(0, sizeof(f_uint128_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -27,18 +25,16 @@ extern "C" { #ifndef _di_f_uint128ss_destroy_callback_ f_status_t f_uint128ss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_uint128s_t * const array = (f_uint128s_t *) void_array; - f_status_t status = F_okay; + f_uint128s_t * const array = (f_uint128s_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size) { - status = f_memory_array_adjust(0, sizeof(f_uint128_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size) { + status = f_memory_array_adjust(0, sizeof(f_uint128_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_type_array/c/type_array/uint16.c b/level_0/f_type_array/c/type_array/uint16.c index 0f03a046d..95bc9de2a 100644 --- a/level_0/f_type_array/c/type_array/uint16.c +++ b/level_0/f_type_array/c/type_array/uint16.c @@ -7,18 +7,16 @@ extern "C" { #ifndef _di_f_uint16ss_delete_callback_ f_status_t f_uint16ss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_uint16s_t * const array = (f_uint16s_t *) void_array; - f_status_t status = F_okay; + f_uint16s_t * const array = (f_uint16s_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(uint16_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(uint16_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -27,18 +25,16 @@ extern "C" { #ifndef _di_f_uint16ss_destroy_callback_ f_status_t f_uint16ss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_uint16s_t * const array = (f_uint16s_t *) void_array; - f_status_t status = F_okay; + f_uint16s_t * const array = (f_uint16s_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(uint16_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(uint16_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_type_array/c/type_array/uint32.c b/level_0/f_type_array/c/type_array/uint32.c index 8ed43f3e9..0c81ccccf 100644 --- a/level_0/f_type_array/c/type_array/uint32.c +++ b/level_0/f_type_array/c/type_array/uint32.c @@ -7,18 +7,16 @@ extern "C" { #ifndef _di_f_uint32ss_delete_callback_ f_status_t f_uint32ss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_uint32s_t * const array = (f_uint32s_t *) void_array; - f_status_t status = F_okay; + f_uint32s_t * const array = (f_uint32s_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(uint32_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(uint32_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -27,18 +25,16 @@ extern "C" { #ifndef _di_f_uint32ss_destroy_callback_ f_status_t f_uint32ss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_uint32s_t * const array = (f_uint32s_t *) void_array; - f_status_t status = F_okay; + f_uint32s_t * const array = (f_uint32s_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(uint32_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(uint32_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_type_array/c/type_array/uint64.c b/level_0/f_type_array/c/type_array/uint64.c index 2f0ce7b8e..9f8de2328 100644 --- a/level_0/f_type_array/c/type_array/uint64.c +++ b/level_0/f_type_array/c/type_array/uint64.c @@ -7,18 +7,16 @@ extern "C" { #ifndef _di_f_uint64ss_delete_callback_ f_status_t f_uint64ss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_uint64s_t * const array = (f_uint64s_t *) void_array; - f_status_t status = F_okay; + f_uint64s_t * const array = (f_uint64s_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_resize(0, sizeof(uint64_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_resize(0, sizeof(uint64_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -27,18 +25,16 @@ extern "C" { #ifndef _di_f_uint64ss_destroy_callback_ f_status_t f_uint64ss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_uint64s_t * const array = (f_uint64s_t *) void_array; - f_status_t status = F_okay; + f_uint64s_t * const array = (f_uint64s_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - status = f_memory_array_adjust(0, sizeof(uint64_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].array) { + status = f_memory_array_adjust(0, sizeof(uint64_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_type_array/c/type_array/uint8.c b/level_0/f_type_array/c/type_array/uint8.c index 0de1ab3fd..7aaf6c8c6 100644 --- a/level_0/f_type_array/c/type_array/uint8.c +++ b/level_0/f_type_array/c/type_array/uint8.c @@ -7,18 +7,16 @@ extern "C" { #ifndef _di_f_uint8ss_delete_callback_ f_status_t f_uint8ss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_uint8s_t * const array = (f_uint8s_t *) void_array; - f_status_t status = F_okay; + f_uint8s_t * const array = (f_uint8s_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size) { - status = f_memory_array_resize(0, sizeof(uint8_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size) { + status = f_memory_array_resize(0, sizeof(uint8_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -27,18 +25,16 @@ extern "C" { #ifndef _di_f_uint8ss_destroy_callback_ f_status_t f_uint8ss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_uint8s_t * const array = (f_uint8s_t *) void_array; - f_status_t status = F_okay; + f_uint8s_t * const array = (f_uint8s_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size) { - status = f_memory_array_adjust(0, sizeof(uint8_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size) { + status = f_memory_array_adjust(0, sizeof(uint8_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_utf/c/utf/dynamics.c b/level_0/f_utf/c/utf/dynamics.c index f1156201a..0709262fd 100644 --- a/level_0/f_utf/c/utf/dynamics.c +++ b/level_0/f_utf/c/utf/dynamics.c @@ -35,18 +35,16 @@ extern "C" { #ifndef _di_f_utf_string_dynamics_delete_callback_ f_status_t f_utf_string_dynamics_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_utf_string_dynamic_t * const array = (f_utf_string_dynamic_t *) void_array; - f_status_t status = F_okay; + f_utf_string_dynamic_t * const array = (f_utf_string_dynamic_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].string, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].string, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -55,18 +53,16 @@ extern "C" { #ifndef _di_f_utf_string_dynamics_destroy_callback_ f_status_t f_utf_string_dynamics_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_utf_string_dynamic_t * const array = (f_utf_string_dynamic_t *) void_array; - f_status_t status = F_okay; + f_utf_string_dynamic_t * const array = (f_utf_string_dynamic_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].string, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].size && array[i].string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].string, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_utf/c/utf/dynamicss.c b/level_0/f_utf/c/utf/dynamicss.c index 989c9c6b8..79c8c2a37 100644 --- a/level_0/f_utf/c/utf/dynamicss.c +++ b/level_0/f_utf/c/utf/dynamicss.c @@ -16,16 +16,14 @@ extern "C" { if (!source.used) return F_data_not; - { - f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_utf_string_dynamics_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_utf_string_dynamics_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - destination->array[destination->used].used = 0; + destination->array[destination->used].used = 0; - if (source.used) { - status = private_f_utf_string_dynamics_append_all(source, &destination->array[destination->used]); - if (F_status_is_error(status)) return status; - } + if (source.used) { + status = private_f_utf_string_dynamics_append_all(source, &destination->array[destination->used]); + if (F_status_is_error(status)) return status; } ++destination->used; @@ -42,20 +40,18 @@ extern "C" { if (!source.used) return F_data_not; - { - f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_utf_string_dynamics_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_utf_string_dynamics_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { - destination->array[destination->used].used = 0; + destination->array[destination->used].used = 0; - if (source.array[i].used) { - status = private_f_utf_string_dynamics_append_all(source.array[i], &destination->array[destination->used]); - if (F_status_is_error(status)) return status; - } - } // for - } + if (source.array[i].used) { + status = private_f_utf_string_dynamics_append_all(source.array[i], &destination->array[destination->used]); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -64,27 +60,25 @@ extern "C" { #ifndef _di_f_utf_string_dynamicss_delete_callback_ f_status_t f_utf_string_dynamicss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_utf_string_dynamics_t * const array = (f_utf_string_dynamics_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; + f_utf_string_dynamics_t * const array = (f_utf_string_dynamics_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - for (j = 0; j < array[i].size; ++j) { + if (array[i].size && array[i].array) { + for (j = 0; j < array[i].size; ++j) { - if (array[i].array[j].size && array[i].array[j].string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].string, &array[i].array[j].used, &array[i].array[j].size); - if (F_status_is_error(status)) return status; - } - } // for + if (array[i].array[j].size && array[i].array[j].string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].string, &array[i].array[j].used, &array[i].array[j].size); + if (F_status_is_error(status)) return status; + } + } // for - status = f_memory_array_resize(0, sizeof(f_utf_string_dynamic_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + status = f_memory_array_resize(0, sizeof(f_utf_string_dynamic_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -93,27 +87,25 @@ extern "C" { #ifndef _di_f_utf_string_dynamicss_destroy_callback_ f_status_t f_utf_string_dynamicss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_utf_string_dynamics_t * const array = (f_utf_string_dynamics_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; + f_utf_string_dynamics_t * const array = (f_utf_string_dynamics_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - for (j = 0; j < array[i].size; ++j) { + if (array[i].size && array[i].array) { + for (j = 0; j < array[i].size; ++j) { - if (array[i].array[j].size && array[i].array[j].string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].string, &array[i].array[j].used, &array[i].array[j].size); - if (F_status_is_error(status)) return status; - } - } // for + if (array[i].array[j].size && array[i].array[j].string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].string, &array[i].array[j].used, &array[i].array[j].size); + if (F_status_is_error(status)) return status; + } + } // for - status = f_memory_array_adjust(0, sizeof(f_utf_string_dynamic_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + status = f_memory_array_adjust(0, sizeof(f_utf_string_dynamic_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_utf/c/utf/map_multis.c b/level_0/f_utf/c/utf/map_multis.c index 7d8dd023e..efd07e28e 100644 --- a/level_0/f_utf/c/utf/map_multis.c +++ b/level_0/f_utf/c/utf/map_multis.c @@ -14,22 +14,20 @@ extern "C" { if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ - { - f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_utf_string_map_multi_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_utf_string_map_multi_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - destination->array[destination->used].key.used = 0; - destination->array[destination->used].value.used = 0; + destination->array[destination->used].key.used = 0; + destination->array[destination->used].value.used = 0; - if (source.key.used) { - status = private_f_utf_string_append(source.key.string, source.key.used, &destination->array[destination->used].key); - if (F_status_is_error(status)) return status; - } + if (source.key.used) { + status = private_f_utf_string_append(source.key.string, source.key.used, &destination->array[destination->used].key); + if (F_status_is_error(status)) return status; + } - if (source.value.used) { - status = private_f_utf_string_dynamics_append_all(source.value, &destination->array[destination->used].value); - if (F_status_is_error(status)) return status; - } + if (source.value.used) { + status = private_f_utf_string_dynamics_append_all(source.value, &destination->array[destination->used].value); + if (F_status_is_error(status)) return status; } ++destination->used; @@ -53,32 +51,30 @@ extern "C" { #ifndef _di_f_utf_string_map_multis_delete_callback_ f_status_t f_utf_string_map_multis_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_utf_string_map_multi_t * const array = (f_utf_string_map_multi_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; + f_utf_string_map_multi_t * const array = (f_utf_string_map_multi_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].key.size && array[i].key.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].key.string, &array[i].key.used, &array[i].key.size); - if (F_status_is_error(status)) return status; - } + if (array[i].key.size && array[i].key.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].key.string, &array[i].key.used, &array[i].key.size); + if (F_status_is_error(status)) return status; + } - if (array[i].value.size && array[i].value.array) { - for (j = 0; j < array[i].value.size; ++j) { + if (array[i].value.size && array[i].value.array) { + for (j = 0; j < array[i].value.size; ++j) { - if (array[i].value.array[j].size && array[i].value.array[j].string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].value.array[j].string, &array[i].value.array[j].used, &array[i].value.array[j].size); - if (F_status_is_error(status)) return status; - } - } // for + if (array[i].value.array[j].size && array[i].value.array[j].string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].value.array[j].string, &array[i].value.array[j].used, &array[i].value.array[j].size); + if (F_status_is_error(status)) return status; + } + } // for - status = f_memory_array_resize(0, sizeof(f_utf_string_dynamic_t), (void **) &array[i].value.array, &array[i].value.used, &array[i].value.size); - if (F_status_is_error(status)) return status; - } - } // for - } + status = f_memory_array_resize(0, sizeof(f_utf_string_dynamic_t), (void **) &array[i].value.array, &array[i].value.used, &array[i].value.size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -87,32 +83,30 @@ extern "C" { #ifndef _di_f_utf_string_map_multis_destroy_callback_ f_status_t f_utf_string_map_multis_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_utf_string_map_multi_t * const array = (f_utf_string_map_multi_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; + f_utf_string_map_multi_t * const array = (f_utf_string_map_multi_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].key.size && array[i].key.string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].key.string, &array[i].key.used, &array[i].key.size); - if (F_status_is_error(status)) return status; - } + if (array[i].key.size && array[i].key.string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].key.string, &array[i].key.used, &array[i].key.size); + if (F_status_is_error(status)) return status; + } - if (array[i].value.size && array[i].value.array) { - for (j = 0; j < array[i].value.size; ++j) { + if (array[i].value.size && array[i].value.array) { + for (j = 0; j < array[i].value.size; ++j) { - if (array[i].value.array[j].size && array[i].value.array[j].string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].value.array[j].string, &array[i].value.array[j].used, &array[i].value.array[j].size); - if (F_status_is_error(status)) return status; - } - } // for + if (array[i].value.array[j].size && array[i].value.array[j].string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].value.array[j].string, &array[i].value.array[j].used, &array[i].value.array[j].size); + if (F_status_is_error(status)) return status; + } + } // for - status = f_memory_array_adjust(0, sizeof(f_utf_string_dynamic_t), (void **) &array[i].value.array, &array[i].value.used, &array[i].value.size); - if (F_status_is_error(status)) return status; - } - } // for - } + status = f_memory_array_adjust(0, sizeof(f_utf_string_dynamic_t), (void **) &array[i].value.array, &array[i].value.used, &array[i].value.size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_utf/c/utf/map_multiss.c b/level_0/f_utf/c/utf/map_multiss.c index 50c773483..3d8c9f4d9 100644 --- a/level_0/f_utf/c/utf/map_multiss.c +++ b/level_0/f_utf/c/utf/map_multiss.c @@ -16,16 +16,14 @@ extern "C" { if (!source.used) return F_data_not; - { - f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_utf_string_map_multis_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_utf_string_map_multis_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - destination->array[destination->used].used = 0; + destination->array[destination->used].used = 0; - if (source.used) { - status = private_f_utf_string_map_multis_append_all(source, &destination->array[destination->used]); - if (F_status_is_error(status)) return status; - } + if (source.used) { + status = private_f_utf_string_map_multis_append_all(source, &destination->array[destination->used]); + if (F_status_is_error(status)) return status; } ++destination->used; @@ -42,19 +40,17 @@ extern "C" { if (!source.used) return F_data_not; - { - f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_utf_string_map_multis_t), (void **) &destination->array, &destination->used, &destination->size); + f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_utf_string_map_multis_t), (void **) &destination->array, &destination->used, &destination->size); - for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { - destination->array[destination->used].used = 0; + destination->array[destination->used].used = 0; - if (source.array[i].used) { - status = private_f_utf_string_map_multis_append_all(source.array[i], &destination->array[destination->used]); - if (F_status_is_error(status)) return status; - } - } // for - } + if (source.array[i].used) { + status = private_f_utf_string_map_multis_append_all(source.array[i], &destination->array[destination->used]); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -63,38 +59,36 @@ extern "C" { #ifndef _di_f_utf_string_map_multiss_delete_callback_ f_status_t f_utf_string_map_multiss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_utf_string_map_multis_t * const array = (f_utf_string_map_multis_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; - f_number_unsigned_t k = 0; - - for (f_number_unsigned_t i = start; i < stop; ++i) { + f_utf_string_map_multis_t * const array = (f_utf_string_map_multis_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; - if (array[i].size && array[i].array) { - if (array[i].array[j].key.size && array[i].array[j].key.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].key.string, &array[i].array[j].key.used, &array[i].array[j].key.size); - if (F_status_is_error(status)) return status; - } + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].array[j].value.size && array[i].array[j].value.array) { - for (k = 0; k < array[i].array[j].value.size; ++k) { + if (array[i].size && array[i].array) { + if (array[i].array[j].key.size && array[i].array[j].key.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].key.string, &array[i].array[j].key.used, &array[i].array[j].key.size); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].value.array[k].size && array[i].array[j].value.array[k].string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].value.array[k].string, &array[i].array[j].value.array[k].used, &array[i].array[j].value.array[k].size); - if (F_status_is_error(status)) return status; - } - } // for + if (array[i].array[j].value.size && array[i].array[j].value.array) { + for (k = 0; k < array[i].array[j].value.size; ++k) { - status = f_memory_array_resize(0, sizeof(f_utf_string_dynamic_t), (void **) &array[i].array[j].value.array, &array[i].array[j].value.used, &array[i].array[j].value.size); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].value.array[k].size && array[i].array[j].value.array[k].string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].value.array[k].string, &array[i].array[j].value.array[k].used, &array[i].array[j].value.array[k].size); + if (F_status_is_error(status)) return status; + } + } // for - status = f_memory_array_resize(0, sizeof(f_utf_string_map_multi_t), (void **) &array[i].array, &array[i].used, &array[i].size); + status = f_memory_array_resize(0, sizeof(f_utf_string_dynamic_t), (void **) &array[i].array[j].value.array, &array[i].array[j].value.used, &array[i].array[j].value.size); if (F_status_is_error(status)) return status; } - } // for - } + + status = f_memory_array_resize(0, sizeof(f_utf_string_map_multi_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -103,38 +97,36 @@ extern "C" { #ifndef _di_f_utf_string_map_multiss_destroy_callback_ f_status_t f_utf_string_map_multiss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_utf_string_map_multis_t * const array = (f_utf_string_map_multis_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; - f_number_unsigned_t k = 0; - - for (f_number_unsigned_t i = start; i < stop; ++i) { + f_utf_string_map_multis_t * const array = (f_utf_string_map_multis_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; + f_number_unsigned_t k = 0; - if (array[i].size && array[i].array) { - if (array[i].array[j].key.size && array[i].array[j].key.string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].key.string, &array[i].array[j].key.used, &array[i].array[j].key.size); - if (F_status_is_error(status)) return status; - } + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].array[j].value.size && array[i].array[j].value.array) { - for (k = 0; k < array[i].array[j].value.size; ++k) { + if (array[i].size && array[i].array) { + if (array[i].array[j].key.size && array[i].array[j].key.string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].key.string, &array[i].array[j].key.used, &array[i].array[j].key.size); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].value.array[k].size && array[i].array[j].value.array[k].string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].value.array[k].string, &array[i].array[j].value.array[k].used, &array[i].array[j].value.array[k].size); - if (F_status_is_error(status)) return status; - } - } // for + if (array[i].array[j].value.size && array[i].array[j].value.array) { + for (k = 0; k < array[i].array[j].value.size; ++k) { - status = f_memory_array_adjust(0, sizeof(f_utf_string_dynamic_t), (void **) &array[i].array[j].value.array, &array[i].array[j].value.used, &array[i].array[j].value.size); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].value.array[k].size && array[i].array[j].value.array[k].string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].value.array[k].string, &array[i].array[j].value.array[k].used, &array[i].array[j].value.array[k].size); + if (F_status_is_error(status)) return status; + } + } // for - status = f_memory_array_adjust(0, sizeof(f_utf_string_map_multi_t), (void **) &array[i].array, &array[i].used, &array[i].size); + status = f_memory_array_adjust(0, sizeof(f_utf_string_dynamic_t), (void **) &array[i].array[j].value.array, &array[i].array[j].value.used, &array[i].array[j].value.size); if (F_status_is_error(status)) return status; } - } // for - } + + status = f_memory_array_adjust(0, sizeof(f_utf_string_map_multi_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_utf/c/utf/maps.c b/level_0/f_utf/c/utf/maps.c index 5346ce0fa..ff7330da1 100644 --- a/level_0/f_utf/c/utf/maps.c +++ b/level_0/f_utf/c/utf/maps.c @@ -51,23 +51,21 @@ extern "C" { #ifndef _di_f_utf_string_maps_delete_callback_ f_status_t f_utf_string_maps_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_utf_string_map_t * const array = (f_utf_string_map_t *) void_array; - f_status_t status = F_okay; + f_utf_string_map_t * const array = (f_utf_string_map_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].key.size && array[i].key.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].key.string, &array[i].key.used, &array[i].key.size); - if (F_status_is_error(status)) return status; - } + if (array[i].key.size && array[i].key.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].key.string, &array[i].key.used, &array[i].key.size); + if (F_status_is_error(status)) return status; + } - if (array[i].value.size && array[i].value.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].value.string, &array[i].value.used, &array[i].value.size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].value.size && array[i].value.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].value.string, &array[i].value.used, &array[i].value.size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -76,23 +74,21 @@ extern "C" { #ifndef _di_f_utf_string_maps_destroy_callback_ f_status_t f_utf_string_maps_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_utf_string_map_t * const array = (f_utf_string_map_t *) void_array; - f_status_t status = F_okay; + f_utf_string_map_t * const array = (f_utf_string_map_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].key.size && array[i].key.string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].key.string, &array[i].key.used, &array[i].key.size); - if (F_status_is_error(status)) return status; - } + if (array[i].key.size && array[i].key.string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].key.string, &array[i].key.used, &array[i].key.size); + if (F_status_is_error(status)) return status; + } - if (array[i].value.size && array[i].value.string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].value.string, &array[i].value.used, &array[i].value.size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].value.size && array[i].value.string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].value.string, &array[i].value.used, &array[i].value.size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_utf/c/utf/mapss.c b/level_0/f_utf/c/utf/mapss.c index c5581d5f8..31c2f831e 100644 --- a/level_0/f_utf/c/utf/mapss.c +++ b/level_0/f_utf/c/utf/mapss.c @@ -15,16 +15,14 @@ extern "C" { if (!source.used) return F_data_not; - { - f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_utf_string_maps_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_utf_string_maps_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - destination->array[destination->used].used = 0; + destination->array[destination->used].used = 0; - if (source.used) { - status = private_f_utf_string_maps_append_all(source, &destination->array[destination->used]); - if (F_status_is_error(status)) return status; - } + if (source.used) { + status = private_f_utf_string_maps_append_all(source, &destination->array[destination->used]); + if (F_status_is_error(status)) return status; } ++destination->used; @@ -41,20 +39,18 @@ extern "C" { if (!source.used) return F_data_not; - { - f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_utf_string_maps_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_utf_string_maps_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { - destination->array[destination->used].used = 0; + destination->array[destination->used].used = 0; - if (source.array[i].used) { - status = private_f_utf_string_maps_append_all(source.array[i], &destination->array[destination->used]); - if (F_status_is_error(status)) return status; - } - } // for - } + if (source.array[i].used) { + status = private_f_utf_string_maps_append_all(source.array[i], &destination->array[destination->used]); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -63,32 +59,30 @@ extern "C" { #ifndef _di_f_utf_string_mapss_delete_callback_ f_status_t f_utf_string_mapss_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_utf_string_maps_t * const array = (f_utf_string_maps_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; + f_utf_string_maps_t * const array = (f_utf_string_maps_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - for (j = 0; j < array[i].size; ++j) { + if (array[i].size && array[i].array) { + for (j = 0; j < array[i].size; ++j) { - if (array[i].array[j].key.size && array[i].array[j].key.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].key.string, &array[i].array[j].key.used, &array[i].array[j].key.size); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].key.size && array[i].array[j].key.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].key.string, &array[i].array[j].key.used, &array[i].array[j].key.size); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].value.size && array[i].array[j].value.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].value.string, &array[i].array[j].value.used, &array[i].array[j].value.size); - if (F_status_is_error(status)) return status; - } - } // for + if (array[i].array[j].value.size && array[i].array[j].value.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].value.string, &array[i].array[j].value.used, &array[i].array[j].value.size); + if (F_status_is_error(status)) return status; + } + } // for - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -97,32 +91,30 @@ extern "C" { #ifndef _di_f_utf_string_mapss_destroy_callback_ f_status_t f_utf_string_mapss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_utf_string_maps_t * const array = (f_utf_string_maps_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; + f_utf_string_maps_t * const array = (f_utf_string_maps_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - for (j = 0; j < array[i].size; ++j) { + if (array[i].size && array[i].array) { + for (j = 0; j < array[i].size; ++j) { - if (array[i].array[j].key.size && array[i].array[j].key.string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].key.string, &array[i].array[j].key.used, &array[i].array[j].key.size); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].key.size && array[i].array[j].key.string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].key.string, &array[i].array[j].key.used, &array[i].array[j].key.size); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].value.size && array[i].array[j].value.string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].value.string, &array[i].array[j].value.used, &array[i].array[j].value.size); - if (F_status_is_error(status)) return status; - } - } // for + if (array[i].array[j].value.size && array[i].array[j].value.string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].value.string, &array[i].array[j].value.used, &array[i].array[j].value.size); + if (F_status_is_error(status)) return status; + } + } // for - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_utf/c/utf/triples.c b/level_0/f_utf/c/utf/triples.c index 11bda73f9..0c33bd40d 100644 --- a/level_0/f_utf/c/utf/triples.c +++ b/level_0/f_utf/c/utf/triples.c @@ -13,28 +13,26 @@ extern "C" { if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ - { - f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_utf_string_triple_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_utf_string_triple_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - destination->array[destination->used].a.used = 0; - destination->array[destination->used].b.used = 0; - destination->array[destination->used].c.used = 0; + destination->array[destination->used].a.used = 0; + destination->array[destination->used].b.used = 0; + destination->array[destination->used].c.used = 0; - if (source.a.used) { - status = private_f_utf_string_append(source.a.string, source.a.used, &destination->array[destination->used].a); - if (F_status_is_error(status)) return status; - } + if (source.a.used) { + status = private_f_utf_string_append(source.a.string, source.a.used, &destination->array[destination->used].a); + if (F_status_is_error(status)) return status; + } - if (source.b.used) { - status = private_f_utf_string_append(source.b.string, source.b.used, &destination->array[destination->used].b); - if (F_status_is_error(status)) return status; - } + if (source.b.used) { + status = private_f_utf_string_append(source.b.string, source.b.used, &destination->array[destination->used].b); + if (F_status_is_error(status)) return status; + } - if (source.c.used) { - status = private_f_utf_string_append(source.c.string, source.c.used, &destination->array[destination->used].c); - if (F_status_is_error(status)) return status; - } + if (source.c.used) { + status = private_f_utf_string_append(source.c.string, source.c.used, &destination->array[destination->used].c); + if (F_status_is_error(status)) return status; } ++destination->used; @@ -51,32 +49,30 @@ extern "C" { if (!source.used) return F_data_not; - { - f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_utf_string_triple_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_utf_string_triple_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { - destination->array[destination->used].a.used = 0; - destination->array[destination->used].b.used = 0; - destination->array[destination->used].c.used = 0; + destination->array[destination->used].a.used = 0; + destination->array[destination->used].b.used = 0; + destination->array[destination->used].c.used = 0; - if (source.array[i].a.used) { - status = private_f_utf_string_append(source.array[i].a.string, source.array[i].a.used, &destination->array[destination->used].a); - if (F_status_is_error(status)) return status; - } + if (source.array[i].a.used) { + status = private_f_utf_string_append(source.array[i].a.string, source.array[i].a.used, &destination->array[destination->used].a); + if (F_status_is_error(status)) return status; + } - if (source.array[i].b.used) { - status = private_f_utf_string_append(source.array[i].b.string, source.array[i].b.used, &destination->array[destination->used].b); - if (F_status_is_error(status)) return status; - } + if (source.array[i].b.used) { + status = private_f_utf_string_append(source.array[i].b.string, source.array[i].b.used, &destination->array[destination->used].b); + if (F_status_is_error(status)) return status; + } - if (source.array[i].c.used) { - status = private_f_utf_string_append(source.array[i].c.string, source.array[i].c.used, &destination->array[destination->used].c); - if (F_status_is_error(status)) return status; - } - } // for - } + if (source.array[i].c.used) { + status = private_f_utf_string_append(source.array[i].c.string, source.array[i].c.used, &destination->array[destination->used].c); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -85,28 +81,26 @@ extern "C" { #ifndef _di_f_utf_string_triples_delete_callback_ f_status_t f_utf_string_triples_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_utf_string_triple_t * const array = (f_utf_string_triple_t *) void_array; - f_status_t status = F_okay; + f_utf_string_triple_t * const array = (f_utf_string_triple_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].a.size && array[i].a.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].a.string, &array[i].a.used, &array[i].a.size); - if (F_status_is_error(status)) return status; - } + if (array[i].a.size && array[i].a.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].a.string, &array[i].a.used, &array[i].a.size); + if (F_status_is_error(status)) return status; + } - if (array[i].b.size && array[i].b.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].b.string, &array[i].b.used, &array[i].b.size); - if (F_status_is_error(status)) return status; - } + if (array[i].b.size && array[i].b.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].b.string, &array[i].b.used, &array[i].b.size); + if (F_status_is_error(status)) return status; + } - if (array[i].c.size && array[i].c.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].c.string, &array[i].c.used, &array[i].c.size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].c.size && array[i].c.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].c.string, &array[i].c.used, &array[i].c.size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -115,28 +109,26 @@ extern "C" { #ifndef _di_f_utf_string_triples_destroy_callback_ f_status_t f_utf_string_triples_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_utf_string_triple_t * const array = (f_utf_string_triple_t *) void_array; - f_status_t status = F_okay; + f_utf_string_triple_t * const array = (f_utf_string_triple_t *) void_array; + f_status_t status = F_okay; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].a.size && array[i].a.string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].a.string, &array[i].a.used, &array[i].a.size); - if (F_status_is_error(status)) return status; - } + if (array[i].a.size && array[i].a.string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].a.string, &array[i].a.used, &array[i].a.size); + if (F_status_is_error(status)) return status; + } - if (array[i].b.size && array[i].b.string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].b.string, &array[i].b.used, &array[i].b.size); - if (F_status_is_error(status)) return status; - } + if (array[i].b.size && array[i].b.string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].b.string, &array[i].b.used, &array[i].b.size); + if (F_status_is_error(status)) return status; + } - if (array[i].c.size && array[i].c.string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].c.string, &array[i].c.used, &array[i].c.size); - if (F_status_is_error(status)) return status; - } - } // for - } + if (array[i].c.size && array[i].c.string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].c.string, &array[i].c.used, &array[i].c.size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } diff --git a/level_0/f_utf/c/utf/tripless.c b/level_0/f_utf/c/utf/tripless.c index a7d190fa7..0084bfea2 100644 --- a/level_0/f_utf/c/utf/tripless.c +++ b/level_0/f_utf/c/utf/tripless.c @@ -15,16 +15,14 @@ extern "C" { if (!source.used) return F_data_not; - { - f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_utf_string_triples_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; + f_status_t status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_utf_string_triples_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - destination->array[destination->used].used = 0; + destination->array[destination->used].used = 0; - if (source.used) { - status = private_f_utf_string_triples_append_all(source, &destination->array[destination->used]); - if (F_status_is_error(status)) return status; - } + if (source.used) { + status = private_f_utf_string_triples_append_all(source, &destination->array[destination->used]); + if (F_status_is_error(status)) return status; } ++destination->used; @@ -41,24 +39,18 @@ extern "C" { if (!source.used) return F_data_not; - { - f_status_t status = F_okay; + f_status_t status = f_memory_array_increase_by(source.used, sizeof(f_utf_string_triples_t), (void **) &destination->array, &destination->used, &destination->size); + if (F_status_is_error(status)) return status; - { - status = f_memory_array_increase_by(source.used, sizeof(f_utf_string_triples_t), (void **) &destination->array, &destination->used, &destination->size); - if (F_status_is_error(status)) return status; - } + for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { - for (f_number_unsigned_t i = 0; i < source.used; ++i, ++destination->used) { - - destination->array[destination->used].used = 0; + destination->array[destination->used].used = 0; - if (source.array[i].used) { - status = private_f_utf_string_triples_append_all(source.array[i], &destination->array[destination->used]); - if (F_status_is_error(status)) return status; - } - } // for - } + if (source.array[i].used) { + status = private_f_utf_string_triples_append_all(source.array[i], &destination->array[destination->used]); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -67,37 +59,35 @@ extern "C" { #ifndef _di_f_utf_string_tripless_delete_callback_ f_status_t f_utf_string_tripless_delete_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_utf_string_triples_t * const array = (f_utf_string_triples_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; + f_utf_string_triples_t * const array = (f_utf_string_triples_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - for (j = 0; j < array[i].size; ++j) { + if (array[i].size && array[i].array) { + for (j = 0; j < array[i].size; ++j) { - if (array[i].array[j].a.size && array[i].array[j].a.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].a.string, &array[i].array[j].a.used, &array[i].array[j].a.size); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].a.size && array[i].array[j].a.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].a.string, &array[i].array[j].a.used, &array[i].array[j].a.size); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].b.size && array[i].array[j].b.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].b.string, &array[i].array[j].b.used, &array[i].array[j].b.size); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].b.size && array[i].array[j].b.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].b.string, &array[i].array[j].b.used, &array[i].array[j].b.size); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].c.size && array[i].array[j].c.string) { - status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].c.string, &array[i].array[j].c.used, &array[i].array[j].c.size); - if (F_status_is_error(status)) return status; - } - } // for + if (array[i].array[j].c.size && array[i].array[j].c.string) { + status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &array[i].array[j].c.string, &array[i].array[j].c.used, &array[i].array[j].c.size); + if (F_status_is_error(status)) return status; + } + } // for - status = f_memory_array_resize(0, sizeof(f_utf_string_triple_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + status = f_memory_array_resize(0, sizeof(f_utf_string_triple_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; } @@ -106,37 +96,35 @@ extern "C" { #ifndef _di_f_utf_string_tripless_destroy_callback_ f_status_t f_utf_string_tripless_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const void_array) { - { - f_utf_string_triples_t * const array = (f_utf_string_triples_t *) void_array; - f_status_t status = F_okay; - f_number_unsigned_t j = 0; + f_utf_string_triples_t * const array = (f_utf_string_triples_t *) void_array; + f_status_t status = F_okay; + f_number_unsigned_t j = 0; - for (f_number_unsigned_t i = start; i < stop; ++i) { + for (f_number_unsigned_t i = start; i < stop; ++i) { - if (array[i].size && array[i].array) { - for (j = 0; j < array[i].size; ++j) { + if (array[i].size && array[i].array) { + for (j = 0; j < array[i].size; ++j) { - if (array[i].array[j].a.size && array[i].array[j].a.string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].a.string, &array[i].array[j].a.used, &array[i].array[j].a.size); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].a.size && array[i].array[j].a.string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].a.string, &array[i].array[j].a.used, &array[i].array[j].a.size); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].b.size && array[i].array[j].b.string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].b.string, &array[i].array[j].b.used, &array[i].array[j].b.size); - if (F_status_is_error(status)) return status; - } + if (array[i].array[j].b.size && array[i].array[j].b.string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].b.string, &array[i].array[j].b.used, &array[i].array[j].b.size); + if (F_status_is_error(status)) return status; + } - if (array[i].array[j].c.size && array[i].array[j].c.string) { - status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].c.string, &array[i].array[j].c.used, &array[i].array[j].c.size); - if (F_status_is_error(status)) return status; - } - } // for + if (array[i].array[j].c.size && array[i].array[j].c.string) { + status = f_memory_array_adjust(0, sizeof(f_char_t), (void **) &array[i].array[j].c.string, &array[i].array[j].c.used, &array[i].array[j].c.size); + if (F_status_is_error(status)) return status; + } + } // for - status = f_memory_array_adjust(0, sizeof(f_utf_string_triple_t), (void **) &array[i].array, &array[i].used, &array[i].size); - if (F_status_is_error(status)) return status; - } - } // for - } + status = f_memory_array_adjust(0, sizeof(f_utf_string_triple_t), (void **) &array[i].array, &array[i].used, &array[i].size); + if (F_status_is_error(status)) return status; + } + } // for return F_okay; }