From fad9a068faec287818dd0aeef1971509f20579c6 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Thu, 29 Apr 2021 22:59:41 -0500 Subject: [PATCH] Update: Lift the restrictions on specifying -o with -l, -s, and -t for the FSS read programs. At some point the FSS read functions were not designed to allow -o and -c at the same time. This is no longer necessary. Remove the checks and the code appears to work as expected. --- .../fss_basic_list_read/c/fss_basic_list_read.c | 36 ---------------------- level_3/fss_basic_read/c/fss_basic_read.c | 36 ---------------------- .../c/fss_embedded_list_read.c | 36 ---------------------- .../c/fss_extended_list_read.c | 36 ---------------------- level_3/fss_extended_read/c/fss_extended_read.c | 36 ---------------------- 5 files changed, 180 deletions(-) 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 acfcbb1..9322ddb 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 @@ -280,42 +280,6 @@ extern "C" { status = F_status_set_error(F_parameter); } - if (F_status_is_error_not(status) && 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) { - f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_object); - f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_line); - f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); - - status = F_status_set_error(F_parameter); - } - - if (F_status_is_error_not(status) && data->parameters[fss_basic_list_read_parameter_select].result == f_console_result_additional) { - f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_object); - f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_select); - f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); - - status = F_status_set_error(F_parameter); - } - - if (data->parameters[fss_basic_list_read_parameter_content].result == f_console_result_found) { - if (F_status_is_error_not(status) && data->parameters[fss_basic_list_read_parameter_total].result == f_console_result_found) { - f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify both the '", fll_error_print_error); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_object); - f_color_print(data->error.to.stream, data->context.set.error, "' and the '"); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_content); - f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_total); - f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); - - status = F_status_set_error(F_parameter); - } - } - } - if (F_status_is_error_not(status) && 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) { f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); 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 b37cf33..3dfebc3 100644 --- a/level_3/fss_basic_read/c/fss_basic_read.c +++ b/level_3/fss_basic_read/c/fss_basic_read.c @@ -280,42 +280,6 @@ extern "C" { status = F_status_set_error(F_parameter); } - if (data->parameters[fss_basic_read_parameter_object].result == f_console_result_found) { - if (F_status_is_error_not(status) && data->parameters[fss_basic_read_parameter_line].result == f_console_result_additional) { - f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_object); - f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_line); - f_color_print(data->error.to.stream, data->context.set.error, "' parameter."); - - status = F_status_set_error(F_parameter); - } - - if (F_status_is_error_not(status) && data->parameters[fss_basic_read_parameter_select].result == f_console_result_additional) { - f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_object); - f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_select); - f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); - - status = F_status_set_error(F_parameter); - } - - if (data->parameters[fss_basic_read_parameter_content].result == f_console_result_found) { - if (F_status_is_error_not(status) && data->parameters[fss_basic_read_parameter_total].result == f_console_result_found) { - f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify both the '", fll_error_print_error); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_object); - f_color_print(data->error.to.stream, data->context.set.error, "' and the '"); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_content); - f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_total); - f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); - - status = F_status_set_error(F_parameter); - } - } - } - if (data->parameters[fss_basic_read_parameter_line].result == f_console_result_additional) { if (F_status_is_error_not(status) && data->parameters[fss_basic_read_parameter_total].result == f_console_result_found) { f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); diff --git a/level_3/fss_embedded_list_read/c/fss_embedded_list_read.c b/level_3/fss_embedded_list_read/c/fss_embedded_list_read.c index ad738db..40956f2 100644 --- a/level_3/fss_embedded_list_read/c/fss_embedded_list_read.c +++ b/level_3/fss_embedded_list_read/c/fss_embedded_list_read.c @@ -280,42 +280,6 @@ extern "C" { status = F_status_set_error(F_parameter); } - if (data->parameters[fss_embedded_list_read_parameter_object].result == f_console_result_found) { - if (F_status_is_error_not(status) && data->parameters[fss_embedded_list_read_parameter_line].result == f_console_result_additional) { - f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_object); - f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_line); - f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); - - status = F_status_set_error(F_parameter); - } - - if (F_status_is_error_not(status) && data->parameters[fss_embedded_list_read_parameter_select].result == f_console_result_additional) { - f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_object); - f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_select); - f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); - - status = F_status_set_error(F_parameter); - } - - if (data->parameters[fss_embedded_list_read_parameter_content].result == f_console_result_found) { - if (F_status_is_error_not(status) && data->parameters[fss_embedded_list_read_parameter_total].result == f_console_result_found) { - f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify both the '", fll_error_print_error); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_object); - f_color_print(data->error.to.stream, data->context.set.error, "' and the '"); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_content); - f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_total); - f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); - - status = F_status_set_error(F_parameter); - } - } - } - if (data->parameters[fss_embedded_list_read_parameter_line].result == f_console_result_additional) { if (F_status_is_error_not(status) && data->parameters[fss_embedded_list_read_parameter_total].result == f_console_result_found) { f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); 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 6aaebb9..25a5b26 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 @@ -280,42 +280,6 @@ extern "C" { status = F_status_set_error(F_parameter); } - if (F_status_is_error_not(status) && 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) { - f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_object); - f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_line); - f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); - - status = F_status_set_error(F_parameter); - } - - if (F_status_is_error_not(status) && data->parameters[fss_extended_list_read_parameter_select].result == f_console_result_additional) { - f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_object); - f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_select); - f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); - - status = F_status_set_error(F_parameter); - } - - if (data->parameters[fss_extended_list_read_parameter_content].result == f_console_result_found) { - if (F_status_is_error_not(status) && data->parameters[fss_extended_list_read_parameter_total].result == f_console_result_found) { - f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify both the '", fll_error_print_error); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_object); - f_color_print(data->error.to.stream, data->context.set.error, "' and the '"); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_content); - f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_total); - f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); - - status = F_status_set_error(F_parameter); - } - } - } - if (F_status_is_error_not(status) && 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) { f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); 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 8d019ee..0f6d9fa 100644 --- a/level_3/fss_extended_read/c/fss_extended_read.c +++ b/level_3/fss_extended_read/c/fss_extended_read.c @@ -280,42 +280,6 @@ extern "C" { status = F_status_set_error(F_parameter); } - if (data->parameters[fss_extended_read_parameter_object].result == f_console_result_found) { - if (F_status_is_error_not(status) && data->parameters[fss_extended_read_parameter_line].result == f_console_result_additional) { - f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_object); - f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_line); - f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); - - status = F_status_set_error(F_parameter); - } - - if (F_status_is_error_not(status) && data->parameters[fss_extended_read_parameter_select].result == f_console_result_additional) { - f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_object); - f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_select); - f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); - - status = F_status_set_error(F_parameter); - } - - if (data->parameters[fss_extended_read_parameter_content].result == f_console_result_found) { - if (F_status_is_error_not(status) && data->parameters[fss_extended_read_parameter_total].result == f_console_result_found) { - f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify both the '", fll_error_print_error); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_object); - f_color_print(data->error.to.stream, data->context.set.error, "' and the '"); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_content); - f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_total); - f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); - - status = F_status_set_error(F_parameter); - } - } - } - if (data->parameters[fss_extended_read_parameter_line].result == f_console_result_additional) { if (F_status_is_error_not(status) && data->parameters[fss_extended_read_parameter_total].result == f_console_result_found) { f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); -- 1.8.3.1