From 39ae3ceedce97d253d2fc04c964322b870e5b85d Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Tue, 27 Oct 2020 22:54:48 -0500 Subject: [PATCH] Cleanup: use 'values' instead of 'additional' for console. The word 'value' makes more sense here than the word 'additional'. --- level_0/f_console/c/console-common.h | 14 ++--- level_0/f_console/c/console.c | 66 +++++++++++----------- level_0/f_console/c/console.h | 2 +- level_1/fl_console/c/console.h | 2 +- level_2/fll_program/c/program.c | 32 +++++------ level_2/fll_program/c/program.h | 22 ++++---- level_3/byte_dump/c/byte_dump.c | 8 +-- level_3/fake/c/fake.c | 2 +- level_3/fake/c/private-fake.c | 10 ++-- level_3/firewall/c/firewall.c | 10 ++-- .../fss_basic_list_read/c/fss_basic_list_read.c | 4 +- .../c/private-fss_basic_list_read.c | 26 ++++----- .../fss_basic_list_write/c/fss_basic_list_write.c | 30 +++++----- level_3/fss_basic_read/c/fss_basic_read.c | 4 +- level_3/fss_basic_read/c/private-fss_basic_read.c | 26 ++++----- level_3/fss_basic_write/c/fss_basic_write.c | 30 +++++----- .../c/fss_extended_list_read.c | 4 +- .../c/private-fss_extended_list_read.c | 26 ++++----- .../c/fss_extended_list_write.c | 30 +++++----- .../c/private-fss_extended_list_write.c | 4 +- level_3/fss_extended_read/c/fss_extended_read.c | 4 +- .../c/private-fss_extended_read.c | 26 ++++----- level_3/fss_extended_write/c/fss_extended_write.c | 40 ++++++------- level_3/fss_status_code/c/fss_status_code.c | 2 +- level_3/iki_read/c/iki_read.c | 8 +-- level_3/iki_read/c/private-iki_read.c | 20 +++---- level_3/iki_write/c/iki_write.c | 14 ++--- level_3/init/c/init.c | 4 +- level_3/status_code/c/status_code.c | 2 +- 29 files changed, 236 insertions(+), 236 deletions(-) diff --git a/level_0/f_console/c/console-common.h b/level_0/f_console/c/console-common.h index c587747..6baad45 100644 --- a/level_0/f_console/c/console-common.h +++ b/level_0/f_console/c/console-common.h @@ -164,7 +164,7 @@ extern "C" { * * - none: parameter not found. * - found: parameter found. - * - additional: parameter found, extra data exists (such as '-f filename', 'filename' would be the extra data). + * - values: parameter found, extra data exists (such as '-f filename', 'filename' would be the extra data). * * - normal: parameters using minus sign, such as '--help'. * - inverse: parameters using plus sign, such as '++version'. @@ -211,7 +211,7 @@ extern "C" { * - symbol_long: The multi-character string, such as 'help' in '--help'. * - symbol_other: The special meaning parameter, such as 'all' in 'make all'. * - * - has_additional: Designates that a parameter will have a given number of additional arguments, such as 'blue' in '--color blue'. + * - has_values: Designates that a parameter will have a given number of values arguments, such as 'blue' in '--color blue'. * - type: One of the f_console_type_* codes, defining how this parameter is to be processed. * * - result: A code representing that the parameter is found and how it is found ('-h' vs '--help'). @@ -220,7 +220,7 @@ extern "C" { * - location_sub: The last sub-location at location in argv (only used by short parameters, such as -h or +l). * - locations: All locations within argv where this parameter is found (order is preserved). * - locations_sub: All sub-locations within argv where this parameter is found (order is preserved). - * - additional: An array of locations representing where in the argv[] the additional arguments are found. + * - values: An array of locations representing where in the argv[] the values arguments are found. */ #ifndef _di_f_console_parameter_t_ typedef struct { @@ -228,7 +228,7 @@ extern "C" { const int8_t *symbol_long; const int8_t *symbol_other; - const uint8_t has_additional; + const uint8_t has_values; const uint8_t type; f_array_length_t result; @@ -236,12 +236,12 @@ extern "C" { f_string_length_t location_sub; f_array_lengths_t locations; f_array_lengths_t locations_sub; - f_array_lengths_t additional; + f_array_lengths_t values; } f_console_parameter_t; - #define f_console_parameter_t_initialize(symbol_short, symbol_long, symbol_other, has_additional, type_value) { symbol_short, symbol_long, symbol_other, has_additional, type_value, f_console_result_none, 0, 0, f_array_lengths_t_initialize, f_array_lengths_t_initialize, f_array_lengths_t_initialize } + #define f_console_parameter_t_initialize(symbol_short, symbol_long, symbol_other, has_values, type_value) { symbol_short, symbol_long, symbol_other, has_values, type_value, f_console_result_none, 0, 0, f_array_lengths_t_initialize, f_array_lengths_t_initialize, f_array_lengths_t_initialize } - #define f_macro_console_parameter_t_initialize(symbol_short, symbol_long, symbol_other, has_additional, type_value, result, location, location_sub, locations, locations_sub, additional) { symbol_short, symbol_long, symbol_other, has_additional, type_value, result, total, location, location_sub, locations, locations_sub, additional } + #define f_macro_console_parameter_t_initialize(symbol_short, symbol_long, symbol_other, has_values, type_value, result, location, location_sub, locations, locations_sub, values) { symbol_short, symbol_long, symbol_other, has_values, type_value, result, total, location, location_sub, locations, locations_sub, values } #endif // _di_f_console_parameter_t_ /** diff --git a/level_0/f_console/c/console.c b/level_0/f_console/c/console.c index aeea10f..c5f917a 100644 --- a/level_0/f_console/c/console.c +++ b/level_0/f_console/c/console.c @@ -64,13 +64,13 @@ extern "C" { f_string_length_t argument_length = 0; f_array_length_t i = 0; - f_array_length_t additional = 0; + f_array_length_t values = 0; uint8_t console_short = f_console_none; uint8_t console_long = f_console_none; uint8_t console_type = f_console_type_normal; - f_string_lengths_t needs_additional = f_string_lengths_t_initialize; + f_string_lengths_t needs_value = f_string_lengths_t_initialize; uint8_t width = 0; @@ -78,26 +78,26 @@ extern "C" { while (location < arguments.argc) { // Additional parameters must always follow what requests them. - if (needs_additional.used > 0) { - i = needs_additional.array[0]; + if (needs_value.used > 0) { + i = needs_value.array[0]; - if (parameters.parameter[i].additional.used + 1 > parameters.parameter[i].additional.size) { - f_macro_array_lengths_t_resize(status, parameters.parameter[i].additional, parameters.parameter[i].additional.size + f_console_default_allocation_step); + if (parameters.parameter[i].values.used + 1 > parameters.parameter[i].values.size) { + f_macro_array_lengths_t_resize(status, parameters.parameter[i].values, parameters.parameter[i].values.size + f_console_default_allocation_step); if (F_status_is_error(status)) { - f_macro_string_lengths_t_delete_simple(needs_additional); + f_macro_string_lengths_t_delete_simple(needs_value); return status; } } parameters.parameter[i].result = f_console_result_additional; - parameters.parameter[i].additional.array[parameters.parameter[i].additional.used++] = location; + parameters.parameter[i].values.array[parameters.parameter[i].values.used++] = location; - needs_additional.used--; + needs_value.used--; - // Pop the matched parameter off of the top of the needs_additional array. - for (f_string_length_t i = 0; i < needs_additional.used; i++) { - needs_additional.array[i] = needs_additional.array[i + 1]; + // Pop the matched parameter off of the top of the needs_value array. + for (f_string_length_t i = 0; i < needs_value.used; ++i) { + needs_value.array[i] = needs_value.array[i + 1]; } // for location++; @@ -167,7 +167,7 @@ extern "C" { status = f_utf_char_to_character(arguments.argv[location] + sub_location, width_max, &character_argument_utf); if (status != F_none) { - f_macro_string_lengths_t_delete_simple(needs_additional); + f_macro_string_lengths_t_delete_simple(needs_value); return status; } @@ -176,7 +176,7 @@ extern "C" { status = f_utf_char_to_character((f_string_t) parameters.parameter[i].symbol_short, width_max, &character_console_utf); if (status != F_none) { - f_macro_string_lengths_t_delete_simple(needs_additional); + f_macro_string_lengths_t_delete_simple(needs_value); return status; } @@ -202,7 +202,7 @@ extern "C" { f_macro_string_lengths_t_resize(status, parameters.parameter[i].locations, parameters.parameter[i].locations.size + f_console_default_allocation_step); if (F_status_is_error(status)) { - f_macro_string_lengths_t_delete_simple(needs_additional); + f_macro_string_lengths_t_delete_simple(needs_value); return status; } } @@ -211,7 +211,7 @@ extern "C" { f_macro_string_lengths_t_resize(status, parameters.parameter[i].locations_sub, parameters.parameter[i].locations_sub.size + f_console_default_allocation_step); if (F_status_is_error(status)) { - f_macro_string_lengths_t_delete_simple(needs_additional); + f_macro_string_lengths_t_delete_simple(needs_value); return status; } } @@ -230,18 +230,18 @@ extern "C" { parameters.parameter[i].locations_sub.array[parameters.parameter[i].locations_sub.used++] = 0; } - if (parameters.parameter[i].has_additional) { - if (needs_additional.used + parameters.parameter[i].has_additional > needs_additional.size) { - f_macro_string_lengths_t_resize(status, needs_additional, needs_additional.used + parameters.parameter[i].has_additional); + if (parameters.parameter[i].has_values) { + if (needs_value.used + parameters.parameter[i].has_values > needs_value.size) { + f_macro_string_lengths_t_resize(status, needs_value, needs_value.used + parameters.parameter[i].has_values); if (F_status_is_error(status)) { - f_macro_string_lengths_t_delete_simple(needs_additional); + f_macro_string_lengths_t_delete_simple(needs_value); return status; } } - for (additional = 0; additional < parameters.parameter[i].has_additional; additional++) { - needs_additional.array[needs_additional.used++] = i; + for (values = 0; values < parameters.parameter[i].has_values; values++) { + needs_value.array[needs_value.used++] = i; } // for } @@ -266,7 +266,7 @@ extern "C" { f_macro_string_lengths_t_resize(status, parameters.parameter[i].locations, parameters.parameter[i].locations.size + f_console_default_allocation_step); if (F_status_is_error(status)) { - f_macro_string_lengths_t_delete_simple(needs_additional); + f_macro_string_lengths_t_delete_simple(needs_value); return status; } } @@ -275,7 +275,7 @@ extern "C" { f_macro_string_lengths_t_resize(status, parameters.parameter[i].locations_sub, parameters.parameter[i].locations_sub.size + f_console_default_allocation_step); if (F_status_is_error(status)) { - f_macro_string_lengths_t_delete_simple(needs_additional); + f_macro_string_lengths_t_delete_simple(needs_value); return status; } } @@ -287,18 +287,18 @@ extern "C" { parameters.parameter[i].location = location; parameters.parameter[i].location_sub = 0; - if (parameters.parameter[i].has_additional) { - if (needs_additional.used + parameters.parameter[i].has_additional > needs_additional.size) { - f_macro_string_lengths_t_resize(status, needs_additional, needs_additional.used + parameters.parameter[i].has_additional); + if (parameters.parameter[i].has_values) { + if (needs_value.used + parameters.parameter[i].has_values > needs_value.size) { + f_macro_string_lengths_t_resize(status, needs_value, needs_value.used + parameters.parameter[i].has_values); if (F_status_is_error(status)) { - f_macro_string_lengths_t_delete_simple(needs_additional); + f_macro_string_lengths_t_delete_simple(needs_value); return status; } } - for (additional = 0; additional < parameters.parameter[i].has_additional; additional++) { - needs_additional.array[needs_additional.used++] = i; + for (values = 0; values < parameters.parameter[i].has_values; values++) { + needs_value.array[needs_value.used++] = i; } // for } @@ -312,7 +312,7 @@ extern "C" { if (remaining->used == remaining->size) { f_macro_memory_structure_macro_increment(status, (*remaining), 1, f_console_default_allocation_step, f_macro_string_lengths_t_resize, F_buffer_too_large); if (F_status_is_error(status)) { - f_macro_string_lengths_t_delete_simple(needs_additional); + f_macro_string_lengths_t_delete_simple(needs_value); return status; } } @@ -324,14 +324,14 @@ extern "C" { location++; } // while - if (needs_additional.used > 0) { + if (needs_value.used > 0) { status = F_data_not; } else { status = F_none; } - f_macro_string_lengths_t_delete_simple(needs_additional); + f_macro_string_lengths_t_delete_simple(needs_value); return status; } diff --git a/level_0/f_console/c/console.h b/level_0/f_console/c/console.h index 041a1d2..4778bc2 100644 --- a/level_0/f_console/c/console.h +++ b/level_0/f_console/c/console.h @@ -78,7 +78,7 @@ extern "C" { * * @return * F_none on success. - * F_data_not if "additional" parameters were expected but not found. + * F_data_not if "values" parameters were expected but not found. * F_buffer_too_large (with error bit) if a buffer would exceed max length. * F_failure (with error bit) if width is not long enough to convert when processing arguments as UTF-8. * F_parameter (with error bit) if a parameter is invalid. diff --git a/level_1/fl_console/c/console.h b/level_1/fl_console/c/console.h index 201017e..b3d5684 100644 --- a/level_1/fl_console/c/console.h +++ b/level_1/fl_console/c/console.h @@ -29,7 +29,7 @@ extern "C" { #endif /** - * Validate and convert a console parameter additional argument to a file directory in a dynamic string. + * Validate and convert a console parameter values argument to a file directory in a dynamic string. * * The directory path is validated to exist. * diff --git a/level_2/fll_program/c/program.c b/level_2/fll_program/c/program.c index 072d912..19dc844 100644 --- a/level_2/fll_program/c/program.c +++ b/level_2/fll_program/c/program.c @@ -133,7 +133,7 @@ extern "C" { #endif // _di_fll_program_parameter_process_ #ifndef _di_fll_program_parameter_additional_append_ - f_return_status fll_program_parameter_additional_append(const f_string_t *argv, const f_array_lengths_t additional, f_string_dynamics_t *destination) { + f_return_status fll_program_parameter_additional_append(const f_string_t *argv, const f_array_lengths_t values, f_string_dynamics_t *destination) { #ifndef _di_level_2_parameter_checking_ if (!argv) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -144,14 +144,14 @@ extern "C" { f_string_length_t length = 0; const f_string_length_t start = destination->used; - for (f_string_length_t i = 0; i < additional.used; i++) { + for (f_string_length_t i = 0; i < values.used; i++) { - length = strnlen(argv[additional.array[i]], f_console_length_size); + length = strnlen(argv[values.array[i]], f_console_length_size); if (length > 0) { f_string_dynamic_t ripped = f_string_dynamic_t_initialize; - status = fl_string_append(argv[additional.array[i]], length, &ripped); + status = fl_string_append(argv[values.array[i]], length, &ripped); if (F_status_is_error(status)) return status; if (status == F_data_not) { @@ -176,7 +176,7 @@ extern "C" { #endif // _di_fll_program_parameter_additional_append_ #ifndef _di_fll_program_parameter_additional_mash_ - f_return_status fll_program_parameter_additional_mash(const f_string_t glue, const f_string_length_t glue_length, const f_string_t *argv, const f_array_lengths_t additional, f_string_dynamic_t *destination) { + f_return_status fll_program_parameter_additional_mash(const f_string_t glue, const f_string_length_t glue_length, const f_string_t *argv, const f_array_lengths_t values, f_string_dynamic_t *destination) { #ifndef _di_level_2_parameter_checking_ if (!argv) return F_status_set_error(F_parameter); if (glue_length < 1) return F_status_set_error(F_parameter); @@ -188,12 +188,12 @@ extern "C" { f_string_length_t length = 0; const f_string_length_t start = destination->used; - for (f_string_length_t i = 0; i < additional.used; i++) { + for (f_string_length_t i = 0; i < values.used; i++) { - length = strnlen(argv[additional.array[i]], f_console_length_size); + length = strnlen(argv[values.array[i]], f_console_length_size); if (length > 0) { - status = fl_string_mash(glue, glue_length, argv[additional.array[i]], length, destination); + status = fl_string_mash(glue, glue_length, argv[values.array[i]], length, destination); if (F_status_is_error(status)) return F_status_set_error(F_string_too_large); } } // for @@ -207,7 +207,7 @@ extern "C" { #endif // _di_fll_program_parameter_additional_mash_ #ifndef _di_fll_program_parameter_additional_rip_ - f_return_status fll_program_parameter_additional_rip(const f_string_t *argv, const f_array_lengths_t additional, f_string_dynamics_t *destination) { + f_return_status fll_program_parameter_additional_rip(const f_string_t *argv, const f_array_lengths_t values, f_string_dynamics_t *destination) { #ifndef _di_level_2_parameter_checking_ if (!argv) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -217,14 +217,14 @@ extern "C" { f_string_length_t length = 0; const f_string_length_t start = destination->used; - for (f_string_length_t i = 0; i < additional.used; i++) { + for (f_string_length_t i = 0; i < values.used; i++) { - length = strnlen(argv[additional.array[i]], f_console_length_size); + length = strnlen(argv[values.array[i]], f_console_length_size); if (length > 0) { f_string_dynamic_t ripped = f_string_dynamic_t_initialize; - status = fl_string_rip(argv[additional.array[i]], length, &ripped); + status = fl_string_rip(argv[values.array[i]], length, &ripped); if (F_status_is_error(status)) return status; if (status == F_data_not) { @@ -251,7 +251,7 @@ extern "C" { #endif // _di_fll_program_parameter_additional_rip_ #ifndef _di_fll_program_parameter_additional_rip_mash_ - f_return_status fll_program_parameter_additional_rip_mash(const f_string_t glue, const f_string_length_t glue_length, const f_string_t *argv, const f_array_lengths_t additional, f_string_dynamic_t *destination) { + f_return_status fll_program_parameter_additional_rip_mash(const f_string_t glue, const f_string_length_t glue_length, const f_string_t *argv, const f_array_lengths_t values, f_string_dynamic_t *destination) { #ifndef _di_level_2_parameter_checking_ if (!argv) return F_status_set_error(F_parameter); if (glue_length < 1) return F_status_set_error(F_parameter); @@ -264,12 +264,12 @@ extern "C" { const f_string_length_t start = destination->used; f_string_dynamic_t ripped = f_string_dynamic_t_initialize; - for (f_string_length_t i = 0; i < additional.used; i++) { + for (f_string_length_t i = 0; i < values.used; i++) { - length = strnlen(argv[additional.array[i]], f_console_length_size); + length = strnlen(argv[values.array[i]], f_console_length_size); if (length > 0) { - status = fl_string_rip(argv[additional.array[i]], length, &ripped); + status = fl_string_rip(argv[values.array[i]], length, &ripped); if (F_status_is_error(status)) { f_macro_string_dynamic_t_delete_simple(ripped); diff --git a/level_2/fll_program/c/program.h b/level_2/fll_program/c/program.h index 2092a70..9d8387c 100644 --- a/level_2/fll_program/c/program.h +++ b/level_2/fll_program/c/program.h @@ -187,7 +187,7 @@ extern "C" { * * @return * F_none on success. - * F_data_not if "additional" parameters were expected but not found. + * F_data_not if "values" parameters were expected but not found. * F_memory_reallocation (with error bit) on memory reallocation error. * F_parameter (with error bit) if a parameter is invalid. * @@ -214,7 +214,7 @@ extern "C" { * * @param argv * The program argument array to parse. - * @param additional + * @param values * The string locations where the console parameters are found. * @param destination * An array of dynamic strings each representing a console parameter. @@ -232,11 +232,11 @@ extern "C" { * @see fl_string_append() */ #ifndef _di_fll_program_parameter_additional_append_ - extern f_return_status fll_program_parameter_additional_append(const f_string_t *argv, const f_array_lengths_t additional, f_string_dynamics_t *destination); + extern f_return_status fll_program_parameter_additional_append(const f_string_t *argv, const f_array_lengths_t values, f_string_dynamics_t *destination); #endif // _di_fll_program_parameter_additional_append_ /** - * Mash together all additional arguments associated with a given console parameter. + * Mash together all values arguments associated with a given console parameter. * * @param glue * A string to append between the source and destination, such as a space: ' '. @@ -244,7 +244,7 @@ extern "C" { * The number of bytes the glue takes up. * @param argv * The program argument array to parse. - * @param additional + * @param values * The string locations where the console parameters are found. * @param destination * The destination string the source and glue are appended onto. @@ -262,7 +262,7 @@ extern "C" { * @see fl_string_mash() */ #ifndef _di_fll_program_parameter_additional_mash_ - extern f_return_status fll_program_parameter_additional_mash(const f_string_t glue, const f_string_length_t glue_length, const f_string_t *argv, const f_array_lengths_t additional, f_string_dynamic_t *destination); + extern f_return_status fll_program_parameter_additional_mash(const f_string_t glue, const f_string_length_t glue_length, const f_string_t *argv, const f_array_lengths_t values, f_string_dynamic_t *destination); #endif // _di_fll_program_parameter_additional_mash_ /** @@ -272,7 +272,7 @@ extern "C" { * * @param argv * The program argument array to parse. - * @param additional + * @param values * The string locations where the console parameters are found. * @param destination * An array of dynamic strings each representing a console parameter. @@ -289,11 +289,11 @@ extern "C" { * @see fl_string_rip() */ #ifndef _di_fll_program_parameter_additional_rip_ - extern f_return_status fll_program_parameter_additional_rip(const f_string_t *argv, const f_array_lengths_t additional, f_string_dynamics_t *destination); + extern f_return_status fll_program_parameter_additional_rip(const f_string_t *argv, const f_array_lengths_t values, f_string_dynamics_t *destination); #endif // _di_fll_program_parameter_additional_rip_ /** - * Mash together all additional arguments associated with a given console parameter. + * Mash together all values arguments associated with a given console parameter. * * The console parameter is trimmed before mashing. * @@ -303,7 +303,7 @@ extern "C" { * The number of bytes the glue takes up. * @param argv * The program argument array to parse. - * @param additional + * @param values * The string locations where the console parameters are found. * @param destination * The destination string the source and glue are appended onto. @@ -323,7 +323,7 @@ extern "C" { * @see fl_string_rip() */ #ifndef _di_fll_program_parameter_additional_rip_mash_ - extern f_return_status fll_program_parameter_additional_rip_mash(const f_string_t glue, const f_string_length_t glue_length, const f_string_t *argv, const f_array_lengths_t additional, f_string_dynamic_t *destination); + extern f_return_status fll_program_parameter_additional_rip_mash(const f_string_t glue, const f_string_length_t glue_length, const f_string_t *argv, const f_array_lengths_t values, f_string_dynamic_t *destination); #endif // _di_fll_program_parameter_additional_rip_mash_ #ifdef __cplusplus diff --git a/level_3/byte_dump/c/byte_dump.c b/level_3/byte_dump/c/byte_dump.c index 049170c..31f1dac 100644 --- a/level_3/byte_dump/c/byte_dump.c +++ b/level_3/byte_dump/c/byte_dump.c @@ -214,7 +214,7 @@ extern "C" { return F_status_set_error(status); } else if (data->parameters[byte_dump_parameter_width].result == f_console_result_additional) { - const f_string_length_t index = data->parameters[byte_dump_parameter_width].additional.array[data->parameters[byte_dump_parameter_width].additional.used - 1]; + const f_string_length_t index = data->parameters[byte_dump_parameter_width].values.array[data->parameters[byte_dump_parameter_width].values.used - 1]; const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index])); f_number_unsigned_t number = 0; @@ -246,7 +246,7 @@ extern "C" { return F_status_set_error(status); } else if (data->parameters[byte_dump_parameter_first].result == f_console_result_additional) { - const f_string_length_t index = data->parameters[byte_dump_parameter_first].additional.array[data->parameters[byte_dump_parameter_first].additional.used - 1]; + const f_string_length_t index = data->parameters[byte_dump_parameter_first].values.array[data->parameters[byte_dump_parameter_first].values.used - 1]; const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index])); f_number_unsigned_t number = 0; @@ -278,7 +278,7 @@ extern "C" { return F_status_set_error(status); } else if (data->parameters[byte_dump_parameter_last].result == f_console_result_additional) { - const f_string_length_t index = data->parameters[byte_dump_parameter_last].additional.array[data->parameters[byte_dump_parameter_last].additional.used - 1]; + const f_string_length_t index = data->parameters[byte_dump_parameter_last].values.array[data->parameters[byte_dump_parameter_last].values.used - 1]; const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index])); f_number_unsigned_t number = 0; @@ -447,7 +447,7 @@ extern "C" { for (f_string_length_t i = 0; i < byte_dump_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); f_macro_string_lengths_t_delete_simple(data->parameters[i].locations_sub); - f_macro_string_lengths_t_delete_simple(data->parameters[i].additional); + f_macro_string_lengths_t_delete_simple(data->parameters[i].values); } // for f_macro_string_lengths_t_delete_simple(data->remaining); diff --git a/level_3/fake/c/fake.c b/level_3/fake/c/fake.c index 348b886..f3fa3dd 100644 --- a/level_3/fake/c/fake.c +++ b/level_3/fake/c/fake.c @@ -363,7 +363,7 @@ extern "C" { for (f_string_length_t i = 0; i < fake_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); f_macro_string_lengths_t_delete_simple(data->parameters[i].locations_sub); - f_macro_string_lengths_t_delete_simple(data->parameters[i].additional); + f_macro_string_lengths_t_delete_simple(data->parameters[i].values); } // for f_macro_string_lengths_t_delete_simple(data->remaining); diff --git a/level_3/fake/c/private-fake.c b/level_3/fake/c/private-fake.c index ffb6cb8..fb89392 100644 --- a/level_3/fake/c/private-fake.c +++ b/level_3/fake/c/private-fake.c @@ -628,7 +628,7 @@ extern "C" { return F_status_set_error(F_parameter); } - f_string_length_t location = data->parameters[parameters_id[i]].additional.array[0]; + f_string_length_t location = data->parameters[parameters_id[i]].values.array[0]; f_string_length_t length = strnlen(arguments.argv[location], f_console_length_size); if (length > 0) { @@ -760,12 +760,12 @@ extern "C" { return F_status_set_error(F_parameter); } else if (data->parameters[parameters_id[i]].result == f_console_result_additional) { - if (data->parameters[parameters_id[i]].additional.used > 1) { + if (data->parameters[parameters_id[i]].values.used > 1) { fake_print_error_parameter_too_many(*data, parameters_name[i]); return F_status_set_error(F_parameter); } - status = fl_console_parameter_to_string_dynamic_directory(arguments.argv[data->parameters[parameters_id[i]].additional.array[0]], parameters_value[i]); + status = fl_console_parameter_to_string_dynamic_directory(arguments.argv[data->parameters[parameters_id[i]].values.array[0]], parameters_value[i]); if (F_status_is_error(status)) { if (fll_error_print(data->error, F_status_set_fine(status), "fl_console_parameter_to_string_dynamic_directory", F_false) == F_unknown && data->error.verbosity != f_console_verbosity_quiet) { @@ -799,7 +799,7 @@ extern "C" { } if (data->parameters[fake_parameter_define].result == f_console_result_additional) { - status = fll_program_parameter_additional_rip(arguments.argv, data->parameters[fake_parameter_define].additional, &data->define); + status = fll_program_parameter_additional_rip(arguments.argv, data->parameters[fake_parameter_define].values, &data->define); if (F_status_is_error(status)) { if (fll_error_print(data->error, F_status_set_fine(status), "fll_program_parameter_additional_rip", F_false) == F_unknown && data->error.verbosity != f_console_verbosity_quiet) { @@ -856,7 +856,7 @@ extern "C" { return F_status_set_error(F_parameter); } else if (data->parameters[fake_parameter_mode].result == f_console_result_additional) { - status = fll_program_parameter_additional_rip(arguments.argv, data->parameters[fake_parameter_mode].additional, &data->mode); + status = fll_program_parameter_additional_rip(arguments.argv, data->parameters[fake_parameter_mode].values, &data->mode); if (F_status_is_error(status)) { if (fll_error_print(data->error, F_status_set_fine(status), "fll_program_parameter_additional_rip", F_false) == F_unknown && data->error.verbosity != f_console_verbosity_quiet) { diff --git a/level_3/firewall/c/firewall.c b/level_3/firewall/c/firewall.c index ba83361..b2a2a90 100644 --- a/level_3/firewall/c/firewall.c +++ b/level_3/firewall/c/firewall.c @@ -132,7 +132,7 @@ extern "C" { if (data->parameters[firewall_parameter_command_stop].result == f_console_result_found) { if (found_command) { - if (data->parameters[command].additional.array[0] > data->parameters[firewall_parameter_command_stop].additional.array[0]) { + if (data->parameters[command].values.array[0] > data->parameters[firewall_parameter_command_stop].values.array[0]) { command = firewall_parameter_command_stop; } } @@ -144,7 +144,7 @@ extern "C" { if (data->parameters[firewall_parameter_command_restart].result == f_console_result_found) { if (found_command) { - if (data->parameters[command].additional.array[0] > data->parameters[firewall_parameter_command_restart].additional.array[0]) { + if (data->parameters[command].values.array[0] > data->parameters[firewall_parameter_command_restart].values.array[0]) { command = firewall_parameter_command_restart; } } @@ -156,7 +156,7 @@ extern "C" { if (data->parameters[firewall_parameter_command_lock].result == f_console_result_found) { if (found_command) { - if (data->parameters[command].additional.array[0] > data->parameters[firewall_parameter_command_lock].additional.array[0]) { + if (data->parameters[command].values.array[0] > data->parameters[firewall_parameter_command_lock].values.array[0]) { command = firewall_parameter_command_lock; } } @@ -168,7 +168,7 @@ extern "C" { if (data->parameters[firewall_parameter_command_show].result == f_console_result_found) { if (found_command) { - if (data->parameters[command].additional.array[0] > data->parameters[firewall_parameter_command_show].additional.array[0]) { + if (data->parameters[command].values.array[0] > data->parameters[firewall_parameter_command_show].values.array[0]) { command = firewall_parameter_command_show; } } @@ -699,7 +699,7 @@ extern "C" { for (f_string_length_t i = 0; i < firewall_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); f_macro_string_lengths_t_delete_simple(data->parameters[i].locations_sub); - f_macro_string_lengths_t_delete_simple(data->parameters[i].additional); + f_macro_string_lengths_t_delete_simple(data->parameters[i].values); } // for f_macro_string_dynamics_t_delete_simple(data->chains); diff --git a/level_3/fss_basic_list_read/c/fss_basic_list_read.c b/level_3/fss_basic_list_read/c/fss_basic_list_read.c index d30f10f..ec3a238 100644 --- a/level_3/fss_basic_list_read/c/fss_basic_list_read.c +++ b/level_3/fss_basic_list_read/c/fss_basic_list_read.c @@ -334,7 +334,7 @@ extern "C" { status = F_status_set_error(F_parameter); } else if (data->parameters[fss_basic_list_read_parameter_delimit].result == f_console_result_additional) { - const f_string_length_t location = data->parameters[fss_basic_list_read_parameter_delimit].additional.array[0]; + const f_string_length_t location = data->parameters[fss_basic_list_read_parameter_delimit].values.array[0]; f_string_length_t length = strnlen(arguments.argv[location], f_console_length_size); if (length == 0) { @@ -526,7 +526,7 @@ extern "C" { for (f_string_length_t i = 0; i < fss_basic_list_read_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); f_macro_string_lengths_t_delete_simple(data->parameters[i].locations_sub); - f_macro_string_lengths_t_delete_simple(data->parameters[i].additional); + f_macro_string_lengths_t_delete_simple(data->parameters[i].values); } // for f_macro_fss_contents_t_delete_simple(data->contents); diff --git a/level_3/fss_basic_list_read/c/private-fss_basic_list_read.c b/level_3/fss_basic_list_read/c/private-fss_basic_list_read.c index b1ea0cb..0276295 100644 --- a/level_3/fss_basic_list_read/c/private-fss_basic_list_read.c +++ b/level_3/fss_basic_list_read/c/private-fss_basic_list_read.c @@ -13,7 +13,7 @@ extern "C" { f_array_length_t depth_size = 1; if (data.parameters[fss_basic_list_read_parameter_depth].result == f_console_result_additional) { - depth_size = data.parameters[fss_basic_list_read_parameter_depth].additional.used; + depth_size = data.parameters[fss_basic_list_read_parameter_depth].values.used; } macro_fss_basic_list_read_depths_t_new(status, (*depths), depth_size); @@ -38,11 +38,11 @@ extern "C" { f_macro_string_dynamic_t_clear(depths->array[i].value_name); - if (!data.parameters[fss_basic_list_read_parameter_depth].additional.used) { + if (!data.parameters[fss_basic_list_read_parameter_depth].values.used) { position_depth = 0; } else { - position_depth = data.parameters[fss_basic_list_read_parameter_depth].additional.array[i]; + position_depth = data.parameters[fss_basic_list_read_parameter_depth].values.array[i]; const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[position_depth])); @@ -55,17 +55,17 @@ extern "C" { } if (data.parameters[fss_basic_list_read_parameter_at].result == f_console_result_additional) { - for (; position_at < data.parameters[fss_basic_list_read_parameter_at].additional.used; position_at++) { + for (; position_at < data.parameters[fss_basic_list_read_parameter_at].values.used; position_at++) { - if (data.parameters[fss_basic_list_read_parameter_at].additional.array[position_at] < position_depth) { + if (data.parameters[fss_basic_list_read_parameter_at].values.array[position_at] < position_depth) { continue; } - if (i + 1 < depths->used && data.parameters[fss_basic_list_read_parameter_at].additional.array[position_at] > data.parameters[fss_basic_list_read_parameter_depth].additional.array[i + 1]) { + if (i + 1 < depths->used && data.parameters[fss_basic_list_read_parameter_at].values.array[position_at] > data.parameters[fss_basic_list_read_parameter_depth].values.array[i + 1]) { break; } - depths->array[i].index_at = data.parameters[fss_basic_list_read_parameter_at].additional.array[position_at]; + depths->array[i].index_at = data.parameters[fss_basic_list_read_parameter_at].values.array[position_at]; const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[depths->array[i].index_at])); @@ -79,17 +79,17 @@ extern "C" { } if (data.parameters[fss_basic_list_read_parameter_name].result == f_console_result_additional) { - for (; position_name < data.parameters[fss_basic_list_read_parameter_name].additional.used; position_name++) { + for (; position_name < data.parameters[fss_basic_list_read_parameter_name].values.used; position_name++) { - if (data.parameters[fss_basic_list_read_parameter_name].additional.array[position_name] < position_depth) { + if (data.parameters[fss_basic_list_read_parameter_name].values.array[position_name] < position_depth) { continue; } - if (i + 1 < depths->used && data.parameters[fss_basic_list_read_parameter_name].additional.array[position_name] > data.parameters[fss_basic_list_read_parameter_depth].additional.array[i + 1]) { + if (i + 1 < depths->used && data.parameters[fss_basic_list_read_parameter_name].values.array[position_name] > data.parameters[fss_basic_list_read_parameter_depth].values.array[i + 1]) { break; } - depths->array[i].index_name = data.parameters[fss_basic_list_read_parameter_name].additional.array[position_name]; + depths->array[i].index_name = data.parameters[fss_basic_list_read_parameter_name].values.array[position_name]; if (data.parameters[fss_basic_list_read_parameter_trim].result == f_console_result_found) { status = fl_string_rip(arguments.argv[depths->array[i].index_name], strlen(arguments.argv[depths->array[i].index_name]), &depths->array[i].value_name); @@ -228,7 +228,7 @@ extern "C" { f_number_unsigned_t select = 0; if (data->parameters[fss_basic_list_read_parameter_select].result == f_console_result_additional) { - const f_array_length_t index = data->parameters[fss_basic_list_read_parameter_select].additional.array[data->parameters[fss_basic_list_read_parameter_select].additional.used - 1]; + const f_array_length_t index = data->parameters[fss_basic_list_read_parameter_select].values.array[data->parameters[fss_basic_list_read_parameter_select].values.used - 1]; const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index])); status = fl_conversion_string_to_number_unsigned(arguments.argv[index], &select, range); @@ -247,7 +247,7 @@ extern "C" { f_array_length_t line = 0; if (data->parameters[fss_basic_list_read_parameter_line].result == f_console_result_additional) { - const f_array_length_t index = data->parameters[fss_basic_list_read_parameter_line].additional.array[data->parameters[fss_basic_list_read_parameter_line].additional.used - 1]; + const f_array_length_t index = data->parameters[fss_basic_list_read_parameter_line].values.array[data->parameters[fss_basic_list_read_parameter_line].values.used - 1]; const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index])); status = fl_conversion_string_to_number_unsigned(arguments.argv[index], &line, range); diff --git a/level_3/fss_basic_list_write/c/fss_basic_list_write.c b/level_3/fss_basic_list_write/c/fss_basic_list_write.c index 3506599..eaee3e7 100644 --- a/level_3/fss_basic_list_write/c/fss_basic_list_write.c +++ b/level_3/fss_basic_list_write/c/fss_basic_list_write.c @@ -159,7 +159,7 @@ extern "C" { if (F_status_is_error_not(status)) { if (data->parameters[fss_basic_list_write_parameter_file].result == f_console_result_additional) { - if (data->parameters[fss_basic_list_write_parameter_file].additional.used > 1) { + if (data->parameters[fss_basic_list_write_parameter_file].values.used > 1) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol[0]); fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); @@ -170,7 +170,7 @@ extern "C" { status = F_status_set_error(F_parameter); } else { - const f_string_length_t location = data->parameters[fss_basic_list_write_parameter_file].additional.array[0]; + const f_string_length_t location = data->parameters[fss_basic_list_write_parameter_file].values.array[0]; output.id = -1; output.stream = 0; @@ -190,11 +190,11 @@ extern "C" { if (F_status_is_error_not(status)) { if (data->parameters[fss_basic_list_write_parameter_object].locations.used || data->parameters[fss_basic_list_write_parameter_content].locations.used) { if (data->parameters[fss_basic_list_write_parameter_object].locations.used) { - if (data->parameters[fss_basic_list_write_parameter_object].locations.used != data->parameters[fss_basic_list_write_parameter_object].additional.used) { + if (data->parameters[fss_basic_list_write_parameter_object].locations.used != data->parameters[fss_basic_list_write_parameter_object].values.used) { fss_basic_list_write_error_parameter_value_missing_print(*data, f_console_symbol_long_enable, fss_basic_list_write_long_object); status = F_status_set_error(F_parameter); } - else if (data->parameters[fss_basic_list_write_parameter_content].locations.used != data->parameters[fss_basic_list_write_parameter_content].additional.used) { + else if (data->parameters[fss_basic_list_write_parameter_content].locations.used != data->parameters[fss_basic_list_write_parameter_content].values.used) { fss_basic_list_write_error_parameter_value_missing_print(*data, f_console_symbol_long_enable, fss_basic_list_write_long_content); status = F_status_set_error(F_parameter); } @@ -250,7 +250,7 @@ extern "C" { } } else if (data->parameters[fss_basic_list_write_parameter_content].locations.used) { - if (data->parameters[fss_basic_list_write_parameter_content].locations.used != data->parameters[fss_basic_list_write_parameter_content].additional.used) { + if (data->parameters[fss_basic_list_write_parameter_content].locations.used != data->parameters[fss_basic_list_write_parameter_content].values.used) { fss_basic_list_write_error_parameter_value_missing_print(*data, f_console_symbol_long_enable, fss_basic_list_write_long_content); status = F_status_set_error(F_parameter); } @@ -299,7 +299,7 @@ extern "C" { status = F_status_set_error(F_parameter); } else if (data->parameters[fss_basic_list_write_parameter_prepend].result == f_console_result_additional) { - const f_string_length_t index = data->parameters[fss_basic_list_write_parameter_prepend].additional.array[data->parameters[fss_basic_list_write_parameter_prepend].additional.used - 1]; + const f_string_length_t index = data->parameters[fss_basic_list_write_parameter_prepend].values.array[data->parameters[fss_basic_list_write_parameter_prepend].values.used - 1]; const f_string_length_t length = strnlen(arguments.argv[index], f_console_length_size); if (length) { @@ -353,7 +353,7 @@ extern "C" { } else if (data->parameters[fss_basic_list_write_parameter_ignore].result == f_console_result_additional) { const f_array_length_t total_locations = data->parameters[fss_basic_list_write_parameter_ignore].locations.used; - const f_array_length_t total_arguments = data->parameters[fss_basic_list_write_parameter_ignore].additional.used; + const f_array_length_t total_arguments = data->parameters[fss_basic_list_write_parameter_ignore].values.used; if (total_locations * 2 > total_arguments) { fprintf(data->error.to.stream, "%c", f_string_eol[0]); @@ -405,9 +405,9 @@ extern "C" { if (data->parameters[fss_basic_list_write_parameter_partial].result == f_console_result_found) { if (data->parameters[fss_basic_list_write_parameter_object].result == f_console_result_additional) { - for (f_array_length_t i = 0; i < data->parameters[fss_basic_list_write_parameter_object].additional.used; i++) { + for (f_array_length_t i = 0; i < data->parameters[fss_basic_list_write_parameter_object].values.used; i++) { - object.string = arguments.argv[data->parameters[fss_basic_list_write_parameter_object].additional.array[i]]; + object.string = arguments.argv[data->parameters[fss_basic_list_write_parameter_object].values.array[i]]; object.used = strnlen(object.string, f_console_length_size); object.size = object.used; @@ -416,9 +416,9 @@ extern "C" { } // for } else { - for (f_array_length_t i = 0; i < data->parameters[fss_basic_list_write_parameter_content].additional.used; i++) { + for (f_array_length_t i = 0; i < data->parameters[fss_basic_list_write_parameter_content].values.used; i++) { - content.string = arguments.argv[data->parameters[fss_basic_list_write_parameter_content].additional.array[i]]; + content.string = arguments.argv[data->parameters[fss_basic_list_write_parameter_content].values.array[i]]; content.used = strnlen(content.string, f_console_length_size); content.size = content.used; @@ -428,13 +428,13 @@ extern "C" { } } else { - for (f_array_length_t i = 0; i < data->parameters[fss_basic_list_write_parameter_object].additional.used; i++) { + for (f_array_length_t i = 0; i < data->parameters[fss_basic_list_write_parameter_object].values.used; i++) { - object.string = arguments.argv[data->parameters[fss_basic_list_write_parameter_object].additional.array[i]]; + object.string = arguments.argv[data->parameters[fss_basic_list_write_parameter_object].values.array[i]]; object.used = strnlen(object.string, f_console_length_size); object.size = object.used; - content.string = arguments.argv[data->parameters[fss_basic_list_write_parameter_content].additional.array[i]]; + content.string = arguments.argv[data->parameters[fss_basic_list_write_parameter_content].values.array[i]]; content.used = strnlen(content.string, f_console_length_size); content.size = content.used; @@ -496,7 +496,7 @@ extern "C" { for (f_string_length_t i = 0; i < fss_basic_list_write_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); f_macro_string_lengths_t_delete_simple(data->parameters[i].locations_sub); - f_macro_string_lengths_t_delete_simple(data->parameters[i].additional); + f_macro_string_lengths_t_delete_simple(data->parameters[i].values); } // for f_macro_string_lengths_t_delete_simple(data->remaining); diff --git a/level_3/fss_basic_read/c/fss_basic_read.c b/level_3/fss_basic_read/c/fss_basic_read.c index 8eb7db5..cbdd6d1 100644 --- a/level_3/fss_basic_read/c/fss_basic_read.c +++ b/level_3/fss_basic_read/c/fss_basic_read.c @@ -334,7 +334,7 @@ extern "C" { status = F_status_set_error(F_parameter); } else if (data->parameters[fss_basic_read_parameter_delimit].result == f_console_result_additional) { - const f_string_length_t location = data->parameters[fss_basic_read_parameter_delimit].additional.array[0]; + const f_string_length_t location = data->parameters[fss_basic_read_parameter_delimit].values.array[0]; f_string_length_t length = strnlen(arguments.argv[location], f_console_length_size); if (length == 0) { @@ -524,7 +524,7 @@ extern "C" { for (f_string_length_t i = 0; i < fss_basic_read_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); f_macro_string_lengths_t_delete_simple(data->parameters[i].locations_sub); - f_macro_string_lengths_t_delete_simple(data->parameters[i].additional); + f_macro_string_lengths_t_delete_simple(data->parameters[i].values); } // for f_macro_fss_contents_t_delete_simple(data->contents); diff --git a/level_3/fss_basic_read/c/private-fss_basic_read.c b/level_3/fss_basic_read/c/private-fss_basic_read.c index ef2e461..a9cbbf8 100644 --- a/level_3/fss_basic_read/c/private-fss_basic_read.c +++ b/level_3/fss_basic_read/c/private-fss_basic_read.c @@ -13,7 +13,7 @@ extern "C" { f_array_length_t depth_size = 1; if (data.parameters[fss_basic_read_parameter_depth].result == f_console_result_additional) { - depth_size = data.parameters[fss_basic_read_parameter_depth].additional.used; + depth_size = data.parameters[fss_basic_read_parameter_depth].values.used; } macro_fss_basic_read_depths_t_new(status, (*depths), depth_size); @@ -38,11 +38,11 @@ extern "C" { f_macro_string_dynamic_t_clear(depths->array[i].value_name); - if (!data.parameters[fss_basic_read_parameter_depth].additional.used) { + if (!data.parameters[fss_basic_read_parameter_depth].values.used) { position_depth = 0; } else { - position_depth = data.parameters[fss_basic_read_parameter_depth].additional.array[i]; + position_depth = data.parameters[fss_basic_read_parameter_depth].values.array[i]; const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[position_depth])); @@ -55,17 +55,17 @@ extern "C" { } if (data.parameters[fss_basic_read_parameter_at].result == f_console_result_additional) { - for (; position_at < data.parameters[fss_basic_read_parameter_at].additional.used; position_at++) { + for (; position_at < data.parameters[fss_basic_read_parameter_at].values.used; position_at++) { - if (data.parameters[fss_basic_read_parameter_at].additional.array[position_at] < position_depth) { + if (data.parameters[fss_basic_read_parameter_at].values.array[position_at] < position_depth) { continue; } - if (i + 1 < depths->used && data.parameters[fss_basic_read_parameter_at].additional.array[position_at] > data.parameters[fss_basic_read_parameter_depth].additional.array[i + 1]) { + if (i + 1 < depths->used && data.parameters[fss_basic_read_parameter_at].values.array[position_at] > data.parameters[fss_basic_read_parameter_depth].values.array[i + 1]) { break; } - depths->array[i].index_at = data.parameters[fss_basic_read_parameter_at].additional.array[position_at]; + depths->array[i].index_at = data.parameters[fss_basic_read_parameter_at].values.array[position_at]; const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[depths->array[i].index_at])); @@ -79,17 +79,17 @@ extern "C" { } if (data.parameters[fss_basic_read_parameter_name].result == f_console_result_additional) { - for (; position_name < data.parameters[fss_basic_read_parameter_name].additional.used; position_name++) { + for (; position_name < data.parameters[fss_basic_read_parameter_name].values.used; position_name++) { - if (data.parameters[fss_basic_read_parameter_name].additional.array[position_name] < position_depth) { + if (data.parameters[fss_basic_read_parameter_name].values.array[position_name] < position_depth) { continue; } - if (i + 1 < depths->used && data.parameters[fss_basic_read_parameter_name].additional.array[position_name] > data.parameters[fss_basic_read_parameter_depth].additional.array[i + 1]) { + if (i + 1 < depths->used && data.parameters[fss_basic_read_parameter_name].values.array[position_name] > data.parameters[fss_basic_read_parameter_depth].values.array[i + 1]) { break; } - depths->array[i].index_name = data.parameters[fss_basic_read_parameter_name].additional.array[position_name]; + depths->array[i].index_name = data.parameters[fss_basic_read_parameter_name].values.array[position_name]; if (data.parameters[fss_basic_read_parameter_trim].result == f_console_result_found) { status = fl_string_rip(arguments.argv[depths->array[i].index_name], strlen(arguments.argv[depths->array[i].index_name]), &depths->array[i].value_name); @@ -217,7 +217,7 @@ extern "C" { f_number_unsigned_t select = 0; if (data->parameters[fss_basic_read_parameter_select].result == f_console_result_additional) { - const f_string_length_t index = data->parameters[fss_basic_read_parameter_select].additional.array[data->parameters[fss_basic_read_parameter_select].additional.used - 1]; + const f_string_length_t index = data->parameters[fss_basic_read_parameter_select].values.array[data->parameters[fss_basic_read_parameter_select].values.used - 1]; const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index])); status = fl_conversion_string_to_number_unsigned(arguments.argv[index], &select, range); @@ -236,7 +236,7 @@ extern "C" { f_array_length_t line = 0; if (data->parameters[fss_basic_read_parameter_line].result == f_console_result_additional) { - const f_array_length_t index = data->parameters[fss_basic_read_parameter_line].additional.array[data->parameters[fss_basic_read_parameter_line].additional.used - 1]; + const f_array_length_t index = data->parameters[fss_basic_read_parameter_line].values.array[data->parameters[fss_basic_read_parameter_line].values.used - 1]; const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index])); status = fl_conversion_string_to_number_unsigned(arguments.argv[index], &line, range); diff --git a/level_3/fss_basic_write/c/fss_basic_write.c b/level_3/fss_basic_write/c/fss_basic_write.c index e1bb15b..c9defc1 100644 --- a/level_3/fss_basic_write/c/fss_basic_write.c +++ b/level_3/fss_basic_write/c/fss_basic_write.c @@ -157,7 +157,7 @@ extern "C" { if (F_status_is_error_not(status)) { if (data->parameters[fss_basic_write_parameter_file].result == f_console_result_additional) { - if (data->parameters[fss_basic_write_parameter_file].additional.used > 1) { + if (data->parameters[fss_basic_write_parameter_file].values.used > 1) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol[0]); fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); @@ -168,7 +168,7 @@ extern "C" { status = F_status_set_error(F_parameter); } else { - const f_string_length_t location = data->parameters[fss_basic_write_parameter_file].additional.array[0]; + const f_string_length_t location = data->parameters[fss_basic_write_parameter_file].values.array[0]; output.id = -1; output.stream = 0; @@ -188,11 +188,11 @@ extern "C" { if (F_status_is_error_not(status)) { if (data->parameters[fss_basic_write_parameter_object].locations.used || data->parameters[fss_basic_write_parameter_content].locations.used) { if (data->parameters[fss_basic_write_parameter_object].locations.used) { - if (data->parameters[fss_basic_write_parameter_object].locations.used != data->parameters[fss_basic_write_parameter_object].additional.used) { + if (data->parameters[fss_basic_write_parameter_object].locations.used != data->parameters[fss_basic_write_parameter_object].values.used) { fss_basic_write_error_parameter_value_missing_print(*data, f_console_symbol_long_enable, fss_basic_write_long_object); status = F_status_set_error(F_parameter); } - else if (data->parameters[fss_basic_write_parameter_content].locations.used != data->parameters[fss_basic_write_parameter_content].additional.used) { + else if (data->parameters[fss_basic_write_parameter_content].locations.used != data->parameters[fss_basic_write_parameter_content].values.used) { fss_basic_write_error_parameter_value_missing_print(*data, f_console_symbol_long_enable, fss_basic_write_long_content); status = F_status_set_error(F_parameter); } @@ -248,7 +248,7 @@ extern "C" { } } else if (data->parameters[fss_basic_write_parameter_content].locations.used) { - if (data->parameters[fss_basic_write_parameter_content].locations.used != data->parameters[fss_basic_write_parameter_content].additional.used) { + if (data->parameters[fss_basic_write_parameter_content].locations.used != data->parameters[fss_basic_write_parameter_content].values.used) { fss_basic_write_error_parameter_value_missing_print(*data, f_console_symbol_long_enable, fss_basic_write_long_content); status = F_status_set_error(F_parameter); } @@ -297,7 +297,7 @@ extern "C" { status = F_status_set_error(F_parameter); } else if (data->parameters[fss_basic_write_parameter_prepend].result == f_console_result_additional) { - const f_string_length_t index = data->parameters[fss_basic_write_parameter_prepend].additional.array[data->parameters[fss_basic_write_parameter_prepend].additional.used - 1]; + const f_string_length_t index = data->parameters[fss_basic_write_parameter_prepend].values.array[data->parameters[fss_basic_write_parameter_prepend].values.used - 1]; const f_string_length_t length = strnlen(arguments.argv[index], f_console_length_size); // Even though this standard does not utilize this parameter, provide the validation for consistency. @@ -349,7 +349,7 @@ extern "C" { } else if (data->parameters[fss_basic_write_parameter_ignore].result == f_console_result_additional) { const f_array_length_t total_locations = data->parameters[fss_basic_write_parameter_ignore].locations.used; - const f_array_length_t total_arguments = data->parameters[fss_basic_write_parameter_ignore].additional.used; + const f_array_length_t total_arguments = data->parameters[fss_basic_write_parameter_ignore].values.used; if (total_locations * 2 > total_arguments) { fprintf(data->error.to.stream, "%c", f_string_eol[0]); @@ -402,9 +402,9 @@ extern "C" { if (data->parameters[fss_basic_write_parameter_object].result == f_console_result_additional) { content.used = 0; - for (f_array_length_t i = 0; i < data->parameters[fss_basic_write_parameter_object].additional.used; i++) { + for (f_array_length_t i = 0; i < data->parameters[fss_basic_write_parameter_object].values.used; i++) { - object.string = arguments.argv[data->parameters[fss_basic_write_parameter_object].additional.array[i]]; + object.string = arguments.argv[data->parameters[fss_basic_write_parameter_object].values.array[i]]; object.used = strnlen(object.string, f_console_length_size); object.size = object.used; @@ -415,9 +415,9 @@ extern "C" { else { object.used = 0; - for (f_array_length_t i = 0; i < data->parameters[fss_basic_write_parameter_content].additional.used; i++) { + for (f_array_length_t i = 0; i < data->parameters[fss_basic_write_parameter_content].values.used; i++) { - content.string = arguments.argv[data->parameters[fss_basic_write_parameter_content].additional.array[i]]; + content.string = arguments.argv[data->parameters[fss_basic_write_parameter_content].values.array[i]]; content.used = strnlen(content.string, f_console_length_size); content.size = content.used; @@ -427,13 +427,13 @@ extern "C" { } } else { - for (f_array_length_t i = 0; i < data->parameters[fss_basic_write_parameter_object].additional.used; i++) { + for (f_array_length_t i = 0; i < data->parameters[fss_basic_write_parameter_object].values.used; i++) { - object.string = arguments.argv[data->parameters[fss_basic_write_parameter_object].additional.array[i]]; + object.string = arguments.argv[data->parameters[fss_basic_write_parameter_object].values.array[i]]; object.used = strnlen(object.string, f_console_length_size); object.size = object.used; - content.string = arguments.argv[data->parameters[fss_basic_write_parameter_content].additional.array[i]]; + content.string = arguments.argv[data->parameters[fss_basic_write_parameter_content].values.array[i]]; content.used = strnlen(content.string, f_console_length_size); content.size = content.used; @@ -495,7 +495,7 @@ extern "C" { for (f_string_length_t i = 0; i < fss_basic_write_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); f_macro_string_lengths_t_delete_simple(data->parameters[i].locations_sub); - f_macro_string_lengths_t_delete_simple(data->parameters[i].additional); + f_macro_string_lengths_t_delete_simple(data->parameters[i].values); } // for f_macro_string_lengths_t_delete_simple(data->remaining); diff --git a/level_3/fss_extended_list_read/c/fss_extended_list_read.c b/level_3/fss_extended_list_read/c/fss_extended_list_read.c index 7b78ca6..f87c779 100644 --- a/level_3/fss_extended_list_read/c/fss_extended_list_read.c +++ b/level_3/fss_extended_list_read/c/fss_extended_list_read.c @@ -334,7 +334,7 @@ extern "C" { status = F_status_set_error(F_parameter); } else if (data->parameters[fss_extended_list_read_parameter_delimit].result == f_console_result_additional) { - const f_string_length_t location = data->parameters[fss_extended_list_read_parameter_delimit].additional.array[0]; + const f_string_length_t location = data->parameters[fss_extended_list_read_parameter_delimit].values.array[0]; f_string_length_t length = strnlen(arguments.argv[location], f_console_length_size); if (length == 0) { @@ -510,7 +510,7 @@ extern "C" { for (f_string_length_t i = 0; i < fss_extended_list_read_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); f_macro_string_lengths_t_delete_simple(data->parameters[i].locations_sub); - f_macro_string_lengths_t_delete_simple(data->parameters[i].additional); + f_macro_string_lengths_t_delete_simple(data->parameters[i].values); } // for f_macro_fss_nest_t_delete_simple(data->nest); diff --git a/level_3/fss_extended_list_read/c/private-fss_extended_list_read.c b/level_3/fss_extended_list_read/c/private-fss_extended_list_read.c index d6b443e..edf7a46 100644 --- a/level_3/fss_extended_list_read/c/private-fss_extended_list_read.c +++ b/level_3/fss_extended_list_read/c/private-fss_extended_list_read.c @@ -13,7 +13,7 @@ extern "C" { f_array_length_t depth_size = 1; if (data.parameters[fss_extended_list_read_parameter_depth].result == f_console_result_additional) { - depth_size = data.parameters[fss_extended_list_read_parameter_depth].additional.used; + depth_size = data.parameters[fss_extended_list_read_parameter_depth].values.used; } macro_fss_extended_list_read_depths_t_new(status, (*depths), depth_size); @@ -38,11 +38,11 @@ extern "C" { f_macro_string_dynamic_t_clear(depths->array[i].value_name); - if (!data.parameters[fss_extended_list_read_parameter_depth].additional.used) { + if (!data.parameters[fss_extended_list_read_parameter_depth].values.used) { position_depth = 0; } else { - position_depth = data.parameters[fss_extended_list_read_parameter_depth].additional.array[i]; + position_depth = data.parameters[fss_extended_list_read_parameter_depth].values.array[i]; const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[position_depth])); @@ -55,17 +55,17 @@ extern "C" { } if (data.parameters[fss_extended_list_read_parameter_at].result == f_console_result_additional) { - for (; position_at < data.parameters[fss_extended_list_read_parameter_at].additional.used; position_at++) { + for (; position_at < data.parameters[fss_extended_list_read_parameter_at].values.used; position_at++) { - if (data.parameters[fss_extended_list_read_parameter_at].additional.array[position_at] < position_depth) { + if (data.parameters[fss_extended_list_read_parameter_at].values.array[position_at] < position_depth) { continue; } - if (i + 1 < depths->used && data.parameters[fss_extended_list_read_parameter_at].additional.array[position_at] > data.parameters[fss_extended_list_read_parameter_depth].additional.array[i + 1]) { + if (i + 1 < depths->used && data.parameters[fss_extended_list_read_parameter_at].values.array[position_at] > data.parameters[fss_extended_list_read_parameter_depth].values.array[i + 1]) { break; } - depths->array[i].index_at = data.parameters[fss_extended_list_read_parameter_at].additional.array[position_at]; + depths->array[i].index_at = data.parameters[fss_extended_list_read_parameter_at].values.array[position_at]; const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[depths->array[i].index_at])); @@ -79,17 +79,17 @@ extern "C" { } if (data.parameters[fss_extended_list_read_parameter_name].result == f_console_result_additional) { - for (; position_name < data.parameters[fss_extended_list_read_parameter_name].additional.used; position_name++) { + for (; position_name < data.parameters[fss_extended_list_read_parameter_name].values.used; position_name++) { - if (data.parameters[fss_extended_list_read_parameter_name].additional.array[position_name] < position_depth) { + if (data.parameters[fss_extended_list_read_parameter_name].values.array[position_name] < position_depth) { continue; } - if (i + 1 < depths->used && data.parameters[fss_extended_list_read_parameter_name].additional.array[position_name] > data.parameters[fss_extended_list_read_parameter_depth].additional.array[i + 1]) { + if (i + 1 < depths->used && data.parameters[fss_extended_list_read_parameter_name].values.array[position_name] > data.parameters[fss_extended_list_read_parameter_depth].values.array[i + 1]) { break; } - depths->array[i].index_name = data.parameters[fss_extended_list_read_parameter_name].additional.array[position_name]; + depths->array[i].index_name = data.parameters[fss_extended_list_read_parameter_name].values.array[position_name]; if (data.parameters[fss_extended_list_read_parameter_trim].result == f_console_result_found) { status = fl_string_rip(arguments.argv[depths->array[i].index_name], strlen(arguments.argv[depths->array[i].index_name]), &depths->array[i].value_name); @@ -230,7 +230,7 @@ extern "C" { f_number_unsigned_t select = 0; if (data->parameters[fss_extended_list_read_parameter_select].result == f_console_result_additional) { - const f_string_length_t index = data->parameters[fss_extended_list_read_parameter_select].additional.array[data->parameters[fss_extended_list_read_parameter_select].additional.used - 1]; + const f_string_length_t index = data->parameters[fss_extended_list_read_parameter_select].values.array[data->parameters[fss_extended_list_read_parameter_select].values.used - 1]; const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index])); status = fl_conversion_string_to_number_unsigned(arguments.argv[index], &select, range); @@ -250,7 +250,7 @@ extern "C" { f_array_length_t line = 0; if (data->parameters[fss_extended_list_read_parameter_line].result == f_console_result_additional) { - const f_array_length_t index = data->parameters[fss_extended_list_read_parameter_line].additional.array[data->parameters[fss_extended_list_read_parameter_line].additional.used - 1]; + const f_array_length_t index = data->parameters[fss_extended_list_read_parameter_line].values.array[data->parameters[fss_extended_list_read_parameter_line].values.used - 1]; const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index])); status = fl_conversion_string_to_number_unsigned(arguments.argv[index], &line, range); diff --git a/level_3/fss_extended_list_write/c/fss_extended_list_write.c b/level_3/fss_extended_list_write/c/fss_extended_list_write.c index 7746174..45dd866 100644 --- a/level_3/fss_extended_list_write/c/fss_extended_list_write.c +++ b/level_3/fss_extended_list_write/c/fss_extended_list_write.c @@ -165,7 +165,7 @@ extern "C" { if (F_status_is_error_not(status)) { if (data->parameters[fss_extended_list_write_parameter_file].result == f_console_result_additional) { - if (data->parameters[fss_extended_list_write_parameter_file].additional.used > 1) { + if (data->parameters[fss_extended_list_write_parameter_file].values.used > 1) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol[0]); fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); @@ -176,7 +176,7 @@ extern "C" { status = F_status_set_error(F_parameter); } else { - const f_string_length_t location = data->parameters[fss_extended_list_write_parameter_file].additional.array[0]; + const f_string_length_t location = data->parameters[fss_extended_list_write_parameter_file].values.array[0]; output.id = -1; output.stream = 0; @@ -196,11 +196,11 @@ extern "C" { if (F_status_is_error_not(status)) { if (data->parameters[fss_extended_list_write_parameter_object].locations.used || data->parameters[fss_extended_list_write_parameter_content].locations.used) { if (data->parameters[fss_extended_list_write_parameter_object].locations.used) { - if (data->parameters[fss_extended_list_write_parameter_object].locations.used != data->parameters[fss_extended_list_write_parameter_object].additional.used) { + if (data->parameters[fss_extended_list_write_parameter_object].locations.used != data->parameters[fss_extended_list_write_parameter_object].values.used) { fss_extended_list_write_error_parameter_value_missing_print(*data, f_console_symbol_long_enable, fss_extended_list_write_long_object); status = F_status_set_error(F_parameter); } - else if (data->parameters[fss_extended_list_write_parameter_content].locations.used != data->parameters[fss_extended_list_write_parameter_content].additional.used) { + else if (data->parameters[fss_extended_list_write_parameter_content].locations.used != data->parameters[fss_extended_list_write_parameter_content].values.used) { fss_extended_list_write_error_parameter_value_missing_print(*data, f_console_symbol_long_enable, fss_extended_list_write_long_content); status = F_status_set_error(F_parameter); } @@ -256,7 +256,7 @@ extern "C" { } } else if (data->parameters[fss_extended_list_write_parameter_content].locations.used) { - if (data->parameters[fss_extended_list_write_parameter_content].locations.used != data->parameters[fss_extended_list_write_parameter_content].additional.used) { + if (data->parameters[fss_extended_list_write_parameter_content].locations.used != data->parameters[fss_extended_list_write_parameter_content].values.used) { fss_extended_list_write_error_parameter_value_missing_print(*data, f_console_symbol_long_enable, fss_extended_list_write_long_content); status = F_status_set_error(F_parameter); } @@ -305,7 +305,7 @@ extern "C" { status = F_status_set_error(F_parameter); } else if (data->parameters[fss_extended_list_write_parameter_prepend].result == f_console_result_additional) { - const f_string_length_t index = data->parameters[fss_extended_list_write_parameter_prepend].additional.array[data->parameters[fss_extended_list_write_parameter_prepend].additional.used - 1]; + const f_string_length_t index = data->parameters[fss_extended_list_write_parameter_prepend].values.array[data->parameters[fss_extended_list_write_parameter_prepend].values.used - 1]; const f_string_length_t length = strnlen(arguments.argv[index], f_console_length_size); if (length) { @@ -359,7 +359,7 @@ extern "C" { } else if (data->parameters[fss_extended_list_write_parameter_ignore].result == f_console_result_additional) { const f_array_length_t total_locations = data->parameters[fss_extended_list_write_parameter_ignore].locations.used; - const f_array_length_t total_arguments = data->parameters[fss_extended_list_write_parameter_ignore].additional.used; + const f_array_length_t total_arguments = data->parameters[fss_extended_list_write_parameter_ignore].values.used; if (total_locations * 2 > total_arguments) { fprintf(data->error.to.stream, "%c", f_string_eol[0]); @@ -414,9 +414,9 @@ extern "C" { if (data->parameters[fss_extended_list_write_parameter_partial].result == f_console_result_found) { if (data->parameters[fss_extended_list_write_parameter_object].result == f_console_result_additional) { - for (f_array_length_t i = 0; i < data->parameters[fss_extended_list_write_parameter_object].additional.used; i++) { + for (f_array_length_t i = 0; i < data->parameters[fss_extended_list_write_parameter_object].values.used; i++) { - object.string = arguments.argv[data->parameters[fss_extended_list_write_parameter_object].additional.array[i]]; + object.string = arguments.argv[data->parameters[fss_extended_list_write_parameter_object].values.array[i]]; object.used = strnlen(object.string, f_console_length_size); object.size = object.used; @@ -425,12 +425,12 @@ extern "C" { } // for } else { - for (f_array_length_t i = 0; i < data->parameters[fss_extended_list_write_parameter_content].additional.used; i++) { + for (f_array_length_t i = 0; i < data->parameters[fss_extended_list_write_parameter_content].values.used; i++) { status = fss_extended_list_write_process_parameter_ignore(arguments, *data, data->parameters[fss_extended_list_write_parameter_content].locations, i, &ignore); if (F_status_is_error(status)) break; - content.string = arguments.argv[data->parameters[fss_extended_list_write_parameter_content].additional.array[i]]; + content.string = arguments.argv[data->parameters[fss_extended_list_write_parameter_content].values.array[i]]; content.used = strnlen(content.string, f_console_length_size); content.size = content.used; @@ -440,16 +440,16 @@ extern "C" { } } else { - for (f_array_length_t i = 0; i < data->parameters[fss_extended_list_write_parameter_object].additional.used; i++) { + for (f_array_length_t i = 0; i < data->parameters[fss_extended_list_write_parameter_object].values.used; i++) { status = fss_extended_list_write_process_parameter_ignore(arguments, *data, data->parameters[fss_extended_list_write_parameter_content].locations, i, &ignore); if (F_status_is_error(status)) break; - object.string = arguments.argv[data->parameters[fss_extended_list_write_parameter_object].additional.array[i]]; + object.string = arguments.argv[data->parameters[fss_extended_list_write_parameter_object].values.array[i]]; object.used = strnlen(object.string, f_console_length_size); object.size = object.used; - content.string = arguments.argv[data->parameters[fss_extended_list_write_parameter_content].additional.array[i]]; + content.string = arguments.argv[data->parameters[fss_extended_list_write_parameter_content].values.array[i]]; content.used = strnlen(content.string, f_console_length_size); content.size = content.used; @@ -513,7 +513,7 @@ extern "C" { for (f_string_length_t i = 0; i < fss_extended_list_write_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); f_macro_string_lengths_t_delete_simple(data->parameters[i].locations_sub); - f_macro_string_lengths_t_delete_simple(data->parameters[i].additional); + f_macro_string_lengths_t_delete_simple(data->parameters[i].values); } // for f_macro_string_lengths_t_delete_simple(data->remaining); diff --git a/level_3/fss_extended_list_write/c/private-fss_extended_list_write.c b/level_3/fss_extended_list_write/c/private-fss_extended_list_write.c index 4fcfc11..5c3cf42 100644 --- a/level_3/fss_extended_list_write/c/private-fss_extended_list_write.c +++ b/level_3/fss_extended_list_write/c/private-fss_extended_list_write.c @@ -361,7 +361,7 @@ extern "C" { } } - index = data.parameters[fss_extended_list_write_parameter_ignore].additional.array[i * 2]; + index = data.parameters[fss_extended_list_write_parameter_ignore].values.array[i * 2]; range.start = 0; range.stop = strnlen(arguments.argv[index], f_console_length_size) - 1; @@ -380,7 +380,7 @@ extern "C" { ignore->array[ignore->used].start = number; - index = data.parameters[fss_extended_list_write_parameter_ignore].additional.array[(i * 2) + 1]; + index = data.parameters[fss_extended_list_write_parameter_ignore].values.array[(i * 2) + 1]; range.start = 0; range.stop = strnlen(arguments.argv[index], f_console_length_size) - 1; diff --git a/level_3/fss_extended_read/c/fss_extended_read.c b/level_3/fss_extended_read/c/fss_extended_read.c index 67f35aa..0df4157 100644 --- a/level_3/fss_extended_read/c/fss_extended_read.c +++ b/level_3/fss_extended_read/c/fss_extended_read.c @@ -334,7 +334,7 @@ extern "C" { status = F_status_set_error(F_parameter); } else if (data->parameters[fss_extended_read_parameter_delimit].result == f_console_result_additional) { - const f_string_length_t location = data->parameters[fss_extended_read_parameter_delimit].additional.array[0]; + const f_string_length_t location = data->parameters[fss_extended_read_parameter_delimit].values.array[0]; f_string_length_t length = strnlen(arguments.argv[location], f_console_length_size); if (length == 0) { @@ -526,7 +526,7 @@ extern "C" { for (f_string_length_t i = 0; i < fss_extended_read_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); f_macro_string_lengths_t_delete_simple(data->parameters[i].locations_sub); - f_macro_string_lengths_t_delete_simple(data->parameters[i].additional); + f_macro_string_lengths_t_delete_simple(data->parameters[i].values); } // for f_macro_fss_contents_t_delete_simple(data->contents); diff --git a/level_3/fss_extended_read/c/private-fss_extended_read.c b/level_3/fss_extended_read/c/private-fss_extended_read.c index e56772f..c200030 100644 --- a/level_3/fss_extended_read/c/private-fss_extended_read.c +++ b/level_3/fss_extended_read/c/private-fss_extended_read.c @@ -40,7 +40,7 @@ extern "C" { f_array_length_t depth_size = 1; if (data.parameters[fss_extended_read_parameter_depth].result == f_console_result_additional) { - depth_size = data.parameters[fss_extended_read_parameter_depth].additional.used; + depth_size = data.parameters[fss_extended_read_parameter_depth].values.used; } macro_fss_extended_read_depths_t_new(status, (*depths), depth_size); @@ -65,11 +65,11 @@ extern "C" { f_macro_string_dynamic_t_clear(depths->array[i].value_name); - if (!data.parameters[fss_extended_read_parameter_depth].additional.used) { + if (!data.parameters[fss_extended_read_parameter_depth].values.used) { position_depth = 0; } else { - position_depth = data.parameters[fss_extended_read_parameter_depth].additional.array[i]; + position_depth = data.parameters[fss_extended_read_parameter_depth].values.array[i]; const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[position_depth])); @@ -82,17 +82,17 @@ extern "C" { } if (data.parameters[fss_extended_read_parameter_at].result == f_console_result_additional) { - for (; position_at < data.parameters[fss_extended_read_parameter_at].additional.used; position_at++) { + for (; position_at < data.parameters[fss_extended_read_parameter_at].values.used; position_at++) { - if (data.parameters[fss_extended_read_parameter_at].additional.array[position_at] < position_depth) { + if (data.parameters[fss_extended_read_parameter_at].values.array[position_at] < position_depth) { continue; } - if (i + 1 < depths->used && data.parameters[fss_extended_read_parameter_at].additional.array[position_at] > data.parameters[fss_extended_read_parameter_depth].additional.array[i + 1]) { + if (i + 1 < depths->used && data.parameters[fss_extended_read_parameter_at].values.array[position_at] > data.parameters[fss_extended_read_parameter_depth].values.array[i + 1]) { break; } - depths->array[i].index_at = data.parameters[fss_extended_read_parameter_at].additional.array[position_at]; + depths->array[i].index_at = data.parameters[fss_extended_read_parameter_at].values.array[position_at]; const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[depths->array[i].index_at])); @@ -106,17 +106,17 @@ extern "C" { } if (data.parameters[fss_extended_read_parameter_name].result == f_console_result_additional) { - for (; position_name < data.parameters[fss_extended_read_parameter_name].additional.used; position_name++) { + for (; position_name < data.parameters[fss_extended_read_parameter_name].values.used; position_name++) { - if (data.parameters[fss_extended_read_parameter_name].additional.array[position_name] < position_depth) { + if (data.parameters[fss_extended_read_parameter_name].values.array[position_name] < position_depth) { continue; } - if (i + 1 < depths->used && data.parameters[fss_extended_read_parameter_name].additional.array[position_name] > data.parameters[fss_extended_read_parameter_depth].additional.array[i + 1]) { + if (i + 1 < depths->used && data.parameters[fss_extended_read_parameter_name].values.array[position_name] > data.parameters[fss_extended_read_parameter_depth].values.array[i + 1]) { break; } - depths->array[i].index_name = data.parameters[fss_extended_read_parameter_name].additional.array[position_name]; + depths->array[i].index_name = data.parameters[fss_extended_read_parameter_name].values.array[position_name]; if (data.parameters[fss_extended_read_parameter_trim].result == f_console_result_found) { status = fl_string_rip(arguments.argv[depths->array[i].index_name], strlen(arguments.argv[depths->array[i].index_name]), &depths->array[i].value_name); @@ -245,7 +245,7 @@ extern "C" { f_number_unsigned_t select = 0; if (data->parameters[fss_extended_read_parameter_select].result == f_console_result_additional) { - const f_array_length_t index = data->parameters[fss_extended_read_parameter_select].additional.array[data->parameters[fss_extended_read_parameter_select].additional.used - 1]; + const f_array_length_t index = data->parameters[fss_extended_read_parameter_select].values.array[data->parameters[fss_extended_read_parameter_select].values.used - 1]; const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index])); status = fl_conversion_string_to_number_unsigned(arguments.argv[index], &select, range); @@ -259,7 +259,7 @@ extern "C" { f_array_length_t line = 0; if (data->parameters[fss_extended_read_parameter_line].result == f_console_result_additional) { - const f_array_length_t index = data->parameters[fss_extended_read_parameter_line].additional.array[data->parameters[fss_extended_read_parameter_line].additional.used - 1]; + const f_array_length_t index = data->parameters[fss_extended_read_parameter_line].values.array[data->parameters[fss_extended_read_parameter_line].values.used - 1]; const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index])); status = fl_conversion_string_to_number_unsigned(arguments.argv[index], &line, range); diff --git a/level_3/fss_extended_write/c/fss_extended_write.c b/level_3/fss_extended_write/c/fss_extended_write.c index 1536aac..095ad41 100644 --- a/level_3/fss_extended_write/c/fss_extended_write.c +++ b/level_3/fss_extended_write/c/fss_extended_write.c @@ -157,7 +157,7 @@ extern "C" { if (F_status_is_error_not(status)) { if (data->parameters[fss_extended_write_parameter_file].result == f_console_result_additional) { - if (data->parameters[fss_extended_write_parameter_file].additional.used > 1) { + if (data->parameters[fss_extended_write_parameter_file].values.used > 1) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol[0]); fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); @@ -168,7 +168,7 @@ extern "C" { status = F_status_set_error(F_parameter); } else { - const f_string_length_t location = data->parameters[fss_extended_write_parameter_file].additional.array[0]; + const f_string_length_t location = data->parameters[fss_extended_write_parameter_file].values.array[0]; output.id = -1; output.stream = 0; @@ -188,11 +188,11 @@ extern "C" { if (F_status_is_error_not(status)) { if (data->parameters[fss_extended_write_parameter_object].locations.used || data->parameters[fss_extended_write_parameter_content].locations.used) { if (data->parameters[fss_extended_write_parameter_object].locations.used) { - if (data->parameters[fss_extended_write_parameter_object].locations.used != data->parameters[fss_extended_write_parameter_object].additional.used) { + if (data->parameters[fss_extended_write_parameter_object].locations.used != data->parameters[fss_extended_write_parameter_object].values.used) { fss_extended_write_error_parameter_value_missing_print(*data, f_console_symbol_long_enable, fss_extended_write_long_object); status = F_status_set_error(F_parameter); } - else if (data->parameters[fss_extended_write_parameter_content].locations.used != data->parameters[fss_extended_write_parameter_content].additional.used) { + else if (data->parameters[fss_extended_write_parameter_content].locations.used != data->parameters[fss_extended_write_parameter_content].values.used) { fss_extended_write_error_parameter_value_missing_print(*data, f_console_symbol_long_enable, fss_extended_write_long_content); status = F_status_set_error(F_parameter); } @@ -259,7 +259,7 @@ extern "C" { } } else if (data->parameters[fss_extended_write_parameter_content].locations.used) { - if (data->parameters[fss_extended_write_parameter_content].locations.used != data->parameters[fss_extended_write_parameter_content].additional.used) { + if (data->parameters[fss_extended_write_parameter_content].locations.used != data->parameters[fss_extended_write_parameter_content].values.used) { fss_extended_write_error_parameter_value_missing_print(*data, f_console_symbol_long_enable, fss_extended_write_long_content); status = F_status_set_error(F_parameter); } @@ -308,7 +308,7 @@ extern "C" { status = F_status_set_error(F_parameter); } else if (data->parameters[fss_extended_write_parameter_prepend].result == f_console_result_additional) { - const f_string_length_t index = data->parameters[fss_extended_write_parameter_prepend].additional.array[data->parameters[fss_extended_write_parameter_prepend].additional.used - 1]; + const f_string_length_t index = data->parameters[fss_extended_write_parameter_prepend].values.array[data->parameters[fss_extended_write_parameter_prepend].values.used - 1]; const f_string_length_t length = strnlen(arguments.argv[index], f_console_length_size); // Even though this standard does not utilize this parameter, provide the validation for consistency. @@ -360,7 +360,7 @@ extern "C" { } else if (data->parameters[fss_extended_write_parameter_ignore].result == f_console_result_additional) { const f_array_length_t total_locations = data->parameters[fss_extended_write_parameter_ignore].locations.used; - const f_array_length_t total_arguments = data->parameters[fss_extended_write_parameter_ignore].additional.used; + const f_array_length_t total_arguments = data->parameters[fss_extended_write_parameter_ignore].values.used; if (total_locations * 2 > total_arguments) { fprintf(data->error.to.stream, "%c", f_string_eol[0]); @@ -413,9 +413,9 @@ extern "C" { if (data->parameters[fss_extended_write_parameter_object].result == f_console_result_additional) { contents.used = 0; - for (f_array_length_t i = 0; i < data->parameters[fss_extended_write_parameter_object].additional.used; i++) { + for (f_array_length_t i = 0; i < data->parameters[fss_extended_write_parameter_object].values.used; i++) { - object.string = arguments.argv[data->parameters[fss_extended_write_parameter_object].additional.array[i]]; + object.string = arguments.argv[data->parameters[fss_extended_write_parameter_object].values.array[i]]; object.used = strnlen(object.string, f_console_length_size); object.size = object.used; @@ -426,7 +426,7 @@ extern "C" { else { object.used = 0; - status = fl_string_dynamics_size_increase(data->parameters[fss_extended_write_parameter_content].additional.used, &contents); + status = fl_string_dynamics_size_increase(data->parameters[fss_extended_write_parameter_content].values.used, &contents); if (status == F_buffer_too_large) { status = F_status_set_error(status); @@ -438,9 +438,9 @@ extern "C" { else { f_array_length_t i = 0; - for (; i < data->parameters[fss_extended_write_parameter_content].additional.used; i++) { + for (; i < data->parameters[fss_extended_write_parameter_content].values.used; i++) { - contents.array[contents.used].string = arguments.argv[data->parameters[fss_extended_write_parameter_content].additional.array[i]]; + contents.array[contents.used].string = arguments.argv[data->parameters[fss_extended_write_parameter_content].values.array[i]]; contents.array[contents.used].used = strnlen(contents.array[contents.used].string, f_console_length_size); contents.array[contents.used].size = contents.array[contents.used].used; contents.used++; @@ -449,7 +449,7 @@ extern "C" { status = fss_extended_write_process(*data, output, quote, 0, &contents, &buffer); // clear the contents array of the static strings to avoid deallocation attempts on static variables. - for (; i < data->parameters[fss_extended_write_parameter_content].additional.used; i++) { + for (; i < data->parameters[fss_extended_write_parameter_content].values.used; i++) { contents.array[contents.used].string = 0; contents.array[contents.used].used = 0; contents.array[contents.used].size = 0; @@ -467,25 +467,25 @@ extern "C" { f_array_length_t object_next = 0; f_array_length_t content_current = 0; - for (; i < data->parameters[fss_extended_write_parameter_object].additional.used; i++) { + for (; i < data->parameters[fss_extended_write_parameter_object].values.used; i++) { object_current = data->parameters[fss_extended_write_parameter_object].locations.array[i]; - if (i + 1 < data->parameters[fss_extended_write_parameter_object].additional.used) { + if (i + 1 < data->parameters[fss_extended_write_parameter_object].values.used) { object_next = data->parameters[fss_extended_write_parameter_object].locations.array[i + 1]; } - object.string = arguments.argv[data->parameters[fss_extended_write_parameter_object].additional.array[i]]; + object.string = arguments.argv[data->parameters[fss_extended_write_parameter_object].values.array[i]]; object.used = strnlen(object.string, f_console_length_size); object.size = object.used; contents.used = 0; - for (; j < data->parameters[fss_extended_write_parameter_content].additional.used; j++) { + for (; j < data->parameters[fss_extended_write_parameter_content].values.used; j++) { content_current = data->parameters[fss_extended_write_parameter_content].locations.array[j]; - if (i + 1 < data->parameters[fss_extended_write_parameter_object].additional.used) { + if (i + 1 < data->parameters[fss_extended_write_parameter_object].values.used) { if (content_current < object_current || content_current > object_next) break; } @@ -500,7 +500,7 @@ extern "C" { contents.array[contents.used].used = 0; } - status = fl_string_append(arguments.argv[data->parameters[fss_extended_write_parameter_content].additional.array[j]], strnlen(arguments.argv[data->parameters[fss_extended_write_parameter_content].additional.array[j]], f_console_length_size), &contents.array[contents.used]); + status = fl_string_append(arguments.argv[data->parameters[fss_extended_write_parameter_content].values.array[j]], strnlen(arguments.argv[data->parameters[fss_extended_write_parameter_content].values.array[j]], f_console_length_size), &contents.array[contents.used]); if (F_status_is_error(status)) { fll_error_print(data->error, F_status_set_fine(status), "fl_string_append", F_true); @@ -569,7 +569,7 @@ extern "C" { for (f_string_length_t i = 0; i < fss_extended_write_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); f_macro_string_lengths_t_delete_simple(data->parameters[i].locations_sub); - f_macro_string_lengths_t_delete_simple(data->parameters[i].additional); + f_macro_string_lengths_t_delete_simple(data->parameters[i].values); } // for f_macro_string_lengths_t_delete_simple(data->remaining); diff --git a/level_3/fss_status_code/c/fss_status_code.c b/level_3/fss_status_code/c/fss_status_code.c index 8c23059..cc09580 100644 --- a/level_3/fss_status_code/c/fss_status_code.c +++ b/level_3/fss_status_code/c/fss_status_code.c @@ -200,7 +200,7 @@ extern "C" { for (f_string_length_t i = 0; i < fss_status_code_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); f_macro_string_lengths_t_delete_simple(data->parameters[i].locations_sub); - f_macro_string_lengths_t_delete_simple(data->parameters[i].additional); + f_macro_string_lengths_t_delete_simple(data->parameters[i].values); } // for f_macro_string_lengths_t_delete_simple(data->remaining); diff --git a/level_3/iki_read/c/iki_read.c b/level_3/iki_read/c/iki_read.c index f6d9687..4e39189 100644 --- a/level_3/iki_read/c/iki_read.c +++ b/level_3/iki_read/c/iki_read.c @@ -174,7 +174,7 @@ extern "C" { status = F_status_set_error(F_parameter); } else if (data->parameters[iki_read_parameter_at].result == f_console_result_additional) { - const f_string_length_t index = data->parameters[iki_read_parameter_at].additional.array[data->parameters[iki_read_parameter_at].additional.used - 1]; + const f_string_length_t index = data->parameters[iki_read_parameter_at].values.array[data->parameters[iki_read_parameter_at].values.used - 1]; const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index])); f_number_unsigned_t number = 0; @@ -214,7 +214,7 @@ extern "C" { status = F_status_set_error(F_parameter); } else if (data->parameters[iki_read_parameter_line].result == f_console_result_additional) { - const f_string_length_t index = data->parameters[iki_read_parameter_line].additional.array[data->parameters[iki_read_parameter_line].additional.used - 1]; + const f_string_length_t index = data->parameters[iki_read_parameter_line].values.array[data->parameters[iki_read_parameter_line].values.used - 1]; const f_string_range_t range = f_macro_string_range_t_initialize(strlen(arguments.argv[index])); f_number_unsigned_t number = 0; @@ -242,7 +242,7 @@ extern "C" { } if (data->parameters[iki_read_parameter_substitute].result != f_console_result_none) { - if (data->parameters[iki_read_parameter_substitute].result == f_console_result_found || data->parameters[iki_read_parameter_substitute].additional.used % 3 != 0) { + if (data->parameters[iki_read_parameter_substitute].result == f_console_result_found || data->parameters[iki_read_parameter_substitute].values.used % 3 != 0) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol[0]); fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); @@ -463,7 +463,7 @@ extern "C" { for (f_string_length_t i = 0; i < iki_read_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); f_macro_string_lengths_t_delete_simple(data->parameters[i].locations_sub); - f_macro_string_lengths_t_delete_simple(data->parameters[i].additional); + f_macro_string_lengths_t_delete_simple(data->parameters[i].values); } // for f_macro_string_lengths_t_delete_simple(data->remaining); diff --git a/level_3/iki_read/c/private-iki_read.c b/level_3/iki_read/c/private-iki_read.c index 544f175..ce9fc00 100644 --- a/level_3/iki_read/c/private-iki_read.c +++ b/level_3/iki_read/c/private-iki_read.c @@ -139,9 +139,9 @@ extern "C" { f_array_length_t j = 0; buffer_range->start = 0; - for (; i < data->parameters[iki_read_parameter_name].additional.used; i++) { + for (; i < data->parameters[iki_read_parameter_name].values.used; i++) { - index = data->parameters[iki_read_parameter_name].additional.array[i]; + index = data->parameters[iki_read_parameter_name].values.array[i]; name.used = 0; status = fl_string_append_nulless(arguments.argv[index], strlen(arguments.argv[index]), &name); @@ -263,9 +263,9 @@ extern "C" { f_array_length_t j = 0; f_string_length_t length_argument = 0; - for (f_array_length_t index = 0; i < data->parameters[iki_read_parameter_name].additional.used; i++) { + for (f_array_length_t index = 0; i < data->parameters[iki_read_parameter_name].values.used; i++) { - index = data->parameters[iki_read_parameter_name].additional.array[i]; + index = data->parameters[iki_read_parameter_name].values.array[i]; length_argument = strnlen(arguments.argv[index], f_console_length_size); for (j = 0, name_missed = F_true; j < names.used; j++) { @@ -424,9 +424,9 @@ extern "C" { range.start = 0; - for (; i < data->parameters[iki_read_parameter_name].additional.used; i++) { + for (; i < data->parameters[iki_read_parameter_name].values.used; i++) { - index = data->parameters[iki_read_parameter_name].additional.array[i]; + index = data->parameters[iki_read_parameter_name].values.array[i]; name.used = 0; status = fl_string_append_nulless(arguments.argv[index], strlen(arguments.argv[index]), &name); @@ -478,9 +478,9 @@ extern "C" { f_console_parameter_t *parameter = &data->parameters[iki_read_parameter_substitute]; - for (; i < parameter->additional.used; i += 3) { + for (; i < parameter->values.used; i += 3) { - index = parameter->additional.array[i]; + index = parameter->values.array[i]; length = strnlen(arguments.argv[index], f_console_length_size); for (j = 0; j < vocabulary->used; j++) { @@ -491,13 +491,13 @@ extern "C" { f_macro_memory_structure_macro_increment(status, substitutionss[j], 1, f_iki_default_allocation_step, macro_iki_read_substitutions_t_resize, F_buffer_too_large); if (F_status_is_error(status)) return status; - index = parameter->additional.array[i + 1]; + index = parameter->values.array[i + 1]; index_2 = substitutionss[j].used; substitutionss[j].array[index_2].replace.string = arguments.argv[index]; substitutionss[j].array[index_2].replace.used = strnlen(arguments.argv[index], f_console_length_size); substitutionss[j].array[index_2].replace.size = substitutionss[j].array[index_2].replace.used; - index = parameter->additional.array[i + 2]; + index = parameter->values.array[i + 2]; substitutionss[j].array[index_2].with.string = arguments.argv[index]; substitutionss[j].array[index_2].with.used = strnlen(arguments.argv[index], f_console_length_size); substitutionss[j].array[index_2].with.size = substitutionss[j].array[index_2].with.used; diff --git a/level_3/iki_write/c/iki_write.c b/level_3/iki_write/c/iki_write.c index a0d5114..18a5bb0 100644 --- a/level_3/iki_write/c/iki_write.c +++ b/level_3/iki_write/c/iki_write.c @@ -130,7 +130,7 @@ extern "C" { if (F_status_is_error_not(status)) { if (data->parameters[iki_write_parameter_file].result == f_console_result_additional) { - if (data->parameters[iki_write_parameter_file].additional.used > 1) { + if (data->parameters[iki_write_parameter_file].values.used > 1) { if (data->error.verbosity != f_console_verbosity_quiet) { fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable, iki_write_long_file); @@ -140,7 +140,7 @@ extern "C" { status = F_status_set_error(F_parameter); } else { - const f_string_length_t location = data->parameters[iki_write_parameter_file].additional.array[0]; + const f_string_length_t location = data->parameters[iki_write_parameter_file].values.array[0]; output.id = -1; output.stream = 0; @@ -199,7 +199,7 @@ extern "C" { } if (F_status_is_error_not(status)) { - if (data->parameters[iki_write_parameter_object].additional.used != data->parameters[iki_write_parameter_content].additional.used) { + if (data->parameters[iki_write_parameter_object].values.used != data->parameters[iki_write_parameter_content].values.used) { if (data->error.verbosity != f_console_verbosity_quiet) { fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameters '", fll_error_print_error); fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable, iki_write_long_content); @@ -360,13 +360,13 @@ extern "C" { f_string_static_t object = f_string_static_t_initialize; f_string_static_t content = f_string_static_t_initialize; - for (f_array_length_t i = 0; i < data->parameters[iki_write_parameter_object].additional.used; i++) { + for (f_array_length_t i = 0; i < data->parameters[iki_write_parameter_object].values.used; i++) { - object.string = arguments.argv[data->parameters[iki_write_parameter_object].additional.array[i]]; + object.string = arguments.argv[data->parameters[iki_write_parameter_object].values.array[i]]; object.used = strnlen(object.string, f_console_length_size); object.size = object.used; - content.string = arguments.argv[data->parameters[iki_write_parameter_content].additional.array[i]]; + content.string = arguments.argv[data->parameters[iki_write_parameter_content].values.array[i]]; content.used = strnlen(content.string, f_console_length_size); content.size = content.used; @@ -409,7 +409,7 @@ extern "C" { for (f_string_length_t i = 0; i < iki_write_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); f_macro_string_lengths_t_delete_simple(data->parameters[i].locations_sub); - f_macro_string_lengths_t_delete_simple(data->parameters[i].additional); + f_macro_string_lengths_t_delete_simple(data->parameters[i].values); } // for f_macro_string_lengths_t_delete_simple(data->remaining); diff --git a/level_3/init/c/init.c b/level_3/init/c/init.c index a1f4cb0..5c2a352 100644 --- a/level_3/init/c/init.c +++ b/level_3/init/c/init.c @@ -113,11 +113,11 @@ extern "C" { } if (data->parameters[init_parameter_runlevel].result == f_console_result_found) { - const unsigned int parameter_length = strlen(arguments.argv[data->parameters[init_parameter_runlevel].additional.array[0]]); + const unsigned int parameter_length = strlen(arguments.argv[data->parameters[init_parameter_runlevel].values.array[0]]); // if the run_level value is greater than the static buffer size, ignore the entire string rather than process a cut off value. if (parameter_length > 0 && parameter_length < init_kernel_runlevel_buffer) { - strncpy((char *) &run_level, arguments.argv[data->parameters[init_parameter_runlevel].additional.array[0]], parameter_length); + strncpy((char *) &run_level, arguments.argv[data->parameters[init_parameter_runlevel].values.array[0]], parameter_length); } } diff --git a/level_3/status_code/c/status_code.c b/level_3/status_code/c/status_code.c index 0bdd4c0..1804eb9 100644 --- a/level_3/status_code/c/status_code.c +++ b/level_3/status_code/c/status_code.c @@ -201,7 +201,7 @@ extern "C" { for (f_string_length_t i = 0; i < status_code_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); f_macro_string_lengths_t_delete_simple(data->parameters[i].locations_sub); - f_macro_string_lengths_t_delete_simple(data->parameters[i].additional); + f_macro_string_lengths_t_delete_simple(data->parameters[i].values); } // for f_macro_string_lengths_t_delete_simple(data->remaining); -- 1.8.3.1