The word 'value' makes more sense here than the word 'additional'.
*
* - 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'.
* - 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').
* - 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 {
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;
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_
/**
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;
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++;
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;
}
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;
}
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;
}
}
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;
}
}
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
}
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;
}
}
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;
}
}
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
}
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;
}
}
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;
}
*
* @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.
#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.
*
#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);
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) {
#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);
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
#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);
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) {
#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);
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);
*
* @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.
*
*
* @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.
* @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: ' '.
* 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.
* @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_
/**
*
* @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.
* @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.
*
* 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.
* @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
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;
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;
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;
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);
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);
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) {
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) {
}
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) {
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) {
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;
}
}
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;
}
}
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;
}
}
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;
}
}
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);
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) {
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);
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);
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]));
}
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]));
}
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);
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);
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);
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);
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;
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);
}
}
}
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);
}
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) {
}
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]);
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;
} // 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;
}
}
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;
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);
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) {
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);
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);
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]));
}
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]));
}
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);
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);
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);
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);
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;
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);
}
}
}
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);
}
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.
}
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]);
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;
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;
}
}
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;
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);
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) {
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);
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);
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]));
}
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]));
}
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);
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);
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);
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);
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;
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);
}
}
}
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);
}
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) {
}
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]);
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;
} // 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;
}
}
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;
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);
}
}
- 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;
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;
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) {
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);
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);
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]));
}
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]));
}
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);
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);
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);
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);
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;
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);
}
}
}
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);
}
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.
}
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]);
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;
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);
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++;
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;
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;
}
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);
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);
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);
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;
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;
}
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);
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);
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);
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++) {
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);
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++) {
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;
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);
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;
}
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);
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;
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);
}
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);
}
}
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);
projects / fll / commitdiff