From 96b871faeabd68ec747f62c44925b2f23dac384c Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Mon, 28 Feb 2022 19:03:32 -0600 Subject: [PATCH] Bugfix: Debug verbositiy should include Verbose verbosity messages. --- level_3/fake/c/private-build-library.c | 8 ++--- level_3/fake/c/private-build-load.c | 12 ++++---- level_3/fake/c/private-build-objects.c | 2 +- level_3/fake/c/private-build-skeleton.c | 2 +- level_3/fake/c/private-build.c | 6 ++-- level_3/fake/c/private-clean.c | 4 +-- level_3/fake/c/private-fake.c | 2 +- level_3/fake/c/private-make-load_fakefile.c | 6 ++-- level_3/fake/c/private-make-load_parameters.c | 2 +- level_3/fake/c/private-make-operate.c | 2 +- level_3/fake/c/private-make-operate_process.c | 10 +++--- level_3/fake/c/private-make-operate_process_type.c | 36 +++++++++++----------- level_3/fake/c/private-skeleton.c | 18 +++++------ 13 files changed, 55 insertions(+), 55 deletions(-) diff --git a/level_3/fake/c/private-build-library.c b/level_3/fake/c/private-build-library.c index aec29a5..db7a0af 100644 --- a/level_3/fake/c/private-build-library.c +++ b/level_3/fake/c/private-build-library.c @@ -331,7 +331,7 @@ extern "C" { *status = f_file_link(parameter_file_name_major, parameter_file_path); - if (F_status_is_error_not(*status) && main->error.verbosity == f_console_verbosity_verbose_e) { + if (F_status_is_error_not(*status) && main->error.verbosity >= f_console_verbosity_verbose_e) { fll_print_format("Linked file '%Q' to '%Q'.%r", main->output.to.stream, parameter_file_path, parameter_file_name_major, f_string_eol_s); } else if (F_status_is_error(*status)) { @@ -362,7 +362,7 @@ extern "C" { *status = f_file_link(parameter_file_name_minor, parameter_file_path); - if (F_status_is_error_not(*status) && main->error.verbosity == f_console_verbosity_verbose_e) { + if (F_status_is_error_not(*status) && main->error.verbosity >= f_console_verbosity_verbose_e) { fll_print_format("Linked file '%Q' to '%Q'.%r", main->output.to.stream, parameter_file_path, parameter_file_name_minor, f_string_eol_s); } else if (F_status_is_error(*status)) { @@ -391,7 +391,7 @@ extern "C" { *status = f_file_link(parameter_file_name_micro, parameter_file_path); - if (F_status_is_error_not(*status) && main->error.verbosity == f_console_verbosity_verbose_e) { + if (F_status_is_error_not(*status) && main->error.verbosity >= f_console_verbosity_verbose_e) { fll_print_format("Linked file '%Q' to '%Q'.%r", main->output.to.stream, parameter_file_path, parameter_file_name_micro, f_string_eol_s); } else if (F_status_is_error(*status)) { @@ -419,7 +419,7 @@ extern "C" { *status = f_file_link(parameter_file_name_nano, parameter_file_path); - if (F_status_is_error_not(*status) && main->error.verbosity == f_console_verbosity_verbose_e) { + if (F_status_is_error_not(*status) && main->error.verbosity >= f_console_verbosity_verbose_e) { fll_print_format("Linked file '%Q' to '%Q'.%r", main->output.to.stream, parameter_file_path, parameter_file_name_nano, f_string_eol_s); } else if (F_status_is_error(*status)) { diff --git a/level_3/fake/c/private-build-load.c b/level_3/fake/c/private-build-load.c index f30be34..e1b29ad 100644 --- a/level_3/fake/c/private-build-load.c +++ b/level_3/fake/c/private-build-load.c @@ -1060,7 +1060,7 @@ extern "C" { else { *settings_single_bool[i] = F_true; - if (main->warning.verbosity == f_console_verbosity_verbose_e) { + if (main->warning.verbosity >= f_console_verbosity_verbose_e) { flockfile(main->warning.to.stream); fl_print_format("%r%[%QThe setting '%]", main->warning.to.stream, f_string_eol_s, main->warning.context, main->warning.prefix, main->warning.context); @@ -1092,7 +1092,7 @@ extern "C" { else { *settings_single_language[i] = fake_build_language_type_c_e; - if (main->warning.verbosity == f_console_verbosity_verbose_e) { + if (main->warning.verbosity >= f_console_verbosity_verbose_e) { flockfile(main->warning.to.stream); fl_print_format("%r%[%QThe setting '%]", main->warning.to.stream, f_string_eol_s, main->warning.context, main->warning.prefix, main->warning.context); @@ -1129,7 +1129,7 @@ extern "C" { else { *settings_single_version[i] = settings_single_version_default[i]; - if (main->warning.verbosity == f_console_verbosity_verbose_e) { + if (main->warning.verbosity >= f_console_verbosity_verbose_e) { flockfile(main->warning.to.stream); fl_print_format("%r%[%QThe setting '%]", main->warning.to.stream, f_string_eol_s, main->warning.context, main->warning.prefix, main->warning.context); @@ -1190,7 +1190,7 @@ extern "C" { if (checks && !setting->version_file) { setting->version_file = fake_build_version_type_micro_e; - if (main->warning.verbosity == f_console_verbosity_verbose_e) { + if (main->warning.verbosity >= f_console_verbosity_verbose_e) { flockfile(main->warning.to.stream); fl_print_format("%r%[%QThe setting '%]", main->warning.to.stream, f_string_eol_s, main->warning.context, main->warning.prefix, main->warning.context); @@ -1208,7 +1208,7 @@ extern "C" { if (checks && !setting->version_target) { setting->version_target = fake_build_version_type_major_e; - if (main->warning.verbosity == f_console_verbosity_verbose_e) { + if (main->warning.verbosity >= f_console_verbosity_verbose_e) { flockfile(main->warning.to.stream); fl_print_format("%r%[%QThe setting '%]", main->warning.to.stream, f_string_eol_s, main->warning.context, main->warning.prefix, main->warning.context); @@ -1329,7 +1329,7 @@ extern "C" { setting->search_static = F_false; } - if (main->error.verbosity == f_console_verbosity_verbose_e) { + if (main->error.verbosity >= f_console_verbosity_verbose_e) { flockfile(main->error.to.stream); fl_print_format("%r%[%QThe parameters '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); diff --git a/level_3/fake/c/private-build-objects.c b/level_3/fake/c/private-build-objects.c index 611a59b..6af0f27 100644 --- a/level_3/fake/c/private-build-objects.c +++ b/level_3/fake/c/private-build-objects.c @@ -139,7 +139,7 @@ extern "C" { break; } - if (main->error.verbosity == f_console_verbosity_verbose_e) { + if (main->error.verbosity >= f_console_verbosity_verbose_e) { fll_print_format("Directory '%Q' created.%r", main->output.to.stream, destination_path, f_string_eol_s); } } diff --git a/level_3/fake/c/private-build-skeleton.c b/level_3/fake/c/private-build-skeleton.c index f161007..0e9e3b5 100644 --- a/level_3/fake/c/private-build-skeleton.c +++ b/level_3/fake/c/private-build-skeleton.c @@ -113,7 +113,7 @@ extern "C" { return; } - if (created && main->error.verbosity == f_console_verbosity_verbose_e) { + if (created && main->error.verbosity >= f_console_verbosity_verbose_e) { fll_print_format("Created directory '%Q'.%r", main->output.to.stream, *directorys[i], f_string_eol_s); } } // for diff --git a/level_3/fake/c/private-build.c b/level_3/fake/c/private-build.c index d755c1f..8191bc9 100644 --- a/level_3/fake/c/private-build.c +++ b/level_3/fake/c/private-build.c @@ -378,7 +378,7 @@ extern "C" { fl_directory_recurse_t recurse = fl_directory_recurse_t_initialize; - if (main->error.verbosity == f_console_verbosity_verbose_e) { + if (main->error.verbosity >= f_console_verbosity_verbose_e) { recurse.output.stream = main->output.to.stream; recurse.output.id = main->output.to.id; recurse.output.flag = main->output.to.flag; @@ -433,7 +433,7 @@ extern "C" { *status = fl_directory_copy(path_source, destination_directory, mode, recurse); if (F_status_is_error(*status)) { - if (main->error.verbosity == f_console_verbosity_verbose_e) { + if (main->error.verbosity >= f_console_verbosity_verbose_e) { for (f_array_length_t j = 0; j < failures.used; ++j) { fake_print_error_build_operation_file(main, F_status_set_fine(*status), "fl_directory_copy", fake_common_file_directory_copy_s, f_file_operation_to_s, path_source, destination_directory, F_true); } // for @@ -517,7 +517,7 @@ extern "C" { break; } - if (main->error.verbosity == f_console_verbosity_verbose_e) { + if (main->error.verbosity >= f_console_verbosity_verbose_e) { fll_print_format("Copied file '%Q' to '%Q'.%r", main->output.to.stream, path_source, destination_file, f_string_eol_s); } } diff --git a/level_3/fake/c/private-clean.c b/level_3/fake/c/private-clean.c index f9d1fdb..7394b00 100644 --- a/level_3/fake/c/private-clean.c +++ b/level_3/fake/c/private-clean.c @@ -25,7 +25,7 @@ extern "C" { f_status_t status = F_none; - if (main->error.verbosity == f_console_verbosity_verbose_e) { + if (main->error.verbosity >= f_console_verbosity_verbose_e) { status = f_directory_remove_custom(main->path_build, F_directory_descriptors_max_d, F_true, fake_clean_remove_recursively_verbosely); } else { @@ -33,7 +33,7 @@ extern "C" { } if (F_status_set_fine(status) == F_file_found_not || F_status_set_fine(status) == F_directory) { - if (main->error.verbosity == f_console_verbosity_verbose_e) { + if (main->error.verbosity >= f_console_verbosity_verbose_e) { flockfile(main->warning.to.stream); f_print_terminated("The build directory '", main->warning.to.stream); diff --git a/level_3/fake/c/private-fake.c b/level_3/fake/c/private-fake.c index 61d2036..6238ef6 100644 --- a/level_3/fake/c/private-fake.c +++ b/level_3/fake/c/private-fake.c @@ -15,7 +15,7 @@ extern "C" { if (F_status_is_error(*status)) return 1; - if (main->error.verbosity == f_console_verbosity_verbose_e) { + if (main->error.verbosity >= f_console_verbosity_verbose_e) { flockfile(main->output.to.stream); f_print_dynamic(program, main->output.to.stream); diff --git a/level_3/fake/c/private-make-load_fakefile.c b/level_3/fake/c/private-make-load_fakefile.c index 42dfadb..be18b58 100644 --- a/level_3/fake/c/private-make-load_fakefile.c +++ b/level_3/fake/c/private-make-load_fakefile.c @@ -31,7 +31,7 @@ extern "C" { if (F_status_is_error(*status)) return; if (!data_make->buffer.used) { - if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { + if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { flockfile(data_make->main->warning.to.stream); fl_print_format("%r%[%QThe fakefile '%]", data_make->main->warning.to.stream, f_string_eol_s, data_make->main->warning.context, data_make->main->warning.prefix, data_make->main->warning.context); @@ -511,7 +511,7 @@ extern "C" { ++data_make->setting_build.environment.used; } - else if (data_make->main->warning.verbosity == f_console_verbosity_verbose_e) { + else if (data_make->main->warning.verbosity >= f_console_verbosity_verbose_e) { flockfile(data_make->main->warning.to.stream); fl_print_format("%r%[%QThe environment name '%]", data_make->main->warning.to.stream, f_string_eol_s, data_make->main->warning.context, data_make->main->warning.prefix, data_make->main->warning.context); @@ -521,7 +521,7 @@ extern "C" { funlockfile(data_make->main->warning.to.stream); } } - else if (data_make->main->warning.verbosity == f_console_verbosity_verbose_e) { + else if (data_make->main->warning.verbosity >= f_console_verbosity_verbose_e) { flockfile(data_make->main->warning.to.stream); fl_print_format("%r%[%QThe environment name '%]", data_make->main->warning.to.stream, f_string_eol_s, data_make->main->warning.context, data_make->main->warning.prefix, data_make->main->warning.context); diff --git a/level_3/fake/c/private-make-load_parameters.c b/level_3/fake/c/private-make-load_parameters.c index 171f7ea..5612076 100644 --- a/level_3/fake/c/private-make-load_parameters.c +++ b/level_3/fake/c/private-make-load_parameters.c @@ -106,7 +106,7 @@ extern "C" { *status = f_string_dynamic_append(f_console_standard_short_quiet_s, &data_make->parameter.verbosity.array[data_make->parameter.verbosity.used]); } } - else if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { + else if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { if (data_make->main->parameters.array[fake_parameter_verbosity_verbose_e].type == f_console_type_normal_e) { *status = f_string_dynamic_append(f_console_symbol_short_enable_s, &data_make->parameter.verbosity.array[data_make->parameter.verbosity.used]); } diff --git a/level_3/fake/c/private-make-operate.c b/level_3/fake/c/private-make-operate.c index 2abbe5a..ffd4ddf 100644 --- a/level_3/fake/c/private-make-operate.c +++ b/level_3/fake/c/private-make-operate.c @@ -115,7 +115,7 @@ extern "C" { if (status != F_child) { f_status_t status_path = f_path_change_at(data_make.path.top.id); - if (F_status_is_error(status_path) && main->warning.verbosity == f_console_verbosity_verbose_e) { + if (F_status_is_error(status_path) && main->warning.verbosity >= f_console_verbosity_verbose_e) { flockfile(main->warning.to.stream); fl_print_format("%r%[%QFailed change back to orignal path '%]", main->warning.to.stream, f_string_eol_s, main->warning.context, main->warning.prefix, main->warning.context); diff --git a/level_3/fake/c/private-make-operate_process.c b/level_3/fake/c/private-make-operate_process.c index 37ff28d..838e7cf 100644 --- a/level_3/fake/c/private-make-operate_process.c +++ b/level_3/fake/c/private-make-operate_process.c @@ -85,7 +85,7 @@ extern "C" { return 0; } - if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { + if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { flockfile(data_make->main->output.to.stream); fl_print_format("%rBreaking as '", data_make->main->output.to.stream, f_string_eol_s); @@ -162,7 +162,7 @@ extern "C" { if (F_status_is_error(*status)) { fll_error_print(data_make->error, F_status_set_fine(*status), "f_environment_set", F_true); } - else if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { + else if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { fll_print_format("%rDefined environment variable '%[%Q%]'.%r", data_make->main->output.to.stream, f_string_eol_s, data_make->main->context.set.notable, arguments.array[0], data_make->main->context.set.notable, f_string_eol_s); } @@ -208,7 +208,7 @@ extern "C" { return 0; } - if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { + if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { fll_print_format("%rExiting as '%[%Q%]'.%r", data_make->main->output.to.stream, f_string_eol_s, data_make->main->context.set.notable, arguments.used ? arguments.array[0] : fake_make_operation_argument_success_s, data_make->main->context.set.notable, f_string_eol_s); } @@ -357,7 +357,7 @@ extern "C" { if (F_status_is_error(*status)) { fll_error_file_print(data_make->error, F_status_set_fine(*status), "f_file_link", F_true, arguments.array[1], f_file_operation_link_s, fll_error_file_type_file_e); } - else if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { + else if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { flockfile(data_make->main->output.to.stream); fl_print_format("Created symbolic link from '%[%Q%]", data_make->main->output.to.stream, data_make->main->context.set.notable, arguments.array[1], data_make->main->context.set.notable); @@ -528,7 +528,7 @@ extern "C" { return status; } - if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { + if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { flockfile(data_make->main->output.to.stream); f_print_dynamic_safely(program, data_make->main->output.to.stream); diff --git a/level_3/fake/c/private-make-operate_process_type.c b/level_3/fake/c/private-make-operate_process_type.c index 31eac13..c110548 100644 --- a/level_3/fake/c/private-make-operate_process_type.c +++ b/level_3/fake/c/private-make-operate_process_type.c @@ -26,7 +26,7 @@ extern "C" { f_mode_t mode = f_mode_t_initialize; if (clone) { - if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { + if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { recurse.output = data_make->main->output.to; recurse.verbose = fake_verbose_print_clone; } @@ -34,7 +34,7 @@ extern "C" { else { macro_f_mode_t_set_default_umask(mode, data_make->main->umask); - if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { + if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { recurse.output = data_make->main->output.to; recurse.verbose = fake_verbose_print_copy; } @@ -105,7 +105,7 @@ extern "C" { status = F_status_set_error(F_failure); } - else if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { + else if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { flockfile(data_make->main->output.to.stream); fl_print_format("%r%s '%[%Q%]' to '", data_make->main->output.to.stream, f_string_eol_s, clone ? "Cloned" : "Copied", data_make->main->context.set.notable, arguments.array[i], data_make->main->context.set.notable); @@ -143,7 +143,7 @@ extern "C" { if (F_status_is_error(status)) { if (F_status_set_fine(status) == F_file_found_not) { - if (data_make->main->warning.verbosity == f_console_verbosity_verbose_e) { + if (data_make->main->warning.verbosity >= f_console_verbosity_verbose_e) { flockfile(data_make->main->warning.to.stream); fl_print_format("%r%[%QThe file '%]", data_make->main->warning.to.stream, data_make->main->warning.prefix, f_string_eol_s); @@ -162,7 +162,7 @@ extern "C" { } } else if (macro_f_file_type_is_directory(file_stat.st_mode)) { - if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { + if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { status = f_directory_remove_custom(arguments.array[i], recursion_max, F_false, fake_clean_remove_recursively_verbosely); } else { @@ -170,7 +170,7 @@ extern "C" { } if (F_status_set_fine(status) == F_file_found_not) { - if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { + if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { fll_print_format("%rThe directory '%[%Q%]' does not exist.%r", data_make->main->output.to.stream, f_string_eol_s, data_make->main->context.set.notable, arguments.array[i], data_make->main->context.set.notable, f_string_eol_s); } @@ -182,7 +182,7 @@ extern "C" { return status; } - else if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { + else if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { fll_print_format("%rRemoved '%[%Q%]'.%r", data_make->main->output.to.stream, f_string_eol_s, data_make->main->context.set.notable, arguments.array[i], data_make->main->context.set.notable, f_string_eol_s); } } @@ -190,7 +190,7 @@ extern "C" { status = f_file_remove(arguments.array[i]); if (F_status_set_fine(status) == F_file_found_not) { - if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { + if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { fll_print_format("%rThe file '%[%Q%]' does not exist.%r", data_make->main->output.to.stream, f_string_eol_s, data_make->main->context.set.notable, arguments.array[i], data_make->main->context.set.notable, f_string_eol_s); } @@ -203,7 +203,7 @@ extern "C" { return status; } - if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { + if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { fll_print_format("%rRemoved '%[%Q%]'.%r", data_make->main->output.to.stream, f_string_eol_s, data_make->main->context.set.notable, arguments.array[i], data_make->main->context.set.notable, f_string_eol_s); } } @@ -242,7 +242,7 @@ extern "C" { data_make->error.to.id = -1; } - if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { + if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { flockfile(data_make->main->output.to.stream); f_print_terminated("Set failure state to '", data_make->main->output.to.stream); @@ -299,7 +299,7 @@ extern "C" { fll_error_file_print(data_make->error, F_status_set_fine(status), all ? "fll_file_role_change_all" : "f_file_role_change", F_true, arguments.array[i], f_file_operation_change_group_s, fll_error_file_type_file_e); } - else if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { + else if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { flockfile(data_make->main->output.to.stream); fl_print_format("%r group of '%[%r%]", data_make->main->output.to.stream, all ? "Recursively changed" : "Changed", data_make->main->context.set.notable, arguments.array[i], data_make->main->context.set.notable); @@ -1003,7 +1003,7 @@ extern "C" { break; } - if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { + if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { fll_print_format("Changed mode of '%Q' to %#@u.%r", data_make->main->output.to.stream, arguments.array[i], mode, f_string_eol_s); } } // for @@ -1026,7 +1026,7 @@ extern "C" { f_string_static_t destination = f_string_static_t_initialize; - if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { + if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { recurse.output = data_make->main->output.to; recurse.verbose = fake_verbose_print_move; } @@ -1117,7 +1117,7 @@ extern "C" { fll_error_file_print(data_make->error, F_status_set_fine(status), all ? "fll_file_role_change_all" : "f_file_role_change", F_true, arguments.array[i], f_file_operation_change_owner_s, fll_error_file_type_file_e); } - else if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { + else if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { fll_print_format("%s owner of '%Q' to %u.%r", data_make->main->output.to.stream, all ? "Recursively changed" : "Changed", arguments.array[i], id, f_string_eol_s); } } // for @@ -1235,7 +1235,7 @@ extern "C" { return 0; } - if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { + if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { status = fake_make_path_relative(data_make, *argument); // The created relative path is for verbosity purposes and as such its failure to be processed should not be treated as a failure of the function. @@ -1300,7 +1300,7 @@ extern "C" { return status; } - if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { + if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { status = fake_make_path_relative(data_make, data_make->path.stack.array[data_make->path.stack.used]); // The created relative path is for verbosity purposes and as such its failure to be processed should not be treated as a failure of the function. @@ -1335,7 +1335,7 @@ extern "C" { } } - if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { + if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { fll_print_format("Changed to project path ''.%r", data_make->main->output.to.stream, f_string_eol_s); } @@ -1389,7 +1389,7 @@ extern "C" { } } - if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { + if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { fll_print_format("Touched '%[%Q%]'.%r", data_make->main->output.to.stream, data_make->main->context.set.notable, arguments.array[i], data_make->main->context.set.notable, f_string_eol_s); } } // for diff --git a/level_3/fake/c/private-skeleton.c b/level_3/fake/c/private-skeleton.c index 47285cb..d4c9ee9 100644 --- a/level_3/fake/c/private-skeleton.c +++ b/level_3/fake/c/private-skeleton.c @@ -18,7 +18,7 @@ extern "C" { if (main->output.verbosity != f_console_verbosity_quiet_e) { fll_print_format("%rGenerating skeleton structure.%r", main->output.to.stream, f_string_eol_s, f_string_eol_s); - if (main->output.verbosity == f_console_verbosity_verbose_e) { + if (main->output.verbosity >= f_console_verbosity_verbose_e) { fll_print_dynamic(f_string_eol_s, main->output.to.stream); } } @@ -91,7 +91,7 @@ extern "C" { } } // for - if (main->output.verbosity == f_console_verbosity_verbose_e) { + if (main->output.verbosity >= f_console_verbosity_verbose_e) { fll_print_dynamic(f_string_eol_s, main->output.to.stream); } } @@ -138,7 +138,7 @@ extern "C" { f_status_t status = f_directory_exists(path); if (status == F_true) { - if (main->error.verbosity == f_console_verbosity_verbose_e) { + if (main->error.verbosity >= f_console_verbosity_verbose_e) { fll_print_format("Directory '%Q' already exists.%r", main->output.to.stream, path, f_string_eol_s); } @@ -178,7 +178,7 @@ extern "C" { return status; } - if (main->error.verbosity == f_console_verbosity_verbose_e) { + if (main->error.verbosity >= f_console_verbosity_verbose_e) { fll_print_format("Directory '%Q' created.%r", main->output.to.stream, path, f_string_eol_s); } } @@ -202,7 +202,7 @@ extern "C" { status = f_file_is(path, F_file_type_regular_d, F_false); if (status == F_true) { - if (main->error.verbosity == f_console_verbosity_verbose_e) { + if (main->error.verbosity >= f_console_verbosity_verbose_e) { fll_print_format("File '%Q' already exists.%r", main->output.to.stream, path, f_string_eol_s); } @@ -214,7 +214,7 @@ extern "C" { status = f_file_is(path, F_file_type_link_d, F_false); if (status == F_true) { - if (main->error.verbosity == f_console_verbosity_verbose_e) { + if (main->error.verbosity >= f_console_verbosity_verbose_e) { fll_print_format("File '%Q' already exists (as a symbolic link).%r", main->output.to.stream, path, f_string_eol_s); } @@ -223,7 +223,7 @@ extern "C" { } if (status == F_false) { - if (main->error.verbosity == f_console_verbosity_verbose_e) { + if (main->error.verbosity >= f_console_verbosity_verbose_e) { fll_print_format("File '%Q' already exists but is not a regular file (or symbolic link).%r", main->output.to.stream, path, f_string_eol_s); } @@ -255,7 +255,7 @@ extern "C" { return status; } - if (main->error.verbosity == f_console_verbosity_verbose_e) { + if (main->error.verbosity >= f_console_verbosity_verbose_e) { fll_print_format("File '%Q' created.%r", main->output.to.stream, path, f_string_eol_s); } @@ -283,7 +283,7 @@ extern "C" { return status; } - if (main->error.verbosity == f_console_verbosity_verbose_e) { + if (main->error.verbosity >= f_console_verbosity_verbose_e) { fll_print_format("File '%Q' pre-populated.%r", main->output.to.stream, path, f_string_eol_s); } -- 1.8.3.1