From: Kevin Day Date: Wed, 18 Jan 2023 03:59:17 +0000 (-0600) Subject: Progress: Continue program related work. X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=601ed074aceb47b6bb6b2aec1b63e28aaa943992;p=fll Progress: Continue program related work. This focuses on getting the Featureless Make program to compile. The settings and functionality is not yet updated so the program is not expected to work yet. --- diff --git a/level_3/fake/c/main/common.h b/level_3/fake/c/main/common.h index cb3b429..2fe0138 100644 --- a/level_3/fake/c/main/common.h +++ b/level_3/fake/c/main/common.h @@ -498,10 +498,10 @@ extern "C" { macro_f_console_parameter_t_initialize6(fake_long_static_disabled_s, 0, f_console_flag_normal_e, 0), \ macro_f_console_parameter_t_initialize6(fake_long_static_enabled_s, 0, f_console_flag_normal_e, 0), \ \ - macro_f_console_parameter_t_initialize7(fake_other_operation_build_s.string, 0, f_console_flag_simple_e, 0), \ - macro_f_console_parameter_t_initialize7(fake_other_operation_clean_s.string, 0, f_console_flag_simple_e, 0), \ - macro_f_console_parameter_t_initialize7(fake_other_operation_make_s.string, 0, f_console_flag_simple_e, 0), \ - macro_f_console_parameter_t_initialize7(fake_other_operation_skeleton_s.string, 0, f_console_flag_simple_e, 0), \ + macro_f_console_parameter_t_initialize7(fake_other_operation_build_s, 0, f_console_flag_simple_e, 0), \ + macro_f_console_parameter_t_initialize7(fake_other_operation_clean_s, 0, f_console_flag_simple_e, 0), \ + macro_f_console_parameter_t_initialize7(fake_other_operation_make_s, 0, f_console_flag_simple_e, 0), \ + macro_f_console_parameter_t_initialize7(fake_other_operation_skeleton_s, 0, f_console_flag_simple_e, 0), \ } #define fake_total_parameters_d 31 @@ -543,7 +543,7 @@ extern "C" { * * flag: Flags passed to the main function. * - * state: The state data used when processing the FSS data. + * state: The state data used when processing the FSS data. * status: The main status code, generally used by the load settings and main functions. * * line_first: A string expected to represent either "\n" or NULL to allow for easy handling of when to print first new line or not. @@ -563,8 +563,8 @@ extern "C" { #define fake_setting_t_initialize \ { \ fake_main_flag_none_e, \ - F_none, \ f_state_t_initialize, \ + F_none, \ f_string_static_t_initialize, \ f_string_static_t_initialize, \ } diff --git a/level_3/fake/c/main/main.c b/level_3/fake/c/main/main.c index dfba70a..194496d 100644 --- a/level_3/fake/c/main/main.c +++ b/level_3/fake/c/main/main.c @@ -32,9 +32,9 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { fll_program_standard_set_down(&data); - if (status == F_child) { + if (setting.status == F_child) { exit(data.child); } - return F_status_is_error(status) ? 1 : 0; + return F_status_is_error(setting.status) ? 1 : 0; } diff --git a/level_3/fake/c/main/private-make-load_fakefile.c b/level_3/fake/c/main/private-make-load_fakefile.c index 14c7992..7f93dc6 100644 --- a/level_3/fake/c/main/private-make-load_fakefile.c +++ b/level_3/fake/c/main/private-make-load_fakefile.c @@ -16,7 +16,7 @@ extern "C" { if (F_status_is_error(*status)) return; if (fll_program_standard_signal_received(data_make->main)) { - fll_program_print_signal_received(data_make->main->warning, data_make->setting->line_first, data_make->main->signal_received); + fll_program_print_signal_received(data_make->main->warning, data_make->data->setting->line_first, data_make->main->signal_received); *status = F_status_set_error(F_interrupt); @@ -44,13 +44,13 @@ extern "C" { if (!data_make->buffer.used) { if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { - f_file_stream_lock(data_make->warning.to); + f_file_stream_lock(data_make->main->warning.to); fl_print_format("%r%[%QThe fakefile '%]", data_make->main->warning.to, f_string_eol_s, data_make->main->warning.context, data_make->main->warning.prefix, data_make->main->warning.context); fl_print_format("%[%Q%]", data_make->main->warning.to, data_make->main->warning.notable, data_make->data->file_data_build_fakefile, data_make->main->warning.notable); fl_print_format("%[' is empty.%]%r", data_make->main->warning.to, data_make->main->warning.context, data_make->main->warning.context, f_string_eol_s); - f_file_stream_unlock(data_make->warning.to); + f_file_stream_unlock(data_make->main->warning.to); } return; @@ -120,7 +120,7 @@ extern "C" { if (!(i % fake_signal_check_short_d)) { if (fll_program_standard_signal_received(data_make->main)) { - fll_program_print_signal_received(data_make->main->warning, data_make->setting->line_first, data_make->main->signal_received); + fll_program_print_signal_received(data_make->main->warning, data_make->data->setting->line_first, data_make->main->signal_received); *status = F_status_set_error(F_interrupt); @@ -214,7 +214,7 @@ extern "C" { if (missing_main) { if (data_make->main->error.verbosity > f_console_verbosity_quiet_e) { - f_file_stream_lock(data_make->error.to); + f_file_stream_lock(data_make->main->error.to); fl_print_format("%r%[%QThe fakefile '%]", data_make->main->error.to, f_string_eol_s, data_make->main->error.context, data_make->main->error.prefix, data_make->main->error.context); fl_print_format("%[%Q%]", data_make->main->error.to, data_make->main->error.notable, data_make->data->file_data_build_fakefile, data_make->main->error.notable); @@ -222,7 +222,7 @@ extern "C" { fl_print_format("%[%r%]", data_make->main->error.to, data_make->main->error.notable, fake_make_section_main_s, data_make->main->error.notable); fl_print_format("%[' object.%]%r", data_make->main->error.to, data_make->main->error.context, data_make->main->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } *status = F_status_set_error(F_failure); @@ -534,23 +534,23 @@ extern "C" { ++data_make->setting_build.environment.used; } else if (data_make->main->warning.verbosity >= f_console_verbosity_verbose_e) { - f_file_stream_lock(data_make->warning.to); + f_file_stream_lock(data_make->main->warning.to); fl_print_format("%r%[%QThe environment name '%]", data_make->main->warning.to, f_string_eol_s, data_make->main->warning.context, data_make->main->warning.prefix, data_make->main->warning.context); fl_print_format("%[%Q%]", data_make->main->warning.to, data_make->main->warning.notable, name_define, data_make->main->warning.notable); fl_print_format("%[' is already added.%]%r", data_make->main->warning.to, data_make->main->warning.context, data_make->main->warning.context, f_string_eol_s); - f_file_stream_unlock(data_make->warning.to); + f_file_stream_unlock(data_make->main->warning.to); } } else if (data_make->main->warning.verbosity >= f_console_verbosity_verbose_e) { - f_file_stream_lock(data_make->warning.to); + f_file_stream_lock(data_make->main->warning.to); fl_print_format("%r%[%QThe environment name '%]", data_make->main->warning.to, f_string_eol_s, data_make->main->warning.context, data_make->main->warning.prefix, data_make->main->warning.context); fl_print_format("%[%Q%]", data_make->main->warning.to, data_make->main->warning.notable, name_define, data_make->main->warning.notable); fl_print_format("%[' is invalid, ignoring.%]%r", data_make->main->warning.to, data_make->main->warning.context, data_make->main->warning.context, f_string_eol_s); - f_file_stream_unlock(data_make->warning.to); + f_file_stream_unlock(data_make->main->warning.to); } name_define.used = 0; diff --git a/level_3/fake/c/main/private-make-operate.c b/level_3/fake/c/main/private-make-operate.c index 5588975..363cc21 100644 --- a/level_3/fake/c/main/private-make-operate.c +++ b/level_3/fake/c/main/private-make-operate.c @@ -86,7 +86,7 @@ extern "C" { fake_make_load_parameters(&data_make, &status); - fake_make_load_fakefile(&data_make, main->pipe & fll_program_data_pipe_input_e, &status); + fake_make_load_fakefile(&data_make, data->main->pipe & fll_program_data_pipe_input_e, &status); if (F_status_is_error(status)) { fake_make_data_delete(&data_make); @@ -114,7 +114,7 @@ extern "C" { data_make.error.suffix = f_string_empty_s; data_make.error.context = data->main->context.set.warning; data_make.error.notable = data->main->context.set.notable; - data_make.error.to.stream = F_type_warning_d; + data_make.error.to.stream = F_type_output_d; data_make.error.to.id = F_type_descriptor_output_d; data_make.error.set = &data->main->context.set; } @@ -167,9 +167,9 @@ extern "C" { flockfile(data->main->error.to.stream); - fl_print_format("%r%[%QThe argument '%]", data->main->error.to.stream, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); - fl_print_format("%[%Q%]", data->main->error.to.stream, data->main->error.notable, data->main->parameters.arguments.array[index], data->main->error.notable); - fl_print_format("%[' is not a valid section name.%]%r", data->main->error.to.stream, data->main->error.context, data->main->error.context, f_string_eol_s); + fl_print_format("%r%[%QThe argument '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); + fl_print_format("%[%Q%]", data->main->error.to, data->main->error.notable, data->main->parameters.arguments.array[index], data->main->error.notable); + fl_print_format("%[' is not a valid section name.%]%r", data->main->error.to, data->main->error.context, data->main->error.context, f_string_eol_s); funlockfile(data->main->error.to.stream); } @@ -201,11 +201,11 @@ extern "C" { if (F_status_is_error(status_path) && data->main->warning.verbosity >= f_console_verbosity_verbose_e) { flockfile(data->main->warning.to.stream); - fl_print_format("%r%[%QFailed change back to orignal path '%]", data->main->warning.to.stream, f_string_eol_s, data->main->warning.context, data->main->warning.prefix, data->main->warning.context); - fl_print_format("%[%Q%]", data->main->warning.to.stream, data->main->warning.notable, data_make.path.stack.array[0], data->main->warning.notable); - fl_print_format("%[', status code =%] ", data->main->warning.to.stream, data->main->warning.context, data->main->warning.context); - fl_print_format("%[%ui%]", data->main->warning.to.stream, data->main->warning.notable, F_status_set_fine(status_path), data->main->warning.notable); - fl_print_format("%['.%]%r", data->main->warning.to.stream, data->main->warning.context, data->main->warning.context, f_string_eol_s); + fl_print_format("%r%[%QFailed change back to orignal path '%]", data->main->warning.to, f_string_eol_s, data->main->warning.context, data->main->warning.prefix, data->main->warning.context); + fl_print_format("%[%Q%]", data->main->warning.to, data->main->warning.notable, data_make.path.stack.array[0], data->main->warning.notable); + fl_print_format("%[', status code =%] ", data->main->warning.to, data->main->warning.context, data->main->warning.context); + fl_print_format("%[%ui%]", data->main->warning.to, data->main->warning.notable, F_status_set_fine(status_path), data->main->warning.notable); + fl_print_format("%['.%]%r", data->main->warning.to, data->main->warning.context, data->main->warning.context, f_string_eol_s); funlockfile(data->main->warning.to.stream); } @@ -233,7 +233,7 @@ extern "C" { const f_status_t status_path = f_path_change_at(data_make.path.top.id); if (F_status_is_error(status_path) && data->main->warning.verbosity >= f_console_verbosity_verbose_e) { - f_file_stream_lock(data->main->warning); + f_file_stream_lock(data->main->warning.to); fl_print_format("%r%[%QFailed change back to orignal path '%]", data->main->warning.to, f_string_eol_s, data->main->warning.context, data->main->warning.prefix, data->main->warning.context); fl_print_format("%[%Q%]", data->main->warning.to, data->main->warning.notable, data_make.path.stack.array[0], data->main->warning.notable); @@ -241,7 +241,7 @@ extern "C" { fl_print_format("%[%ui%]", data->main->warning.to, data->main->warning.notable, F_status_set_fine(status_path), data->main->warning.notable); fl_print_format("%['.%]%r", data->main->warning.to, data->main->warning.context, data->main->warning.context, f_string_eol_s); - f_file_stream_unlock(data->main->warning); + f_file_stream_unlock(data->main->warning.to); } } } @@ -1251,13 +1251,13 @@ extern "C" { const f_fss_named_t *section = &data_make->fakefile.array[id_section]; if (data_make->main->message.verbosity != f_console_verbosity_quiet_e && data_make->main->message.verbosity != f_console_verbosity_error_e) { - f_file_stream_lock(data_make->message.to); + f_file_stream_lock(data_make->main->message.to); fl_print_format("%r%[Processing Section '%]", data_make->main->message.to, f_string_eol_s, data_make->main->context.set.important, data_make->main->context.set.important); fl_print_format("%[%/Q%]", data_make->main->message.to, data_make->main->context.set.notable, data_make->buffer, section->name, data_make->main->context.set.notable); fl_print_format("%['.%]%r", data_make->main->message.to, data_make->main->context.set.important, data_make->main->context.set.important, f_string_eol_s); - f_file_stream_unlock(data_make->message.to); + f_file_stream_unlock(data_make->main->message.to); } if (!section->objects.used) { @@ -1361,7 +1361,7 @@ extern "C" { if (!(i % fake_signal_check_short_d)) { if (fll_program_standard_signal_received(data_make->main)) { - fll_program_print_signal_received(data_make->main->warning, data_make->setting->line_first, data_make->main->signal_received); + fll_program_print_signal_received(data_make->main->warning, data_make->data->setting->line_first, data_make->main->signal_received); *status = F_status_set_error(F_interrupt); @@ -1432,8 +1432,8 @@ extern "C" { data_make->error.suffix = f_string_empty_s; data_make->error.context = data_make->main->context.set.error; data_make->error.notable = data_make->main->context.set.notable; - data_make->error.to = F_type_error_d; - data_make->error.to.id = F_type_descriptor_error_d; + data_make->main->error.to.stream = F_type_error_d; + data_make->main->error.to.id = F_type_descriptor_error_d; data_make->error.set = &data_make->main->context.set; } @@ -1486,27 +1486,27 @@ extern "C" { if (F_status_set_error(*status) == F_interrupt) return 0; if (i == section->objects.used && F_status_is_error_not(*status) && (state_process.operation == fake_make_operation_type_and_e || state_process.operation == fake_make_operation_type_else_e || state_process.operation == fake_make_operation_type_if_e || state_process.operation == fake_make_operation_type_or_e)) { - if (data_make->data->main->error.verbosity > f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); + if (data_make->data->main->error.verbosity > f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); - fl_print_format("%r%[%QIncomplete '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%r%[%QIncomplete '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); if (state_process.operation == fake_make_operation_type_and_e) { - fl_print_format("%[%r%]", data_make->error.to, data_make->error.notable, fake_make_operation_and_s, data_make->error.notable); + fl_print_format("%[%r%]", data_make->main->error.to, data_make->error.notable, fake_make_operation_and_s, data_make->error.notable); } else if (state_process.operation == fake_make_operation_type_else_e) { - fl_print_format("%[%r%]", data_make->error.to, data_make->error.notable, fake_make_operation_else_s, data_make->error.notable); + fl_print_format("%[%r%]", data_make->main->error.to, data_make->error.notable, fake_make_operation_else_s, data_make->error.notable); } else if (state_process.operation == fake_make_operation_type_if_e) { - fl_print_format("%[%r%]", data_make->error.to, data_make->error.notable, fake_make_operation_if_s, data_make->error.notable); + fl_print_format("%[%r%]", data_make->main->error.to, data_make->error.notable, fake_make_operation_if_s, data_make->error.notable); } else { - fl_print_format("%[%r%]", data_make->error.to, data_make->error.notable, fake_make_operation_or_s, data_make->error.notable); + fl_print_format("%[%r%]", data_make->main->error.to, data_make->error.notable, fake_make_operation_or_s, data_make->error.notable); } - fl_print_format("%[' at end of the section.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%[' at end of the section.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } fake_print_message_section_operation_failed(data_make->data, data_make->error, data_make->buffer, section->name, section->objects.array[section->objects.used - 1]); diff --git a/level_3/fake/c/main/private-make-operate_process.c b/level_3/fake/c/main/private-make-operate_process.c index 9f059f4..4abaedd 100644 --- a/level_3/fake/c/main/private-make-operate_process.c +++ b/level_3/fake/c/main/private-make-operate_process.c @@ -287,7 +287,7 @@ extern "C" { if (!program.used && !arguments.used) return F_data_not; if (fll_program_standard_signal_received(data_make->main)) { - fll_program_print_signal_received(data_make->main->warning, data_make->setting->line_first, data_make->main->signal_received); + fll_program_print_signal_received(data_make->main->warning, data_make->data->setting->line_first, data_make->main->signal_received); return F_status_set_error(F_interrupt); } @@ -323,7 +323,7 @@ extern "C" { } if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { - f_file_stream_lock(data_make->message.to); + f_file_stream_lock(data_make->main->message.to); f_array_length_t i = 0; @@ -345,7 +345,7 @@ extern "C" { f_print_dynamic_raw(f_string_eol_s, data_make->main->message.to); - f_file_stream_unlock(data_make->message.to); + f_file_stream_unlock(data_make->main->message.to); // Flush to stdout before executing command. f_file_stream_flush(data_make->main->message.to); @@ -363,7 +363,7 @@ extern "C" { status = fll_execute_program(program, arguments, ¶meter, 0, (void *) &return_code); if (fll_program_standard_signal_received(data_make->main)) { - fll_program_print_signal_received(data_make->main->warning, data_make->setting->line_first, data_make->main->signal_received); + fll_program_print_signal_received(data_make->main->warning, data_make->data->setting->line_first, data_make->main->signal_received); return F_status_set_error(F_interrupt); } @@ -372,14 +372,14 @@ extern "C" { if (F_status_set_fine(status) == F_interrupt) return status; if (F_status_set_fine(status) == F_file_found_not) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); - fl_print_format("%r%[%QFailed to find program '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, program, data_make->error.notable); - fl_print_format("%[' for executing.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QFailed to find program '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%Q%]", data_make->main->error.to, data_make->error.notable, program, data_make->error.notable); + fl_print_format("%[' for executing.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } } else if (F_status_set_fine(status) != F_failure) { @@ -440,14 +440,14 @@ extern "C" { return status; } - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); - fl_print_format("%r%[%QFailed with return code %]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%i%]", data_make->error.to, data_make->error.notable, return_code, data_make->error.notable); - fl_print_format("%[.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QFailed with return code %]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%i%]", data_make->main->error.to, data_make->error.notable, return_code, data_make->error.notable); + fl_print_format("%[.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } if (data_make->setting_make.fail == fake_make_operation_fail_type_exit_e) return F_status_set_error(F_failure); diff --git a/level_3/fake/c/main/private-make-operate_process_type.c b/level_3/fake/c/main/private-make-operate_process_type.c index 46c6a44..76837a1 100644 --- a/level_3/fake/c/main/private-make-operate_process_type.c +++ b/level_3/fake/c/main/private-make-operate_process_type.c @@ -30,13 +30,13 @@ extern "C" { } if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { - f_file_stream_lock(data_make->message.to); + f_file_stream_lock(data_make->main->message.to); fl_print_format("%rBreaking as '", data_make->main->message.to, f_string_eol_s); fl_print_format("%[%Q%]", data_make->main->message.to, data_make->main->context.set.notable, data_make->cache_arguments.used ? data_make->cache_arguments.array[0] : fake_make_operation_argument_success_s, data_make->main->context.set.notable); fl_print_format("'.%r", data_make->main->message.to, f_string_eol_s); - f_file_stream_unlock(data_make->message.to); + f_file_stream_unlock(data_make->main->message.to); } return status; @@ -327,12 +327,12 @@ extern "C" { } if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { - f_file_stream_lock(data_make->message.to); + f_file_stream_lock(data_make->main->message.to); fl_print_format("%r%s '%[%Q%]' to '", data_make->main->message.to, f_string_eol_s, clone ? "Cloned" : "Copied", data_make->main->context.set.notable, data_make->cache_arguments.array[i], data_make->main->context.set.notable); fl_print_format("%[%Q%]'.%r", data_make->main->message.to, data_make->main->context.set.notable, destination, data_make->main->context.set.notable, f_string_eol_s); - f_file_stream_unlock(data_make->message.to); + f_file_stream_unlock(data_make->main->message.to); } } else if (F_status_is_error(status_file)) { @@ -386,13 +386,13 @@ 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) { - f_file_stream_lock(data_make->warning.to); + f_file_stream_lock(data_make->main->warning.to); fl_print_format("%r%[%QThe file '%]", data_make->main->warning.to, data_make->main->warning.prefix, f_string_eol_s); fl_print_format("%[%Q%]", data_make->main->warning.to, data_make->main->warning.notable, data_make->cache_arguments.array[i], data_make->main->warning.notable); fl_print_format("%[' cannot be found.%]%r", data_make->main->warning.to, f_string_eol_s); - f_file_stream_unlock(data_make->warning.to); + f_file_stream_unlock(data_make->main->warning.to); } status = F_none; @@ -473,8 +473,8 @@ extern "C" { data_make->error.suffix = f_string_empty_s; data_make->error.context = data_make->main->context.set.error; data_make->error.notable = data_make->main->context.set.notable; - data_make->error.to = F_type_error_d; - data_make->error.to.id = F_type_descriptor_error_d; + data_make->main->error.to.stream = F_type_error_d; + data_make->main->error.to.id = F_type_descriptor_error_d; data_make->error.set = &data_make->main->context.set; } else { @@ -498,8 +498,8 @@ extern "C" { data_make->error.suffix = f_string_empty_s; data_make->error.context = data_make->main->context.set.error; data_make->error.notable = data_make->main->context.set.notable; - data_make->error.to = F_type_error_d; - data_make->error.to.id = F_type_descriptor_error_d; + data_make->main->error.to.stream = F_type_error_d; + data_make->main->error.to.id = F_type_descriptor_error_d; data_make->error.set = &data_make->main->context.set; } else if (fl_string_dynamic_compare(fake_make_operation_argument_warn_s, data_make->cache_arguments.array[0]) == F_equal_to) { @@ -508,18 +508,18 @@ extern "C" { data_make->error.suffix = f_string_empty_s; data_make->error.context = data_make->main->context.set.warning; data_make->error.notable = data_make->main->context.set.notable; - data_make->error.to = F_type_warning_d; - data_make->error.to.id = F_type_descriptor_output_d; + data_make->main->error.to.stream = F_type_output_d; + data_make->main->error.to.id = F_type_descriptor_output_d; data_make->error.set = &data_make->main->context.set; } else { data_make->setting_make.fail = fake_make_operation_fail_type_ignore_e; - data_make->error.to = 0; - data_make->error.to.id = -1; + data_make->main->error.to.stream = 0; + data_make->main->error.to.id = -1; } if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { - f_file_stream_lock(data_make->message.to); + f_file_stream_lock(data_make->main->message.to); f_print_terminated("Set failure state to '", data_make->main->message.to); @@ -535,7 +535,7 @@ extern "C" { fl_print_format("'.%r", data_make->main->message.to, f_string_eol_s); - f_file_stream_unlock(data_make->message.to); + f_file_stream_unlock(data_make->main->message.to); } } #endif // _di_fake_make_operate_process_type_fail_ @@ -581,12 +581,12 @@ extern "C" { } if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { - f_file_stream_lock(data_make->message.to); + f_file_stream_lock(data_make->main->message.to); fl_print_format("%r group of '%[%r%]", data_make->main->message.to, all ? "Recursively changed" : "Changed", data_make->main->context.set.notable, data_make->cache_arguments.array[i], data_make->main->context.set.notable); fl_print_format("' to %[%ul%].%r", data_make->main->message.to, data_make->main->context.set.notable, id, data_make->main->context.set.notable, f_string_eol_s); - f_file_stream_unlock(data_make->message.to); + f_file_stream_unlock(data_make->main->message.to); } } // for @@ -930,21 +930,21 @@ extern "C" { if (F_status_is_error(status)) { state_process->condition_result = fake_condition_result_error_e; - if (data_make->main->error.verbosity > f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); + if (data_make->main->error.verbosity > f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); if ((i == 1 && number_left > F_number_t_size_unsigned_d) || (i > 1 && number_right > F_number_t_size_unsigned_d)) { - fl_print_format("%r%[%QThe number '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[i], data_make->error.notable); - fl_print_format("%[' may only be between the ranges -%un to %un.%]%r", data_make->error.to, data_make->error.context, F_number_t_size_unsigned_d, F_number_t_size_unsigned_d, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QThe number '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%Q%]", data_make->main->error.to, data_make->error.notable, data_make->cache_arguments.array[i], data_make->error.notable); + fl_print_format("%[' may only be between the ranges -%un to %un.%]%r", data_make->main->error.to, data_make->error.context, F_number_t_size_unsigned_d, F_number_t_size_unsigned_d, data_make->error.context, f_string_eol_s); } else { - fl_print_format("%r%[%QInvalid or unsupported number provided '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[i], data_make->error.notable); - fl_print_format("%['.%]%r", data_make->error.to, data_make->error.context, F_number_t_size_unsigned_d, F_number_t_size_unsigned_d, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QInvalid or unsupported number provided '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%Q%]", data_make->main->error.to, data_make->error.notable, data_make->cache_arguments.array[i], data_make->error.notable); + fl_print_format("%['.%]%r", data_make->main->error.to, data_make->error.context, F_number_t_size_unsigned_d, F_number_t_size_unsigned_d, data_make->error.context, f_string_eol_s); } - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } return F_status_set_error(F_failure); @@ -1363,12 +1363,12 @@ extern "C" { } if (data_make->main->error.verbosity >= f_console_verbosity_verbose_e) { - f_file_stream_lock(data_make->message.to); + f_file_stream_lock(data_make->main->message.to); fl_print_format("Created symbolic link from '%[%Q%]", data_make->main->message.to, data_make->main->context.set.notable, data_make->cache_arguments.array[data_make->cache_arguments.used - 1], data_make->main->context.set.notable); fl_print_format("' to %[%Q%].%r", data_make->main->message.to, data_make->main->context.set.notable, data_make->cache_arguments.array[0], data_make->main->context.set.notable, f_string_eol_s); - f_file_stream_unlock(data_make->message.to); + f_file_stream_unlock(data_make->main->message.to); } return F_none; @@ -1773,12 +1773,12 @@ extern "C" { } // for } - f_file_stream_lock(data_make->message.to); + f_file_stream_lock(data_make->main->message.to); fll_print_dynamic_raw(data_make->cache_1, data_make->main->message.to); fll_print_dynamic_raw(f_string_eol_s, data_make->main->message.to); - f_file_stream_unlock(data_make->message.to); + f_file_stream_unlock(data_make->main->message.to); return F_none; } diff --git a/level_3/fake/c/main/private-make-operate_validate_type.c b/level_3/fake/c/main/private-make-operate_validate_type.c index 789aaad..97dbb88 100644 --- a/level_3/fake/c/main/private-make-operate_validate_type.c +++ b/level_3/fake/c/main/private-make-operate_validate_type.c @@ -22,14 +22,14 @@ extern "C" { if (fl_string_dynamic_compare(fake_make_operation_argument_success_s, data_make->cache_arguments.array[0]) == F_equal_to_not) { if (fl_string_dynamic_compare(fake_make_operation_argument_failure_s, data_make->cache_arguments.array[0]) == F_equal_to_not) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); - fl_print_format("%r%[%QUnsupported break type '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[0], data_make->error.notable); - fl_print_format("%['.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QUnsupported break type '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%Q%]", data_make->main->error.to, data_make->error.notable, data_make->cache_arguments.array[0], data_make->error.notable); + fl_print_format("%['.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } return F_status_set_error(F_failure); @@ -59,14 +59,14 @@ extern "C" { const f_status_t status = f_file_is(path_file, F_file_type_regular_d, F_false); if (status == F_file_found_not) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); - fl_print_format("%r%[%QFailed to find file '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, path_file, data_make->error.notable); - fl_print_format("%['.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QFailed to find file '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%Q%]", data_make->main->error.to, data_make->error.notable, path_file, data_make->error.notable); + fl_print_format("%['.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } return F_status_set_error(F_failure); @@ -79,22 +79,22 @@ extern "C" { } if (!status) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); - fl_print_format("%r%[%QThe file '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, path_file, data_make->error.notable); - fl_print_format("%[' must be a regular file.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QThe file '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%Q%]", data_make->main->error.to, data_make->error.notable, path_file, data_make->error.notable); + fl_print_format("%[' must be a regular file.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } return F_status_set_error(F_failure); } } else { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - fll_print_format("%r%[QFilename argument must not be an empty string.%]%r", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context, f_string_eol_s); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + fll_print_format("%r%[QFilename argument must not be an empty string.%]%r", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context, f_string_eol_s); } return F_status_set_error(F_failure); @@ -139,14 +139,14 @@ extern "C" { for (f_array_length_t i = 0; i < data_make->cache_arguments.used - 1; ++i) { if (f_file_exists(data_make->cache_arguments.array[i], F_true) != F_true) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); - fl_print_format("%r%[%QFailed to find file '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[i], data_make->error.notable); - fl_print_format("%['.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QFailed to find file '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%Q%]", data_make->main->error.to, data_make->error.notable, data_make->cache_arguments.array[i], data_make->error.notable); + fl_print_format("%['.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } status = F_status_set_error(F_failure); @@ -159,14 +159,14 @@ extern "C" { status_file = f_directory_is(data_make->cache_arguments.array[data_make->cache_arguments.used - 1]); if (status_file == F_false || status_file == F_file_found_not) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); - fl_print_format("%r%[%QThe last file '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[data_make->cache_arguments.used - 1], data_make->error.notable); - fl_print_format("%[' must be a valid directory.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QThe last file '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%Q%]", data_make->main->error.to, data_make->error.notable, data_make->cache_arguments.array[data_make->cache_arguments.used - 1], data_make->error.notable); + fl_print_format("%[' must be a valid directory.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } status = F_status_set_error(F_failure); @@ -187,14 +187,14 @@ extern "C" { status_file = f_directory_is(data_make->cache_arguments.array[1]); if (status_file == F_false) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); - fl_print_format("%r%[%QThe second file '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[1], data_make->error.notable); - fl_print_format("%[' must be a valid directory.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QThe second file '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%Q%]", data_make->main->error.to, data_make->error.notable, data_make->cache_arguments.array[1], data_make->error.notable); + fl_print_format("%[' must be a valid directory.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } status = F_status_set_error(F_failure); @@ -221,14 +221,14 @@ extern "C" { } if (data_make->setting_build.build_compiler.used) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); - fl_print_format("%r%[%QNo compiler has been specified, cannot perform '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%r%]", data_make->error.to, data_make->error.notable, fake_make_operation_compile_s, data_make->error.notable); - fl_print_format("%[' section operation.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QNo compiler has been specified, cannot perform '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%r%]", data_make->main->error.to, data_make->error.notable, fake_make_operation_compile_s, data_make->error.notable); + fl_print_format("%[' section operation.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } return F_status_set_error(F_failure); @@ -243,18 +243,18 @@ extern "C" { if (state_process->operation == fake_make_operation_type_if_e) { if (state_process->operation_previous == fake_make_operation_type_if_e) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); - - fl_print_format("%r%[%QMust not be used immediately after another '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%r%]", data_make->error.to, data_make->error.notable, fake_make_operation_if_s, data_make->error.notable); - fl_print_format("%[', '%]", data_make->error.to, data_make->error.context, data_make->error.context); - fl_print_format("%[%r%]", data_make->error.to, data_make->error.notable, fake_make_operation_and_s, data_make->error.notable); - fl_print_format("%[', or '%]", data_make->error.to, data_make->error.context, data_make->error.context); - fl_print_format("%[%r%]", data_make->error.to, data_make->error.notable, fake_make_operation_or_s, data_make->error.notable); - fl_print_format("%[' section operation.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - - f_file_stream_unlock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); + + fl_print_format("%r%[%QMust not be used immediately after another '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%r%]", data_make->main->error.to, data_make->error.notable, fake_make_operation_if_s, data_make->error.notable); + fl_print_format("%[', '%]", data_make->main->error.to, data_make->error.context, data_make->error.context); + fl_print_format("%[%r%]", data_make->main->error.to, data_make->error.notable, fake_make_operation_and_s, data_make->error.notable); + fl_print_format("%[', or '%]", data_make->main->error.to, data_make->error.context, data_make->error.context); + fl_print_format("%[%r%]", data_make->main->error.to, data_make->error.notable, fake_make_operation_or_s, data_make->error.notable); + fl_print_format("%[' section operation.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + + f_file_stream_unlock(data_make->main->error.to); } return F_status_set_error(F_failure); @@ -262,18 +262,18 @@ extern "C" { } else { if (!(state_process->operation_previous == fake_make_operation_type_if_e || state_process->operation_previous == fake_make_operation_type_and_e || state_process->operation_previous == fake_make_operation_type_or_e)) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); - - fl_print_format("%r%[%QMay only be used immediately after another '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%r%]", data_make->error.to, data_make->error.notable, fake_make_operation_if_s, data_make->error.notable); - fl_print_format("%[', '%]", data_make->error.to, data_make->error.context, data_make->error.context); - fl_print_format("%[%r%]", data_make->error.to, data_make->error.notable, fake_make_operation_and_s, data_make->error.notable); - fl_print_format("%[', or '%]", data_make->error.to, data_make->error.context, data_make->error.context); - fl_print_format("%[%r%]", data_make->error.to, data_make->error.notable, fake_make_operation_or_s, data_make->error.notable); - fl_print_format("%[' section operation.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - - f_file_stream_unlock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); + + fl_print_format("%r%[%QMay only be used immediately after another '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%r%]", data_make->main->error.to, data_make->error.notable, fake_make_operation_if_s, data_make->error.notable); + fl_print_format("%[', '%]", data_make->main->error.to, data_make->error.context, data_make->error.context); + fl_print_format("%[%r%]", data_make->main->error.to, data_make->error.notable, fake_make_operation_and_s, data_make->error.notable); + fl_print_format("%[', or '%]", data_make->main->error.to, data_make->error.context, data_make->error.context); + fl_print_format("%[%r%]", data_make->main->error.to, data_make->error.notable, fake_make_operation_or_s, data_make->error.notable); + fl_print_format("%[' section operation.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + + f_file_stream_unlock(data_make->main->error.to); } return F_status_set_error(F_failure); @@ -423,16 +423,16 @@ extern "C" { } // for if (i == 23) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); - fl_print_format("%r%[%QUnsupported '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%r%]", data_make->error.to, data_make->error.notable, if_and_or, data_make->error.notable); - fl_print_format("%[' type '%]", data_make->error.to, data_make->error.context, data_make->error.context); - fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[k], data_make->error.notable); - fl_print_format("%['.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QUnsupported '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%r%]", data_make->main->error.to, data_make->error.notable, if_and_or, data_make->error.notable); + fl_print_format("%[' type '%]", data_make->main->error.to, data_make->error.context, data_make->error.context); + fl_print_format("%[%Q%]", data_make->main->error.to, data_make->error.notable, data_make->cache_arguments.array[k], data_make->error.notable); + fl_print_format("%['.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } return F_status_set_error(F_failure); @@ -460,16 +460,16 @@ extern "C" { } // for if (j == 7) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); - fl_print_format("%r%[%QUnsupported '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%r%]", data_make->error.to, data_make->error.notable, if_and_or, data_make->error.notable); - fl_print_format("%[' not type '%]", data_make->error.to, data_make->error.context, data_make->error.context); - fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[k], data_make->error.notable); - fl_print_format("%['.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QUnsupported '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%r%]", data_make->main->error.to, data_make->error.notable, if_and_or, data_make->error.notable); + fl_print_format("%[' not type '%]", data_make->main->error.to, data_make->error.context, data_make->error.context); + fl_print_format("%[%Q%]", data_make->main->error.to, data_make->error.notable, data_make->cache_arguments.array[k], data_make->error.notable); + fl_print_format("%['.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } return F_status_set_error(F_failure); @@ -511,14 +511,14 @@ extern "C" { if (state_process->condition == fake_make_operation_if_type_if_mode_e || state_process->condition == fake_make_operation_if_type_if_not_mode_e) { if (fl_string_dynamic_compare(fake_make_operation_argument_is_s, data_make->cache_arguments.array[k]) == F_equal_to_not) { if (fl_string_dynamic_compare(fake_make_operation_argument_has_s, data_make->cache_arguments.array[k]) == F_equal_to_not) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); - fl_print_format("%r%[%QUnsupported %smode type '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, j == 6 ? "" : "not ", data_make->error.context); - fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[k], data_make->error.notable); - fl_print_format("%['.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QUnsupported %smode type '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, j == 6 ? "" : "not ", data_make->error.context); + fl_print_format("%[%Q%]", data_make->main->error.to, data_make->error.notable, data_make->cache_arguments.array[k], data_make->error.notable); + fl_print_format("%['.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } return F_status_set_error(F_failure); @@ -581,14 +581,14 @@ extern "C" { type_file |= 0x40; } else { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); - fl_print_format("%r%[%QUnsupported file type '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[i], data_make->error.notable); - fl_print_format("%['.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QUnsupported file type '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%Q%]", data_make->main->error.to, data_make->error.notable, data_make->cache_arguments.array[i], data_make->error.notable); + fl_print_format("%['.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } type_file |= 0x80; @@ -682,21 +682,21 @@ extern "C" { if (F_status_is_error(status_number)) { status = F_status_set_error(F_failure); - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); if (number > F_number_t_size_unsigned_d) { - fl_print_format("%r%[%QThe number '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[i], data_make->error.notable); - fl_print_format("%[' may only be between the ranges -%un to %un.%]%r", data_make->error.to, data_make->error.context, F_number_t_size_unsigned_d, F_number_t_size_unsigned_d, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QThe number '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%Q%]", data_make->main->error.to, data_make->error.notable, data_make->cache_arguments.array[i], data_make->error.notable); + fl_print_format("%[' may only be between the ranges -%un to %un.%]%r", data_make->main->error.to, data_make->error.context, F_number_t_size_unsigned_d, F_number_t_size_unsigned_d, data_make->error.context, f_string_eol_s); } else { - fl_print_format("%r%[%QInvalid or unsupported number provided '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[i], data_make->error.notable); - fl_print_format("%['.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QInvalid or unsupported number provided '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%Q%]", data_make->main->error.to, data_make->error.notable, data_make->cache_arguments.array[i], data_make->error.notable); + fl_print_format("%['.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); } - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } } } // for @@ -735,14 +735,14 @@ extern "C" { for (f_array_length_t i = 0; i < data_make->cache_arguments.used - 1; ++i) { if (f_file_exists(data_make->cache_arguments.array[i], F_true) != F_true) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); - fl_print_format("%r%[%QFailed to find file '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[i], data_make->error.notable); - fl_print_format("%['.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QFailed to find file '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%Q%]", data_make->main->error.to, data_make->error.notable, data_make->cache_arguments.array[i], data_make->error.notable); + fl_print_format("%['.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } status = F_status_set_error(F_failure); @@ -755,14 +755,14 @@ extern "C" { status_file = f_directory_is(data_make->cache_arguments.array[data_make->cache_arguments.used - 1]); if (status_file == F_false || status_file == F_file_found_not) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); - fl_print_format("%r%[%QThe last file '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[data_make->cache_arguments.used - 1], data_make->error.notable); - fl_print_format("%[' must be a valid directory.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QThe last file '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%Q%]", data_make->main->error.to, data_make->error.notable, data_make->cache_arguments.array[data_make->cache_arguments.used - 1], data_make->error.notable); + fl_print_format("%[' must be a valid directory.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } status = F_status_set_error(F_failure); @@ -783,14 +783,14 @@ extern "C" { status_file = f_directory_is(data_make->cache_arguments.array[1]); if (status_file == F_false) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); - fl_print_format("%r%[%QThe second file '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[1], data_make->error.notable); - fl_print_format("%[' must be a valid directory.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QThe second file '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%Q%]", data_make->main->error.to, data_make->error.notable, data_make->cache_arguments.array[1], data_make->error.notable); + fl_print_format("%[' must be a valid directory.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } status = F_status_set_error(F_failure); @@ -814,22 +814,22 @@ extern "C" { const f_status_t status = fake_make_operate_validate_define_name(data_make->cache_arguments.array[0]); if (status == F_none) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - fll_print_format("%r%[%QDefine name must not be an empty string.%]%r", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context, f_string_eol_s); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + fll_print_format("%r%[%QDefine name must not be an empty string.%]%r", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context, f_string_eol_s); } return F_status_set_error(F_failure); } if (status == F_false) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); - fl_print_format("%r%[%QInvalid characters in the define setting name '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[0], data_make->error.notable); - fl_print_format("%[', only alpha-numeric ASCII characters and underscore (without a leading digit) is allowed.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QInvalid characters in the define setting name '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%Q%]", data_make->main->error.to, data_make->error.notable, data_make->cache_arguments.array[0], data_make->error.notable); + fl_print_format("%[', only alpha-numeric ASCII characters and underscore (without a leading digit) is allowed.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } return F_status_set_error(F_failure); @@ -875,46 +875,46 @@ extern "C" { f_status_t fake_make_operate_validate_type_else(fake_make_data_t * const data_make, fake_state_process_t * const state_process) { if (state_process->operation_previous == fake_make_operation_type_else_e) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); - fl_print_format("%r%[%QMust not be used immediately after another '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%r%]", data_make->error.to, data_make->error.notable, fake_make_operation_else_s, data_make->error.notable); - fl_print_format("%[' section operation.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QMust not be used immediately after another '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%r%]", data_make->main->error.to, data_make->error.notable, fake_make_operation_else_s, data_make->error.notable); + fl_print_format("%[' section operation.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } return F_status_set_error(F_failure); } if (state_process->operation_previous == fake_make_operation_type_if_e || state_process->operation_previous == fake_make_operation_type_and_e || state_process->operation_previous == fake_make_operation_type_or_e) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); - - fl_print_format("%r%[%QMust not be used immediately after an '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%r%]", data_make->error.to, data_make->error.notable, fake_make_operation_if_s, data_make->error.notable); - fl_print_format("%[', '%]", data_make->error.to, data_make->error.context, data_make->error.context); - fl_print_format("%[%r%]", data_make->error.to, data_make->error.notable, fake_make_operation_and_s, data_make->error.notable); - fl_print_format("%[', or '%]", data_make->error.to, data_make->error.context, data_make->error.context); - fl_print_format("%[%r%]", data_make->error.to, data_make->error.notable, fake_make_operation_or_s, data_make->error.notable); - fl_print_format("%[' section operation.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - - f_file_stream_unlock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); + + fl_print_format("%r%[%QMust not be used immediately after an '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%r%]", data_make->main->error.to, data_make->error.notable, fake_make_operation_if_s, data_make->error.notable); + fl_print_format("%[', '%]", data_make->main->error.to, data_make->error.context, data_make->error.context); + fl_print_format("%[%r%]", data_make->main->error.to, data_make->error.notable, fake_make_operation_and_s, data_make->error.notable); + fl_print_format("%[', or '%]", data_make->main->error.to, data_make->error.context, data_make->error.context); + fl_print_format("%[%r%]", data_make->main->error.to, data_make->error.notable, fake_make_operation_or_s, data_make->error.notable); + fl_print_format("%[' section operation.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + + f_file_stream_unlock(data_make->main->error.to); } return F_status_set_error(F_failure); } if (!state_process->block) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - fl_print_format("%r%[%QHas no preceding '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%r%]", data_make->error.to, data_make->error.notable, fake_make_operation_if_s, data_make->error.notable); - fl_print_format("%[', '%]", data_make->error.to, data_make->error.context, data_make->error.context); - fl_print_format("%[%r%]", data_make->error.to, data_make->error.notable, fake_make_operation_and_s, data_make->error.notable); - fl_print_format("%[', or '%]", data_make->error.to, data_make->error.context, data_make->error.context); - fl_print_format("%[%r%]", data_make->error.to, data_make->error.notable, fake_make_operation_or_s, data_make->error.notable); - fl_print_format("%[' section operation.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + fl_print_format("%r%[%QHas no preceding '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%r%]", data_make->main->error.to, data_make->error.notable, fake_make_operation_if_s, data_make->error.notable); + fl_print_format("%[', '%]", data_make->main->error.to, data_make->error.context, data_make->error.context); + fl_print_format("%[%r%]", data_make->main->error.to, data_make->error.notable, fake_make_operation_and_s, data_make->error.notable); + fl_print_format("%[', or '%]", data_make->main->error.to, data_make->error.context, data_make->error.context); + fl_print_format("%[%r%]", data_make->main->error.to, data_make->error.notable, fake_make_operation_or_s, data_make->error.notable); + fl_print_format("%[' section operation.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); } return F_status_set_error(F_failure); @@ -942,14 +942,14 @@ extern "C" { if (data_make->cache_arguments.used) { if (fl_string_dynamic_compare(fake_make_operation_argument_success_s, data_make->cache_arguments.array[0]) == F_equal_to_not) { if (fl_string_dynamic_compare(fake_make_operation_argument_failure_s, data_make->cache_arguments.array[0]) == F_equal_to_not) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); - fl_print_format("%r%[%QUnsupported exit type '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[0], data_make->error.notable); - fl_print_format("%['.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QUnsupported exit type '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%Q%]", data_make->main->error.to, data_make->error.notable, data_make->cache_arguments.array[0], data_make->error.notable); + fl_print_format("%['.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } return F_status_set_error(F_failure); @@ -968,14 +968,14 @@ extern "C" { if (fl_string_dynamic_compare(fake_make_operation_argument_exit_s, data_make->cache_arguments.array[0]) == F_equal_to_not) { if (fl_string_dynamic_compare(fake_make_operation_argument_warn_s, data_make->cache_arguments.array[0]) == F_equal_to_not) { if (fl_string_dynamic_compare(fake_make_operation_argument_ignore_s, data_make->cache_arguments.array[0]) == F_equal_to_not) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); - fl_print_format("%r%[%QUnsupported fail type '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[0], data_make->error.notable); - fl_print_format("%['.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QUnsupported fail type '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%Q%]", data_make->main->error.to, data_make->error.notable, data_make->cache_arguments.array[0], data_make->error.notable); + fl_print_format("%['.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } return F_status_set_error(F_failure); @@ -1002,14 +1002,14 @@ extern "C" { } if (!data_make->setting_build.build_indexer.used) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); - fl_print_format("%r%[%QNo indexer has been specified, cannot perform '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%r%]", data_make->error.to, data_make->error.notable, fake_make_operation_index_s, data_make->error.notable); - fl_print_format("%[' section operation.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QNo indexer has been specified, cannot perform '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%r%]", data_make->main->error.to, data_make->error.notable, fake_make_operation_index_s, data_make->error.notable); + fl_print_format("%[' section operation.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } return F_status_set_error(F_failure); @@ -1163,8 +1163,8 @@ extern "C" { } } else { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - fll_print_format("%r%[%QTarget filename argument must not be an empty string.%]%r", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context, f_string_eol_s); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + fll_print_format("%r%[%QTarget filename argument must not be an empty string.%]%r", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context, f_string_eol_s); } } } @@ -1202,14 +1202,14 @@ extern "C" { for (f_array_length_t i = 0; i < data_make->cache_arguments.used - 1; ++i) { if (f_file_exists(data_make->cache_arguments.array[i], F_true) != F_true) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); - fl_print_format("%r%[%QFailed to find file '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[i], data_make->error.notable); - fl_print_format("%['.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QFailed to find file '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%Q%]", data_make->main->error.to, data_make->error.notable, data_make->cache_arguments.array[i], data_make->error.notable); + fl_print_format("%['.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } status = F_status_set_error(F_failure); @@ -1226,14 +1226,14 @@ extern "C" { status = f_directory_is(data_make->cache_arguments.array[data_make->cache_arguments.used - 1]); if (status == F_false || status == F_file_found_not) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); - fl_print_format("%r%[%QThe last file '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[data_make->cache_arguments.used - 1], data_make->error.notable); - fl_print_format("%[' must be a valid directory.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QThe last file '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%Q%]", data_make->main->error.to, data_make->error.notable, data_make->cache_arguments.array[data_make->cache_arguments.used - 1], data_make->error.notable); + fl_print_format("%[' must be a valid directory.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } return F_status_set_error(F_failure); @@ -1254,14 +1254,14 @@ extern "C" { status = f_directory_is(data_make->cache_arguments.array[1]); if (status == F_false) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); - fl_print_format("%r%[%QThe second file '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[1], data_make->error.notable); - fl_print_format("%[' must be a valid directory.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QThe second file '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%Q%]", data_make->main->error.to, data_make->error.notable, data_make->cache_arguments.array[1], data_make->error.notable); + fl_print_format("%[' must be a valid directory.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } return F_status_set_error(F_failure); @@ -1298,13 +1298,13 @@ extern "C" { } // for if (id_section == data_make->fakefile.used) { - f_file_stream_lock(data_make->error.to); + f_file_stream_lock(data_make->main->error.to); - fl_print_format("%r%[%QNo operation section named '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[0], data_make->error.notable); - fl_print_format("%[' is found.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QNo operation section named '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%Q%]", data_make->main->error.to, data_make->error.notable, data_make->cache_arguments.array[0], data_make->error.notable); + fl_print_format("%[' is found.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); return F_status_set_error(F_failure); } @@ -1312,14 +1312,14 @@ extern "C" { for (f_array_length_t i = 0; i < section_stack->used; ++i) { if (section_stack->array[i] == id_section) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); - fl_print_format("%r%[%QThe section operation '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->fakefile.array[id_section].name, data_make->error.notable); - fl_print_format("%[' is already in the operation stack, recursion is not allowed.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QThe section operation '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%Q%]", data_make->main->error.to, data_make->error.notable, data_make->fakefile.array[id_section].name, data_make->error.notable); + fl_print_format("%[' is already in the operation stack, recursion is not allowed.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } return F_status_set_error(F_failure); @@ -1380,7 +1380,7 @@ extern "C" { for (f_array_length_t i = 0; i < 33; ++i) { if (fl_string_dynamic_compare(reserved_name[i], data_make->cache_arguments.array[0]) == F_equal_to) { - fll_print_format("%r%[%QCannot assign a value to the parameter name '%r' because it is a reserved parameter name.%]%r", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, reserved_name[i], data_make->error.context, f_string_eol_s); + fll_print_format("%r%[%QCannot assign a value to the parameter name '%r' because it is a reserved parameter name.%]%r", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, reserved_name[i], data_make->error.context, f_string_eol_s); status = F_status_set_error(F_failure); } @@ -1416,21 +1416,21 @@ extern "C" { status_file = f_file_is(data_make->cache_arguments.array[i], F_file_type_regular_d, F_false); if (status_file == F_file_found_not) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); - fl_print_format("%r%[%QFailed to find file '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[i], data_make->error.notable); - fl_print_format("%['.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QFailed to find file '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%Q%]", data_make->main->error.to, data_make->error.notable, data_make->cache_arguments.array[i], data_make->error.notable); + fl_print_format("%['.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } status = F_status_set_error(F_failure); } if (F_status_is_error(status_file)) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { fll_error_file_print(data_make->error, F_status_set_fine(status_file), "f_file_is", F_true, data_make->cache_arguments.array[i], f_file_operation_find_s, fll_error_file_type_directory_e); } @@ -1458,8 +1458,8 @@ extern "C" { } if (data_make->path.stack.used == 1) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - fll_print_format("%r%[%QMust not attempt to pop project root off of path stack.%]%r", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context, f_string_eol_s); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + fll_print_format("%r%[%QMust not attempt to pop project root off of path stack.%]%r", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context, f_string_eol_s); } return F_status_set_error(F_failure); @@ -1496,21 +1496,21 @@ extern "C" { const f_status_t status = f_file_is(data_make->cache_arguments.array[0], F_file_type_directory_d, F_false); if (status == F_file_found_not) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); - fl_print_format("%r%[%QFailed to find file '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[0], data_make->error.notable); - fl_print_format("%['.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QFailed to find file '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%Q%]", data_make->main->error.to, data_make->error.notable, data_make->cache_arguments.array[0], data_make->error.notable); + fl_print_format("%['.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } return F_status_set_error(F_failure); } if (F_status_is_error(status)) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { fll_error_file_print(data_make->error, F_status_set_fine(status), "f_file_is", F_true, data_make->data->file_data_build_fakefile, f_file_operation_find_s, fll_error_file_type_file_e); } @@ -1518,14 +1518,14 @@ extern "C" { } if (!status) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); - fl_print_format("%r%[%QThe file '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[0], data_make->error.notable); - fl_print_format("%[' must be a directory file.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QThe file '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%Q%]", data_make->main->error.to, data_make->error.notable, data_make->cache_arguments.array[0], data_make->error.notable); + fl_print_format("%[' must be a directory file.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } return F_status_set_error(F_failure); @@ -1534,8 +1534,8 @@ extern "C" { return F_none; } - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - fll_print_format("%r%[%QFilename argument must not be an empty string.%]%r", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context, f_string_eol_s); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + fll_print_format("%r%[%QFilename argument must not be an empty string.%]%r", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context, f_string_eol_s); } return F_status_set_error(F_failure); @@ -1554,14 +1554,14 @@ extern "C" { if (fl_string_dynamic_compare(fake_make_operation_argument_file_s, data_make->cache_arguments.array[0]) == F_equal_to_not) { if (fl_string_dynamic_compare(fake_make_operation_argument_directory_s, data_make->cache_arguments.array[0]) == F_equal_to_not) { - if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to) { - f_file_stream_lock(data_make->error.to); + if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->main->error.to.stream) { + f_file_stream_lock(data_make->main->error.to); - fl_print_format("%r%[%QUnsupported file type '%]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%Q%]", data_make->error.to, data_make->error.notable, data_make->cache_arguments.array[0], data_make->error.notable); - fl_print_format("%['.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QUnsupported file type '%]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%Q%]", data_make->main->error.to, data_make->error.notable, data_make->cache_arguments.array[0], data_make->error.notable); + fl_print_format("%['.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } return F_status_set_error(F_failure); diff --git a/level_3/fake/c/main/private-print.c b/level_3/fake/c/main/private-print.c index f0448ac..fe599dc 100644 --- a/level_3/fake/c/main/private-print.c +++ b/level_3/fake/c/main/private-print.c @@ -7,9 +7,9 @@ extern "C" { #endif #ifndef _di_fake_print_error_build_operation_file_ - bool fake_print_error_build_operation_file(fake_data_t * const data, const f_status_t status, const f_string_static_t function, const f_string_static_t operation, const f_string_static_t source, const f_string_static_t destination, const f_string_static_t how, const bool fallback) { + bool fake_print_error_build_operation_file(fake_data_t * const data, const f_status_t status, const f_string_t function, const f_string_static_t operation, const f_string_static_t source, const f_string_static_t destination, const f_string_static_t how, const bool fallback) { - if (f_status_set_fine(status) == F_file_found_not) { + if (F_status_set_fine(status) == F_file_found_not) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { f_file_stream_lock(data->main->error.to); @@ -25,12 +25,12 @@ extern "C" { return F_false; } - if (f_status_set_fine(status) == F_parameter) { + if (F_status_set_fine(status) == F_parameter) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { f_file_stream_lock(data->main->error.to); fl_print_format("%r%[%QInvalid parameter when calling '%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); - fl_print_format("%[%S%]", data->main->error.to, data->main->error.notable, function, data->main->error.notable); + fl_print_format("%[%Q%]", data->main->error.to, data->main->error.notable, function, data->main->error.notable); fl_print_format("%[() to %Q '%]", data->main->error.to, data->main->error.context, operation, data->main->error.context); fake_print_error_build_operation_file_message(data, operation, source, destination, how); @@ -43,7 +43,7 @@ extern "C" { return F_false; } - if (f_status_set_fine(status) == F_name) { + if (F_status_set_fine(status) == F_name) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { f_file_stream_lock(data->main->error.to); @@ -66,7 +66,7 @@ extern "C" { return F_false; } - if (f_status_set_fine(status) == F_memory_not) { + if (F_status_set_fine(status) == F_memory_not) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { f_file_stream_lock(data->main->error.to); @@ -82,7 +82,7 @@ extern "C" { return F_false; } - if (f_status_set_fine(status) == F_number_overflow) { + if (F_status_set_fine(status) == F_number_overflow) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { f_file_stream_lock(data->main->error.to); @@ -98,7 +98,7 @@ extern "C" { return F_false; } - if (f_status_set_fine(status) == F_directory) { + if (F_status_set_fine(status) == F_directory) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { f_file_stream_lock(data->main->error.to); @@ -114,7 +114,7 @@ extern "C" { return F_false; } - if (f_status_set_fine(status) == F_access_denied) { + if (F_status_set_fine(status) == F_access_denied) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { f_file_stream_lock(data->main->error.to); @@ -130,7 +130,7 @@ extern "C" { return F_false; } - if (f_status_set_fine(status) == F_loop) { + if (F_status_set_fine(status) == F_loop) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { f_file_stream_lock(data->main->error.to); @@ -146,7 +146,7 @@ extern "C" { return F_false; } - if (f_status_set_fine(status) == F_prohibited) { + if (F_status_set_fine(status) == F_prohibited) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { f_file_stream_lock(data->main->error.to); @@ -162,7 +162,7 @@ extern "C" { return F_false; } - if (f_status_set_fine(status) == F_directory_found_not) { + if (F_status_set_fine(status) == F_directory_found_not) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { f_file_stream_lock(data->main->error.to); @@ -178,7 +178,7 @@ extern "C" { return F_false; } - if (f_status_set_fine(status) == F_failure) { + if (F_status_set_fine(status) == F_failure) { if (data->main->error.verbosity > f_console_verbosity_quiet_e) { f_file_stream_lock(data->main->error.to); @@ -194,11 +194,11 @@ extern "C" { return F_false; } - if (fll_error_print(data->main->error, f_status_set_fine(status), function, F_false) == F_known_not && fallback && data->main->error.verbosity > f_console_verbosity_quiet_e) { + if (fll_error_print(data->main->error, F_status_set_fine(status), function, F_false) == F_known_not && fallback && data->main->error.verbosity > f_console_verbosity_quiet_e) { f_file_stream_lock(data->main->error.to); fl_print_format("%r%[UNKNOWN %Q(%]", data->main->error.to, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context); - fl_print_format("%[%ui%]", data->main->error.to, data->main->error.notable, f_status_set_fine(status), data->main->error.notable); + fl_print_format("%[%ui%]", data->main->error.to, data->main->error.notable, F_status_set_fine(status), data->main->error.notable); fl_print_format("%[) occurred while trying to %Q '%]", data->main->error.to, data->main->error.context, operation, data->main->error.context); fake_print_error_build_operation_file_message(data, operation, source, destination, how); @@ -332,9 +332,9 @@ extern "C" { void fake_print_error_requires_more_arguments(fake_make_data_t * const data_make) { if (data_make->error.verbosity == f_console_verbosity_quiet_e) return; - if (!data_make->error.to) return; + if (!data_make->main->error.to.stream) return; - fll_print_format("%r%[%QRequires more arguments.%]%r", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context, f_string_eol_s); + fll_print_format("%r%[%QRequires more arguments.%]%r", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context, f_string_eol_s); } #endif // _di_fake_print_error_requires_more_arguments_ @@ -342,9 +342,9 @@ extern "C" { void fake_print_error_too_many_arguments(fake_make_data_t * const data_make) { if (data_make->error.verbosity == f_console_verbosity_quiet_e) return; - if (!data_make->error.to) return; + if (!data_make->main->error.to.stream) return; - fll_print_format("%r%[%QHas too many arguments.%]%r", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context, f_string_eol_s); + fll_print_format("%r%[%QHas too many arguments.%]%r", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context, f_string_eol_s); } #endif // _di_fake_print_error_too_many_arguments_ @@ -352,22 +352,22 @@ extern "C" { void fake_print_error_argument_empty(fake_make_data_t * const data_make, const f_array_length_t index) { if (data_make->error.verbosity == f_console_verbosity_quiet_e) return; - if (!data_make->error.to) return; + if (!data_make->main->error.to.stream) return; - f_file_stream_lock(data_make->error.to); + f_file_stream_lock(data_make->main->error.to); - fl_print_format("%r%[%QThe %]", data_make->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); - fl_print_format("%[%un%]", data_make->error.to, data_make->error.notable, index, data_make->error.notable); - fl_print_format("%[ argument must not be an empty string.%]%r", data_make->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); + fl_print_format("%r%[%QThe %]", data_make->main->error.to, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%[%un%]", data_make->main->error.to, data_make->error.notable, index, data_make->error.notable); + fl_print_format("%[ argument must not be an empty string.%]%r", data_make->main->error.to, data_make->error.context, data_make->error.context, f_string_eol_s); - f_file_stream_unlock(data_make->error.to); + f_file_stream_unlock(data_make->main->error.to); } #endif // _di_fake_print_error_argument_empty_ #ifndef _di_fake_print_message_section_operation_failed_ void fake_print_message_section_operation_failed(fake_data_t * const data, const fl_print_t print, const f_string_static_t buffer, const f_string_range_t section_name, const f_string_range_t operation_name) { - if (print.verbosity == f_console_verbosity_quiet_e || !print.to) return; + if (print.verbosity == f_console_verbosity_quiet_e || !print.to.stream) return; f_array_length_t line = 1; f_state_t state = f_state_t_initialize; @@ -391,7 +391,7 @@ extern "C" { #ifndef _di_fake_print_message_section_operation_link_argument_unknown_ void fake_print_message_section_operation_link_argument_unknown(fake_data_t * const data, const fl_print_t print, const f_string_static_t argument) { - if (print.verbosity == f_console_verbosity_quiet_e || !print.to) return; + if (print.verbosity == f_console_verbosity_quiet_e || !print.to.stream) return; f_file_stream_lock(print.to); @@ -411,7 +411,7 @@ extern "C" { #ifndef _di_fake_print_message_section_operation_link_point_exists_ void fake_print_message_section_operation_link_point_exists(fake_data_t * const data, const fl_print_t print, const f_string_static_t argument) { - if (print.verbosity == f_console_verbosity_quiet_e || !print.to) return; + if (print.verbosity == f_console_verbosity_quiet_e || !print.to.stream) return; f_file_stream_lock(print.to); @@ -427,7 +427,7 @@ extern "C" { #ifndef _di_fake_print_message_section_operation_link_target_exists_not_ void fake_print_message_section_operation_link_target_exists_not(fake_data_t * const data, const fl_print_t print, const f_string_static_t argument) { - if (print.verbosity == f_console_verbosity_quiet_e || !print.to) return; + if (print.verbosity == f_console_verbosity_quiet_e || !print.to.stream) return; f_file_stream_lock(print.to); @@ -443,7 +443,7 @@ extern "C" { #ifndef _di_fake_print_message_section_operation_path_outside_ void fake_print_message_section_operation_path_outside(fake_data_t * const data, const fl_print_t print, const f_status_t status, const char *function, const f_string_static_t path) { - if (data->main->error.verbosity == f_console_verbosity_quiet_e || !print.to) return; + if (data->main->error.verbosity == f_console_verbosity_quiet_e || !print.to.stream) return; f_file_stream_lock(data->main->error.to); @@ -463,7 +463,7 @@ extern "C" { #ifndef _di_fake_print_message_section_operation_path_stack_max_ void fake_print_message_section_operation_path_stack_max(fake_data_t * const data, fl_print_t print, const f_status_t status, const char *function, const f_string_static_t path) { - if (data->main->error.verbosity == f_console_verbosity_quiet_e || !print.to) return; + if (data->main->error.verbosity == f_console_verbosity_quiet_e || !print.to.stream) return; if (status == F_array_too_large) { f_file_stream_lock(data->main->error.to); @@ -490,7 +490,7 @@ extern "C" { #ifndef _di_fake_print_message_section_operation_stack_max_ void fake_print_message_section_operation_stack_max(fake_data_t * const data, fl_print_t print, const f_string_static_t buffer, const f_string_range_t section_name, const f_string_range_t operation_name, const f_array_length_t stack_max) { - if (data->main->error.verbosity == f_console_verbosity_quiet_e || !print.to) return; + if (data->main->error.verbosity == f_console_verbosity_quiet_e || !print.to.stream) return; f_array_length_t line = 1; f_state_t state = f_state_t_initialize; @@ -516,7 +516,7 @@ extern "C" { #ifndef _di_fake_print_message_section_operation_unknown_ void fake_print_message_section_operation_unknown(fake_data_t * const data, const fl_print_t print, const f_string_static_t buffer, const f_string_range_t section_name, const f_string_range_t operation_name) { - if (data->main->error.verbosity == f_console_verbosity_quiet_e || !print.to) return; + if (data->main->error.verbosity == f_console_verbosity_quiet_e || !print.to.stream) return; f_array_length_t line = 1; f_state_t state = f_state_t_initialize; @@ -542,7 +542,7 @@ extern "C" { if (data->main->warning.verbosity == f_console_verbosity_quiet_e) return; - f_file_stream_lock(data->main->warning); + f_file_stream_lock(data->main->warning.to); fl_print_format("%r%[%QThe fakefile '%]", data->main->warning.to, f_string_eol_s, data->main->warning.context, data->main->warning.prefix, data->main->warning.context); fl_print_format("%[%Q%]", data->main->warning.to, data->main->warning.notable, path_file, data->main->warning.notable); @@ -552,7 +552,7 @@ extern "C" { fl_print_format("%[%/Q%]", data->main->warning.to, data->main->warning.notable, buffer, range_object, data->main->warning.notable); fl_print_format("%['.%]%r", data->main->warning.to, data->main->warning.context, data->main->warning.context, f_string_eol_s); - f_file_stream_unlock(data->main->warning); + f_file_stream_unlock(data->main->warning.to); } #endif // _di_fake_print_warning_settings_content_empty_ @@ -561,7 +561,7 @@ extern "C" { if (data->main->warning.verbosity == f_console_verbosity_quiet_e) return; - f_file_stream_lock(data->main->warning); + f_file_stream_lock(data->main->warning.to); fl_print_format("%r%[%QThe fakefile '%]", data->main->warning.to, f_string_eol_s, data->main->warning.context, data->main->warning.prefix, data->main->warning.context); fl_print_format("%[%Q%]", data->main->warning.to, data->main->warning.notable, path_file, data->main->warning.notable); @@ -573,7 +573,7 @@ extern "C" { fl_print_format("%[%/Q%]", data->main->warning.to, data->main->warning.notable, buffer, range_object, data->main->warning.notable); fl_print_format("%['.%]%r", data->main->warning.to, data->main->warning.context, data->main->warning.context, f_string_eol_s); - f_file_stream_unlock(data->main->warning); + f_file_stream_unlock(data->main->warning.to); } #endif // _di_fake_print_warning_settings_content_invalid_ @@ -582,7 +582,7 @@ extern "C" { if (data->main->warning.verbosity == f_console_verbosity_quiet_e) return; - f_file_stream_lock(data->main->warning); + f_file_stream_lock(data->main->warning.to); fl_print_format("%r%[%QThe fakefile '%]", data->main->warning.to, f_string_eol_s, data->main->warning.context, data->main->warning.prefix, data->main->warning.context); fl_print_format("%[%r%]", data->main->warning.to, data->main->warning.notable, name_object, data->main->warning.notable); @@ -590,7 +590,7 @@ extern "C" { fl_print_format("%[%Q%]", data->main->warning.to, data->main->warning.notable, path_file, data->main->warning.notable); fl_print_format("%[' may only have a single property, only using the first.%]%r", data->main->warning.to, data->main->warning.context, data->main->warning.context, f_string_eol_s); - f_file_stream_unlock(data->main->warning); + f_file_stream_unlock(data->main->warning.to); } #endif // _di_fake_print_warning_settings_content_multiple_ @@ -599,7 +599,7 @@ extern "C" { if (data->main->warning.verbosity == f_console_verbosity_quiet_e) return; - f_file_stream_lock(data->main->warning); + f_file_stream_lock(data->main->warning.to); fl_print_format("%r%[%QThe object '%]", data->main->warning.to, f_string_eol_s, data->main->warning.context, data->main->warning.prefix, data->main->warning.context); fl_print_format("%[%r%]", data->main->warning.to, data->main->warning.notable, name_object, data->main->warning.notable); @@ -607,7 +607,7 @@ extern "C" { fl_print_format("%[%Q%]", data->main->warning.to, data->main->warning.notable, path_file, data->main->warning.notable); fl_print_format("%[' may only be specified once, only using the first.%]%r", data->main->warning.to, data->main->warning.context, data->main->warning.context, f_string_eol_s); - f_file_stream_unlock(data->main->warning); + f_file_stream_unlock(data->main->warning.to); } #endif // _di_fake_print_warning_settings_object_multiple_ diff --git a/level_3/fake/c/main/private-print.h b/level_3/fake/c/main/private-print.h index c202588..4882ec7 100644 --- a/level_3/fake/c/main/private-print.h +++ b/level_3/fake/c/main/private-print.h @@ -45,7 +45,7 @@ extern "C" { * @see fake_print_error_build_operation_file_message(); */ #ifndef _di_fake_print_error_operation_file_ - extern bool fake_print_error_build_operation_file(fake_data_t * const data, const f_status_t status, const char *function, const f_string_static_t operation, const f_string_static_t source, const f_string_static_t destination, const f_string_static_t how, const bool fallback) F_attribute_visibility_internal_d; + extern bool fake_print_error_build_operation_file(fake_data_t * const data, const f_status_t status, const f_string_t function, const f_string_static_t operation, const f_string_static_t source, const f_string_static_t destination, const f_string_static_t how, const bool fallback) F_attribute_visibility_internal_d; #endif // _di_fake_print_error_operation_file_ /** diff --git a/level_3/firewall/c/private-firewall.c b/level_3/firewall/c/private-firewall.c index fc77c09..1029ef9 100644 --- a/level_3/firewall/c/private-firewall.c +++ b/level_3/firewall/c/private-firewall.c @@ -290,13 +290,13 @@ f_status_t firewall_perform_commands(firewall_data_t * const data, firewall_loca // If the remaining rule does not match as firewall_rule_s, then it is an invalid rule. else if (fl_string_dynamic_compare_string(local->buffer.string + local->rule_objects.array[i].start, firewall_rule_s, length) == F_equal_to_not) { if (length) { - f_file_stream_lock(data->main->warning); + f_file_stream_lock(data->main->warning.to); fl_print_format("%r%[%QAt line %ul, the object '%]", data->main->warning.to, f_string_eol_s, data->main->warning.context, data->main->warning.prefix, i, data->main->warning.context, data->main->warning.notable); fl_print_format("%[%/Q%]", data->main->warning.to, data->main->warning.notable, local->buffer, local->rule_objects.array[i], data->main->warning.notable); fl_print_format("%[' is invalid.%]%r", data->main->warning.to, data->main->warning.context, data->main->warning.context, f_string_eol_s); - f_file_stream_unlock(data->main->warning); + f_file_stream_unlock(data->main->warning.to); } else { fll_print_format("%r%[%QAt line %ul, the object is missing.%]%r", data->main->warning.to, f_string_eol_s, data->main->warning.context, data->main->warning.prefix, i, data->main->warning.context, f_string_eol_s); @@ -309,7 +309,7 @@ f_status_t firewall_perform_commands(firewall_data_t * const data, firewall_loca length = (local->rule_objects.array[i].stop - local->rule_objects.array[i].start) + 1; if (length) { - f_file_stream_lock(data->main->warning); + f_file_stream_lock(data->main->warning.to); fl_print_format("%r%[%QAt line %ul, the object '%]", data->main->warning.to, f_string_eol_s, data->main->warning.context, data->main->warning.prefix, i, data->main->warning.context); fl_print_format("%[%/Q%]", data->main->warning.to, data->main->warning.notable, local->buffer, local->rule_objects.array[i], data->main->warning.notable); @@ -317,7 +317,7 @@ f_status_t firewall_perform_commands(firewall_data_t * const data, firewall_loca fl_print_format("%[%/Q%]", data->main->warning.to, data->main->warning.notable, local->buffer, local->rule_contents.array[i].array[0], data->main->warning.notable); fl_print_format("%['.%]%r", data->main->warning.to, data->main->warning.context, data->main->warning.context, f_string_eol_s); - f_file_stream_unlock(data->main->warning); + f_file_stream_unlock(data->main->warning.to); } else { fll_print_format("%r%[%QAt line %ul, the object has no content.%]%r", data->main->warning.to, f_string_eol_s, data->main->warning.context, data->main->warning.prefix, i, data->main->warning.context, f_string_eol_s); @@ -515,13 +515,13 @@ f_status_t firewall_perform_commands(firewall_data_t * const data, firewall_loca else { length = (local->rule_objects.array[i].stop - local->rule_objects.array[i].start) + 1; - f_file_stream_lock(data->main->warning); + f_file_stream_lock(data->main->warning.to); fl_print_format("%r%[%QAt line %ul, the object '%]", data->main->warning.to, f_string_eol_s, data->main->warning.context, data->main->warning.prefix, i, data->main->warning.context); fl_print_format("%[%/Q%]", data->main->warning.to, data->main->warning.notable, local->buffer, local->rule_objects.array[i], data->main->warning.notable); fl_print_format("%]%[' has no content.%]%r", data->main->warning.to, data->main->warning.context, data->main->warning.context, f_string_eol_s); - f_file_stream_unlock(data->main->warning); + f_file_stream_unlock(data->main->warning.to); break; } diff --git a/level_3/utf8/c/main/common-print.c b/level_3/utf8/c/main/common-print.c index 5d26921..fc7a94d 100644 --- a/level_3/utf8/c/main/common-print.c +++ b/level_3/utf8/c/main/common-print.c @@ -14,6 +14,8 @@ extern "C" { "fll_program_parameter_process_context", "fll_program_parameter_process_verbosity", "utf8_detect_codepoint", + "utf8_process_file_bytesequence", + "utf8_process_file_codepoint", }; #endif // _di_utf8_f_a_ diff --git a/level_3/utf8/c/main/common-print.h b/level_3/utf8/c/main/common-print.h index c74d180..cab2f7a 100644 --- a/level_3/utf8/c/main/common-print.h +++ b/level_3/utf8/c/main/common-print.h @@ -47,6 +47,8 @@ extern "C" { utf8_f_fll_program_parameter_process_context_e, utf8_f_fll_program_parameter_process_verbosity_e, utf8_f_utf8_detect_codepoint_e, + utf8_f_utf8_process_file_bytesequence_e, + utf8_f_utf8_process_file_codepoint_e, }; // enum #endif // _di_utf8_f_e_ diff --git a/level_3/utf8/c/main/utf8.c b/level_3/utf8/c/main/utf8.c index 034525d..6692327 100644 --- a/level_3/utf8/c/main/utf8.c +++ b/level_3/utf8/c/main/utf8.c @@ -53,7 +53,7 @@ extern "C" { } if (F_status_is_error(setting->status) && F_status_set_fine(setting->status) != F_utf_fragment && F_status_set_fine(setting->status) != F_complete_not_utf) { - utf8_print_error_file(setting, main->error, setting->mode & utf8_mode_from_bytesequence_e ? "utf8_process_file_bytesequence" : "utf8_process_file_codepoint", f_string_empty_s, f_file_operation_process_s, fll_error_file_type_pipe_e); + utf8_print_error_file(setting, main->error, setting->mode & utf8_mode_from_bytesequence_e ? macro_utf8_f(utf8_process_file_bytesequence) : macro_utf8_f(utf8_process_file_codepoint), f_string_empty_s, f_file_operation_process_s, fll_error_file_type_pipe_e); } } @@ -118,7 +118,7 @@ extern "C" { } if (F_status_is_error(setting->status) && F_status_set_fine(setting->status) != F_utf_fragment && F_status_set_fine(setting->status) != F_complete_not_utf) { - utf8_print_error_file(setting, main->error, setting->mode & utf8_mode_from_bytesequence_e ? "utf8_process_file_bytesequence" : "utf8_process_file_codepoint", setting->path_files_from.array[i], f_file_operation_process_s, fll_error_file_type_file_e); + utf8_print_error_file(setting, main->error, setting->mode & utf8_mode_from_bytesequence_e ? macro_utf8_f(utf8_process_file_bytesequence) : utf8_process_file_bytesequence(utf8_process_file_codepoint), setting->path_files_from.array[i], f_file_operation_process_s, fll_error_file_type_file_e); break; }