From: Kevin Day Date: Fri, 1 May 2020 03:40:01 +0000 (-0500) Subject: Cleanup: whitespace tweaks and use define for printing long symbol X-Git-Tag: 0.5.0~307 X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=206bf3c1c47edc315d170bfba733de9e6874cde0;p=fll Cleanup: whitespace tweaks and use define for printing long symbol --- diff --git a/level_1/fl_fss/c/fss_basic.c b/level_1/fl_fss/c/fss_basic.c index 0248a5e..bcc22cb 100644 --- a/level_1/fl_fss/c/fss_basic.c +++ b/level_1/fl_fss/c/fss_basic.c @@ -682,7 +682,7 @@ extern "C" { } while (location->start <= location->stop && location->start < content.used) { - if (content.string[location->start] == f_string_eol){ + if (content.string[location->start] == f_string_eol) { buffer->string[buffer_position.stop] = f_string_eol; buffer->used = buffer_position.stop + 1; return f_none_on_eos; diff --git a/level_1/fl_fss/c/fss_extended.c b/level_1/fl_fss/c/fss_extended.c index 77ca674..189b94f 100644 --- a/level_1/fl_fss/c/fss_extended.c +++ b/level_1/fl_fss/c/fss_extended.c @@ -402,7 +402,7 @@ extern "C" { if (found->used >= found->size) { f_macro_fss_content_resize(status, (*found), found->size + f_fss_default_allocation_step); - if (f_status_is_error(status)){ + if (f_status_is_error(status)) { f_macro_string_lengths_delete_simple(delimits); return status; diff --git a/level_3/byte_dump/c/byte_dump.c b/level_3/byte_dump/c/byte_dump.c index 952780a..c6aa474 100644 --- a/level_3/byte_dump/c/byte_dump.c +++ b/level_3/byte_dump/c/byte_dump.c @@ -43,13 +43,13 @@ extern "C" { fll_program_print_help_usage(context, byte_dump_name, "filename(s)"); printf(" When using the "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", byte_dump_long_text); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, byte_dump_long_text); printf(" option, some UTF-8 characters may be replaced by your instance and cause display alignment issues."); printf("%c%c", f_string_eol, f_string_eol); printf(" Special UTF-8 characters and non-spacing UTF-8 characters may be replaced with a space (or a placeholder when the "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", byte_dump_long_placeholder); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, byte_dump_long_placeholder); printf(" option is used)."); printf("%c%c", f_string_eol, f_string_eol); @@ -59,7 +59,7 @@ extern "C" { printf("%c%c", f_string_eol, f_string_eol); printf(" When "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", byte_dump_long_last); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, byte_dump_long_last); printf(" is used, any UTF-8 sequences will still be printed in full should any part is found within the requested range."); printf("%c%c", f_string_eol, f_string_eol); @@ -158,7 +158,7 @@ extern "C" { else if (data->remaining.used > 0 || data->process_pipe) { if (data->parameters[byte_dump_parameter_width].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", byte_dump_long_width); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, byte_dump_long_width); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' was specified, but no value was given."); byte_dump_delete_data(data); @@ -170,7 +170,7 @@ extern "C" { if (f_status_is_error(status) || number < 1 || number >= 0xfb) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", byte_dump_long_width); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, byte_dump_long_width); fl_color_print(f_standard_error, data->context.error, data->context.reset, "' value can only be a number between "); fl_color_print(f_standard_error, data->context.notable, data->context.reset, "0"); fl_color_print(f_standard_error, data->context.error, data->context.reset, " and "); @@ -186,7 +186,7 @@ extern "C" { if (data->parameters[byte_dump_parameter_first].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", byte_dump_long_first); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, byte_dump_long_first); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' was specified, but no value was given."); byte_dump_delete_data(data); @@ -198,7 +198,7 @@ extern "C" { if (f_status_is_error(status) || number > f_type_number_size_unsigned) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", byte_dump_long_first); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, byte_dump_long_first); fl_color_print(f_standard_error, data->context.error, data->context.reset, "' value can only be a number (inclusively) between "); fl_color_print(f_standard_error, data->context.notable, data->context.reset, "0"); fl_color_print(f_standard_error, data->context.error, data->context.reset, " and "); @@ -214,7 +214,7 @@ extern "C" { if (data->parameters[byte_dump_parameter_last].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", byte_dump_long_last); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, byte_dump_long_last); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' was specified, but no value was given."); byte_dump_delete_data(data); @@ -226,7 +226,7 @@ extern "C" { if (f_status_is_error(status) || number < 0 || number > f_type_number_size_unsigned) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", byte_dump_long_last); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, byte_dump_long_last); fl_color_print(f_standard_error, data->context.error, data->context.reset, "' value can only be a number (inclusively) between "); fl_color_print(f_standard_error, data->context.notable, data->context.reset, "0"); fl_color_print(f_standard_error, data->context.error, data->context.reset, " and "); @@ -243,9 +243,9 @@ extern "C" { if (data->parameters[byte_dump_parameter_first].result == f_console_result_additional && data->parameters[byte_dump_parameter_last].result == f_console_result_additional) { if (data->first > data->last) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", byte_dump_long_first); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, byte_dump_long_first); fl_color_print(f_standard_error, data->context.error, data->context.reset, "' value cannot be greater than the parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", byte_dump_long_last); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, byte_dump_long_last); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' value."); byte_dump_delete_data(data); 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 cf0e6d6..1c32447 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 @@ -38,27 +38,27 @@ extern "C" { printf("%c", f_string_eol); printf(" When using the "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_list_read_long_depth); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_depth); printf(" option, an order of operations is enforced on the parameters.%c", f_string_eol); printf(" When this order of operations is in effect, parameters to the right of a depth parameter are influenced by that depth parameter:%c", f_string_eol); printf(" "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_list_read_long_at); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_at); printf(": An object index at the specified depth.%c", f_string_eol); printf(" "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_list_read_long_depth); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_depth); printf(": A new depth within the specified depth, indexed from the root.%c", f_string_eol); printf(" "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_list_read_long_name); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_name); printf(": An object name at the specified depth.%c", f_string_eol); printf("%c", f_string_eol); printf(" The parameter "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_list_read_long_depth); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_depth); printf(" must be in numeric order, but values in between may be skipped.%c", f_string_eol); printf(" ('-d 0 -a 1 -d 2 -a 2' would specify index 1 at depth 0, any index at depth 1, and index 2 at depth 2.)%c", f_string_eol); printf(" ('-d 2 -a 1 -d 0 -a 2' would be invalid because depth 2 is before depth 1.)%c", f_string_eol); @@ -66,53 +66,53 @@ extern "C" { printf("%c", f_string_eol); printf(" The parameter "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_list_read_long_select); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_select); printf(" selects a content index at a given depth.%c", f_string_eol); printf(" (This parameter is not synonymous with the depth parameter and does not relate to nested content).%c", f_string_eol); printf("%c", f_string_eol); printf(" Specify both "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_list_read_long_object); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_object); printf(" and the "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_list_read_long_total); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_total); printf(" parameters to get the total objects.%c", f_string_eol); printf("%c", f_string_eol); printf(" When both "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_list_read_long_at); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_at); printf(" and "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_list_read_long_name); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_name); printf(" parameters are specified (at the same depth), the "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_list_read_long_at); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_at); printf(" parameter value will be treated as a position relative to the specified "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_list_read_long_name); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_name); printf(" parameter value.%c", f_string_eol); printf("%c", f_string_eol); printf(" This program may support parameters, such as "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_list_read_long_depth); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_depth); printf(" or "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_list_read_long_select); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_select); printf(", even if not supported by the standard.%c", f_string_eol); printf(" This is done to help ensure consistency for scripting.%c", f_string_eol); printf("%c", f_string_eol); printf(" For parameters like "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_list_read_long_depth); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_depth); printf(", if the standard doesn't support nested content, then only a depth of 0 would be valid.%c", f_string_eol); printf(" For parameters like "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_list_read_long_select); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_select); printf(", if the standard doesn't support multiple content groups, then only a select of 0 would be valid.%c", f_string_eol); printf("%c", f_string_eol); printf(" The parameter "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_list_read_long_trim); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_trim); printf(" will remove leading and trailing whitespaces when selecting objects or when printing objects.%c", f_string_eol); printf("%c", f_string_eol); @@ -149,7 +149,7 @@ extern "C" { else if (data->remaining.used > 0 || data->process_pipe) { if (data->parameters[fss_basic_list_read_parameter_at].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_basic_list_read_long_at); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_at); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' requires a positive number."); fss_basic_list_read_delete_data(data); @@ -158,7 +158,7 @@ extern "C" { if (data->parameters[fss_basic_list_read_parameter_depth].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_basic_list_read_long_depth); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_depth); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' requires a positive number."); fss_basic_list_read_delete_data(data); @@ -167,7 +167,7 @@ extern "C" { if (data->parameters[fss_basic_list_read_parameter_line].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_basic_list_read_long_line); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_line); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' requires a positive number."); fss_basic_list_read_delete_data(data); @@ -176,7 +176,7 @@ extern "C" { if (data->parameters[fss_basic_list_read_parameter_name].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_basic_list_read_long_name); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_name); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' requires a string."); fss_basic_list_read_delete_data(data); @@ -185,7 +185,7 @@ extern "C" { if (data->parameters[fss_basic_list_read_parameter_select].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_basic_list_read_long_select); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_select); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' requires a positive number."); fss_basic_list_read_delete_data(data); @@ -195,9 +195,9 @@ extern "C" { if (data->parameters[fss_basic_list_read_parameter_object].result == f_console_result_found) { if (data->parameters[fss_basic_list_read_parameter_line].result == f_console_result_additional) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: Cannot specify the '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_basic_list_read_long_object); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_object); fl_color_print(f_standard_error, data->context.error, data->context.reset, "' parameter with the '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_basic_list_read_long_line); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_line); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' parameter."); fss_basic_list_read_delete_data(data); @@ -206,9 +206,9 @@ extern "C" { if (data->parameters[fss_basic_list_read_parameter_select].result == f_console_result_additional) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: Cannot specify the '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_basic_list_read_long_object); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_object); fl_color_print(f_standard_error, data->context.error, data->context.reset, "' parameter with the '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_basic_list_read_long_select); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_select); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' parameter."); fss_basic_list_read_delete_data(data); @@ -219,9 +219,9 @@ extern "C" { if (data->parameters[fss_basic_list_read_parameter_line].result == f_console_result_additional) { if (data->parameters[fss_basic_list_read_parameter_total].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: Cannot specify the '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_basic_list_read_long_line); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_line); fl_color_print(f_standard_error, data->context.error, data->context.reset, "' parameter with the '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_basic_list_read_long_total); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_total); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' parameter."); fss_basic_list_read_delete_data(data); @@ -258,7 +258,7 @@ extern "C" { if (data->parameters[fss_basic_list_read_parameter_select].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: the '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_basic_list_read_long_select); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_select); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' parameter requires a positive number."); macro_fss_basic_list_read_depths_delete_simple(depths); 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 b6da80c..93d51a6 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 @@ -30,28 +30,28 @@ extern "C" { fl_color_print(f_standard_error, context.error, context.reset, "ERROR: The argument '"); fl_color_print(f_standard_error, context.notable, context.reset, "%s", argument); fl_color_print(f_standard_error, context.error, context.reset, "' is not a valid number for the parameter '"); - fl_color_print(f_standard_error, context.notable, context.reset, "--%s", parameter_name); + fl_color_print(f_standard_error, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, parameter_name); fl_color_print_line(f_standard_error, context.error, context.reset, "'."); } else if (status == f_number_underflow) { fl_color_print(f_standard_error, context.error, context.reset, "ERROR: The argument '"); fl_color_print(f_standard_error, context.notable, context.reset, "%s", argument); fl_color_print(f_standard_error, context.error, context.reset, "' is too small for the parameter '"); - fl_color_print(f_standard_error, context.notable, context.reset, "--%s", parameter_name); + fl_color_print(f_standard_error, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, parameter_name); fl_color_print_line(f_standard_error, context.error, context.reset, "'."); } else if (status == f_number_overflow) { fl_color_print(f_standard_error, context.error, context.reset, "ERROR: The argument '"); fl_color_print(f_standard_error, context.notable, context.reset, "%s", argument); fl_color_print(f_standard_error, context.error, context.reset, "' is too large for the parameter '"); - fl_color_print(f_standard_error, context.notable, context.reset, "--%s", parameter_name); + fl_color_print(f_standard_error, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, parameter_name); fl_color_print_line(f_standard_error, context.error, context.reset, "'."); } else if (status == f_number_negative) { fl_color_print(f_standard_error, context.error, context.reset, "ERROR: The argument '"); fl_color_print(f_standard_error, context.notable, context.reset, "%s", argument); fl_color_print(f_standard_error, context.error, context.reset, "' is negative, which is not allowed for the parameter '"); - fl_color_print(f_standard_error, context.notable, context.reset, "--%s", parameter_name); + fl_color_print(f_standard_error, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, parameter_name); fl_color_print_line(f_standard_error, context.error, context.reset, "'."); } else if (status == f_number_positive) { @@ -60,12 +60,12 @@ extern "C" { fl_color_print(f_standard_error, context.error, context.reset, "' contains a '"); fl_color_print(f_standard_error, context.notable, context.reset, "+"); fl_color_print(f_standard_error, context.error, context.reset, "', which is not allowed for the parameter '"); - fl_color_print(f_standard_error, context.notable, context.reset, "--%s", parameter_name); + fl_color_print(f_standard_error, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, parameter_name); fl_color_print_line(f_standard_error, context.error, context.reset, "'."); } else if (status == f_no_data) { fl_color_print(f_standard_error, context.error, context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, context.notable, context.reset, "--%s", parameter_name); + fl_color_print(f_standard_error, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, parameter_name); fl_color_print_line(f_standard_error, context.error, context.reset, "' must not be an empty string."); } else { @@ -74,7 +74,7 @@ extern "C" { fl_color_print(f_standard_error, context.error, context.reset, ") has occurred while calling "); fl_color_print(f_standard_error, context.notable, context.reset, "%s()", function_name); fl_color_print(f_standard_error, context.error, context.reset, "' for the parameter '"); - fl_color_print(f_standard_error, context.notable, context.reset, "--%s", parameter_name); + fl_color_print(f_standard_error, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, parameter_name); fl_color_print(f_standard_error, context.error, context.reset, "' with the value '"); fl_color_print(f_standard_error, context.notable, context.reset, "%s", argument); fl_color_print_line(f_standard_error, context.error, context.reset, "'."); @@ -170,7 +170,7 @@ extern "C" { if (depths->array[i].value_name.used == 0) { fl_color_print(f_standard_error, data.context.error, data.context.reset, "ERROR: The '"); - fl_color_print(f_standard_error, data.context.notable, data.context.reset, "--%s", fss_basic_list_read_long_name); + fl_color_print(f_standard_error, data.context.notable, data.context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_name); fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "' must not be an empty string."); return f_status_set_error(f_invalid_parameter); @@ -185,14 +185,14 @@ extern "C" { fl_color_print(f_standard_error, data.context.error, data.context.reset, "ERROR: The value '"); fl_color_print(f_standard_error, data.context.notable, data.context.reset, "%llu", depths->array[i].depth); fl_color_print(f_standard_error, data.context.error, data.context.reset, "' may only be specified once for the parameter '"); - fl_color_print(f_standard_error, data.context.notable, data.context.reset, "--%s", fss_basic_list_read_long_depth); + fl_color_print(f_standard_error, data.context.notable, data.context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_depth); fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "'."); return f_status_set_error(f_invalid_parameter); } else if (depths->array[i].depth > depths->array[j].depth) { fl_color_print(f_standard_error, data.context.error, data.context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data.context.notable, data.context.reset, "--%s", fss_basic_list_read_long_depth); + fl_color_print(f_standard_error, data.context.notable, data.context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_depth); fl_color_print(f_standard_error, data.context.error, data.context.reset, "' may not have the value '"); fl_color_print(f_standard_error, data.context.notable, data.context.reset, "%llu", depths->array[i].depth); fl_color_print(f_standard_error, data.context.error, data.context.reset, "' before the value '"); 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 cce0c52..ea87c8c 100644 --- a/level_3/fss_basic_read/c/fss_basic_read.c +++ b/level_3/fss_basic_read/c/fss_basic_read.c @@ -38,27 +38,27 @@ extern "C" { printf("%c", f_string_eol); printf(" When using the "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_read_long_depth); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_depth); printf(" option, an order of operations is enforced on the parameters.%c", f_string_eol); printf(" When this order of operations is in effect, parameters to the right of a depth parameter are influenced by that depth parameter:%c", f_string_eol); printf(" "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_read_long_at); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_at); printf(": An object index at the specified depth.%c", f_string_eol); printf(" "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_read_long_depth); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_depth); printf(": A new depth within the specified depth, indexed from the root.%c", f_string_eol); printf(" "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_read_long_name); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_name); printf(": An object name at the specified depth.%c", f_string_eol); printf("%c", f_string_eol); printf(" The parameter "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_read_long_depth); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_depth); printf(" must be in numeric order, but values in between may be skipped.%c", f_string_eol); printf(" ('-d 0 -a 1 -d 2 -a 2' would specify index 1 at depth 0, any index at depth 1, and index 2 at depth 2.)%c", f_string_eol); printf(" ('-d 2 -a 1 -d 0 -a 2' would be invalid because depth 2 is before depth 1.)%c", f_string_eol); @@ -66,53 +66,53 @@ extern "C" { printf("%c", f_string_eol); printf(" The parameter "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_read_long_select); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_select); printf(" selects a content index at a given depth.%c", f_string_eol); printf(" (This parameter is not synonymous with the depth parameter and does not relate to nested content).%c", f_string_eol); printf("%c", f_string_eol); printf(" Specify both "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_read_long_object); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_object); printf(" and the "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_read_long_total); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_total); printf(" parameters to get the total objects.%c", f_string_eol); printf("%c", f_string_eol); printf(" When both "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_read_long_at); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_at); printf(" and "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_read_long_name); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_name); printf(" parameters are specified (at the same depth), the "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_read_long_at); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_at); printf(" parameter value will be treated as a position relative to the specified "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_read_long_name); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_name); printf(" parameter value.%c", f_string_eol); printf("%c", f_string_eol); printf(" This program may support parameters, such as "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_read_long_depth); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_depth); printf(" or "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_read_long_select); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_select); printf(", even if not supported by the standard.%c", f_string_eol); printf(" This is done to help ensure consistency for scripting.%c", f_string_eol); printf("%c", f_string_eol); printf(" For parameters like "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_read_long_depth); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_depth); printf(", if the standard doesn't support nested content, then only a depth of 0 would be valid.%c", f_string_eol); printf(" For parameters like "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_read_long_select); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_select); printf(", if the standard doesn't support multiple content groups, then only a select of 0 would be valid.%c", f_string_eol); printf("%c", f_string_eol); printf(" The parameter "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_basic_read_long_trim); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_trim); printf(" will remove leading and trailing whitespaces when selecting objects or when printing objects.%c", f_string_eol); printf("%c", f_string_eol); @@ -149,7 +149,7 @@ extern "C" { else if (data->remaining.used > 0 || data->process_pipe) { if (data->parameters[fss_basic_read_parameter_at].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_basic_read_long_at); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_at); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' requires a positive number."); fss_basic_read_delete_data(data); @@ -158,7 +158,7 @@ extern "C" { if (data->parameters[fss_basic_read_parameter_depth].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_basic_read_long_depth); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_depth); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' requires a positive number."); fss_basic_read_delete_data(data); @@ -167,7 +167,7 @@ extern "C" { if (data->parameters[fss_basic_read_parameter_line].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_basic_read_long_line); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_line); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' requires a positive number."); fss_basic_read_delete_data(data); @@ -176,7 +176,7 @@ extern "C" { if (data->parameters[fss_basic_read_parameter_name].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_basic_read_long_name); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_name); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' requires a string."); fss_basic_read_delete_data(data); @@ -185,7 +185,7 @@ extern "C" { if (data->parameters[fss_basic_read_parameter_select].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_basic_read_long_select); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_select); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' requires a positive number."); fss_basic_read_delete_data(data); @@ -195,9 +195,9 @@ extern "C" { if (data->parameters[fss_basic_read_parameter_object].result == f_console_result_found) { if (data->parameters[fss_basic_read_parameter_line].result == f_console_result_additional) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: Cannot specify the '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_basic_read_long_object); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_object); fl_color_print(f_standard_error, data->context.error, data->context.reset, "' parameter with the '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_basic_read_long_line); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_line); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' parameter."); fss_basic_read_delete_data(data); @@ -206,9 +206,9 @@ extern "C" { if (data->parameters[fss_basic_read_parameter_select].result == f_console_result_additional) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: Cannot specify the '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_basic_read_long_object); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_object); fl_color_print(f_standard_error, data->context.error, data->context.reset, "' parameter with the '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_basic_read_long_select); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_select); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' parameter."); fss_basic_read_delete_data(data); @@ -219,9 +219,9 @@ extern "C" { if (data->parameters[fss_basic_read_parameter_line].result == f_console_result_additional) { if (data->parameters[fss_basic_read_parameter_total].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: Cannot specify the '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_basic_read_long_line); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_line); fl_color_print(f_standard_error, data->context.error, data->context.reset, "' parameter with the '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_basic_read_long_total); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_total); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' parameter."); fss_basic_read_delete_data(data); @@ -258,7 +258,7 @@ extern "C" { if (data->parameters[fss_basic_read_parameter_select].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: the '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_basic_read_long_select); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_select); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' parameter requires a positive number."); macro_fss_basic_read_depths_delete_simple(depths); 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 f0eb68c..0df2238 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 @@ -30,28 +30,28 @@ extern "C" { fl_color_print(f_standard_error, context.error, context.reset, "ERROR: The argument '"); fl_color_print(f_standard_error, context.notable, context.reset, "%s", argument); fl_color_print(f_standard_error, context.error, context.reset, "' is not a valid number for the parameter '"); - fl_color_print(f_standard_error, context.notable, context.reset, "--%s", parameter_name); + fl_color_print(f_standard_error, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, parameter_name); fl_color_print_line(f_standard_error, context.error, context.reset, "'."); } else if (status == f_number_underflow) { fl_color_print(f_standard_error, context.error, context.reset, "ERROR: The argument '"); fl_color_print(f_standard_error, context.notable, context.reset, "%s", argument); fl_color_print(f_standard_error, context.error, context.reset, "' is too small for the parameter '"); - fl_color_print(f_standard_error, context.notable, context.reset, "--%s", parameter_name); + fl_color_print(f_standard_error, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, parameter_name); fl_color_print_line(f_standard_error, context.error, context.reset, "'."); } else if (status == f_number_overflow) { fl_color_print(f_standard_error, context.error, context.reset, "ERROR: The argument '"); fl_color_print(f_standard_error, context.notable, context.reset, "%s", argument); fl_color_print(f_standard_error, context.error, context.reset, "' is too large for the parameter '"); - fl_color_print(f_standard_error, context.notable, context.reset, "--%s", parameter_name); + fl_color_print(f_standard_error, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, parameter_name); fl_color_print_line(f_standard_error, context.error, context.reset, "'."); } else if (status == f_number_negative) { fl_color_print(f_standard_error, context.error, context.reset, "ERROR: The argument '"); fl_color_print(f_standard_error, context.notable, context.reset, "%s", argument); fl_color_print(f_standard_error, context.error, context.reset, "' is negative, which is not allowed for the parameter '"); - fl_color_print(f_standard_error, context.notable, context.reset, "--%s", parameter_name); + fl_color_print(f_standard_error, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, parameter_name); fl_color_print_line(f_standard_error, context.error, context.reset, "'."); } else if (status == f_number_positive) { @@ -60,12 +60,12 @@ extern "C" { fl_color_print(f_standard_error, context.error, context.reset, "' contains a '"); fl_color_print(f_standard_error, context.notable, context.reset, "+"); fl_color_print(f_standard_error, context.error, context.reset, "', which is not allowed for the parameter '"); - fl_color_print(f_standard_error, context.notable, context.reset, "--%s", parameter_name); + fl_color_print(f_standard_error, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, parameter_name); fl_color_print_line(f_standard_error, context.error, context.reset, "'."); } else if (status == f_no_data) { fl_color_print(f_standard_error, context.error, context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, context.notable, context.reset, "--%s", parameter_name); + fl_color_print(f_standard_error, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, parameter_name); fl_color_print_line(f_standard_error, context.error, context.reset, "' must not be an empty string."); } else { @@ -74,7 +74,7 @@ extern "C" { fl_color_print(f_standard_error, context.error, context.reset, ") has occurred while calling "); fl_color_print(f_standard_error, context.notable, context.reset, "%s()", function_name); fl_color_print(f_standard_error, context.error, context.reset, "' for the parameter '"); - fl_color_print(f_standard_error, context.notable, context.reset, "--%s", parameter_name); + fl_color_print(f_standard_error, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, parameter_name); fl_color_print(f_standard_error, context.error, context.reset, "' with the value '"); fl_color_print(f_standard_error, context.notable, context.reset, "%s", argument); fl_color_print_line(f_standard_error, context.error, context.reset, "'."); @@ -170,7 +170,7 @@ extern "C" { if (depths->array[i].value_name.used == 0) { fl_color_print(f_standard_error, data.context.error, data.context.reset, "ERROR: The '"); - fl_color_print(f_standard_error, data.context.notable, data.context.reset, "--%s", fss_basic_read_long_name); + fl_color_print(f_standard_error, data.context.notable, data.context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_name); fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "' must not be an empty string."); return f_status_set_error(f_invalid_parameter); @@ -185,14 +185,14 @@ extern "C" { fl_color_print(f_standard_error, data.context.error, data.context.reset, "ERROR: The value '"); fl_color_print(f_standard_error, data.context.notable, data.context.reset, "%llu", depths->array[i].depth); fl_color_print(f_standard_error, data.context.error, data.context.reset, "' may only be specified once for the parameter '"); - fl_color_print(f_standard_error, data.context.notable, data.context.reset, "--%s", fss_basic_read_long_depth); + fl_color_print(f_standard_error, data.context.notable, data.context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_depth); fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "'."); return f_status_set_error(f_invalid_parameter); } else if (depths->array[i].depth > depths->array[j].depth) { fl_color_print(f_standard_error, data.context.error, data.context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data.context.notable, data.context.reset, "--%s", fss_basic_read_long_depth); + fl_color_print(f_standard_error, data.context.notable, data.context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_depth); fl_color_print(f_standard_error, data.context.error, data.context.reset, "' may not have the value '"); fl_color_print(f_standard_error, data.context.notable, data.context.reset, "%llu", depths->array[i].depth); fl_color_print(f_standard_error, data.context.error, data.context.reset, "' before the value '"); 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 a49d317..bf49c5b 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 @@ -38,27 +38,27 @@ extern "C" { printf("%c", f_string_eol); printf(" When using the "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_list_read_long_depth); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_depth); printf(" option, an order of operations is enforced on the parameters.%c", f_string_eol); printf(" When this order of operations is in effect, parameters to the right of a depth parameter are influenced by that depth parameter:%c", f_string_eol); printf(" "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_list_read_long_at); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_at); printf(": An object index at the specified depth.%c", f_string_eol); printf(" "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_list_read_long_depth); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_depth); printf(": A new depth within the specified depth, indexed from the root.%c", f_string_eol); printf(" "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_list_read_long_name); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_name); printf(": An object name at the specified depth.%c", f_string_eol); printf("%c", f_string_eol); printf(" The parameter "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_list_read_long_depth); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_depth); printf(" must be in numeric order, but values in between may be skipped.%c", f_string_eol); printf(" ('-d 0 -a 1 -d 2 -a 2' would specify index 1 at depth 0, any index at depth 1, and index 2 at depth 2.)%c", f_string_eol); printf(" ('-d 2 -a 1 -d 0 -a 2' would be invalid because depth 2 is before depth 1.)%c", f_string_eol); @@ -66,53 +66,53 @@ extern "C" { printf("%c", f_string_eol); printf(" The parameter "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_list_read_long_select); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_select); printf(" selects a content index at a given depth.%c", f_string_eol); printf(" (This parameter is not synonymous with the depth parameter and does not relate to nested content).%c", f_string_eol); printf("%c", f_string_eol); printf(" Specify both "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_list_read_long_object); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_object); printf(" and the "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_list_read_long_total); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_total); printf(" parameters to get the total objects.%c", f_string_eol); printf("%c", f_string_eol); printf(" When both "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_list_read_long_at); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_at); printf(" and "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_list_read_long_name); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_name); printf(" parameters are specified (at the same depth), the "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_list_read_long_at); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_at); printf(" parameter value will be treated as a position relative to the specified "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_list_read_long_name); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_name); printf(" parameter value.%c", f_string_eol); printf("%c", f_string_eol); printf(" This program may support parameters, such as "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_list_read_long_depth); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_depth); printf(" or "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_list_read_long_select); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_select); printf(", even if not supported by the standard.%c", f_string_eol); printf(" This is done to help ensure consistency for scripting.%c", f_string_eol); printf("%c", f_string_eol); printf(" For parameters like "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_list_read_long_depth); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_depth); printf(", if the standard doesn't support nested content, then only a depth of 0 would be valid.%c", f_string_eol); printf(" For parameters like "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_list_read_long_select); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_select); printf(", if the standard doesn't support multiple content groups, then only a select of 0 would be valid.%c", f_string_eol); printf("%c", f_string_eol); printf(" The parameter "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_list_read_long_trim); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_trim); printf(" will remove leading and trailing whitespaces when selecting objects or when printing objects.%c", f_string_eol); printf("%c", f_string_eol); @@ -149,7 +149,7 @@ extern "C" { else if (data->remaining.used > 0 || data->process_pipe) { if (data->parameters[fss_extended_list_read_parameter_at].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_extended_list_read_long_at); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_at); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' requires a positive number."); fss_extended_list_read_delete_data(data); @@ -158,7 +158,7 @@ extern "C" { if (data->parameters[fss_extended_list_read_parameter_depth].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_extended_list_read_long_depth); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_depth); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' requires a positive number."); fss_extended_list_read_delete_data(data); @@ -167,7 +167,7 @@ extern "C" { if (data->parameters[fss_extended_list_read_parameter_line].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_extended_list_read_long_line); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_line); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' requires a positive number."); fss_extended_list_read_delete_data(data); @@ -176,7 +176,7 @@ extern "C" { if (data->parameters[fss_extended_list_read_parameter_name].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_extended_list_read_long_name); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_name); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' requires a string."); fss_extended_list_read_delete_data(data); @@ -185,7 +185,7 @@ extern "C" { if (data->parameters[fss_extended_list_read_parameter_select].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_extended_list_read_long_select); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_select); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' requires a positive number."); fss_extended_list_read_delete_data(data); @@ -195,9 +195,9 @@ extern "C" { if (data->parameters[fss_extended_list_read_parameter_object].result == f_console_result_found) { if (data->parameters[fss_extended_list_read_parameter_line].result == f_console_result_additional) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: Cannot specify the '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_extended_list_read_long_object); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_object); fl_color_print(f_standard_error, data->context.error, data->context.reset, "' parameter with the '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_extended_list_read_long_line); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_line); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' parameter."); fss_extended_list_read_delete_data(data); @@ -206,9 +206,9 @@ extern "C" { if (data->parameters[fss_extended_list_read_parameter_select].result == f_console_result_additional) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: Cannot specify the '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_extended_list_read_long_object); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_object); fl_color_print(f_standard_error, data->context.error, data->context.reset, "' parameter with the '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_extended_list_read_long_select); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_select); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' parameter."); fss_extended_list_read_delete_data(data); @@ -219,9 +219,9 @@ extern "C" { if (data->parameters[fss_extended_list_read_parameter_line].result == f_console_result_additional) { if (data->parameters[fss_extended_list_read_parameter_total].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: Cannot specify the '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_extended_list_read_long_line); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_line); fl_color_print(f_standard_error, data->context.error, data->context.reset, "' parameter with the '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_extended_list_read_long_total); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_total); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' parameter."); fss_extended_list_read_delete_data(data); @@ -243,7 +243,7 @@ extern "C" { if (data->parameters[fss_extended_list_read_parameter_select].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: the '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_extended_list_read_long_select); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_select); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' parameter requires a positive number."); macro_fss_extended_list_read_depths_delete_simple(depths); 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 4cc033a..f0f98aa 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 @@ -30,28 +30,28 @@ extern "C" { fl_color_print(f_standard_error, context.error, context.reset, "ERROR: The argument '"); fl_color_print(f_standard_error, context.notable, context.reset, "%s", argument); fl_color_print(f_standard_error, context.error, context.reset, "' is not a valid number for the parameter '"); - fl_color_print(f_standard_error, context.notable, context.reset, "--%s", parameter_name); + fl_color_print(f_standard_error, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, parameter_name); fl_color_print_line(f_standard_error, context.error, context.reset, "'."); } else if (status == f_number_underflow) { fl_color_print(f_standard_error, context.error, context.reset, "ERROR: The argument '"); fl_color_print(f_standard_error, context.notable, context.reset, "%s", argument); fl_color_print(f_standard_error, context.error, context.reset, "' is too small for the parameter '"); - fl_color_print(f_standard_error, context.notable, context.reset, "--%s", parameter_name); + fl_color_print(f_standard_error, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, parameter_name); fl_color_print_line(f_standard_error, context.error, context.reset, "'."); } else if (status == f_number_overflow) { fl_color_print(f_standard_error, context.error, context.reset, "ERROR: The argument '"); fl_color_print(f_standard_error, context.notable, context.reset, "%s", argument); fl_color_print(f_standard_error, context.error, context.reset, "' is too large for the parameter '"); - fl_color_print(f_standard_error, context.notable, context.reset, "--%s", parameter_name); + fl_color_print(f_standard_error, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, parameter_name); fl_color_print_line(f_standard_error, context.error, context.reset, "'."); } else if (status == f_number_negative) { fl_color_print(f_standard_error, context.error, context.reset, "ERROR: The argument '"); fl_color_print(f_standard_error, context.notable, context.reset, "%s", argument); fl_color_print(f_standard_error, context.error, context.reset, "' is negative, which is not allowed for the parameter '"); - fl_color_print(f_standard_error, context.notable, context.reset, "--%s", parameter_name); + fl_color_print(f_standard_error, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, parameter_name); fl_color_print_line(f_standard_error, context.error, context.reset, "'."); } else if (status == f_number_positive) { @@ -60,12 +60,12 @@ extern "C" { fl_color_print(f_standard_error, context.error, context.reset, "' contains a '"); fl_color_print(f_standard_error, context.notable, context.reset, "+"); fl_color_print(f_standard_error, context.error, context.reset, "', which is not allowed for the parameter '"); - fl_color_print(f_standard_error, context.notable, context.reset, "--%s", parameter_name); + fl_color_print(f_standard_error, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, parameter_name); fl_color_print_line(f_standard_error, context.error, context.reset, "'."); } else if (status == f_no_data) { fl_color_print(f_standard_error, context.error, context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, context.notable, context.reset, "--%s", parameter_name); + fl_color_print(f_standard_error, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, parameter_name); fl_color_print_line(f_standard_error, context.error, context.reset, "' must not be an empty string."); } else { @@ -74,7 +74,7 @@ extern "C" { fl_color_print(f_standard_error, context.error, context.reset, ") has occurred while calling "); fl_color_print(f_standard_error, context.notable, context.reset, "%s()", function_name); fl_color_print(f_standard_error, context.error, context.reset, "' for the parameter '"); - fl_color_print(f_standard_error, context.notable, context.reset, "--%s", parameter_name); + fl_color_print(f_standard_error, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, parameter_name); fl_color_print(f_standard_error, context.error, context.reset, "' with the value '"); fl_color_print(f_standard_error, context.notable, context.reset, "%s", argument); fl_color_print_line(f_standard_error, context.error, context.reset, "'."); @@ -170,7 +170,7 @@ extern "C" { if (depths->array[i].value_name.used == 0) { fl_color_print(f_standard_error, data.context.error, data.context.reset, "ERROR: The '"); - fl_color_print(f_standard_error, data.context.notable, data.context.reset, "--%s", fss_extended_list_read_long_name); + fl_color_print(f_standard_error, data.context.notable, data.context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_name); fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "' must not be an empty string."); return f_status_set_error(f_invalid_parameter); @@ -185,14 +185,14 @@ extern "C" { fl_color_print(f_standard_error, data.context.error, data.context.reset, "ERROR: The value '"); fl_color_print(f_standard_error, data.context.notable, data.context.reset, "%llu", depths->array[i].depth); fl_color_print(f_standard_error, data.context.error, data.context.reset, "' may only be specified once for the parameter '"); - fl_color_print(f_standard_error, data.context.notable, data.context.reset, "--%s", fss_extended_list_read_long_depth); + fl_color_print(f_standard_error, data.context.notable, data.context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_depth); fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "'."); return f_status_set_error(f_invalid_parameter); } else if (depths->array[i].depth > depths->array[j].depth) { fl_color_print(f_standard_error, data.context.error, data.context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data.context.notable, data.context.reset, "--%s", fss_extended_list_read_long_depth); + fl_color_print(f_standard_error, data.context.notable, data.context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_depth); fl_color_print(f_standard_error, data.context.error, data.context.reset, "' may not have the value '"); fl_color_print(f_standard_error, data.context.notable, data.context.reset, "%llu", depths->array[i].depth); fl_color_print(f_standard_error, data.context.error, data.context.reset, "' before the value '"); 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 1e9785c..7d9c8dc 100644 --- a/level_3/fss_extended_read/c/fss_extended_read.c +++ b/level_3/fss_extended_read/c/fss_extended_read.c @@ -38,27 +38,27 @@ extern "C" { printf("%c", f_string_eol); printf(" When using the "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_read_long_depth); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_depth); printf(" option, an order of operations is enforced on the parameters.%c", f_string_eol); printf(" When this order of operations is in effect, parameters to the right of a depth parameter are influenced by that depth parameter:%c", f_string_eol); printf(" "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_read_long_at); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_at); printf(": An object index at the specified depth.%c", f_string_eol); printf(" "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_read_long_depth); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_depth); printf(": A new depth within the specified depth, indexed from the root.%c", f_string_eol); printf(" "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_read_long_name); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_name); printf(": An object name at the specified depth.%c", f_string_eol); printf("%c", f_string_eol); printf(" The parameter "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_read_long_depth); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_depth); printf(" must be in numeric order, but values in between may be skipped.%c", f_string_eol); printf(" ('-d 0 -a 1 -d 2 -a 2' would specify index 1 at depth 0, any index at depth 1, and index 2 at depth 2.)%c", f_string_eol); printf(" ('-d 2 -a 1 -d 0 -a 2' would be invalid because depth 2 is before depth 1.)%c", f_string_eol); @@ -66,53 +66,53 @@ extern "C" { printf("%c", f_string_eol); printf(" The parameter "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_read_long_select); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_select); printf(" selects a content index at a given depth.%c", f_string_eol); printf(" (This parameter is not synonymous with the depth parameter and does not relate to nested content).%c", f_string_eol); printf("%c", f_string_eol); printf(" Specify both "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_read_long_object); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_object); printf(" and the "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_read_long_total); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_total); printf(" parameters to get the total objects.%c", f_string_eol); printf("%c", f_string_eol); printf(" When both "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_read_long_at); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_at); printf(" and "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_read_long_name); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_name); printf(" parameters are specified (at the same depth), the "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_read_long_at); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_at); printf(" parameter value will be treated as a position relative to the specified "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_read_long_name); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_name); printf(" parameter value.%c", f_string_eol); printf("%c", f_string_eol); printf(" This program may support parameters, such as "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_read_long_depth); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_depth); printf(" or "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_read_long_select); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_select); printf(", even if not supported by the standard.%c", f_string_eol); printf(" This is done to help ensure consistency for scripting.%c", f_string_eol); printf("%c", f_string_eol); printf(" For parameters like "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_read_long_depth); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_depth); printf(", if the standard doesn't support nested content, then only a depth of 0 would be valid.%c", f_string_eol); printf(" For parameters like "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_read_long_select); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_select); printf(", if the standard doesn't support multiple content groups, then only a select of 0 would be valid.%c", f_string_eol); printf("%c", f_string_eol); printf(" The parameter "); - fl_color_print(f_standard_output, context.notable, context.reset, "--%s", fss_extended_read_long_trim); + fl_color_print(f_standard_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_trim); printf(" will remove leading and trailing whitespaces when selecting objects or when printing objects.%c", f_string_eol); printf("%c", f_string_eol); @@ -149,7 +149,7 @@ extern "C" { else if (data->remaining.used > 0 || data->process_pipe) { if (data->parameters[fss_extended_read_parameter_at].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_extended_read_long_at); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_at); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' requires a positive number."); fss_extended_read_delete_data(data); @@ -158,7 +158,7 @@ extern "C" { if (data->parameters[fss_extended_read_parameter_depth].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_extended_read_long_depth); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_depth); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' requires a positive number."); fss_extended_read_delete_data(data); @@ -167,7 +167,7 @@ extern "C" { if (data->parameters[fss_extended_read_parameter_line].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_extended_read_long_line); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_line); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' requires a positive number."); fss_extended_read_delete_data(data); @@ -176,7 +176,7 @@ extern "C" { if (data->parameters[fss_extended_read_parameter_name].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_extended_read_long_name); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_name); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' requires a string."); fss_extended_read_delete_data(data); @@ -185,7 +185,7 @@ extern "C" { if (data->parameters[fss_extended_read_parameter_select].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_extended_read_long_select); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_select); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' requires a positive number."); fss_extended_read_delete_data(data); @@ -195,9 +195,9 @@ extern "C" { if (data->parameters[fss_extended_read_parameter_object].result == f_console_result_found) { if (data->parameters[fss_extended_read_parameter_line].result == f_console_result_additional) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: Cannot specify the '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_extended_read_long_object); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_object); fl_color_print(f_standard_error, data->context.error, data->context.reset, "' parameter with the '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_extended_read_long_line); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_line); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' parameter."); fss_extended_read_delete_data(data); @@ -206,9 +206,9 @@ extern "C" { if (data->parameters[fss_extended_read_parameter_select].result == f_console_result_additional) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: Cannot specify the '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_extended_read_long_object); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_object); fl_color_print(f_standard_error, data->context.error, data->context.reset, "' parameter with the '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_extended_read_long_select); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_select); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' parameter."); fss_extended_read_delete_data(data); @@ -219,9 +219,9 @@ extern "C" { if (data->parameters[fss_extended_read_parameter_line].result == f_console_result_additional) { if (data->parameters[fss_extended_read_parameter_total].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: Cannot specify the '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_extended_read_long_line); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_line); fl_color_print(f_standard_error, data->context.error, data->context.reset, "' parameter with the '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_extended_read_long_total); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_total); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' parameter."); fss_extended_read_delete_data(data); @@ -258,7 +258,7 @@ extern "C" { if (data->parameters[fss_extended_read_parameter_select].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: the '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_extended_read_long_select); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_select); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "' parameter requires a positive number."); macro_fss_extended_read_depths_delete_simple(depths); 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 31c0b8c..8742f02 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 @@ -30,28 +30,28 @@ extern "C" { fl_color_print(f_standard_error, context.error, context.reset, "ERROR: The argument '"); fl_color_print(f_standard_error, context.notable, context.reset, "%s", argument); fl_color_print(f_standard_error, context.error, context.reset, "' is not a valid number for the parameter '"); - fl_color_print(f_standard_error, context.notable, context.reset, "--%s", parameter_name); + fl_color_print(f_standard_error, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, parameter_name); fl_color_print_line(f_standard_error, context.error, context.reset, "'."); } else if (status == f_number_underflow) { fl_color_print(f_standard_error, context.error, context.reset, "ERROR: The argument '"); fl_color_print(f_standard_error, context.notable, context.reset, "%s", argument); fl_color_print(f_standard_error, context.error, context.reset, "' is too small for the parameter '"); - fl_color_print(f_standard_error, context.notable, context.reset, "--%s", parameter_name); + fl_color_print(f_standard_error, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, parameter_name); fl_color_print_line(f_standard_error, context.error, context.reset, "'."); } else if (status == f_number_overflow) { fl_color_print(f_standard_error, context.error, context.reset, "ERROR: The argument '"); fl_color_print(f_standard_error, context.notable, context.reset, "%s", argument); fl_color_print(f_standard_error, context.error, context.reset, "' is too large for the parameter '"); - fl_color_print(f_standard_error, context.notable, context.reset, "--%s", parameter_name); + fl_color_print(f_standard_error, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, parameter_name); fl_color_print_line(f_standard_error, context.error, context.reset, "'."); } else if (status == f_number_negative) { fl_color_print(f_standard_error, context.error, context.reset, "ERROR: The argument '"); fl_color_print(f_standard_error, context.notable, context.reset, "%s", argument); fl_color_print(f_standard_error, context.error, context.reset, "' is negative, which is not allowed for the parameter '"); - fl_color_print(f_standard_error, context.notable, context.reset, "--%s", parameter_name); + fl_color_print(f_standard_error, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, parameter_name); fl_color_print_line(f_standard_error, context.error, context.reset, "'."); } else if (status == f_number_positive) { @@ -60,12 +60,12 @@ extern "C" { fl_color_print(f_standard_error, context.error, context.reset, "' contains a '"); fl_color_print(f_standard_error, context.notable, context.reset, "+"); fl_color_print(f_standard_error, context.error, context.reset, "', which is not allowed for the parameter '"); - fl_color_print(f_standard_error, context.notable, context.reset, "--%s", parameter_name); + fl_color_print(f_standard_error, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, parameter_name); fl_color_print_line(f_standard_error, context.error, context.reset, "'."); } else if (status == f_no_data) { fl_color_print(f_standard_error, context.error, context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, context.notable, context.reset, "--%s", parameter_name); + fl_color_print(f_standard_error, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, parameter_name); fl_color_print_line(f_standard_error, context.error, context.reset, "' must not be an empty string."); } else { @@ -74,7 +74,7 @@ extern "C" { fl_color_print(f_standard_error, context.error, context.reset, ") has occurred while calling "); fl_color_print(f_standard_error, context.notable, context.reset, "%s()", function_name); fl_color_print(f_standard_error, context.error, context.reset, "' for the parameter '"); - fl_color_print(f_standard_error, context.notable, context.reset, "--%s", parameter_name); + fl_color_print(f_standard_error, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, parameter_name); fl_color_print(f_standard_error, context.error, context.reset, "' with the value '"); fl_color_print(f_standard_error, context.notable, context.reset, "%s", argument); fl_color_print_line(f_standard_error, context.error, context.reset, "'."); @@ -170,7 +170,7 @@ extern "C" { if (depths->array[i].value_name.used == 0) { fl_color_print(f_standard_error, data.context.error, data.context.reset, "ERROR: The '"); - fl_color_print(f_standard_error, data.context.notable, data.context.reset, "--%s", fss_extended_read_long_name); + fl_color_print(f_standard_error, data.context.notable, data.context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_name); fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "' must not be an empty string."); return f_status_set_error(f_invalid_parameter); @@ -185,14 +185,14 @@ extern "C" { fl_color_print(f_standard_error, data.context.error, data.context.reset, "ERROR: The value '"); fl_color_print(f_standard_error, data.context.notable, data.context.reset, "%llu", depths->array[i].depth); fl_color_print(f_standard_error, data.context.error, data.context.reset, "' may only be specified once for the parameter '"); - fl_color_print(f_standard_error, data.context.notable, data.context.reset, "--%s", fss_extended_read_long_depth); + fl_color_print(f_standard_error, data.context.notable, data.context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_depth); fl_color_print_line(f_standard_error, data.context.error, data.context.reset, "'."); return f_status_set_error(f_invalid_parameter); } else if (depths->array[i].depth > depths->array[j].depth) { fl_color_print(f_standard_error, data.context.error, data.context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data.context.notable, data.context.reset, "--%s", fss_extended_read_long_depth); + fl_color_print(f_standard_error, data.context.notable, data.context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_depth); fl_color_print(f_standard_error, data.context.error, data.context.reset, "' may not have the value '"); fl_color_print(f_standard_error, data.context.notable, data.context.reset, "%llu", depths->array[i].depth); fl_color_print(f_standard_error, data.context.error, data.context.reset, "' before the value '"); 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 e1373ba..02131b2 100644 --- a/level_3/fss_status_code/c/fss_status_code.c +++ b/level_3/fss_status_code/c/fss_status_code.c @@ -62,9 +62,9 @@ extern "C" { if (data->parameters[fss_status_code_parameter_is_error].result == f_console_result_found) { if (data->parameters[fss_status_code_parameter_is_warning].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_status_code_long_is_error); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_status_code_long_is_error); fl_color_print(f_standard_error, data->context.error, data->context.reset, "' cannot be used with the parameter "); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_status_code_long_is_warning); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_status_code_long_is_warning); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "."); fss_status_code_delete_data(data); @@ -72,9 +72,9 @@ extern "C" { } else if (data->parameters[fss_status_code_parameter_is_fine].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_status_code_long_is_error); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_status_code_long_is_error); fl_color_print(f_standard_error, data->context.error, data->context.reset, "' cannot be used with the parameter "); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_status_code_long_is_fine); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_status_code_long_is_fine); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "."); fss_status_code_delete_data(data); @@ -83,9 +83,9 @@ extern "C" { } else if (data->parameters[fss_status_code_parameter_is_warning].result == f_console_result_found && data->parameters[fss_status_code_parameter_is_fine].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_status_code_long_is_warning); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_status_code_long_is_warning); fl_color_print(f_standard_error, data->context.error, data->context.reset, "' cannot be used with the parameter "); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", fss_status_code_long_is_fine); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fss_status_code_long_is_fine); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "."); fss_status_code_delete_data(data); diff --git a/level_3/status_code/c/status_code.c b/level_3/status_code/c/status_code.c index 99c60c5..b6a2910 100644 --- a/level_3/status_code/c/status_code.c +++ b/level_3/status_code/c/status_code.c @@ -62,9 +62,9 @@ extern "C" { if (data->parameters[status_code_parameter_is_error].result == f_console_result_found) { if (data->parameters[status_code_parameter_is_warning].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", status_code_long_is_error); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, status_code_long_is_error); fl_color_print(f_standard_error, data->context.error, data->context.reset, "' cannot be used with the parameter "); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", status_code_long_is_warning); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, status_code_long_is_warning); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "."); status_code_delete_data(data); @@ -72,9 +72,9 @@ extern "C" { } else if (data->parameters[status_code_parameter_is_fine].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", status_code_long_is_error); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, status_code_long_is_error); fl_color_print(f_standard_error, data->context.error, data->context.reset, "' cannot be used with the parameter "); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", status_code_long_is_fine); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, status_code_long_is_fine); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "."); status_code_delete_data(data); @@ -83,9 +83,9 @@ extern "C" { } else if (data->parameters[status_code_parameter_is_warning].result == f_console_result_found && data->parameters[status_code_parameter_is_fine].result == f_console_result_found) { fl_color_print(f_standard_error, data->context.error, data->context.reset, "ERROR: The parameter '"); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", status_code_long_is_warning); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, status_code_long_is_warning); fl_color_print(f_standard_error, data->context.error, data->context.reset, "' cannot be used with the parameter "); - fl_color_print(f_standard_error, data->context.notable, data->context.reset, "--%s", status_code_long_is_fine); + fl_color_print(f_standard_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, status_code_long_is_fine); fl_color_print_line(f_standard_error, data->context.error, data->context.reset, "."); status_code_delete_data(data);