From 4b9f5ff1b3c93aeca443f448275f865c02301c47 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sun, 8 Sep 2019 15:39:29 -0500 Subject: [PATCH] Regression: display "+" and "++" and not "-" and "--" for special parameter options When I wrote fll_program_print_help_option() I completely forgot to provide a way to set eithe "-" or "+" and "--" or "++". This resulted in the "--help" display of the options to incorrectly print using "-" and "--". Add additional function parameters to allow setting the symbols when calling fll_program_print_help_option(). --- level_2/fll_program/c/program.c | 10 +++++----- level_2/fll_program/c/program.h | 10 ++++++++-- level_3/bit_dump/c/bit_dump.c | 14 +++++++------- level_3/firewall/c/firewall.c | 12 ++++++------ .../fss_basic_list_read/c/fss_basic_list_read.c | 22 +++++++++++----------- .../fss_basic_list_write/c/fss_basic_list_write.c | 16 ++++++++-------- level_3/fss_basic_read/c/fss_basic_read.c | 18 +++++++++--------- level_3/fss_basic_write/c/fss_basic_write.c | 16 ++++++++-------- level_3/fss_extended_read/c/fss_extended_read.c | 20 ++++++++++---------- level_3/fss_extended_write/c/fss_extended_write.c | 18 +++++++++--------- level_3/fss_status_code/c/fss_status_code.c | 18 +++++++++--------- level_3/init/c/init.c | 16 ++++++++-------- level_3/status_code/c/status_code.c | 18 +++++++++--------- 13 files changed, 107 insertions(+), 101 deletions(-) diff --git a/level_2/fll_program/c/program.c b/level_2/fll_program/c/program.c index 7848eb1..92b3588 100644 --- a/level_2/fll_program/c/program.c +++ b/level_2/fll_program/c/program.c @@ -20,12 +20,12 @@ extern "C" { #endif // _di_fll_program_print_help_header_ #ifndef _di_fll_program_print_help_option_ - f_return_status fll_program_print_help_option(const fl_color_context context, const f_string option_short, const f_string option_long, const f_string description) { + f_return_status fll_program_print_help_option(const fl_color_context context, const f_string option_short, const f_string option_long, const f_string symbol_short, const f_string symbol_long, const f_string description) { printf("%c", f_string_eol); - printf(" %s", f_console_symbol_short_enable); + printf(" %s", symbol_short); fl_color_print(f_standard_output, context.standout, context.reset, option_short); - printf(", %s", f_console_symbol_long_enable); + printf(", %s", symbol_long); fl_color_print(f_standard_output, context.standout, context.reset, option_long); printf(" %s", description); @@ -34,9 +34,9 @@ extern "C" { #endif // _di_fll_program_print_help_option_ #ifndef _di_fll_program_print_help_option_long_ - f_return_status fll_program_print_help_option_long(const fl_color_context context, const f_string option_long, const f_string description) { + f_return_status fll_program_print_help_option_long(const fl_color_context context, const f_string option_long, const f_string symbol_long, const f_string description) { printf("%c", f_string_eol); - printf(" %s", f_console_symbol_long_enable); + printf(" %s", symbol_long); fl_color_print(f_standard_output, context.standout, context.reset, option_long); printf(" %s", description); diff --git a/level_2/fll_program/c/program.h b/level_2/fll_program/c/program.h index 57b4ab6..80c9dbf 100644 --- a/level_2/fll_program/c/program.h +++ b/level_2/fll_program/c/program.h @@ -53,6 +53,10 @@ extern "C" { * The short name of the option. * @param option_long * The long name of the option. + * @param symbol_short + * The short symbol of the option. + * @param symbol_long + * The long symbol of the option. * @param description * A desciption associated with the option. * @@ -60,7 +64,7 @@ extern "C" { * f_none on success. */ #ifndef _di_fll_program_print_help_option_ - extern f_return_status fll_program_print_help_option(const fl_color_context context, const f_string option_short, const f_string option_long, const f_string description); + extern f_return_status fll_program_print_help_option(const fl_color_context context, const f_string option_short, const f_string option_long, const f_string symbol_short, const f_string symbol_long, const f_string description); #endif // _di_fll_program_print_help_option_ /** @@ -70,6 +74,8 @@ extern "C" { * The color context. * @param option_long * The long name of the option. + * @param symbol_long + * The long symbol of the option. * @param description * A desciption associated with the option. * @@ -77,7 +83,7 @@ extern "C" { * f_none on success. */ #ifndef _di_fll_program_print_help_option_long_ - extern f_return_status fll_program_print_help_option_long(const fl_color_context context, const f_string option_long, const f_string description); + extern f_return_status fll_program_print_help_option_long(const fl_color_context context, const f_string option_long, const f_string symbol_long, const f_string description); #endif // _di_fll_program_print_help_option_long_ /** diff --git a/level_3/bit_dump/c/bit_dump.c b/level_3/bit_dump/c/bit_dump.c index 79c8c41..20ebbc4 100644 --- a/level_3/bit_dump/c/bit_dump.c +++ b/level_3/bit_dump/c/bit_dump.c @@ -9,16 +9,16 @@ extern "C" { f_return_status bit_dump_print_help(const bit_dump_data data) { fll_program_print_help_header(data.context, bit_dump_name_long, bit_dump_version); - fll_program_print_help_option(data.context, f_console_standard_short_help, f_console_standard_long_help, " Print this help message."); - fll_program_print_help_option(data.context, f_console_standard_short_light, f_console_standard_long_light, " Output using colors that show up better on light backgrounds"); - fll_program_print_help_option(data.context, f_console_standard_short_dark, f_console_standard_long_dark, " Output using colors that show up better on dark backgrounds"); - fll_program_print_help_option(data.context, f_console_standard_short_no_color, f_console_standard_long_no_color, " Do not output in color."); - fll_program_print_help_option(data.context, f_console_standard_short_version, f_console_standard_long_version, " Print only the version number."); + fll_program_print_help_option(data.context, f_console_standard_short_help, f_console_standard_long_help, f_console_symbol_short_enable, f_console_symbol_long_enable, " Print this help message."); + fll_program_print_help_option(data.context, f_console_standard_short_light, f_console_standard_long_light, f_console_symbol_short_disable, f_console_symbol_long_disable, " Output using colors that show up better on light backgrounds"); + fll_program_print_help_option(data.context, f_console_standard_short_dark, f_console_standard_long_dark, f_console_symbol_short_disable, f_console_symbol_long_disable, " Output using colors that show up better on dark backgrounds"); + fll_program_print_help_option(data.context, f_console_standard_short_no_color, f_console_standard_long_no_color, f_console_symbol_short_disable, f_console_symbol_long_disable, " Do not output in color."); + fll_program_print_help_option(data.context, f_console_standard_short_version, f_console_standard_long_version, f_console_symbol_short_disable, f_console_symbol_long_disable, " Print only the version number."); printf("%c", f_string_eol); - fll_program_print_help_option(data.context, bit_dump_short_binary, bit_dump_long_binary, " Display binary representation."); - fll_program_print_help_option(data.context, bit_dump_short_hex, bit_dump_long_hex, " Display hexadecimal representation."); + fll_program_print_help_option(data.context, bit_dump_short_binary, bit_dump_long_binary, f_console_symbol_short_enable, f_console_symbol_long_enable, " Display binary representation."); + fll_program_print_help_option(data.context, bit_dump_short_hex, bit_dump_long_hex, f_console_symbol_short_enable, f_console_symbol_long_enable, " Display hexadecimal representation."); fll_program_print_help_usage(data.context, bit_dump_name, "filename(s)"); diff --git a/level_3/firewall/c/firewall.c b/level_3/firewall/c/firewall.c index a330fa4..4dd189c 100644 --- a/level_3/firewall/c/firewall.c +++ b/level_3/firewall/c/firewall.c @@ -15,14 +15,14 @@ extern "C" { f_return_status firewall_print_help(const firewall_data data) { fll_program_print_help_header(data.context, firewall_name_long, firewall_version); - fll_program_print_help_option(data.context, f_console_standard_short_help, f_console_standard_long_help, " Print this help message."); - fll_program_print_help_option(data.context, f_console_standard_short_light, f_console_standard_long_light, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(data.context, f_console_standard_short_dark, f_console_standard_long_dark, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(data.context, f_console_standard_short_no_color, f_console_standard_long_no_color, "Do not output in color."); - fll_program_print_help_option(data.context, f_console_standard_short_version, f_console_standard_long_version, " Print only the version number."); + fll_program_print_help_option(data.context, f_console_standard_short_help, f_console_standard_long_help, f_console_symbol_short_enable, f_console_symbol_long_enable, " Print this help message."); + fll_program_print_help_option(data.context, f_console_standard_short_light, f_console_standard_long_light, f_console_symbol_short_disable, f_console_symbol_long_disable, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(data.context, f_console_standard_short_dark, f_console_standard_long_dark, f_console_symbol_short_disable, f_console_symbol_long_disable, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(data.context, f_console_standard_short_no_color, f_console_standard_long_no_color, f_console_symbol_short_disable, f_console_symbol_long_disable, "Do not output in color."); + fll_program_print_help_option(data.context, f_console_standard_short_version, f_console_standard_long_version, f_console_symbol_short_disable, f_console_symbol_long_disable, " Print only the version number."); #ifdef _en_firewall_debug_ - fll_program_print_help_option(data.context, f_console_standard_short_debug, f_console_standard_long_debug, " Enable debugging."); + fll_program_print_help_option(data.context, f_console_standard_short_debug, f_console_standard_long_debug, f_console_symbol_short_disable, f_console_symbol_long_disable, " Enable debugging."); #endif // _en_firewall_debug_ printf("%c%c", f_string_eol, f_string_eol); 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 273b40f..f8b90d1 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 @@ -8,20 +8,20 @@ extern "C" { f_return_status fss_basic_list_read_print_help(const fss_basic_list_read_data data) { fll_program_print_help_header(data.context, fss_basic_list_read_name_long, fss_basic_list_read_version); - fll_program_print_help_option(data.context, f_console_standard_short_help, f_console_standard_long_help, " Print this help message."); - fll_program_print_help_option(data.context, f_console_standard_short_light, f_console_standard_long_light, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(data.context, f_console_standard_short_dark, f_console_standard_long_dark, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(data.context, f_console_standard_short_no_color, f_console_standard_long_no_color, "Do not output in color."); - fll_program_print_help_option(data.context, f_console_standard_short_version, f_console_standard_long_version, " Print only the version number."); + fll_program_print_help_option(data.context, f_console_standard_short_help, f_console_standard_long_help, f_console_symbol_short_enable, f_console_symbol_long_enable, " Print this help message."); + fll_program_print_help_option(data.context, f_console_standard_short_light, f_console_standard_long_light, f_console_symbol_short_disable, f_console_symbol_long_disable, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(data.context, f_console_standard_short_dark, f_console_standard_long_dark, f_console_symbol_short_disable, f_console_symbol_long_disable, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(data.context, f_console_standard_short_no_color, f_console_standard_long_no_color, f_console_symbol_short_disable, f_console_symbol_long_disable, "Do not output in color."); + fll_program_print_help_option(data.context, f_console_standard_short_version, f_console_standard_long_version, f_console_symbol_short_disable, f_console_symbol_long_disable, " Print only the version number."); printf("%c", f_string_eol); - fll_program_print_help_option(data.context, fss_basic_list_read_short_name, fss_basic_list_read_long_name, " Find and print content from this object name."); - fll_program_print_help_option(data.context, fss_basic_list_read_short_count, fss_basic_list_read_long_count, " Find a specific occurrence of the object."); - fll_program_print_help_option(data.context, fss_basic_list_read_short_total, fss_basic_list_read_long_total, " Print the total number of objects in this file."); - fll_program_print_help_option(data.context, fss_basic_list_read_short_object, fss_basic_list_read_long_object, " Print the object instead of the content."); - fll_program_print_help_option(data.context, fss_basic_list_read_short_size, fss_basic_list_read_long_size, " Print total lines in the given content."); - fll_program_print_help_option(data.context, fss_basic_list_read_short_line, fss_basic_list_read_long_line, " Print only the content at the given line."); + fll_program_print_help_option(data.context, fss_basic_list_read_short_name, fss_basic_list_read_long_name, f_console_symbol_short_enable, f_console_symbol_long_enable, " Find and print content from this object name."); + fll_program_print_help_option(data.context, fss_basic_list_read_short_count, fss_basic_list_read_long_count, f_console_symbol_short_enable, f_console_symbol_long_enable, " Find a specific occurrence of the object."); + fll_program_print_help_option(data.context, fss_basic_list_read_short_total, fss_basic_list_read_long_total, f_console_symbol_short_enable, f_console_symbol_long_enable, " Print the total number of objects in this file."); + fll_program_print_help_option(data.context, fss_basic_list_read_short_object, fss_basic_list_read_long_object, f_console_symbol_short_enable, f_console_symbol_long_enable, " Print the object instead of the content."); + fll_program_print_help_option(data.context, fss_basic_list_read_short_size, fss_basic_list_read_long_size, f_console_symbol_short_enable, f_console_symbol_long_enable, " Print total lines in the given content."); + fll_program_print_help_option(data.context, fss_basic_list_read_short_line, fss_basic_list_read_long_line, f_console_symbol_short_enable, f_console_symbol_long_enable, " Print only the content at the given line."); fll_program_print_help_usage(data.context, fss_basic_list_read_name, "filename(s)"); diff --git a/level_3/fss_basic_list_write/c/fss_basic_list_write.c b/level_3/fss_basic_list_write/c/fss_basic_list_write.c index 35bfe60..caa414a 100644 --- a/level_3/fss_basic_list_write/c/fss_basic_list_write.c +++ b/level_3/fss_basic_list_write/c/fss_basic_list_write.c @@ -8,17 +8,17 @@ extern "C" { f_return_status fss_basic_list_write_print_help(const fss_basic_list_write_data data) { fll_program_print_help_header(data.context, fss_basic_list_write_name_long, fss_basic_list_write_version); - fll_program_print_help_option(data.context, f_console_standard_short_help, f_console_standard_long_help, " Print this help message."); - fll_program_print_help_option(data.context, f_console_standard_short_light, f_console_standard_long_light, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(data.context, f_console_standard_short_dark, f_console_standard_long_dark, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(data.context, f_console_standard_short_no_color, f_console_standard_long_no_color, "Do not output in color."); - fll_program_print_help_option(data.context, f_console_standard_short_version, f_console_standard_long_version, " Print only the version number."); + fll_program_print_help_option(data.context, f_console_standard_short_help, f_console_standard_long_help, f_console_symbol_short_enable, f_console_symbol_long_enable, " Print this help message."); + fll_program_print_help_option(data.context, f_console_standard_short_light, f_console_standard_long_light, f_console_symbol_short_disable, f_console_symbol_long_disable, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(data.context, f_console_standard_short_dark, f_console_standard_long_dark, f_console_symbol_short_disable, f_console_symbol_long_disable, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(data.context, f_console_standard_short_no_color, f_console_standard_long_no_color, f_console_symbol_short_disable, f_console_symbol_long_disable, "Do not output in color."); + fll_program_print_help_option(data.context, f_console_standard_short_version, f_console_standard_long_version, f_console_symbol_short_disable, f_console_symbol_long_disable, " Print only the version number."); printf("%c", f_string_eol); - fll_program_print_help_option(data.context, fss_basic_list_write_short_object, fss_basic_list_write_long_object, " Write an object instead of content."); - fll_program_print_help_option(data.context, fss_basic_list_write_short_file, fss_basic_list_write_long_file, " Specify a file to send output to."); - fll_program_print_help_option(data.context, fss_basic_list_write_short_string, fss_basic_list_write_long_string, " Specify a string to convert."); + fll_program_print_help_option(data.context, fss_basic_list_write_short_object, fss_basic_list_write_long_object, f_console_symbol_short_enable, f_console_symbol_long_enable, " Write an object instead of content."); + fll_program_print_help_option(data.context, fss_basic_list_write_short_file, fss_basic_list_write_long_file, f_console_symbol_short_enable, f_console_symbol_long_enable, " Specify a file to send output to."); + fll_program_print_help_option(data.context, fss_basic_list_write_short_string, fss_basic_list_write_long_string, f_console_symbol_short_enable, f_console_symbol_long_enable, " Specify a string to convert."); fll_program_print_help_usage(data.context, fss_basic_list_write_name, ""); 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 6e8d7f5..df8e010 100644 --- a/level_3/fss_basic_read/c/fss_basic_read.c +++ b/level_3/fss_basic_read/c/fss_basic_read.c @@ -8,18 +8,18 @@ extern "C" { f_return_status fss_basic_read_print_help(const fss_basic_read_data data) { fll_program_print_help_header(data.context, fss_basic_read_name_long, fss_basic_read_version); - fll_program_print_help_option(data.context, f_console_standard_short_help, f_console_standard_long_help, " Print this help message."); - fll_program_print_help_option(data.context, f_console_standard_short_light, f_console_standard_long_light, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(data.context, f_console_standard_short_dark, f_console_standard_long_dark, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(data.context, f_console_standard_short_no_color, f_console_standard_long_no_color, "Do not output in color."); - fll_program_print_help_option(data.context, f_console_standard_short_version, f_console_standard_long_version, " Print only the version number."); + fll_program_print_help_option(data.context, f_console_standard_short_help, f_console_standard_long_help, f_console_symbol_short_enable, f_console_symbol_long_enable, " Print this help message."); + fll_program_print_help_option(data.context, f_console_standard_short_light, f_console_standard_long_light, f_console_symbol_short_disable, f_console_symbol_long_disable, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(data.context, f_console_standard_short_dark, f_console_standard_long_dark, f_console_symbol_short_disable, f_console_symbol_long_disable, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(data.context, f_console_standard_short_no_color, f_console_standard_long_no_color, f_console_symbol_short_disable, f_console_symbol_long_disable, "Do not output in color."); + fll_program_print_help_option(data.context, f_console_standard_short_version, f_console_standard_long_version, f_console_symbol_short_disable, f_console_symbol_long_disable, " Print only the version number."); printf("%c", f_string_eol); - fll_program_print_help_option(data.context, fss_basic_read_short_name, fss_basic_read_long_name, " Find and print content from this object name."); - fll_program_print_help_option(data.context, fss_basic_read_short_count, fss_basic_read_long_count, " Find a specific occurrence of the object."); - fll_program_print_help_option(data.context, fss_basic_read_short_total, fss_basic_read_long_total, " Print the total number of objects in this file."); - fll_program_print_help_option(data.context, fss_basic_read_short_object, fss_basic_read_long_object, " Print the object instead of the content."); + fll_program_print_help_option(data.context, fss_basic_read_short_name, fss_basic_read_long_name, f_console_symbol_short_enable, f_console_symbol_long_enable, " Find and print content from this object name."); + fll_program_print_help_option(data.context, fss_basic_read_short_count, fss_basic_read_long_count, f_console_symbol_short_enable, f_console_symbol_long_enable, " Find a specific occurrence of the object."); + fll_program_print_help_option(data.context, fss_basic_read_short_total, fss_basic_read_long_total, f_console_symbol_short_enable, f_console_symbol_long_enable, " Print the total number of objects in this file."); + fll_program_print_help_option(data.context, fss_basic_read_short_object, fss_basic_read_long_object, f_console_symbol_short_enable, f_console_symbol_long_enable, " Print the object instead of the content."); fll_program_print_help_usage(data.context, fss_basic_read_name, "filename(s)"); diff --git a/level_3/fss_basic_write/c/fss_basic_write.c b/level_3/fss_basic_write/c/fss_basic_write.c index b2407a8..7b82120 100644 --- a/level_3/fss_basic_write/c/fss_basic_write.c +++ b/level_3/fss_basic_write/c/fss_basic_write.c @@ -8,17 +8,17 @@ extern "C" { f_return_status fss_basic_write_print_help(const fss_basic_write_data data) { fll_program_print_help_header(data.context, fss_basic_write_name_long, fss_basic_write_version); - fll_program_print_help_option(data.context, f_console_standard_short_help, f_console_standard_long_help, " Print this help message."); - fll_program_print_help_option(data.context, f_console_standard_short_light, f_console_standard_long_light, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(data.context, f_console_standard_short_dark, f_console_standard_long_dark, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(data.context, f_console_standard_short_no_color, f_console_standard_long_no_color, "Do not output in color."); - fll_program_print_help_option(data.context, f_console_standard_short_version, f_console_standard_long_version, " Print only the version number."); + fll_program_print_help_option(data.context, f_console_standard_short_help, f_console_standard_long_help, f_console_symbol_short_enable, f_console_symbol_long_enable, " Print this help message."); + fll_program_print_help_option(data.context, f_console_standard_short_light, f_console_standard_long_light, f_console_symbol_short_disable, f_console_symbol_long_disable, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(data.context, f_console_standard_short_dark, f_console_standard_long_dark, f_console_symbol_short_disable, f_console_symbol_long_disable, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(data.context, f_console_standard_short_no_color, f_console_standard_long_no_color, f_console_symbol_short_disable, f_console_symbol_long_disable, "Do not output in color."); + fll_program_print_help_option(data.context, f_console_standard_short_version, f_console_standard_long_version, f_console_symbol_short_disable, f_console_symbol_long_disable, " Print only the version number."); printf("%c", f_string_eol); - fll_program_print_help_option(data.context, fss_basic_write_short_object, fss_basic_write_long_object, " Write an object instead of content."); - fll_program_print_help_option(data.context, fss_basic_write_short_file, fss_basic_write_long_file, " Specify a file to send output to."); - fll_program_print_help_option(data.context, fss_basic_write_short_string, fss_basic_write_long_string, " Specify a string to convert."); + fll_program_print_help_option(data.context, fss_basic_write_short_object, fss_basic_write_long_object, f_console_symbol_short_enable, f_console_symbol_long_enable, " Write an object instead of content."); + fll_program_print_help_option(data.context, fss_basic_write_short_file, fss_basic_write_long_file, f_console_symbol_short_enable, f_console_symbol_long_enable, " Specify a file to send output to."); + fll_program_print_help_option(data.context, fss_basic_write_short_string, fss_basic_write_long_string, f_console_symbol_short_enable, f_console_symbol_long_enable, " Specify a string to convert."); fll_program_print_help_usage(data.context, fss_basic_write_name, ""); 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 bc3e4ae..31cad9e 100644 --- a/level_3/fss_extended_read/c/fss_extended_read.c +++ b/level_3/fss_extended_read/c/fss_extended_read.c @@ -8,19 +8,19 @@ extern "C" { f_return_status fss_extended_read_print_help(const fss_extended_read_data data) { fll_program_print_help_header(data.context, fss_extended_read_name_long, fss_extended_read_version); - fll_program_print_help_option(data.context, f_console_standard_short_help, f_console_standard_long_help, " Print this help message."); - fll_program_print_help_option(data.context, f_console_standard_short_light, f_console_standard_long_light, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(data.context, f_console_standard_short_dark, f_console_standard_long_dark, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(data.context, f_console_standard_short_no_color, f_console_standard_long_no_color, "Do not output in color."); - fll_program_print_help_option(data.context, f_console_standard_short_version, f_console_standard_long_version, " Print only the version number."); + fll_program_print_help_option(data.context, f_console_standard_short_help, f_console_standard_long_help, f_console_symbol_short_enable, f_console_symbol_long_enable, " Print this help message."); + fll_program_print_help_option(data.context, f_console_standard_short_light, f_console_standard_long_light, f_console_symbol_short_disable, f_console_symbol_long_disable, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(data.context, f_console_standard_short_dark, f_console_standard_long_dark, f_console_symbol_short_disable, f_console_symbol_long_disable, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(data.context, f_console_standard_short_no_color, f_console_standard_long_no_color, f_console_symbol_short_disable, f_console_symbol_long_disable, "Do not output in color."); + fll_program_print_help_option(data.context, f_console_standard_short_version, f_console_standard_long_version, f_console_symbol_short_disable, f_console_symbol_long_disable, " Print only the version number."); printf("%c", f_string_eol); - fll_program_print_help_option(data.context, fss_extended_read_short_name, fss_extended_read_long_name, " Find and print content from this object name."); - fll_program_print_help_option(data.context, fss_extended_read_short_count, fss_extended_read_long_count, " Find a specific occurrence of the object."); - fll_program_print_help_option(data.context, fss_extended_read_short_total, fss_extended_read_long_total, " Print the total number of objects in this file."); - fll_program_print_help_option(data.context, fss_extended_read_short_object, fss_extended_read_long_object, " Print the object instead of the content."); - fll_program_print_help_option(data.context, fss_extended_read_short_select, fss_extended_read_long_select, " Select a specific content to print, default is 0."); + fll_program_print_help_option(data.context, fss_extended_read_short_name, fss_extended_read_long_name, f_console_symbol_short_enable, f_console_symbol_long_enable, " Find and print content from this object name."); + fll_program_print_help_option(data.context, fss_extended_read_short_count, fss_extended_read_long_count, f_console_symbol_short_enable, f_console_symbol_long_enable, " Find a specific occurrence of the object."); + fll_program_print_help_option(data.context, fss_extended_read_short_total, fss_extended_read_long_total, f_console_symbol_short_enable, f_console_symbol_long_enable, " Print the total number of objects in this file."); + fll_program_print_help_option(data.context, fss_extended_read_short_object, fss_extended_read_long_object, f_console_symbol_short_enable, f_console_symbol_long_enable, " Print the object instead of the content."); + fll_program_print_help_option(data.context, fss_extended_read_short_select, fss_extended_read_long_select, f_console_symbol_short_enable, f_console_symbol_long_enable, " Select a specific content to print, default is 0."); fll_program_print_help_usage(data.context, fss_extended_read_name, "filename(s)"); diff --git a/level_3/fss_extended_write/c/fss_extended_write.c b/level_3/fss_extended_write/c/fss_extended_write.c index 47e5fda..32b6ff1 100644 --- a/level_3/fss_extended_write/c/fss_extended_write.c +++ b/level_3/fss_extended_write/c/fss_extended_write.c @@ -8,18 +8,18 @@ extern "C" { f_return_status fss_extended_write_print_help(const fss_extended_write_data data) { fll_program_print_help_header(data.context, fss_extended_write_name_long, fss_extended_write_version); - fll_program_print_help_option(data.context, f_console_standard_short_help, f_console_standard_long_help, " Print this help message."); - fll_program_print_help_option(data.context, f_console_standard_short_light, f_console_standard_long_light, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(data.context, f_console_standard_short_dark, f_console_standard_long_dark, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(data.context, f_console_standard_short_no_color, f_console_standard_long_no_color, "Do not output in color."); - fll_program_print_help_option(data.context, f_console_standard_short_version, f_console_standard_long_version, " Print only the version number."); + fll_program_print_help_option(data.context, f_console_standard_short_help, f_console_standard_long_help, f_console_symbol_short_enable, f_console_symbol_long_enable, " Print this help message."); + fll_program_print_help_option(data.context, f_console_standard_short_light, f_console_standard_long_light, f_console_symbol_short_disable, f_console_symbol_long_disable, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(data.context, f_console_standard_short_dark, f_console_standard_long_dark, f_console_symbol_short_disable, f_console_symbol_long_disable, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(data.context, f_console_standard_short_no_color, f_console_standard_long_no_color, f_console_symbol_short_disable, f_console_symbol_long_disable, "Do not output in color."); + fll_program_print_help_option(data.context, f_console_standard_short_version, f_console_standard_long_version, f_console_symbol_short_disable, f_console_symbol_long_disable, " Print only the version number."); printf("%c", f_string_eol); - fll_program_print_help_option(data.context, fss_extended_write_short_object, fss_extended_write_long_object, " Write an object instead of content."); - fll_program_print_help_option(data.context, fss_extended_write_short_file, fss_extended_write_long_file, " Specify a file to send output to."); - fll_program_print_help_option(data.context, fss_extended_write_short_string, fss_extended_write_long_string, " Specify a string to convert."); - fll_program_print_help_option(data.context, fss_extended_write_short_partial, fss_extended_write_long_partial, " For 'content', do not output the end of content character."); + fll_program_print_help_option(data.context, fss_extended_write_short_object, fss_extended_write_long_object, f_console_symbol_short_enable, f_console_symbol_long_enable, " Write an object instead of content."); + fll_program_print_help_option(data.context, fss_extended_write_short_file, fss_extended_write_long_file, f_console_symbol_short_enable, f_console_symbol_long_enable, " Specify a file to send output to."); + fll_program_print_help_option(data.context, fss_extended_write_short_string, fss_extended_write_long_string, f_console_symbol_short_enable, f_console_symbol_long_enable, " Specify a string to convert."); + fll_program_print_help_option(data.context, fss_extended_write_short_partial, fss_extended_write_long_partial, f_console_symbol_short_enable, f_console_symbol_long_enable, " For 'content', do not output the end of content character."); fll_program_print_help_usage(data.context, fss_extended_write_name, ""); 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 2fc410c..f4792c2 100644 --- a/level_3/fss_status_code/c/fss_status_code.c +++ b/level_3/fss_status_code/c/fss_status_code.c @@ -8,18 +8,18 @@ extern "C" { f_return_status fss_status_code_print_help(const fss_status_code_data data) { fll_program_print_help_header(data.context, fss_status_code_name_long, fss_status_code_version); - fll_program_print_help_option(data.context, f_console_standard_short_help, f_console_standard_long_help, " Print this help message."); - fll_program_print_help_option(data.context, f_console_standard_short_light, f_console_standard_long_light, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(data.context, f_console_standard_short_dark, f_console_standard_long_dark, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(data.context, f_console_standard_short_no_color, f_console_standard_long_no_color, "Do not output in color."); - fll_program_print_help_option(data.context, f_console_standard_short_version, f_console_standard_long_version, " Print only the version number."); + fll_program_print_help_option(data.context, f_console_standard_short_help, f_console_standard_long_help, f_console_symbol_short_enable, f_console_symbol_long_enable, " Print this help message."); + fll_program_print_help_option(data.context, f_console_standard_short_light, f_console_standard_long_light, f_console_symbol_short_disable, f_console_symbol_long_disable, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(data.context, f_console_standard_short_dark, f_console_standard_long_dark, f_console_symbol_short_disable, f_console_symbol_long_disable, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(data.context, f_console_standard_short_no_color, f_console_standard_long_no_color, f_console_symbol_short_disable, f_console_symbol_long_disable, "Do not output in color."); + fll_program_print_help_option(data.context, f_console_standard_short_version, f_console_standard_long_version, f_console_symbol_short_disable, f_console_symbol_long_disable, " Print only the version number."); printf("%c", f_string_eol); - fll_program_print_help_option(data.context, fss_status_code_short_is_fine, fss_status_code_long_is_fine, " Print f_true if the error code is not an error."); - fll_program_print_help_option(data.context, fss_status_code_short_is_warning, fss_status_code_long_is_warning, "Print f_true if the error code is a warning."); - fll_program_print_help_option(data.context, fss_status_code_short_is_error, fss_status_code_long_is_error, " Print f_true if the error code is an error."); - fll_program_print_help_option(data.context, fss_status_code_short_number, fss_status_code_long_number, " Convert status code name to number."); + fll_program_print_help_option(data.context, fss_status_code_short_is_fine, fss_status_code_long_is_fine, f_console_symbol_short_enable, f_console_symbol_long_enable, " Print f_true if the error code is not an error."); + fll_program_print_help_option(data.context, fss_status_code_short_is_warning, fss_status_code_long_is_warning, f_console_symbol_short_enable, f_console_symbol_long_enable, "Print f_true if the error code is a warning."); + fll_program_print_help_option(data.context, fss_status_code_short_is_error, fss_status_code_long_is_error, f_console_symbol_short_enable, f_console_symbol_long_enable, " Print f_true if the error code is an error."); + fll_program_print_help_option(data.context, fss_status_code_short_number, fss_status_code_long_number, f_console_symbol_short_enable, f_console_symbol_long_enable, " Convert status code name to number."); fll_program_print_help_usage(data.context, fss_status_code_name, "status code(s)"); diff --git a/level_3/init/c/init.c b/level_3/init/c/init.c index c9f4002..34f8461 100644 --- a/level_3/init/c/init.c +++ b/level_3/init/c/init.c @@ -24,17 +24,17 @@ extern "C" { f_return_status init_print_help(const init_argument argument) { fll_program_print_help_header(data.context, init_name_long, init_version); - fll_program_print_help_option(data.context, f_console_standard_short_help, f_console_standard_long_help, " Print this help message."); - fll_program_print_help_option(data.context, f_console_standard_short_light, f_console_standard_long_light, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(data.context, f_console_standard_short_dark, f_console_standard_long_dark, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(data.context, f_console_standard_short_no_color, f_console_standard_long_no_color, "Do not output in color."); - fll_program_print_help_option(data.context, f_console_standard_short_version, f_console_standard_long_version, " Print only the version number."); - fll_program_print_help_option(data.context, f_console_standard_short_debug, f_console_standard_long_debug, " Enable debugging."); + fll_program_print_help_option(data.context, f_console_standard_short_help, f_console_standard_long_help, f_console_symbol_short_enable, f_console_symbol_long_enable, " Print this help message."); + fll_program_print_help_option(data.context, f_console_standard_short_light, f_console_standard_long_light, f_console_symbol_short_disable, f_console_symbol_long_disable, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(data.context, f_console_standard_short_dark, f_console_standard_long_dark, f_console_symbol_short_disable, f_console_symbol_long_disable, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(data.context, f_console_standard_short_no_color, f_console_standard_long_no_color, f_console_symbol_short_disable, f_console_symbol_long_disable, "Do not output in color."); + fll_program_print_help_option(data.context, f_console_standard_short_version, f_console_standard_long_version, f_console_symbol_short_disable, f_console_symbol_long_disable, " Print only the version number."); + fll_program_print_help_option(data.context, f_console_standard_short_debug, f_console_standard_long_debug, f_console_symbol_short_disable, f_console_symbol_long_disable, " Enable debugging."); printf("%c", f_string_eol); - fll_program_print_help_option(data.context, init_parameter_no_prepare_short_name, init_parameter_no_prepare_long_name, " Do not attempt to process kernel command line or perform any boot-time specific preparations."); - fll_program_print_help_option(data.context, init_parameter_runlevel_short_name, init_parameter_runlevel_long_name, " Specify a custom run level, ignoring the kernel command line runlevel argument."); + fll_program_print_help_option(data.context, init_parameter_no_prepare_short_name, init_parameter_no_prepare_long_name, f_console_symbol_short_enable, f_console_symbol_long_enable, " Do not attempt to process kernel command line or perform any boot-time specific preparations."); + fll_program_print_help_option(data.context, init_parameter_runlevel_short_name, init_parameter_runlevel_long_name, f_console_symbol_short_enable, f_console_symbol_long_enable, " Specify a custom run level, ignoring the kernel command line runlevel argument."); fll_program_print_help_usage(data.context, init_name, ""); diff --git a/level_3/status_code/c/status_code.c b/level_3/status_code/c/status_code.c index 5e8e5bb..68b1b32 100644 --- a/level_3/status_code/c/status_code.c +++ b/level_3/status_code/c/status_code.c @@ -8,18 +8,18 @@ extern "C" { f_return_status status_code_print_help(const status_code_data data) { fll_program_print_help_header(data.context, status_code_name_long, status_code_version); - fll_program_print_help_option(data.context, f_console_standard_short_help, f_console_standard_long_help, " Print this help message."); - fll_program_print_help_option(data.context, f_console_standard_short_light, f_console_standard_long_light, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(data.context, f_console_standard_short_dark, f_console_standard_long_dark, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(data.context, f_console_standard_short_no_color, f_console_standard_long_no_color, "Do not output in color."); - fll_program_print_help_option(data.context, f_console_standard_short_version, f_console_standard_long_version, " Print only the version number."); + fll_program_print_help_option(data.context, f_console_standard_short_help, f_console_standard_long_help, f_console_symbol_short_enable, f_console_symbol_long_enable, " Print this help message."); + fll_program_print_help_option(data.context, f_console_standard_short_light, f_console_standard_long_light, f_console_symbol_short_disable, f_console_symbol_long_disable, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(data.context, f_console_standard_short_dark, f_console_standard_long_dark, f_console_symbol_short_disable, f_console_symbol_long_disable, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(data.context, f_console_standard_short_no_color, f_console_standard_long_no_color, f_console_symbol_short_disable, f_console_symbol_long_disable, "Do not output in color."); + fll_program_print_help_option(data.context, f_console_standard_short_version, f_console_standard_long_version, f_console_symbol_short_disable, f_console_symbol_long_disable, " Print only the version number."); printf("%c", f_string_eol); - fll_program_print_help_option(data.context, status_code_short_is_fine, status_code_long_is_fine, " Print f_true if the error code is not an error."); - fll_program_print_help_option(data.context, status_code_short_is_warning, status_code_long_is_warning, "Print f_true if the error code is a warning."); - fll_program_print_help_option(data.context, status_code_short_is_error, status_code_long_is_error, " Print f_true if the error code is an error."); - fll_program_print_help_option(data.context, status_code_short_number, status_code_long_number, " Convert status code name to number."); + fll_program_print_help_option(data.context, status_code_short_is_fine, status_code_long_is_fine, f_console_symbol_short_enable, f_console_symbol_long_enable, " Print f_true if the error code is not an error."); + fll_program_print_help_option(data.context, status_code_short_is_warning, status_code_long_is_warning, f_console_symbol_short_enable, f_console_symbol_long_enable, "Print f_true if the error code is a warning."); + fll_program_print_help_option(data.context, status_code_short_is_error, status_code_long_is_error, f_console_symbol_short_enable, f_console_symbol_long_enable, " Print f_true if the error code is an error."); + fll_program_print_help_option(data.context, status_code_short_number, status_code_long_number, f_console_symbol_short_enable, f_console_symbol_long_enable, " Convert status code name to number."); fll_program_print_help_usage(data.context, status_code_name, "status code(s)"); -- 1.8.3.1