From a14e9eb57869d775e3b1a87210afe9475964bb5d Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sun, 9 Jun 2024 21:54:46 -0500 Subject: [PATCH] Bugfix: Controller simulation is using error output rather than normal output in one case. The normal output should be used rather than the error output. The condition upon printing should also be on normal verbosity rather than error verbosity. --- level_3/controller/c/rule/private-rule.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/level_3/controller/c/rule/private-rule.c b/level_3/controller/c/rule/private-rule.c index 5fe0f81..e2162c3 100644 --- a/level_3/controller/c/rule/private-rule.c +++ b/level_3/controller/c/rule/private-rule.c @@ -1682,33 +1682,33 @@ extern "C" { } if (options & controller_process_option_simulate_d) { - if (main->error.verbosity != f_console_verbosity_quiet_e && main->error.verbosity != f_console_verbosity_error_e) { - controller_lock_print(main->error.to, thread); + if (main->output.verbosity != f_console_verbosity_quiet_e) { + controller_lock_print(main->output.to, thread); - fl_print_format("%rSimulating execution of '%[", main->error.to.stream, f_string_eol_s, main->context.set.title); + fl_print_format("%rSimulating execution of '%[", main->output.to.stream, f_string_eol_s, main->context.set.title); if (program.used) { - f_print_dynamic_safely(program, main->error.to.stream); + f_print_dynamic_safely(program, main->output.to.stream); } else { - f_print_dynamic_safely(arguments.array[0], main->error.to.stream); + f_print_dynamic_safely(arguments.array[0], main->output.to.stream); } - fl_print_format("%]' with the arguments: '%[", main->error.to.stream, main->context.set.title, main->context.set.important); + fl_print_format("%]' with the arguments: '%[", main->output.to.stream, main->context.set.title, main->context.set.important); for (f_array_length_t i = program.used ? 0 : 1; i < arguments.used; ++i) { if (program.used && i || !program.used && i > 1) { - f_print_dynamic_raw(f_string_space_s, main->error.to.stream); + f_print_dynamic_raw(f_string_space_s, main->output.to.stream); } - f_print_dynamic_safely(arguments.array[i], main->error.to.stream); + f_print_dynamic_safely(arguments.array[i], main->output.to.stream); } // for - fl_print_format("%]' from '", main->error.to.stream, main->context.set.important); - fl_print_format("%[%Q%]'.%r", main->error.to.stream, main->context.set.notable, process->rule.name, main->context.set.notable, f_string_eol_s); + fl_print_format("%]' from '", main->output.to.stream, main->context.set.important); + fl_print_format("%[%Q%]'.%r", main->output.to.stream, main->context.set.notable, process->rule.name, main->context.set.notable, f_string_eol_s); - controller_unlock_print_flush(main->error.to, thread); + controller_unlock_print_flush(main->output.to, thread); } // Sleep for less than a second to better show simulation of synchronous vs asynchronous. -- 1.8.3.1