From: Kevin Day Date: Wed, 12 Nov 2025 04:33:02 +0000 (-0600) Subject: Update: Utilize the F_status_debug_source_d for handling the errors. X-Git-Tag: 0.7.3~1 X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=2067e739e678f49311ad56ab35c3038db00be93c;p=fll Update: Utilize the F_status_debug_source_d for handling the errors. This simplifies some of the logic and code. However, there are some disadvantages of doing this. One such disadvantage is losing the specific function that has failed. The location in the source file should be sufficient, if not ideal. Address issues where the `debug` mode is not being specified in some programs. --- diff --git a/build/stand_alone/byte_dump.settings b/build/stand_alone/byte_dump.settings index 15f846ab0..19b12b7a4 100644 --- a/build/stand_alone/byte_dump.settings +++ b/build/stand_alone/byte_dump.settings @@ -75,7 +75,7 @@ build_sources_program fll/level_2/error.c fll/level_2/private-error.c fll/level_ build_sources_program fll/level_2/print.c build_sources_program fll/level_2/program.c fll/level_2/program/common.c fll/level_2/program/print.c fll/level_2/program/string.c fll/level_2/private-program.c -build_sources_program program/byte_dump/main/common.c program/byte_dump/main/common/define.c program/byte_dump/main/common/enumeration.c program/byte_dump/main/common/print.c program/byte_dump/main/common/string.c program/byte_dump/main/common/type.c program/byte_dump/main/print/data.c program/byte_dump/main/print/error.c program/byte_dump/main/print/message.c program/byte_dump/main/process.c program/byte_dump/main/signal.c program/byte_dump/main/thread.c program/byte_dump/main/byte_dump.c +build_sources_program program/byte_dump/main/common.c program/byte_dump/main/common/define.c program/byte_dump/main/common/enumeration.c program/byte_dump/main/common/string.c program/byte_dump/main/common/type.c program/byte_dump/main/print/data.c program/byte_dump/main/print/error.c program/byte_dump/main/print/message.c program/byte_dump/main/process.c program/byte_dump/main/signal.c program/byte_dump/main/thread.c program/byte_dump/main/byte_dump.c build_sources_program program/byte_dump/main/main.c diff --git a/build/stand_alone/example.settings b/build/stand_alone/example.settings index 909cd98f2..f27220025 100644 --- a/build/stand_alone/example.settings +++ b/build/stand_alone/example.settings @@ -74,7 +74,7 @@ build_sources_program fll/level_2/error.c fll/level_2/private-error.c fll/level_ build_sources_program fll/level_2/print.c build_sources_program fll/level_2/program.c fll/level_2/program/common.c fll/level_2/program/print.c fll/level_2/program/string.c fll/level_2/private-program.c -build_sources_program program/example/main/common.c program/example/main/common/define.c program/example/main/common/enumeration.c program/example/main/common/print.c program/example/main/common/string.c program/example/main/common/type.c +build_sources_program program/example/main/common.c program/example/main/common/define.c program/example/main/common/enumeration.c program/example/main/common/string.c program/example/main/common/type.c build_sources_program program/example/main/print/data.c program/example/main/print/debug.c program/example/main/print/error.c program/example/main/print/message.c program/example/main/print/verbose.c program/example/main/print/warning.c build_sources_program program/example/main/example.c program/example/main/signal.c program/example/main/thread.c diff --git a/build/stand_alone/firewall.settings b/build/stand_alone/firewall.settings index d45251261..dfffd4dcd 100644 --- a/build/stand_alone/firewall.settings +++ b/build/stand_alone/firewall.settings @@ -91,7 +91,7 @@ build_sources_program fll/level_2/fss.c fll/level_2/fss/basic.c fll/level_2/fss/ build_sources_program fll/level_2/print.c build_sources_program fll/level_2/program.c fll/level_2/program/common.c fll/level_2/program/print.c fll/level_2/program/string.c fll/level_2/private-program.c -build_sources_program program/firewall/main/common.c program/firewall/main/common/define.c program/firewall/main/common/enumeration.c program/firewall/main/common/print.c program/firewall/main/common/string.c program/firewall/main/common/type.c +build_sources_program program/firewall/main/common.c program/firewall/main/common/define.c program/firewall/main/common/enumeration.c program/firewall/main/common/string.c program/firewall/main/common/type.c build_sources_program program/firewall/main/print/debug.c program/firewall/main/print/error.c program/firewall/main/print/message.c program/firewall/main/print/warning.c build_sources_program program/firewall/main/operate.c program/firewall/main/operate/buffer.c program/firewall/main/operate/chains.c program/firewall/main/operate/create.c program/firewall/main/operate/default.c program/firewall/main/operate/delete.c program/firewall/main/operate/process.c program/firewall/main/operate/rules.c program/firewall/main/operate/show.c build_sources_program program/firewall/main/firewall.c program/firewall/main/signal.c program/firewall/main/thread.c diff --git a/build/stand_alone/utf8.settings b/build/stand_alone/utf8.settings index f416b3a8b..41ef4662a 100644 --- a/build/stand_alone/utf8.settings +++ b/build/stand_alone/utf8.settings @@ -76,7 +76,7 @@ build_sources_program fll/level_2/error.c fll/level_2/private-error.c fll/level_ build_sources_program fll/level_2/print.c build_sources_program fll/level_2/program.c fll/level_2/program/common.c fll/level_2/program/print.c fll/level_2/program/string.c fll/level_2/private-program.c -build_sources_program program/utf8/main/common.c program/utf8/main/common/define.c program/utf8/main/common/enumeration.c program/utf8/main/common/print.c program/utf8/main/common/string.c program/utf8/main/common/type.c program/utf8/main/bytesequence.c program/utf8/main/codepoint.c program/utf8/main/print/data.c program/utf8/main/print/error.c program/utf8/main/print/message.c program/utf8/main/process.c program/utf8/main/signal.c program/utf8/main/thread.c program/utf8/main/utf8.c +build_sources_program program/utf8/main/common.c program/utf8/main/common/define.c program/utf8/main/common/enumeration.c program/utf8/main/common/string.c program/utf8/main/common/type.c program/utf8/main/bytesequence.c program/utf8/main/codepoint.c program/utf8/main/print/data.c program/utf8/main/print/error.c program/utf8/main/print/message.c program/utf8/main/process.c program/utf8/main/signal.c program/utf8/main/thread.c program/utf8/main/utf8.c build_sources_program program/utf8/main/main.c diff --git a/level_3/byte_dump/c/main/byte_dump.c b/level_3/byte_dump/c/main/byte_dump.c index 57d02a1b3..e292a8ced 100644 --- a/level_3/byte_dump/c/main/byte_dump.c +++ b/level_3/byte_dump/c/main/byte_dump.c @@ -57,7 +57,7 @@ extern "C" { main->setting.state.status = f_file_stream_open(main->setting.files.array[i], f_string_empty_s, &file); if (F_status_is_error(main->setting.state.status)) { - byte_dump_print_error_file(&main->program.error, macro_byte_dump_f(f_file_stream_open), main->setting.files.array[i], f_file_operation_open_s, fll_error_file_type_file_e); + byte_dump_print_error_file(&main->program.error, F_status_debug_source_d, main->setting.files.array[i], f_file_operation_open_s, fll_error_file_type_file_e); break; } diff --git a/level_3/byte_dump/c/main/byte_dump.h b/level_3/byte_dump/c/main/byte_dump.h index 6cc6294b9..39941bb97 100644 --- a/level_3/byte_dump/c/main/byte_dump.h +++ b/level_3/byte_dump/c/main/byte_dump.h @@ -50,7 +50,6 @@ // Byte Dump includes. #include #include -#include #include #include #include diff --git a/level_3/byte_dump/c/main/common.c b/level_3/byte_dump/c/main/common.c index 9600d273b..0e39f69b3 100644 --- a/level_3/byte_dump/c/main/common.c +++ b/level_3/byte_dump/c/main/common.c @@ -18,7 +18,7 @@ extern "C" { main->setting.state.step_small = byte_dump_allocation_small_d; if (F_status_is_error(main->setting.state.status)) { - byte_dump_print_error(&main->program.error, macro_byte_dump_f(f_console_parameter_process)); + byte_dump_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -26,7 +26,7 @@ extern "C" { main->setting.state.status = fll_program_parameter_process_context_standard(F_true, &main->program); if (F_status_is_error(main->setting.state.status)) { - byte_dump_print_error(&main->program.error, macro_byte_dump_f(fll_program_parameter_process_context_standard)); + byte_dump_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -34,7 +34,7 @@ extern "C" { main->setting.state.status = fll_program_parameter_process_verbosity_standard(F_true, &main->program); if (F_status_is_error(main->setting.state.status)) { - byte_dump_print_error(&main->program.error, macro_byte_dump_f(fll_program_parameter_process_verbosity_standard)); + byte_dump_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -53,7 +53,7 @@ extern "C" { main->setting.state.status = f_console_parameter_prioritize_right(main->program.parameters, choices, &choice); if (F_status_is_error(main->setting.state.status)) { - byte_dump_print_error(&main->program.error, macro_byte_dump_f(f_console_parameter_prioritize_right)); + byte_dump_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -85,7 +85,7 @@ extern "C" { main->setting.state.status = f_console_parameter_prioritize_right(main->program.parameters, choices, &choice); if (F_status_is_error(main->setting.state.status)) { - byte_dump_print_error(&main->program.error, macro_byte_dump_f(f_console_parameter_prioritize_right)); + byte_dump_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -111,7 +111,7 @@ extern "C" { main->setting.state.status = f_console_parameter_prioritize_right(main->program.parameters, choices, &choice); if (F_status_is_error(main->setting.state.status)) { - byte_dump_print_error(&main->program.error, macro_byte_dump_f(f_console_parameter_prioritize_right)); + byte_dump_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -279,7 +279,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(parameters->remaining.used, sizeof(f_string_dynamic_t), (void **) &main->setting.files.array, &main->setting.files.used, &main->setting.files.size); if (F_status_is_error(main->setting.state.status)) { - byte_dump_print_error(&main->program.error, macro_byte_dump_f(f_memory_array_increase_by)); + byte_dump_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -310,7 +310,7 @@ extern "C" { status_files = main->setting.state.status; } - byte_dump_print_error_file(&main->program.error, macro_byte_dump_f(f_file_exists), parameters->arguments.array[number], f_file_operation_find_s, fll_error_file_type_file_e); + byte_dump_print_error_file(&main->program.error, F_status_debug_source_d, parameters->arguments.array[number], f_file_operation_find_s, fll_error_file_type_file_e); } } // for diff --git a/level_3/byte_dump/c/main/common/print.c b/level_3/byte_dump/c/main/common/print.c deleted file mode 100644 index c89e35041..000000000 --- a/level_3/byte_dump/c/main/common/print.c +++ /dev/null @@ -1,23 +0,0 @@ -#include "../byte_dump.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef _di_byte_dump_f_a_ - const f_string_t byte_dump_f_a[] = { - "f_console_parameter_prioritize_right", - "f_console_parameter_process", - "f_file_exists", - "f_file_stream_open", - "f_memory_array_increase_by", - "f_thread_create", - "fl_conversion_dynamic_to_unsigned_detect", - "fll_program_parameter_process_context_standard", - "fll_program_parameter_process_verbosity_standard", - }; -#endif // _di_byte_dump_f_a_ - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/level_3/byte_dump/c/main/common/print.h b/level_3/byte_dump/c/main/common/print.h deleted file mode 100644 index ed48cadc0..000000000 --- a/level_3/byte_dump/c/main/common/print.h +++ /dev/null @@ -1,58 +0,0 @@ -/** - * FLL - Level 3 - * - * Project: Byte Dump - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Provides the common print functionality. - * - * This is auto-included and should not need to be explicitly included. - */ -#ifndef _byte_dump_common_print_h -#define _byte_dump_common_print_h - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * A special array of strings intended for representing function names. - * - * These are primarily used for printing errors with the function names. - * - * The macro macro_byte_dump_f() is used to reference the array index by the enum name. - * - * macro_byte_dump_f(): - * - name: The name of the function. - */ -#ifndef _di_byte_dump_f_a_ - extern const f_string_t byte_dump_f_a[]; - - #define macro_byte_dump_f(name) byte_dump_f_a[byte_dump_f_##name##_e] -#endif // _di_byte_dump_f_a_ - -/** - * An enum representing specific indexes within the above array. - * - * This is a convenience enum used to make code slightly more readable. - */ -#ifndef _di_byte_dump_f_e_ - enum { - byte_dump_f_f_console_parameter_prioritize_right_e, - byte_dump_f_f_console_parameter_process_e, - byte_dump_f_f_file_exists_e, - byte_dump_f_f_file_stream_open_e, - byte_dump_f_f_memory_array_increase_by_e, - byte_dump_f_f_thread_create_e, - byte_dump_f_fl_conversion_dynamic_to_unsigned_detect_e, - byte_dump_f_fll_program_parameter_process_context_standard_e, - byte_dump_f_fll_program_parameter_process_verbosity_standard_e, - }; // enum -#endif // _di_byte_dump_f_e_ - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif // _byte_dump_common_print_h diff --git a/level_3/byte_dump/c/main/main.c b/level_3/byte_dump/c/main/main.c index 1c084853f..c922b53ba 100644 --- a/level_3/byte_dump/c/main/main.c +++ b/level_3/byte_dump/c/main/main.c @@ -46,7 +46,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { data.setting.state.status = f_thread_create(0, &id_signal, &byte_dump_thread_signal, (void *) &data); if (F_status_is_error(data.setting.state.status)) { - byte_dump_print_error(&data.program.error, macro_byte_dump_f(f_thread_create)); + byte_dump_print_error(&data.program.error, F_status_debug_source_d); } else { { diff --git a/level_3/byte_dump/c/main/print/error.c b/level_3/byte_dump/c/main/print/error.c index 29c411709..abe3e0bc9 100644 --- a/level_3/byte_dump/c/main/print/error.c +++ b/level_3/byte_dump/c/main/print/error.c @@ -5,26 +5,26 @@ extern "C" { #endif #ifndef _di_byte_dump_print_error_ - f_status_t byte_dump_print_error(fl_print_t * const print, const f_string_t function) { + f_status_t byte_dump_print_error(fl_print_t * const print, const f_string_t debug) { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - fll_error_print(print, F_status_set_fine(((byte_dump_main_t *) print->custom)->setting.state.status), function, fll_error_file_flag_fallback_e); + fll_error_print(print, F_status_set_fine(((byte_dump_main_t *) print->custom)->setting.state.status), debug, fll_error_file_flag_fallback_e); return F_okay; } #endif // _di_byte_dump_print_error_ #ifndef _di_byte_dump_print_error_file_ - f_status_t byte_dump_print_error_file(fl_print_t * const print, const f_string_t function, const f_string_static_t name, const f_string_static_t operation, const uint8_t type) { + f_status_t byte_dump_print_error_file(fl_print_t * const print, const f_string_t debug, const f_string_static_t name, const f_string_static_t operation, const uint8_t type) { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; byte_dump_main_t * const main = (byte_dump_main_t *) print->custom; - fll_error_file_print(print, F_status_set_fine(main->setting.state.status), function, fll_error_file_flag_fallback_e, name, operation, type); + fll_error_file_print(print, F_status_set_fine(main->setting.state.status), debug, fll_error_file_flag_fallback_e, name, operation, type); return F_okay; } diff --git a/level_3/byte_dump/c/main/print/error.h b/level_3/byte_dump/c/main/print/error.h index ffef64ec0..bf1005ea3 100644 --- a/level_3/byte_dump/c/main/print/error.h +++ b/level_3/byte_dump/c/main/print/error.h @@ -23,8 +23,10 @@ extern "C" { * The output structure to print to. * * This does not alter print.custom.setting.state.status. - * @param function - * The name of the function associated with the error. + * @param debug + * (optional) The debug details, such as file, line number, and function. + * + * Set to NULL to disable. * * @return * F_okay on success. @@ -35,7 +37,7 @@ extern "C" { * @see fll_error_print() */ #ifndef _di_byte_dump_print_error_ - extern f_status_t byte_dump_print_error(fl_print_t * const print, const f_string_t function); + extern f_status_t byte_dump_print_error(fl_print_t * const print, const f_string_t debug); #endif // _di_byte_dump_print_error_ /** @@ -45,8 +47,8 @@ extern "C" { * The output structure to print to. * * This does not alter print.custom.setting.state.status. - * @param function - * (optional) The name of the function where the error happened. + * @param debug + * (optional) The debug details, such as file, line number, and function. * * Set to NULL to disable. * @param name @@ -65,7 +67,7 @@ extern "C" { * @see fll_error_file_print() */ #ifndef _di_byte_dump_print_error_file_ - extern f_status_t byte_dump_print_error_file(fl_print_t * const print, const f_string_t function, const f_string_static_t name, const f_string_static_t operation, const uint8_t type); + extern f_status_t byte_dump_print_error_file(fl_print_t * const print, const f_string_t debug, const f_string_static_t name, const f_string_static_t operation, const uint8_t type); #endif // _di_byte_dump_print_error_file_ /** diff --git a/level_3/byte_dump/data/build/settings b/level_3/byte_dump/data/build/settings index 0341e4ac7..fc9bf8957 100644 --- a/level_3/byte_dump/data/build/settings +++ b/level_3/byte_dump/data/build/settings @@ -46,11 +46,11 @@ build_libraries_static-individual_thread -l:libf_thread.a build_libraries_static-level -l:libfll_2.a -l:libfll_1.a -l:libfll_0.a build_libraries_static-monolithic -l:libfll.a -build_sources_library main/common.c main/common/define.c main/common/enumeration.c main/common/print.c main/common/string.c main/common/type.c main/print/data.c main/print/error.c main/print/message.c main/process.c main/signal.c main/thread.c main/byte_dump.c +build_sources_library main/common.c main/common/define.c main/common/enumeration.c main/common/string.c main/common/type.c main/print/data.c main/print/error.c main/print/message.c main/process.c main/signal.c main/thread.c main/byte_dump.c build_sources_program main/main.c -build_sources_headers main/common.h main/common/define.h main/common/enumeration.h main/common/print.h main/common/string.h main/common/type.h main/print/data.h main/print/error.h main/print/message.h main/process.h main/signal.h main/thread.h main/byte_dump.h +build_sources_headers main/common.h main/common/define.h main/common/enumeration.h main/common/string.h main/common/type.h main/print/data.h main/print/error.h main/print/message.h main/process.h main/signal.h main/thread.h main/byte_dump.h build_sources_documentation man diff --git a/level_3/example/c/main/common.c b/level_3/example/c/main/common.c index 4614e7e54..69e310563 100644 --- a/level_3/example/c/main/common.c +++ b/level_3/example/c/main/common.c @@ -18,7 +18,7 @@ extern "C" { main->setting.state.step_small = example_allocation_small_d; if (F_status_is_error(main->setting.state.status)) { - example_print_error(&main->program.error, macro_example_f(f_console_parameter_process)); + example_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -26,7 +26,7 @@ extern "C" { main->setting.state.status = fll_program_parameter_process_context_standard(F_true, &main->program); if (F_status_is_error(main->setting.state.status)) { - example_print_error(&main->program.error, macro_example_f(fll_program_parameter_process_context_standard)); + example_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -34,7 +34,7 @@ extern "C" { main->setting.state.status = fll_program_parameter_process_verbosity_standard(F_true, &main->program); if (F_status_is_error(main->setting.state.status)) { - example_print_error(&main->program.error, macro_example_f(fll_program_parameter_process_verbosity_standard)); + example_print_error(&main->program.error, F_status_debug_source_d); return; } diff --git a/level_3/example/c/main/common/print.c b/level_3/example/c/main/common/print.c index 9da93ca42..65ff2a770 100644 --- a/level_3/example/c/main/common/print.c +++ b/level_3/example/c/main/common/print.c @@ -4,15 +4,6 @@ extern "C" { #endif -#ifndef _di_example_f_a_ - const f_string_t example_f_a[] = { - "f_console_parameter_process", - "f_thread_create", - "fll_program_parameter_process_context_standard", - "fll_program_parameter_process_verbosity_standard", - }; -#endif // _di_example_f_a_ - #ifdef __cplusplus } // extern "C" #endif diff --git a/level_3/example/c/main/common/print.h b/level_3/example/c/main/common/print.h index 7096e4317..6fe5b30ad 100644 --- a/level_3/example/c/main/common/print.h +++ b/level_3/example/c/main/common/print.h @@ -16,36 +16,6 @@ extern "C" { #endif -/** - * A special array of strings intended for representing function names. - * - * These are primarily used for printing errors with the function names. - * - * The macro macro_example_f() is used to reference the array index by the enum name. - * - * macro_example_f(): - * - name: The name of the function. - */ -#ifndef _di_example_f_a_ - extern const f_string_t example_f_a[]; - - #define macro_example_f(name) example_f_a[example_f_##name##_e] -#endif // _di_example_f_a_ - -/** - * An enum representing specific indexes within the above array. - * - * This is a convenience enum used to make code slightly more readable. - */ -#ifndef _di_example_f_e_ - enum { - example_f_f_console_parameter_process_e, - example_f_f_thread_create_e, - example_f_fll_program_parameter_process_context_standard_e, - example_f_fll_program_parameter_process_verbosity_standard_e, - }; // enum -#endif // _di_example_f_e_ - #ifdef __cplusplus } // extern "C" #endif diff --git a/level_3/example/c/main/example.h b/level_3/example/c/main/example.h index 67862e5f0..8f9af509c 100644 --- a/level_3/example/c/main/example.h +++ b/level_3/example/c/main/example.h @@ -25,12 +25,9 @@ #include #include #include -//#include #include -//#include #include #include -//#include #include #ifndef _di_thread_support_ @@ -49,7 +46,6 @@ // Example includes. #include #include -#include #include #include #include diff --git a/level_3/example/c/main/main.c b/level_3/example/c/main/main.c index 9fd6ac2c0..85c87680e 100644 --- a/level_3/example/c/main/main.c +++ b/level_3/example/c/main/main.c @@ -49,7 +49,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { data.setting.state.status = f_thread_create(0, &id_signal, &example_thread_signal, (void *) &data); if (F_status_is_error(data.setting.state.status)) { - example_print_error(&data.program.error, macro_example_f(f_thread_create)); + example_print_error(&data.program.error, F_status_debug_source_d); } else { { diff --git a/level_3/example/c/main/print/error.c b/level_3/example/c/main/print/error.c index 7998ebbbd..7ecfb365c 100644 --- a/level_3/example/c/main/print/error.c +++ b/level_3/example/c/main/print/error.c @@ -5,14 +5,12 @@ extern "C" { #endif #ifndef _di_example_print_error_ - f_status_t example_print_error(fl_print_t * const print, const f_string_t function) { + f_status_t example_print_error(fl_print_t * const print, const f_string_t debug) { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - example_main_t * const main = (example_main_t *) print->custom; - - fll_error_print(print, F_status_set_fine(main->setting.state.status), function, fll_error_file_flag_fallback_e); + fll_error_print(print, F_status_set_fine(((example_main_t *) print->custom)->setting.state.status), debug, fll_error_file_flag_fallback_e); return F_okay; } diff --git a/level_3/example/c/main/print/error.h b/level_3/example/c/main/print/error.h index 95014109d..d4fd9f4a5 100644 --- a/level_3/example/c/main/print/error.h +++ b/level_3/example/c/main/print/error.h @@ -23,8 +23,10 @@ extern "C" { * The output structure to print to. * * This does not alter print.custom.setting.state.status. - * @param function - * The name of the function associated with the error. + * @param debug + * (optional) The debug details, such as file, line number, and function. + * + * Set to NULL to disable. * * @return * F_okay on success. @@ -35,7 +37,7 @@ extern "C" { * @see fll_error_print() */ #ifndef _di_example_print_error_ - extern f_status_t example_print_error(fl_print_t * const print, const f_string_t function); + extern f_status_t example_print_error(fl_print_t * const print, const f_string_t debug); #endif // _di_example_print_error_ #ifdef __cplusplus diff --git a/level_3/example/data/build/settings b/level_3/example/data/build/settings index 990b86f65..40162925e 100644 --- a/level_3/example/data/build/settings +++ b/level_3/example/data/build/settings @@ -52,13 +52,13 @@ build_libraries_static-individual_thread -l:libf_thread.a build_libraries_static-level -l:libfll_2.a -l:libfll_1.a -l:libfll_0.a build_libraries_static-monolithic -l:libfll.a -build_sources_library main/common.c main/common/define.c main/common/enumeration.c main/common/print.c main/common/string.c main/common/type.c +build_sources_library main/common.c main/common/define.c main/common/enumeration.c main/common/string.c main/common/type.c build_sources_library main/print/data.c main/print/debug.c main/print/error.c main/print/message.c main/print/verbose.c main/print/warning.c build_sources_library main/example.c main/signal.c main/thread.c build_sources_program main/main.c -build_sources_headers main/common.h main/common/define.h main/common/enumeration.h main/common/print.h main/common/string.h main/common/type.h +build_sources_headers main/common.h main/common/define.h main/common/enumeration.h main/common/string.h main/common/type.h build_sources_headers main/print/data.h main/print/debug.h main/print/error.h main/print/message.h main/print/verbose.h main/print/warning.h build_sources_headers main/example.h main/signal.h main/thread.h diff --git a/level_3/fake/c/main/build.c b/level_3/fake/c/main/build.c index a0a163967..dfeda5a9d 100644 --- a/level_3/fake/c/main/build.c +++ b/level_3/fake/c/main/build.c @@ -24,7 +24,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -33,7 +33,7 @@ extern "C" { main->setting.state.status = fll_execute_arguments_add(main->cache_argument, &main->cache_arguments); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fll_execute_arguments_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -50,7 +50,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -84,7 +84,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -104,7 +104,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -114,7 +114,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fll_execute_arguments_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -180,7 +180,7 @@ extern "C" { main->setting.state.status = fll_execute_arguments_add(strings[s]->array[i], &main->cache_arguments); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fll_execute_arguments_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -204,7 +204,6 @@ extern "C" { f_status_t failed = F_okay; fake_local_t local = macro_fake_local_t_initialize_1(main, &main->cache_map, &failed); - uint8_t func = 0; main->cache_recurse_do.action = &fake_do_copy_action; main->cache_recurse_do.handle = &fake_do_copy_handle; @@ -235,7 +234,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -250,7 +249,6 @@ extern "C" { main->cache_map.key.used = source.used; main->cache_map.value.used = destination.used; - func = 0; main->setting.state.status = f_memory_array_increase_by(f_path_separator_s.used + files.array[i].used + 1, sizeof(f_char_t), (void **) &main->cache_map.key.string, &main->cache_map.key.used, &main->cache_map.key.size); if (F_status_is_error_not(main->setting.state.status)) { @@ -258,7 +256,6 @@ extern "C" { } if (F_status_is_error_not(main->setting.state.status) && main->cache_map.key.used) { - func = 1; main->setting.state.status = f_string_dynamic_append_assure(f_path_separator_s, &main->cache_map.key); } @@ -267,29 +264,23 @@ extern "C" { } if (F_status_is_error_not(main->setting.state.status)) { - func = 2; main->setting.state.status = f_string_dynamic_append_nulless(files.array[i], &main->cache_map.key); } if (F_status_is_error_not(main->setting.state.status)) { if (preserve && offset < main->cache_map.key.used) { - func = 9; main->setting.state.status = f_string_append_nulless(main->cache_map.key.string + offset, main->cache_map.key.used - offset, &main->cache_map.value); } else { - func = 3; main->setting.state.status = f_file_name_base(files.array[i], &main->cache_map.value); } } if (F_status_is_error_not(main->setting.state.status)) { - func = 4; main->setting.state.status = f_string_dynamic_terminate_after(&main->cache_map.value); } if (F_status_is_error_not(main->setting.state.status)) { - func = 5; - main->cache_map.key.string[main->cache_map.key.used] = 0; main->cache_map.value.string[main->cache_map.value.used] = 0; @@ -297,11 +288,9 @@ extern "C" { } if (main->setting.state.status == F_true) { - func = 2; main->setting.state.status = f_string_dynamic_append_nulless(main->cache_map.key, &main->cache_recurse_do.path_cache); if (F_status_is_error_not(main->setting.state.status)) { - func = 4; main->setting.state.status = f_string_dynamic_terminate_after(&main->cache_recurse_do.path_cache); } @@ -318,7 +307,7 @@ extern "C" { main->setting.state.status = F_status_set_error(F_failure); } - fake_print_error_build_operation_file(&main->program.error, macro_fake_f(fl_directory_do), macro_fake_f(fl_directory_do), f_file_operation_copy_s, main->cache_map.key, main->cache_map.value, f_file_operation_to_s, F_true); + fake_print_error_build_operation_file(&main->program.error, F_status_debug_source_d, macro_fake_f(fl_directory_do), f_file_operation_copy_s, main->cache_map.key, main->cache_map.value, f_file_operation_to_s, F_true); if (F_status_is_error(failed)) { main->setting.state.status = failed; @@ -329,51 +318,25 @@ extern "C" { } } else if (main->setting.state.status == F_false) { - func = 6; main->setting.state.status = f_file_name_directory(main->cache_map.value, &main->cache_recurse_do.path_cache); if (F_status_is_error_not(main->setting.state.status)) { - func = 7; main->setting.state.status = fl_directory_create(main->cache_recurse_do.path_cache, F_file_mode_all_rwx_d); } if (F_status_is_error_not(main->setting.state.status)) { fake_print_verbose_copying(&main->program.message, main->cache_map.key, main->cache_map.value); - func = 8; main->setting.state.status = f_file_copy(main->cache_map.key, main->cache_map.value, mode, F_file_default_size_read_d, f_file_stat_flag_reference_e); } + + if (F_status_is_error(main->setting.state.status)) { + fake_print_error_build_operation_file(&main->program.error, 0, F_status_debug_source_d, f_file_operation_copy_s, main->cache_map.key, main->cache_map.value, f_file_operation_to_s, F_true); + } } if (F_status_is_error(main->setting.state.status)) { - fake_print_error_build_operation_file( - &main->program.error, - 0, - !func - ? macro_fake_f(f_memory_array_increase_by) - : func == 1 - ? macro_fake_f(f_string_dynamic_append_assure) - : func == 2 - ? macro_fake_f(f_string_dynamic_append_nulless) - : func == 3 - ? macro_fake_f(f_file_name_base) - : func == 4 - ? macro_fake_f(f_string_dynamic_terminate_after) - : func == 5 - ? macro_fake_f(f_directory_is) - : func == 6 - ? macro_fake_f(f_file_name_directory) - : func == 7 - ? macro_fake_f(fl_directory_create) - : func == 8 - ? macro_fake_f(f_file_copy) - : macro_fake_f(f_string_append_nulless), - f_file_operation_copy_s, - main->cache_map.key, - main->cache_map.value, - f_file_operation_to_s, - F_true - ); + fake_print_error_build_operation_file(&main->program.error, 0, F_status_debug_source_d, f_file_operation_copy_s, main->cache_map.key, main->cache_map.value, f_file_operation_to_s, F_true); break; } @@ -418,7 +381,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -448,7 +411,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -457,7 +420,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fll_execute_arguments_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -475,7 +438,7 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) { f_memory_array_resize(0, sizeof(f_char_t), (void **) &defines.string, &defines.used, &defines.size); - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_mash)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -525,7 +488,7 @@ extern "C" { f_memory_array_resize(0, sizeof(f_char_t), (void **) &defines.string, &defines.used, &defines.size); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fll_execute_arguments_add_parameter_set)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -542,7 +505,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -566,7 +529,7 @@ extern "C" { fake_print_error_failure_script(&main->program.error, main->cache_argument); } else { - fake_print_error(&main->program.error, macro_fake_f(fll_execute_program)); + fake_print_error(&main->program.error, F_status_debug_source_d); } } else { @@ -594,7 +557,7 @@ extern "C" { main->setting.state.status = f_file_name_base(path, name); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_file_name_base)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -642,7 +605,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -650,7 +613,7 @@ extern "C" { main->setting.state.status = fll_execute_arguments_add(main->cache_argument, &main->cache_arguments); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fll_execute_arguments_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -715,7 +678,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_nulless(fake_path_part_script_s, &main->cache_argument); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); } } @@ -735,7 +698,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_nulless(data_build.setting.path_headers, &main->cache_1); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); } } } @@ -776,7 +739,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_nulless(fake_path_part_script_s, &main->cache_argument); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); } else { fake_build_copy(data, mode, fake_build_scripts_s, main->cache_argument, data->path_build_programs_script, data_build.setting.build_sources_script, stage.file_sources_script, F_false, 0); @@ -835,7 +798,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_assure(f_path_separator_s, source); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_assure)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -844,7 +807,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); } } #endif // _di_fake_build_path_source_string_ @@ -878,7 +841,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_nulless(sources[i]->array[j], &main->cache_argument); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -886,7 +849,7 @@ extern "C" { main->setting.state.status = fll_execute_arguments_add(main->cache_argument, &main->cache_arguments); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fll_execute_arguments_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -918,7 +881,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_nulless(*file, &main->cache_argument); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -926,7 +889,7 @@ extern "C" { main->setting.state.status = fll_execute_arguments_add(main->cache_argument, &main->cache_arguments); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fll_execute_arguments_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -951,7 +914,7 @@ extern "C" { main->setting.state.status = f_file_touch(file, mode.regular, F_false); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file(&main->program.error, macro_fake_f(f_file_touch), file, f_file_operation_touch_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, file, f_file_operation_touch_s, fll_error_file_type_file_e); } else { main->setting.state.status = F_okay; diff --git a/level_3/fake/c/main/build/library.c b/level_3/fake/c/main/build/library.c index eb0d2ef41..3ef6720eb 100644 --- a/level_3/fake/c/main/build/library.c +++ b/level_3/fake/c/main/build/library.c @@ -52,7 +52,7 @@ extern "C" { main->setting.state.status = fll_execute_arguments_add(values[i]->array[j], &main->cache_arguments); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fll_execute_arguments_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -63,7 +63,7 @@ extern "C" { fake_build_objects_add(data, data_build, &data->path_build_objects_shared, &data_build->setting.build_objects_library, &data_build->setting.build_objects_library_shared); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fake_build_objects_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -71,7 +71,7 @@ extern "C" { fake_build_sources_add(data, data_build, &data_build->setting.path_sources_library, &data_build->setting.build_sources_library, &data_build->setting.build_sources_library_shared); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fake_build_sources_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -259,7 +259,7 @@ extern "C" { main->setting.state.status = fll_execute_arguments_add(fake_build_parameter_library_shared_s, &main->cache_arguments); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fll_execute_arguments_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -284,7 +284,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -296,7 +296,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fll_execute_arguments_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -321,7 +321,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -329,7 +329,7 @@ extern "C" { main->setting.state.status = fll_execute_arguments_add(main->cache_argument, &main->cache_arguments); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fll_execute_arguments_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -337,7 +337,7 @@ extern "C" { fake_build_arguments_standard_add(data, data_build, F_true, fake_build_type_library_e); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fake_build_arguments_standard_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -382,7 +382,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -394,10 +394,10 @@ extern "C" { } else { if (F_status_set_fine(main->setting.state.status) == F_file_found) { - fake_print_error_file(&main->program.error, macro_fake_f(f_file_link), main->cache_argument, f_file_operation_link_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_argument, f_file_operation_link_s, fll_error_file_type_file_e); } else { - fake_print_error_file(&main->program.error, macro_fake_f(f_file_link), targets[i], f_file_operation_link_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, targets[i], f_file_operation_link_s, fll_error_file_type_file_e); } return 0; @@ -447,7 +447,7 @@ extern "C" { main->setting.state.status = fll_execute_arguments_add(values[i]->array[j], &main->cache_arguments); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fll_execute_arguments_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -462,7 +462,7 @@ extern "C" { main->setting.state.status = fll_execute_arguments_add(data_build->setting.build_indexer_arguments.array[i], &main->cache_arguments); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fll_execute_arguments_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -491,13 +491,13 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); } else { main->setting.state.status = fll_execute_arguments_add(main->cache_2, &main->cache_arguments); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fll_execute_arguments_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); } } } @@ -506,7 +506,7 @@ extern "C" { fake_build_objects_add(data, data_build, &data->path_build_objects_static, &data_build->setting.build_objects_library, &data_build->setting.build_objects_library_static); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fake_build_objects_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); } } @@ -526,7 +526,7 @@ extern "C" { fake_build_get_file_name_without_extension(data, sources[i]->array[j], &main->cache_1); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fake_build_get_file_name_without_extension)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -534,7 +534,7 @@ extern "C" { main->setting.state.status = f_file_name_directory(sources[i]->array[j], &main->cache_2); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_file_name_directory)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -545,7 +545,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_prepend(data->path_build_objects_static, &main->cache_2); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_prepend)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -553,7 +553,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_assure(f_path_separator_s, &main->cache_2); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_assure)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -581,7 +581,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -589,7 +589,7 @@ extern "C" { main->setting.state.status = fll_execute_arguments_add(main->cache_argument, &main->cache_arguments); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fll_execute_arguments_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -643,7 +643,7 @@ extern "C" { main->setting.state.status = fll_execute_arguments_add(values[i]->array[j], &main->cache_arguments); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fll_execute_arguments_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -679,7 +679,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_nulless(sources[i]->array[j], &main->cache_1); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -687,7 +687,7 @@ extern "C" { fake_build_get_file_name_without_extension(data, sources[i]->array[j], &main->cache_2); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fake_build_get_file_name_without_extension)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -695,7 +695,7 @@ extern "C" { main->setting.state.status = f_file_name_directory(sources[i]->array[j], &main->cache_argument); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_file_name_directory)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -704,7 +704,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_prepend(data->path_build_objects_static, &main->cache_argument); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_prepend)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -712,7 +712,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_assure(f_path_separator_s, &main->cache_argument); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_assure)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -731,7 +731,7 @@ extern "C" { main->setting.state.status = fl_directory_create(main->cache_argument, mode.directory); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file(&main->program.error, macro_fake_f(fl_directory_create), main->cache_argument, f_file_operation_create_s, fll_error_file_type_directory_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_argument, f_file_operation_create_s, fll_error_file_type_directory_e); return 0; } @@ -739,7 +739,7 @@ extern "C" { fake_build_print_verbose_create_directory(&main->program.message, main->cache_argument); } else if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file(&main->program.error, macro_fake_f(f_directory_exists), main->cache_argument, f_file_operation_create_s, fll_error_file_type_directory_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_argument, f_file_operation_create_s, fll_error_file_type_directory_e); return 0; } @@ -761,7 +761,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -782,7 +782,7 @@ extern "C" { main->setting.state.status = fll_execute_arguments_add(values[k], &main->cache_arguments); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fll_execute_arguments_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } diff --git a/level_3/fake/c/main/build/load.c b/level_3/fake/c/main/build/load.c index 0218d9d6a..a886aa664 100644 --- a/level_3/fake/c/main/build/load.c +++ b/level_3/fake/c/main/build/load.c @@ -33,7 +33,7 @@ extern "C" { main->setting.state.status = fl_environment_load_name(variables[i], environment); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fl_environment_load_name)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -53,7 +53,7 @@ extern "C" { main->setting.state.status = fl_environment_load_names(data_build->setting.environment, environment); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fl_environment_load_names)); + fake_print_error(&main->program.error, F_status_debug_source_d); } else { main->setting.state.status = F_okay; @@ -146,13 +146,13 @@ extern "C" { fll_fss_extended_read(buffer, &range, &objects, &contents, 0, 0, &delimits, 0, &main->setting.state); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_fss(&main->program.error, macro_fake_f(fll_fss_extended_read), macro_fake_f(fll_fss_extended_read), data->file_data_build_settings, range, F_true); + fake_print_error_fss(&main->program.error, F_status_debug_source_d, macro_fake_f(fll_fss_extended_read), data->file_data_build_settings, range, F_true); } else { f_fss_apply_delimit(delimits, &buffer, &main->setting.state); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_fss_apply_delimit)); + fake_print_error(&main->program.error, F_status_debug_source_d); } else { fake_build_load_setting_process(data, F_true, path_file, modes_custom.used ? &modes_custom : 0, buffer, objects, contents, setting); @@ -653,8 +653,6 @@ extern "C" { f_number_unsigned_t i = 0; f_number_unsigned_t j = 0; - f_string_t function = macro_fake_f(fll_fss_snatch_apart); - main->setting.state.status = fll_fss_snatch_apart(buffer, objects, contents, settings_name, fake_build_setting_total_d, settings_value, settings_matches, 0); if (main->setting.state.status == F_okay) { @@ -703,7 +701,9 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(settings_value[j]->used + f_string_ascii_minus_s.used + modes->array[i].used, sizeof(f_char_t), (void **) &settings_mode_names[j].string, &settings_mode_names[j].used, &settings_mode_names[j].size); if (F_status_is_error(main->setting.state.status)) { - function = macro_fake_f(f_memory_array_increase_by); + fake_print_error(&main->program.error, F_status_debug_source_d); + + error_printed = F_true; break; } @@ -719,7 +719,9 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - function = macro_fake_f(f_string_dynamic_append); + fake_print_error(&main->program.error, F_status_debug_source_d); + + error_printed = F_true; break; } @@ -729,7 +731,9 @@ extern "C" { main->setting.state.status = fll_fss_snatch_apart(buffer, objects, contents, settings_mode_names, fake_build_setting_total_d, settings_value, 0, 0); if (F_status_is_error(main->setting.state.status)) { - function = macro_fake_f(fll_fss_snatch_apart); + fake_print_error(&main->program.error, F_status_debug_source_d); + + error_printed = F_true; } } @@ -775,7 +779,7 @@ extern "C" { fake_build_print_error_setting_too_long(&main->program.warning, path_file); } else if (!error_printed) { - fake_print_error(&main->program.error, function); + fake_print_error(&main->program.error, F_status_debug_source_d); } } else { @@ -1407,7 +1411,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append(settings_single_string_default[i], settings_single_destination[i]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -1454,7 +1458,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append(*single_source, settings_single_destination[i]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -1492,7 +1496,7 @@ extern "C" { main->setting.state.status = f_path_directory_cleanup(*single_source, settings_single_destination[i]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_path_directory_cleanup)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -1501,7 +1505,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(single_source->used + 1, sizeof(f_char_t), (void **) &settings_single_destination[i]->string, &settings_single_destination[i]->used, &settings_single_destination[i]->size); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_memory_array_increase_by)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -1528,7 +1532,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_nulless(*single_source, settings_single_destination[i]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -1575,7 +1579,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); } } @@ -1672,7 +1676,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_assure(f_path_separator_s, &setting->path_sources); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_assure)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -1797,7 +1801,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_file_name_base)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -1849,7 +1853,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } diff --git a/level_3/fake/c/main/build/object.c b/level_3/fake/c/main/build/object.c index 13f7480ad..113122904 100644 --- a/level_3/fake/c/main/build/object.c +++ b/level_3/fake/c/main/build/object.c @@ -48,7 +48,7 @@ extern "C" { main->setting.state.status = fll_execute_arguments_add(values[i]->array[j], &main->cache_arguments); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fll_execute_arguments_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -84,7 +84,7 @@ extern "C" { fake_build_sources_object_add(data, data_build, &sources[i]->array[j]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fake_build_sources_object_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -96,7 +96,7 @@ extern "C" { fake_build_get_file_name_without_extension(data, sources[i]->array[j], &main->cache_1); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fake_build_get_file_name_without_extension)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -104,7 +104,7 @@ extern "C" { main->setting.state.status = f_file_name_directory(sources[i]->array[j], &main->cache_2); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_file_name_directory)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -112,7 +112,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_assure(f_path_separator_s, &main->cache_2); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_assure)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -124,7 +124,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -143,7 +143,7 @@ extern "C" { main->setting.state.status = fl_directory_create(main->cache_argument, mode.directory); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file(&main->program.error, macro_fake_f(fl_directory_create), main->cache_argument, f_file_operation_create_s, fll_error_file_type_directory_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_argument, f_file_operation_create_s, fll_error_file_type_directory_e); return 0; } @@ -151,7 +151,7 @@ extern "C" { fake_build_print_verbose_create_directory(&main->program.message, main->cache_argument); } else if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file(&main->program.error, macro_fake_f(f_directory_exists), main->cache_argument, f_file_operation_create_s, fll_error_file_type_directory_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_argument, f_file_operation_create_s, fll_error_file_type_directory_e); return 0; } @@ -165,7 +165,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -185,7 +185,7 @@ extern "C" { main->setting.state.status = fll_execute_arguments_add(values[k], &main->cache_arguments); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fll_execute_arguments_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } diff --git a/level_3/fake/c/main/build/program.c b/level_3/fake/c/main/build/program.c index 6603b0338..25d40b7e1 100644 --- a/level_3/fake/c/main/build/program.c +++ b/level_3/fake/c/main/build/program.c @@ -52,7 +52,7 @@ extern "C" { main->setting.state.status = fll_execute_arguments_add(values[i]->array[j], &main->cache_arguments); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fll_execute_arguments_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -63,7 +63,7 @@ extern "C" { fake_build_objects_add(data, data_build, &data->path_build_objects_shared, &data_build->setting.build_objects_program, &data_build->setting.build_objects_program_shared); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fake_build_objects_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -71,7 +71,7 @@ extern "C" { fake_build_sources_add(data, data_build, &data_build->setting.path_sources_program, &data_build->setting.build_sources_program, &data_build->setting.build_sources_program_shared); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fake_build_sources_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -93,7 +93,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -110,7 +110,7 @@ extern "C" { main->setting.state.status = fll_execute_arguments_add(values[i], &main->cache_arguments); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fll_execute_arguments_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -135,7 +135,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -143,7 +143,7 @@ extern "C" { main->setting.state.status = fll_execute_arguments_add(main->cache_argument, &main->cache_arguments); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fll_execute_arguments_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -196,7 +196,7 @@ extern "C" { main->setting.state.status = fll_execute_arguments_add(values[i]->array[j], &main->cache_arguments); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fll_execute_arguments_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -207,7 +207,7 @@ extern "C" { fake_build_objects_add(data, data_build, &data->path_build_objects_static, &data_build->setting.build_objects_program, &data_build->setting.build_objects_program_static); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fake_build_objects_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -215,7 +215,7 @@ extern "C" { fake_build_sources_add(data, data_build, &data_build->setting.path_sources_program, &data_build->setting.build_sources_program, &data_build->setting.build_sources_program_static); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fake_build_sources_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -248,7 +248,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -265,7 +265,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fll_execute_arguments_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -286,7 +286,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -294,7 +294,7 @@ extern "C" { main->setting.state.status = fll_execute_arguments_add(main->cache_argument, &main->cache_arguments); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fll_execute_arguments_add)); + fake_print_error(&main->program.error, F_status_debug_source_d); return 0; } diff --git a/level_3/fake/c/main/build/skeleton.c b/level_3/fake/c/main/build/skeleton.c index d700eccea..6103a78f0 100644 --- a/level_3/fake/c/main/build/skeleton.c +++ b/level_3/fake/c/main/build/skeleton.c @@ -23,7 +23,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -107,7 +107,7 @@ extern "C" { continue; } - fake_print_error_file(&main->program.error, macro_fake_f(f_directory_create), directorys[i], f_file_operation_create_s, fll_error_file_type_directory_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, directorys[i], f_file_operation_create_s, fll_error_file_type_directory_e); return; } diff --git a/level_3/fake/c/main/clean.c b/level_3/fake/c/main/clean.c index ca41270ed..e04138e61 100644 --- a/level_3/fake/c/main/clean.c +++ b/level_3/fake/c/main/clean.c @@ -34,7 +34,7 @@ extern "C" { main->setting.state.status = F_okay; } else if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file(&main->program.error, macro_fake_f(f_directory_remove), main->setting.build, f_file_operation_delete_s, fll_error_file_type_directory_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->setting.build, f_file_operation_delete_s, fll_error_file_type_directory_e); } else { main->setting.state.status = F_okay; diff --git a/level_3/fake/c/main/common.c b/level_3/fake/c/main/common.c index 7b8b9ab57..0fe00c097 100644 --- a/level_3/fake/c/main/common.c +++ b/level_3/fake/c/main/common.c @@ -28,7 +28,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_console_parameter_process)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -36,7 +36,7 @@ extern "C" { main->setting.state.status = fll_program_parameter_process_context_standard(F_true, &main->program); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fll_program_parameter_process_context_standard)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -44,7 +44,7 @@ extern "C" { main->setting.state.status = fll_program_parameter_process_verbosity_standard(F_true, &main->program); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fll_program_parameter_process_verbosity_standard)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -219,7 +219,7 @@ extern "C" { main->setting.state.status = f_utf_is_word_dash_plus(parameters->arguments.array[index].string + j, parameters->arguments.array[index].used - j, F_false); if (F_status_is_error(main->setting.state.status)) { - if (fake_print_error_fallback(&main->program.error, macro_fake_f(f_utf_is_word_dash_plus)) == F_false) { + if (fake_print_error_fallback(&main->program.error, F_status_debug_source_d) == F_false) { fll_program_print_error_parameter_process(&main->program.error, f_console_symbol_long_normal_s, names[i]); } @@ -241,7 +241,7 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) { if (main->program.error.verbosity > f_console_verbosity_quiet_e) { - if (fake_print_error_fallback(&main->program.error, macro_fake_f(f_path_directory_cleanup)) == F_false) { + if (fake_print_error_fallback(&main->program.error, F_status_debug_source_d) == F_false) { fll_program_print_error_parameter_process(&main->program.error, f_console_symbol_long_normal_s, names[i]); } } @@ -256,7 +256,7 @@ extern "C" { main->setting.state.status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &variable[i]->string, &variable[i]->used, &variable[i]->size); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_memory_array_resize)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -285,7 +285,7 @@ extern "C" { main->setting.state.status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &variable[i]->string, &variable[i]->used, &variable[i]->size); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_memory_array_resize)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -333,7 +333,7 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) { if (main->program.error.verbosity > f_console_verbosity_quiet_e) { - if (fake_print_error_fallback(&main->program.error, macro_fake_f(fll_program_parameter_additional_rip)) == F_false) { + if (fake_print_error_fallback(&main->program.error, F_status_debug_source_d) == F_false) { fll_program_print_error_parameter_process(&main->program.error, f_console_symbol_long_normal_s, names[i]); } } @@ -351,7 +351,7 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) { // @todo fix this to print an error about the actual invalid character so that it can be investigated. - if (fake_print_error_fallback(&main->program.error, macro_fake_f(f_utf_is_word_dash_plus)) == F_false) { + if (fake_print_error_fallback(&main->program.error, F_status_debug_source_d) == F_false) { fll_program_print_error_parameter_process(&main->program.error, f_console_symbol_long_normal_s, names[i]); } @@ -382,7 +382,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(1, sizeof(uint8_t), (void **) &main->setting.operations.array, &main->setting.operations.used, &main->setting.operations.size); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_memory_array_increase_by)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -410,7 +410,7 @@ extern "C" { parameter_state->state->status = f_memory_array_increase(parameter_state->state->step_small, sizeof(uint8_t), (void **) &data->main->setting.operations.array, &data->main->setting.operations.used, &data->main->setting.operations.size); if (F_status_is_error(parameter_state->state->status)) { - fake_print_error(&data->main->program.error, macro_fake_f(f_memory_array_increase)); + fake_print_error(&data->main->program.error, F_status_debug_source_d); return; } diff --git a/level_3/fake/c/main/common/print.c b/level_3/fake/c/main/common/print.c index 25e192bd1..5d7c2f768 100644 --- a/level_3/fake/c/main/common/print.c +++ b/level_3/fake/c/main/common/print.c @@ -6,102 +6,11 @@ extern "C" { #ifndef _di_fake_f_a_ const f_string_t fake_f_a[] = { - "f_account_group_id_by_name", - "f_account_id_by_name", - "f_compare_dynamic_partial", - "f_console_parameter_prioritize_right", - "f_console_parameter_process", - "f_conversion_number_signed_to_string", - "f_directory_create", - "f_directory_exists", - "f_directory_is", - "f_directory_open", - "f_directory_remove", - "f_directory_touch", - "f_environment_get_all", - "f_environment_set", - "f_file_clone", - "f_file_copy", - "f_file_create", - "f_file_exists", - "f_file_group_read", - "f_file_is", - "f_file_link", - "f_file_mode_determine", - "f_file_mode_read", - "f_file_mode_set", - "f_file_mode_to_mode", - "f_file_name_base", - "f_file_name_directory", - "f_file_open", - "f_file_owner_read", - "f_file_read", - "f_file_remove", - "f_file_rename", - "f_file_role_change", - "f_file_size", - "f_file_stat", - "f_file_stream_open", - "f_file_stream_read_block", - "f_file_stream_write", - "f_file_touch", - "f_file_write", - "f_fss_apply_delimit", - "f_memory_array_increase", "f_memory_array_increase_by", - "f_memory_array_resize", - "f_memory_arrays_resize", "f_path_change", - "f_path_current", - "f_path_directory_cleanup", - "f_string_append_nulless", - "f_string_dynamic_append", - "f_string_dynamic_append_assure", - "f_string_dynamic_append_nulless", - "f_string_dynamic_mash", - "f_string_dynamic_partial_append", - "f_string_dynamic_partial_append_nulless", - "f_string_dynamic_prepend", - "f_string_dynamic_terminate_after", - "f_thread_create", - "f_utf_is_word_dash_plus", - "fl_conversion_dynamic_to_unsigned_detect", - "fl_directory_create", "fl_directory_do", - "fl_directory_list", - "fl_environment_load_name", - "fl_environment_load_names", - "fl_iki_read", - "fll_execute_arguments_add", - "fll_execute_arguments_add_parameter_set", - "fll_execute_program", - "fll_file_mode_set_all", - "fll_file_role_change_all", "fll_fss_basic_list_read", "fll_fss_extended_read", - "fll_fss_snatch_apart", - "fll_fss_snatch_map_apart", - "fll_program_parameter_additional_rip", - "fll_program_parameter_process_context_standard", - "fll_program_parameter_process_verbosity_standard", - "fake_build_arguments_standard_add", - "fake_build_get_file_name_without_extension", - "fake_build_load_setting", - "fake_build_objects_add", - "fake_build_sources_add", - "fake_build_sources_object_add", - "fake_make_assure_inside_project", - "fake_make_get_id", - "fake_make_get_id_mode", - "fake_make_operate_expand_build", - "fake_make_operate_expand_context", - "fake_make_operate_expand_environment", - "fake_make_operate_process_buffer_escape", - "fake_make_operate_section", - "fake_make_path_relative", - "fake_path_generate_string_dynamic", - "fake_skeleton_operate_directory_create", - "macro_f_string_map_multis_t_resize", }; #endif // _di_fake_f_a_ diff --git a/level_3/fake/c/main/common/print.h b/level_3/fake/c/main/common/print.h index d0e98fb1f..250b05a95 100644 --- a/level_3/fake/c/main/common/print.h +++ b/level_3/fake/c/main/common/print.h @@ -39,102 +39,11 @@ extern "C" { */ #ifndef _di_fake_f_e_ enum { - fake_f_f_account_group_id_by_name_e, - fake_f_f_account_id_by_name_e, - fake_f_f_compare_dynamic_partial_e, - fake_f_f_console_parameter_prioritize_right_e, - fake_f_f_console_parameter_process_e, - fake_f_f_conversion_number_signed_to_string_e, - fake_f_f_directory_create_e, - fake_f_f_directory_exists_e, - fake_f_f_directory_is_e, - fake_f_f_directory_open_e, - fake_f_f_directory_remove_e, - fake_f_f_directory_touch_e, - fake_f_f_environment_get_all_e, - fake_f_f_environment_set_e, - fake_f_f_file_clone_e, - fake_f_f_file_copy_e, - fake_f_f_file_create_e, - fake_f_f_file_exists_e, - fake_f_f_file_group_read_e, - fake_f_f_file_is_e, - fake_f_f_file_link_e, - fake_f_f_file_mode_determine_e, - fake_f_f_file_mode_read_e, - fake_f_f_file_mode_set_e, - fake_f_f_file_mode_to_mode_e, - fake_f_f_file_name_base_e, - fake_f_f_file_name_directory_e, - fake_f_f_file_open_e, - fake_f_f_file_owner_read_e, - fake_f_f_file_read_e, - fake_f_f_file_remove_e, - fake_f_f_file_rename_e, - fake_f_f_file_role_change_e, - fake_f_f_file_size_e, - fake_f_f_file_stat_e, - fake_f_f_file_stream_open_e, - fake_f_f_file_stream_read_block_e, - fake_f_f_file_stream_write_e, - fake_f_f_file_touch_e, - fake_f_f_file_write_e, - fake_f_f_fss_apply_delimit_e, - fake_f_f_memory_array_increase_e, fake_f_f_memory_array_increase_by_e, - fake_f_f_memory_array_resize_e, - fake_f_f_memory_arrays_resize_e, fake_f_f_path_change_e, - fake_f_f_path_current_e, - fake_f_f_path_directory_cleanup_e, - fake_f_f_string_append_nulless_e, - fake_f_f_string_dynamic_append_e, - fake_f_f_string_dynamic_append_assure_e, - fake_f_f_string_dynamic_append_nulless_e, - fake_f_f_string_dynamic_mash_e, - fake_f_f_string_dynamic_partial_append_e, - fake_f_f_string_dynamic_partial_append_nulless_e, - fake_f_f_string_dynamic_prepend_e, - fake_f_f_string_dynamic_terminate_after_e, - fake_f_f_thread_create_e, - fake_f_f_utf_is_word_dash_plus_e, - fake_f_fl_conversion_dynamic_to_unsigned_detect_e, - fake_f_fl_directory_create_e, fake_f_fl_directory_do_e, - fake_f_fl_directory_list_e, - fake_f_fl_environment_load_name_e, - fake_f_fl_environment_load_names_e, - fake_f_fl_iki_read_e, - fake_f_fll_execute_arguments_add_e, - fake_f_fll_execute_arguments_add_parameter_set_e, - fake_f_fll_execute_program_e, - fake_f_fll_file_mode_set_all_e, - fake_f_fll_file_role_change_all_e, fake_f_fll_fss_basic_list_read_e, fake_f_fll_fss_extended_read_e, - fake_f_fll_fss_snatch_apart_e, - fake_f_fll_fss_snatch_map_apart_e, - fake_f_fll_program_parameter_additional_rip_e, - fake_f_fll_program_parameter_process_context_standard_e, - fake_f_fll_program_parameter_process_verbosity_standard_e, - fake_f_fake_build_arguments_standard_add_e, - fake_f_fake_build_get_file_name_without_extension_e, - fake_f_fake_build_load_setting_e, - fake_f_fake_build_objects_add_e, - fake_f_fake_build_sources_add_e, - fake_f_fake_build_sources_object_add_e, - fake_f_fake_make_assure_inside_project_e, - fake_f_fake_make_get_id_e, - fake_f_fake_make_get_id_mode_e, - fake_f_fake_make_operate_expand_build_e, - fake_f_fake_make_operate_expand_context_e, - fake_f_fake_make_operate_expand_environment_e, - fake_f_fake_make_operate_process_buffer_escape_e, - fake_f_fake_make_operate_section_e, - fake_f_fake_make_path_relative_e, - fake_f_fake_path_generate_string_dynamic_e, - fake_f_fake_skeleton_operate_directory_create_e, - fake_f_macro_f_string_map_multis_t_resize_e, }; // enum #endif // _di_fake_f_e_ diff --git a/level_3/fake/c/main/fake.c b/level_3/fake/c/main/fake.c index c67d31911..3fbac4059 100644 --- a/level_3/fake/c/main/fake.c +++ b/level_3/fake/c/main/fake.c @@ -60,7 +60,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append)); + fake_print_error(&main->program.error, F_status_debug_source_d); } } @@ -99,7 +99,7 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) { fake_print_error_file( &main->program.error, - macro_fake_f(f_file_is), + F_status_debug_source_d, (main->setting.operations.array[i] == fake_operation_build_e) ? data.file_data_build_settings : data.file_data_build_fakefile, @@ -249,7 +249,7 @@ extern "C" { fake_print_error_execute_program_not_found(&main->program.error, program); } else { - fake_print_error(&main->program.error, macro_fake_f(fll_execute_program)); + fake_print_error(&main->program.error, F_status_debug_source_d); } } @@ -268,7 +268,7 @@ extern "C" { main->setting.state.status = f_file_exists(path_file, F_true); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file(&main->program.error, macro_fake_f(f_file_exists), path_file, f_file_operation_find_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, path_file, f_file_operation_find_s, fll_error_file_type_file_e); return; } @@ -280,7 +280,7 @@ extern "C" { main->setting.state.status = f_file_size(path_file, F_true, &size_file); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file(&main->program.error, macro_fake_f(f_file_size), path_file, f_file_operation_read_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, path_file, f_file_operation_read_s, fll_error_file_type_file_e); return; } @@ -294,7 +294,7 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) { const f_string_static_t message = macro_f_string_static_t_initialize_1("allocate buffer size for", 0, 24); - fake_print_error_file(&main->program.error, macro_fake_f(f_memory_array_increase_by), path_file, message, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, path_file, message, fll_error_file_type_file_e); return; } @@ -307,7 +307,7 @@ extern "C" { main->setting.state.status = f_file_stream_open(path_file, f_string_empty_s, &file); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file(&main->program.error, macro_fake_f(f_file_stream_open), path_file, f_file_operation_open_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, path_file, f_file_operation_open_s, fll_error_file_type_file_e); return; } @@ -318,7 +318,7 @@ extern "C" { f_file_stream_close(&file); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file(&main->program.error, macro_fake_f(f_file_read), path_file, f_file_operation_read_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, path_file, f_file_operation_read_s, fll_error_file_type_file_e); } else { main->setting.state.status = F_okay; @@ -328,7 +328,7 @@ extern "C" { if (required) { main->setting.state.status = F_status_set_error(F_file_found_not); - fake_print_error_file(&main->program.error, macro_fake_f(f_file_exists), path_file, f_file_operation_find_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, path_file, f_file_operation_find_s, fll_error_file_type_file_e); } } } @@ -351,7 +351,7 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) { const f_string_static_t message = macro_f_string_static_t_initialize_1("allocate buffer size for", 0, 24); - fake_print_error_file(&main->program.error, macro_fake_f(f_memory_array_increase_by), f_string_ascii_minus_s, message, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, f_string_ascii_minus_s, message, fll_error_file_type_file_e); return; } @@ -367,7 +367,7 @@ extern "C" { } while (F_status_is_fine(main->setting.state.status) && main->setting.state.status != F_interrupt && main->setting.state.status != F_okay_eof); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file(&main->program.error, macro_fake_f(f_file_stream_read_block), f_string_ascii_minus_s, f_file_operation_read_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, f_string_ascii_minus_s, f_file_operation_read_s, fll_error_file_type_file_e); } else { main->setting.state.status = F_okay; @@ -463,7 +463,7 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) { if (F_status_set_fine(main->setting.state.status) != F_directory_found_not || requireds[i]) { - fake_print_error_file(&main->program.error, macro_fake_f(f_file_stat), values[i], f_file_operation_access_s, fll_error_file_type_directory_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, values[i], f_file_operation_access_s, fll_error_file_type_directory_e); return; } diff --git a/level_3/fake/c/main/fake/do.c b/level_3/fake/c/main/fake/do.c index 6b8b279b2..3beb66406 100644 --- a/level_3/fake/c/main/fake/do.c +++ b/level_3/fake/c/main/fake/do.c @@ -26,7 +26,6 @@ extern "C" { } f_string_map_t * const map = (f_string_map_t *) local->custom_1; - uint8_t func = 0; // Append the directory path on start. // If the path is a directory, then make sure to copy/clone the directory first before the action. @@ -34,7 +33,6 @@ extern "C" { // Append the name to the path everytime, except for the top-path because that is already part of the path. if (recurse->depth) { - func = 0; recurse->state.status = f_memory_array_increase_by(f_path_separator_s.used + name.used + 1, sizeof(f_char_t), (void **) &map->key.string, &map->key.used, &map->key.size); if (F_status_is_error_not(recurse->state.status)) { @@ -42,7 +40,6 @@ extern "C" { } if (F_status_is_error_not(recurse->state.status)) { - func = 1; recurse->state.status = f_string_dynamic_append_nulless(f_path_separator_s, &map->key); } @@ -59,14 +56,24 @@ extern "C" { } } - if (F_status_is_error_not(recurse->state.status)) { + if (F_status_is_error(recurse->state.status)) { + fake_print_error_file( + &local->main->program.error, + F_status_debug_source_d, + map->key, + recurse->state.code & fake_state_code_clone_d + ? f_file_operation_clone_s + : f_file_operation_copy_s, + fll_error_file_type_directory_e + ); + } + else { map->key.string[map->key.used] = 0; map->value.string[map->value.used] = 0; if (recurse->state.code & fake_state_code_clone_d) { fake_print_verbose_cloning(&local->main->program.message, map->key, map->value); - func = 2; recurse->state.status = f_file_clone( map->key, map->value, @@ -77,11 +84,14 @@ extern "C" { : f_file_stat_flag_reference_e ) ); + + if (F_status_is_error(recurse->state.status)) { + fake_print_error_file(&local->main->program.error, F_status_debug_source_d, map->key, f_file_operation_clone_s, fll_error_file_type_directory_e); + } } else { fake_print_verbose_copying(&local->main->program.message, map->key, map->value); - func = 3; recurse->state.status = f_file_copy( map->key, map->value, @@ -91,28 +101,16 @@ extern "C" { ? 0 : f_file_stat_flag_reference_e ); + + if (F_status_is_error(recurse->state.status)) { + fake_print_error_file(&local->main->program.error, F_status_debug_source_d, map->key, f_file_operation_copy_s, fll_error_file_type_directory_e); + } } } if (F_status_is_error(recurse->state.status)) { local->main->setting.state.status = recurse->state.status; - fake_print_error_file( - &local->main->program.error, - !func - ? macro_fake_f(f_memory_array_increase_by) - : func == 1 - ? macro_fake_f(f_string_dynamic_append_nulless) - : func == 2 - ? macro_fake_f(f_file_clone) - : macro_fake_f(f_file_copy), - map->key, - recurse->state.code & fake_state_code_clone_d - ? f_file_operation_clone_s - : f_file_operation_copy_s, - fll_error_file_type_directory_e - ); - // Save the error status for when the error message is printed. *((f_status_t *) local->custom_2) = recurse->state.status; } @@ -157,7 +155,7 @@ extern "C" { fake_print_error_build_operation_file( &local->main->program.error, - macro_fake_f(fl_directory_do), + F_status_debug_source_d, macro_fake_f(fl_directory_do), recurse->state.code & fake_state_code_clone_d ? f_file_operation_clone_s diff --git a/level_3/fake/c/main/fake/path_generate.c b/level_3/fake/c/main/fake/path_generate.c index cdbcca70c..68d6d20d1 100644 --- a/level_3/fake/c/main/fake/path_generate.c +++ b/level_3/fake/c/main/fake/path_generate.c @@ -60,7 +60,7 @@ extern "C" { fake_path_generate_string_dynamic(data, sources[i], values[i], parameters_size[i]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fake_path_generate_string_dynamic)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -105,7 +105,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_nulless(sources[i], values[i]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -173,7 +173,7 @@ extern "C" { fake_path_generate_string_dynamic(data, sources[i], values[i], parameters_size[i]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fake_path_generate_string_dynamic)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -233,7 +233,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_nulless(sources[i], values[i]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -255,7 +255,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_nulless(main->setting.work, values[i]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -280,7 +280,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_nulless(sources[i], values[i]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -320,7 +320,7 @@ extern "C" { fake_path_generate_string_dynamic(data, sources[i], values[i], parameters_size[i]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fake_path_generate_string_dynamic)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -351,7 +351,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_nulless(sources[i], values[i]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } diff --git a/level_3/fake/c/main/main.c b/level_3/fake/c/main/main.c index bec70631d..65d2d66b3 100644 --- a/level_3/fake/c/main/main.c +++ b/level_3/fake/c/main/main.c @@ -55,7 +55,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { data.setting.state.status = f_thread_create(0, &id_signal, &fake_thread_signal, (void *) &data); if (F_status_is_error(data.setting.state.status)) { - fake_print_error(&data.program.error, macro_fake_f(f_thread_create)); + fake_print_error(&data.program.error, F_status_debug_source_d); } else { { diff --git a/level_3/fake/c/main/make.c b/level_3/fake/c/main/make.c index 7e1bed3a1..d8f0018b3 100644 --- a/level_3/fake/c/main/make.c +++ b/level_3/fake/c/main/make.c @@ -49,7 +49,7 @@ extern "C" { fake_main_t * const main = data_make->main; if (!buffer.used) { - fake_print_error(&main->program.error, macro_fake_f(fake_make_get_id)); + fake_print_error(&main->program.error, F_status_debug_source_d); main->setting.state.status = F_status_set_error(F_parameter); @@ -81,7 +81,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, is_owner ? macro_fake_f(f_account_id_by_name) : macro_fake_f(f_account_group_id_by_name)); + fake_print_error(&main->program.error, F_status_debug_source_d); } else { if (main->setting.state.status == F_exist_not) { @@ -95,7 +95,7 @@ extern "C" { } } else { - fake_print_error(&main->program.error, macro_fake_f(fl_conversion_dynamic_to_unsigned_detect)); + fake_print_error(&main->program.error, F_status_debug_source_d); } return 0; @@ -121,7 +121,7 @@ extern "C" { fake_main_t * const main = data_make->main; if (!buffer.used) { - fake_print_error(&main->program.error, macro_fake_f(fake_make_get_id_mode)); + fake_print_error(&main->program.error, F_status_debug_source_d); main->setting.state.status = F_status_set_error(F_parameter); @@ -135,7 +135,7 @@ extern "C" { fake_print_error_mode_invalid(&main->program.error, buffer); } else { - fake_print_error(&main->program.error, macro_fake_f(fake_make_get_id_mode)); + fake_print_error(&main->program.error, F_status_debug_source_d); } } else { diff --git a/level_3/fake/c/main/make/load_fakefile.c b/level_3/fake/c/main/make/load_fakefile.c index f04d42255..ee27e92c8 100644 --- a/level_3/fake/c/main/make/load_fakefile.c +++ b/level_3/fake/c/main/make/load_fakefile.c @@ -47,13 +47,13 @@ extern "C" { fll_fss_basic_list_read(data_make->main->buffer, &range, &list_objects, &list_contents, &delimits, 0, &comments, &data_make->main->setting.state); if (F_status_is_error(data_make->main->setting.state.status)) { - fake_print_error_fss(&data_make->main->program.error, macro_fake_f(fll_fss_basic_list_read), macro_fake_f(fll_fss_basic_list_read), data_make->data->file_data_build_fakefile, range, F_true); + fake_print_error_fss(&data_make->main->program.error, F_status_debug_source_d, macro_fake_f(fll_fss_basic_list_read), data_make->data->file_data_build_fakefile, range, F_true); } else { f_fss_apply_delimit(delimits, &data_make->main->buffer, &data_make->main->setting.state); if (F_status_is_error(data_make->main->setting.state.status)) { - fake_print_error(&data_make->main->program.error, macro_fake_f(f_fss_apply_delimit)); + fake_print_error(&data_make->main->program.error, F_status_debug_source_d); } delimits.used = 0; @@ -81,7 +81,7 @@ extern "C" { data_make->main->setting.state.status = f_memory_array_increase_by(list_objects.used, sizeof(f_fss_named_t), (void **) &data_make->fakefile.array, &data_make->fakefile.used, &data_make->fakefile.size); if (F_status_is_error(data_make->main->setting.state.status)) { - fake_print_error(&data_make->main->program.error, macro_fake_f(f_memory_array_resize)); + fake_print_error(&data_make->main->program.error, F_status_debug_source_d); f_fss_set_delete(&settings); f_memory_array_resize(0, sizeof(f_range_t), (void **) &list_objects.array, &list_objects.used, &list_objects.size); @@ -111,7 +111,7 @@ extern "C" { fll_fss_extended_read(data_make->main->buffer, &content_range, &settings.objects, &settings.contents, 0, 0, &delimits, 0, &data_make->main->setting.state); if (F_status_is_error(data_make->main->setting.state.status)) { - fake_print_error_fss(&data_make->main->program.error, macro_fake_f(fll_fss_extended_read), macro_fake_f(fll_fss_extended_read), data_make->data->file_data_build_fakefile, content_range, F_true); + fake_print_error_fss(&data_make->main->program.error, F_status_debug_source_d, macro_fake_f(fll_fss_extended_read), data_make->data->file_data_build_fakefile, content_range, F_true); break; } @@ -119,7 +119,7 @@ extern "C" { f_fss_apply_delimit(delimits, &data_make->main->buffer, &data_make->main->setting.state); if (F_status_is_error(data_make->main->setting.state.status)) { - fake_print_error(&data_make->main->program.error, macro_fake_f(f_fss_apply_delimit)); + fake_print_error(&data_make->main->program.error, F_status_debug_source_d); break; } @@ -152,7 +152,7 @@ extern "C" { fll_fss_extended_read(data_make->main->buffer, &content_range, &data_make->fakefile.array[data_make->fakefile.used].objects, &data_make->fakefile.array[data_make->fakefile.used].contents, 0, &data_make->fakefile.array[data_make->fakefile.used].quotess, &delimits, 0, &data_make->main->setting.state); if (F_status_is_error(data_make->main->setting.state.status)) { - fake_print_error_fss(&data_make->main->program.error, macro_fake_f(fll_fss_extended_read), macro_fake_f(fll_fss_extended_read), data_make->data->file_data_build_fakefile, content_range, F_true); + fake_print_error_fss(&data_make->main->program.error, F_status_debug_source_d, macro_fake_f(fll_fss_extended_read), data_make->data->file_data_build_fakefile, content_range, F_true); break; } @@ -160,7 +160,7 @@ extern "C" { f_fss_apply_delimit(delimits, &data_make->main->buffer, &data_make->main->setting.state); if (F_status_is_error(data_make->main->setting.state.status)) { - fake_print_error(&data_make->main->program.error, macro_fake_f(f_fss_apply_delimit)); + fake_print_error(&data_make->main->program.error, F_status_debug_source_d); break; } @@ -186,31 +186,24 @@ extern "C" { } // Always have the parameter variable "return" map at index 0 and be pre-initialized. - { - f_string_t function_name = macro_fake_f(macro_f_string_map_multis_t_resize); - - data_make->main->setting.state.status = f_memory_arrays_resize(data_make->main->setting.state.step_small, sizeof(f_string_map_multi_t), (void **) &data_make->setting_make.parameter.array, &data_make->setting_make.parameter.used, &data_make->setting_make.parameter.size, &f_string_map_multis_delete_callback); + data_make->main->setting.state.status = f_memory_arrays_resize(data_make->main->setting.state.step_small, sizeof(f_string_map_multi_t), (void **) &data_make->setting_make.parameter.array, &data_make->setting_make.parameter.used, &data_make->setting_make.parameter.size, &f_string_map_multis_delete_callback); - if (F_status_is_error_not(data_make->main->setting.state.status)) { - data_make->setting_make.parameter.used = 1; - - function_name = macro_fake_f(f_string_dynamic_append); - data_make->main->setting.state.status = f_string_dynamic_append(fake_make_setting_return_s, &data_make->setting_make.parameter.array[0].key); - } + if (F_status_is_error_not(data_make->main->setting.state.status)) { + data_make->setting_make.parameter.used = 1; - if (F_status_is_error_not(data_make->main->setting.state.status)) { - function_name = macro_fake_f(f_memory_arrays_resize); + data_make->main->setting.state.status = f_string_dynamic_append(fake_make_setting_return_s, &data_make->setting_make.parameter.array[0].key); + } - data_make->main->setting.state.status = f_memory_arrays_resize(1, sizeof(f_string_dynamic_t), (void **) &data_make->setting_make.parameter.array[0].value.array, &data_make->setting_make.parameter.array[0].value.used, &data_make->setting_make.parameter.array[0].value.size, &f_string_dynamics_delete_callback); - } + if (F_status_is_error_not(data_make->main->setting.state.status)) { + data_make->main->setting.state.status = f_memory_arrays_resize(1, sizeof(f_string_dynamic_t), (void **) &data_make->setting_make.parameter.array[0].value.array, &data_make->setting_make.parameter.array[0].value.used, &data_make->setting_make.parameter.array[0].value.size, &f_string_dynamics_delete_callback); + } - if (F_status_is_error(data_make->main->setting.state.status)) { - fake_print_error(&data_make->main->program.error, function_name); + if (F_status_is_error(data_make->main->setting.state.status)) { + fake_print_error(&data_make->main->program.error, F_status_debug_source_d); - f_fss_set_delete(&settings); + f_fss_set_delete(&settings); - return; - } + return; } f_range_t *range_compiler = 0; @@ -260,7 +253,7 @@ extern "C" { fake_build_load_setting(data_make->data, 0, F_false, &data_make->setting_build); if (F_status_is_error(data_make->main->setting.state.status) && data_make->main->setting.state.status != F_status_set_error(F_interrupt)) { - fake_print_error(&data_make->main->program.error, macro_fake_f(fake_build_load_setting)); + fake_print_error(&data_make->main->program.error, F_status_debug_source_d); } } @@ -285,7 +278,7 @@ extern "C" { if (F_status_is_error(data_make->main->setting.state.status)) { if (F_status_set_fine(data_make->main->setting.state.status) != F_interrupt) { - fake_print_error(&data_make->main->program.error, macro_fake_f(f_string_dynamic_partial_append)); + fake_print_error(&data_make->main->program.error, F_status_debug_source_d); } f_fss_set_delete(&settings); @@ -370,7 +363,7 @@ extern "C" { data_make->main->setting.state.status = fll_fss_snatch_map_apart(data_make->main->buffer, settings->objects, settings->contents, settings_name, 2, settings_value, 0, 0); if (F_status_is_error(data_make->main->setting.state.status)) { - fake_print_error(&data_make->main->program.error, macro_fake_f(fll_fss_snatch_map_apart)); + fake_print_error(&data_make->main->program.error, F_status_debug_source_d); f_memory_arrays_resize(0, sizeof(f_string_map_multi_t), (void **) &define.array, &define.used, &define.size, &f_string_map_multis_delete_callback); @@ -394,7 +387,7 @@ extern "C" { data_make->main->setting.state.status = f_string_dynamic_mash(f_string_space_s, define.array[i].value.array[j], &combined); if (F_status_is_error(data_make->main->setting.state.status)) { - fake_print_error(&data_make->main->program.error, macro_fake_f(f_string_dynamic_mash)); + fake_print_error(&data_make->main->program.error, F_status_debug_source_d); break; } @@ -405,7 +398,7 @@ extern "C" { data_make->main->setting.state.status = f_environment_set(define.array[i].key, combined, F_true); if (F_status_is_error(data_make->main->setting.state.status)) { - fake_print_error(&data_make->main->program.error, macro_fake_f(f_environment_set)); + fake_print_error(&data_make->main->program.error, F_status_debug_source_d); break; } @@ -447,7 +440,7 @@ extern "C" { data_make->main->setting.state.status = f_string_dynamic_partial_append_nulless(data_make->main->buffer, content->array[i], &name_define); if (F_status_is_error(data_make->main->setting.state.status)) { - fake_print_error(&data_make->main->program.error, macro_fake_f(f_string_dynamic_partial_append_nulless)); + fake_print_error(&data_make->main->program.error, F_status_debug_source_d); break; } @@ -462,7 +455,7 @@ extern "C" { data_make->main->setting.state.status = f_memory_array_increase(fake_allocation_small_d, sizeof(f_string_dynamic_t), (void **) &data_make->setting_build.environment.array, &data_make->setting_build.environment.used, &data_make->setting_build.environment.size); if (F_status_is_error(data_make->main->setting.state.status)) { - fake_print_error(&data_make->main->program.error, macro_fake_f(f_memory_array_increase)); + fake_print_error(&data_make->main->program.error, F_status_debug_source_d); break; } @@ -472,7 +465,7 @@ extern "C" { data_make->main->setting.state.status = f_memory_array_increase_by(name_define.used + 1, sizeof(f_char_t), (void **) &data_make->setting_build.environment.array[j].string, &data_make->setting_build.environment.array[j].used, &data_make->setting_build.environment.array[j].size); if (F_status_is_error(data_make->main->setting.state.status)) { - fake_print_error(&data_make->main->program.error, macro_fake_f(f_memory_array_increase_by)); + fake_print_error(&data_make->main->program.error, F_status_debug_source_d); break; } @@ -480,7 +473,7 @@ extern "C" { data_make->main->setting.state.status = f_string_dynamic_append_nulless(name_define, &data_make->setting_build.environment.array[j]); if (F_status_is_error(data_make->main->setting.state.status)) { - fake_print_error(&data_make->main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&data_make->main->program.error, F_status_debug_source_d); break; } @@ -495,7 +488,7 @@ extern "C" { data_make->main->setting.state.status = f_string_dynamic_append_nulless(name_define, &data_make->setting_build.environment.array[j]); if (F_status_is_error(data_make->main->setting.state.status)) { - fake_print_error(&data_make->main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&data_make->main->program.error, F_status_debug_source_d); break; } @@ -580,7 +573,7 @@ extern "C" { data_make->main->setting.state.status = f_string_dynamic_partial_append_nulless(data_make->main->buffer, content->array[i], &data_make->setting_make.parameter.array[0].value.array[0]); if (F_status_is_error(data_make->main->setting.state.status)) { - fake_print_error(&data_make->main->program.error, macro_fake_f(f_string_dynamic_partial_append_nulless)); + fake_print_error(&data_make->main->program.error, F_status_debug_source_d); break; } @@ -588,7 +581,7 @@ extern "C" { data_make->main->setting.state.status = f_string_dynamic_append_assure(f_string_space_s, &data_make->setting_make.parameter.array[0].value.array[0]); if (F_status_is_error(data_make->main->setting.state.status)) { - fake_print_error(&data_make->main->program.error, macro_fake_f(f_string_dynamic_append_assure)); + fake_print_error(&data_make->main->program.error, F_status_debug_source_d); break; } @@ -636,7 +629,7 @@ extern "C" { data_make->main->setting.state.status = f_string_dynamic_partial_append_nulless(data_make->main->buffer, content->array[content->used - 1], &data_make->setting_make.stage); if (F_status_is_error(data_make->main->setting.state.status)) { - fake_print_error(&data_make->main->program.error, macro_fake_f(f_string_dynamic_partial_append_nulless)); + fake_print_error(&data_make->main->program.error, F_status_debug_source_d); return; } diff --git a/level_3/fake/c/main/make/load_parameters.c b/level_3/fake/c/main/make/load_parameters.c index dccbbb20f..a9a0dbd80 100644 --- a/level_3/fake/c/main/make/load_parameters.c +++ b/level_3/fake/c/main/make/load_parameters.c @@ -20,7 +20,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_memory_array_increase_by)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -67,7 +67,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -84,7 +84,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_memory_array_increase_by)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -143,7 +143,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -195,7 +195,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(fake_allocation_small_d, sizeof(f_string_dynamic_t), (void **) &destination[i]->array, &destination[i]->used, &destination[i]->size); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_memory_array_increase_by)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -208,7 +208,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_memory_array_increase)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -229,7 +229,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -240,7 +240,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(fake_allocation_small_d, sizeof(f_string_dynamic_t), (void **) &destination[i]->array, &destination[i]->used, &destination[i]->size); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_memory_array_increase_by)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -252,7 +252,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -350,7 +350,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(fake_allocation_small_d, sizeof(f_string_dynamic_t), (void **) &destination[i]->array, &destination[i]->used, &destination[i]->size); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_memory_array_increase_by)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -363,7 +363,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_memory_array_increase)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -384,7 +384,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -395,7 +395,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(fake_allocation_small_d, sizeof(f_string_dynamic_t), (void **) &destination[i]->array, &destination[i]->used, &destination[i]->size); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_memory_array_increase_by)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -407,7 +407,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } diff --git a/level_3/fake/c/main/make/operate.c b/level_3/fake/c/main/make/operate.c index bc902c0f5..5c4f5adef 100644 --- a/level_3/fake/c/main/make/operate.c +++ b/level_3/fake/c/main/make/operate.c @@ -23,7 +23,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase(main->setting.state.step_small, sizeof(f_string_dynamic_t), (void **) &data_make.path.stack.array, &data_make.path.stack.used, &data_make.path.stack.size); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&data_make.main->program.error, macro_fake_f(f_memory_array_increase)); + fake_print_error(&data_make.main->program.error, F_status_debug_source_d); return; } @@ -31,7 +31,7 @@ extern "C" { main->setting.state.status = f_path_current(F_true, &data_make.path.stack.array[0]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&data_make.main->program.error, macro_fake_f(f_path_current)); + fake_print_error(&data_make.main->program.error, F_status_debug_source_d); fake_make_data_delete(&data_make); @@ -41,7 +41,7 @@ extern "C" { main->setting.state.status = f_directory_open(data_make.path.stack.array[0], F_false, &data_make.path.top.id); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&data_make.main->program.error, macro_fake_f(f_directory_open)); + fake_print_error(&data_make.main->program.error, F_status_debug_source_d); fake_make_data_delete(&data_make); @@ -229,7 +229,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(content.used, sizeof(f_string_dynamic_t), (void **) &main->cache_arguments.array, &main->cache_arguments.used, &main->cache_arguments.size); if (F_status_is_error(main->setting.state.status) || main->setting.state.status == F_string_too_large) { - fake_print_error(&main->program.error, macro_fake_f(f_memory_array_increase_by)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -356,7 +356,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase(main->setting.state.step_small, sizeof(f_string_dynamic_t), (void **) &main->cache_arguments.array, &main->cache_arguments.used, &main->cache_arguments.size); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_memory_array_increase)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -375,7 +375,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase(main->setting.state.step_small, sizeof(f_string_dynamic_t), (void **) &main->cache_arguments.array, &main->cache_arguments.used, &main->cache_arguments.size); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_memory_array_increase)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -392,7 +392,7 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) { if (F_status_set_fine(main->setting.state.status) != F_interrupt) { - fake_print_error(&main->program.error, macro_fake_f(fl_iki_read)); + fake_print_error(&main->program.error, F_status_debug_source_d); } break; @@ -413,7 +413,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_partial_append_nulless(main->buffer, range, &main->cache_arguments.array[main->cache_arguments.used]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_partial_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -449,7 +449,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_compare_dynamic_partial)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -464,7 +464,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_nulless(data_make->setting_make.parameter.array[0].value.array[0], &main->cache_arguments.array[main->cache_arguments.used]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -473,7 +473,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append(f_string_ascii_0_s, &main->cache_arguments.array[main->cache_arguments.used]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -487,7 +487,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(data_make->path.stack.array[0].used + f_path_separator_s.used + 1, sizeof(f_char_t), (void **) &main->cache_arguments.array[main->cache_arguments.used].string, &main->cache_arguments.array[main->cache_arguments.used].used, &main->cache_arguments.array[main->cache_arguments.used].size); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_memory_array_increase_by)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -495,7 +495,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append(data_make->path.stack.array[0], &main->cache_arguments.array[main->cache_arguments.used]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -504,7 +504,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_assure(f_path_separator_s, &main->cache_arguments.array[main->cache_arguments.used]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_assure)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -518,7 +518,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(data_make->path.stack.array[data_make->path.stack.used - 1].used + f_path_separator_s.used + 1, sizeof(f_char_t), (void **) &main->cache_arguments.array[main->cache_arguments.used].string, &main->cache_arguments.array[main->cache_arguments.used].used, &main->cache_arguments.array[main->cache_arguments.used].size); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_memory_array_increase_by)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -526,7 +526,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append(data_make->path.stack.array[data_make->path.stack.used - 1], &main->cache_arguments.array[main->cache_arguments.used]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -535,7 +535,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_assure(f_path_separator_s, &main->cache_arguments.array[main->cache_arguments.used]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_assure)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -569,7 +569,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(l + f_string_space_s.used + 1, sizeof(f_char_t), (void **) &main->cache_arguments.array[main->cache_arguments.used].string, &main->cache_arguments.array[main->cache_arguments.used].used, &main->cache_arguments.array[main->cache_arguments.used].size); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_memory_array_increase_by)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -582,7 +582,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append(f_string_space_s, &main->cache_arguments.array[main->cache_arguments.used]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -591,7 +591,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_nulless(reserved_value[k]->array[l], &main->cache_arguments.array[main->cache_arguments.used]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -614,7 +614,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase(main->setting.state.step_small, sizeof(f_string_dynamic_t), (void **) &main->cache_arguments.array, &main->cache_arguments.used, &main->cache_arguments.size); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_memory_array_increase)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -625,7 +625,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_nulless(reserved_value[k]->array[l], &main->cache_arguments.array[main->cache_arguments.used]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -667,7 +667,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(l + f_string_space_s.used + 1, sizeof(f_char_t), (void **) &main->cache_arguments.array[main->cache_arguments.used].string, &main->cache_arguments.array[main->cache_arguments.used].used, &main->cache_arguments.array[main->cache_arguments.used].size); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_memory_array_increase_by)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -682,7 +682,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append(f_string_space_s, &main->cache_arguments.array[main->cache_arguments.used]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -695,7 +695,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase(main->setting.state.step_small, sizeof(f_string_dynamic_t), (void **) &main->cache_arguments.array, &main->cache_arguments.used, &main->cache_arguments.size); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_memory_array_increase)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -707,7 +707,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_nulless(parameter->array[k].value.array[l], &main->cache_arguments.array[main->cache_arguments.used]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -728,7 +728,7 @@ extern "C" { fake_make_operate_expand_build(data_make, quotes.array[i], iki_data->content.array[j]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fake_make_operate_expand_build)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -742,7 +742,7 @@ extern "C" { fake_make_operate_expand_environment(data_make, quotes.array[i], iki_data->content.array[j]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fake_make_operate_expand_environment)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -755,7 +755,7 @@ extern "C" { fake_make_operate_expand_context(data_make, quotes.array[i], iki_data->content.array[j]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fake_make_operate_expand_context)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -772,7 +772,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_partial_append_nulless(main->buffer, range, &main->cache_arguments.array[main->cache_arguments.used]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_partial_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -790,7 +790,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_partial_append_nulless(main->buffer, range, &main->cache_arguments.array[main->cache_arguments.used]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_partial_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -802,7 +802,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase(main->setting.state.step_small, sizeof(f_string_dynamic_t), (void **) &main->cache_arguments.array, &main->cache_arguments.used, &main->cache_arguments.size); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_memory_array_increase)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -814,7 +814,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_partial_append_nulless(main->buffer, content.array[i], &main->cache_arguments.array[main->cache_arguments.used]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_partial_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -824,7 +824,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase(main->setting.state.step_small, sizeof(f_string_dynamic_t), (void **) &main->cache_arguments.array, &main->cache_arguments.used, &main->cache_arguments.size); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_memory_array_increase)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -1313,7 +1313,7 @@ extern "C" { if (id_section >= data_make->fakefile.used) { main->setting.state.status = F_status_set_error(F_parameter); - fake_print_error(&data_make->error, macro_fake_f(fake_make_operate_section)); + fake_print_error(&data_make->error, F_status_debug_source_d); return 0; } @@ -1322,7 +1322,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase(main->setting.state.step_small, sizeof(f_number_unsigned_t), (void **) §ion_stack->array, §ion_stack->used, §ion_stack->size); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&data_make->error, macro_fake_f(f_memory_array_increase)); + fake_print_error(&data_make->error, F_status_debug_source_d); return 0; } diff --git a/level_3/fake/c/main/make/operate_process.c b/level_3/fake/c/main/make/operate_process.c index 5cb7aef29..fd6a10a56 100644 --- a/level_3/fake/c/main/make/operate_process.c +++ b/level_3/fake/c/main/make/operate_process.c @@ -305,7 +305,7 @@ extern "C" { main->setting.state.status = fl_environment_load_names(data_make->setting_build.environment, &data_make->environment); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fl_environment_load_names)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -314,7 +314,7 @@ extern "C" { main->setting.state.status = f_environment_get_all(&data_make->environment); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_environment_get_all)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -342,7 +342,7 @@ extern "C" { fake_make_print_error_program_not_found(&main->program.error, program); } else if (F_status_set_fine(main->setting.state.status) != F_failure) { - fake_print_error(&main->program.error, macro_fake_f(fll_execute_program)); + fake_print_error(&main->program.error, F_status_debug_source_d); } } @@ -369,7 +369,7 @@ extern "C" { main->setting.state.status = f_conversion_number_signed_to_string(WEXITSTATUS(return_code), f_conversion_data_base_10_c, &number); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_conversion_number_signed_to_string)); + fake_print_error(&main->program.error, F_status_debug_source_d); f_memory_array_resize(0, sizeof(f_char_t), (void **) &number.string, &number.used, &number.size); @@ -381,7 +381,7 @@ extern "C" { f_memory_array_resize(0, sizeof(f_char_t), (void **) &number.string, &number.used, &number.size); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -401,7 +401,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fll_error_print(&data_make->error, F_status_set_fine(main->setting.state.status), macro_fake_f(f_string_dynamic_append), F_true); + fll_error_print(&data_make->error, F_status_set_fine(main->setting.state.status), F_status_debug_source_d, F_true); } else { main->setting.state.status = F_okay; diff --git a/level_3/fake/c/main/make/operate_process_type.c b/level_3/fake/c/main/make/operate_process_type.c index 931052680..3a7857da5 100644 --- a/level_3/fake/c/main/make/operate_process_type.c +++ b/level_3/fake/c/main/make/operate_process_type.c @@ -229,7 +229,6 @@ extern "C" { fake_string_dynamic_reset(&main->cache_map.key); fake_string_dynamic_reset(&main->cache_map.value); - uint8_t func = 0; uint8_t existing = F_true; uint8_t type = fll_error_file_type_path_e; f_number_unsigned_t i = 0; @@ -260,12 +259,10 @@ extern "C" { fake_string_dynamic_reset(&main->cache_map.key); fake_string_dynamic_reset(&main->cache_map.value); - func = 0; operation = f_file_operation_process_s; main->setting.state.status = f_memory_array_increase_by(main->cache_arguments.array[i].used + 1, sizeof(f_char_t), (void **) &main->cache_map.key.string, &main->cache_map.key.used, &main->cache_map.key.size); if (F_status_is_error_not(main->setting.state.status)) { - func = 1; main->setting.state.status = f_string_dynamic_append_nulless(main->cache_arguments.array[i], &main->cache_map.key); } @@ -278,92 +275,97 @@ extern "C" { } if (F_status_is_error_not(main->setting.state.status) && existing) { - func = 2; main->setting.state.status = f_string_dynamic_append_assure(f_path_separator_s, &main->cache_map.value); } if (F_status_is_error_not(main->setting.state.status) && existing) { - func = 3; main->setting.state.status = f_string_dynamic_terminate_after(&main->cache_map.key); } if (F_status_is_error_not(main->setting.state.status) && existing) { - func = 4; main->setting.state.status = f_file_name_base(main->cache_arguments.array[i], &main->cache_map.value); } - if (F_status_is_error_not(main->setting.state.status)) { - func = 5; + if (F_status_is_error(main->setting.state.status)) { + fake_print_error_file( + &main->program.error, + F_status_debug_source_d, + main->cache_arguments.used + ? main->cache_arguments.array[1] + : f_string_empty_s, + operation, + type + ); + } + else { operation = f_file_operation_identify_s; type = fll_error_file_type_directory_e; main->setting.state.status = f_directory_is(main->cache_arguments.array[i]); if (main->setting.state.status == F_true) { - func = 6; operation = clone ? f_file_operation_clone_s : f_file_operation_copy_s; fl_directory_do(main->cache_arguments.array[i], &main->cache_recurse_do); if (F_status_is_error(main->cache_recurse_do.state.status)) { main->setting.state.status = main->cache_recurse_do.state.status; + + fake_print_error_file( + &main->program.error, + F_status_debug_source_d, + main->cache_arguments.used + ? main->cache_arguments.array[1] + : f_string_empty_s, + operation, + type + ); } } else if (main->setting.state.status == F_false) { type = fll_error_file_type_file_e; if (clone) { - func = 7; operation = f_file_operation_clone_s; main->setting.state.status = f_file_clone(main->cache_arguments.array[i], main->cache_map.value, F_file_default_size_write_d, f_file_stat_flag_group_e | f_file_stat_flag_owner_e | (f_directory_recurse_do_flag_dereference_d ? 0 : f_file_stat_flag_reference_e)); } else { - func = 8; operation = f_file_operation_copy_s; main->setting.state.status = f_file_copy(main->cache_arguments.array[i], main->cache_map.value, main->cache_recurse_do.mode, F_file_default_size_write_d, f_directory_recurse_do_flag_dereference_d ? 0 : f_file_stat_flag_reference_e); } - if (F_status_is_error_not(main->cache_recurse_do.state.status)) { + if (F_status_is_error(main->cache_recurse_do.state.status)) { + fake_print_error_file( + &main->program.error, + F_status_debug_source_d, + main->cache_arguments.used + ? main->cache_arguments.array[1] + : f_string_empty_s, + operation, + type + ); + } + else { fake_make_print_verbose_operate_copy(&main->program.message, clone, main->cache_arguments.array[i], main->cache_map.value); } } + else if (F_status_is_error(main->setting.state.status)) { + fake_print_error_file( + &main->program.error, + F_status_debug_source_d, + main->cache_arguments.used + ? main->cache_arguments.array[1] + : f_string_empty_s, + operation, + type + ); + } } } // for - if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file( - &main->program.error, - !func - ? macro_fake_f(f_memory_array_increase_by) - : func == 1 - ? macro_fake_f(f_string_dynamic_append_nulless) - : func == 2 - ? macro_fake_f(f_string_dynamic_append_assure) - : func == 3 - ? macro_fake_f(f_string_dynamic_terminate_after) - : func == 4 - ? macro_fake_f(f_file_name_base) - : func == 5 - ? macro_fake_f(f_directory_is) - : func == 6 - ? macro_fake_f(fl_directory_do) - : func == 7 - ? macro_fake_f(f_file_clone) - : macro_fake_f(f_file_copy), - main->cache_arguments.used - ? main->cache_arguments.array[1] - : f_string_empty_s, - operation, - type - ); - - main->setting.state.status = F_status_set_error(F_failure); - } - else { - main->setting.state.status = F_okay; - } + main->setting.state.status = F_status_is_error(main->setting.state.status) ? F_status_set_error(F_failure) : F_okay; } #endif // _di_fake_make_operate_process_type_copy_ @@ -382,7 +384,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_environment_set)); + fake_print_error(&main->program.error, F_status_debug_source_d); } else { fake_make_print_verbose_operate_define(&main->program.message, main->cache_arguments.array[0]); @@ -417,7 +419,7 @@ extern "C" { main->setting.state.status = F_okay; } else { - fake_print_error_file(&main->program.error, macro_fake_f(f_file_stat), main->cache_arguments.array[i], f_file_operation_delete_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[i], f_file_operation_delete_s, fll_error_file_type_file_e); main->setting.state.status = F_status_set_error(F_failure); @@ -439,7 +441,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file(&main->program.error, macro_fake_f(f_directory_remove), main->cache_arguments.array[i], f_file_operation_delete_s, fll_error_file_type_directory_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[i], f_file_operation_delete_s, fll_error_file_type_directory_e); main->setting.state.status = F_status_set_error(F_failure); @@ -458,7 +460,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file(&main->program.error, macro_fake_f(f_file_remove), main->cache_arguments.array[i], f_file_operation_delete_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[i], f_file_operation_delete_s, fll_error_file_type_file_e); main->setting.state.status = F_status_set_error(F_failure); @@ -574,7 +576,7 @@ extern "C" { fake_make_assure_inside_project(data_make, main->cache_arguments.array[i]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_operation_path_outside(&data_make->error, macro_fake_f(fake_make_assure_inside_project), main->cache_argument.used ? main->cache_argument : main->cache_arguments.array[i]); + fake_print_error_operation_path_outside(&data_make->error, F_status_debug_source_d, main->cache_argument.used ? main->cache_argument : main->cache_arguments.array[i]); continue; } @@ -587,7 +589,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file(&main->program.error, all ? macro_fake_f(fll_file_role_change_all) : macro_fake_f(f_file_role_change), main->cache_arguments.array[i], f_file_operation_change_group_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[i], f_file_operation_change_group_s, fll_error_file_type_file_e); main->setting.state.status = F_status_set_error(F_failure); @@ -673,7 +675,7 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) { state_process->condition_result = fake_condition_result_error_e; - fake_print_error_file(&main->program.error, macro_fake_f(f_file_exists), main->cache_arguments.array[i], f_file_operation_find_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[i], f_file_operation_find_s, fll_error_file_type_file_e); main->setting.state.status = F_status_set_error(F_failure); @@ -779,7 +781,7 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) { state_process->condition_result = fake_condition_result_error_e; - fake_print_error_file(&main->program.error, macro_fake_f(f_file_mode_read), main->cache_arguments.array[i], f_file_operation_get_type_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[i], f_file_operation_get_type_s, fll_error_file_type_file_e); main->setting.state.status = F_status_set_error(F_failure); @@ -999,7 +1001,7 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) { state_process->condition_result = fake_condition_result_error_e; - fake_print_error(&main->program.error, macro_fake_f(fake_make_get_id)); + fake_print_error(&main->program.error, F_status_debug_source_d); main->setting.state.status = F_status_set_error(F_failure); @@ -1015,7 +1017,7 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) { state_process->condition_result = fake_condition_result_error_e; - fake_print_error_file(&main->program.error, macro_fake_f(f_file_group_read), main->cache_arguments.array[i], f_file_operation_get_group_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[i], f_file_operation_get_group_s, fll_error_file_type_file_e); main->setting.state.status = F_status_set_error(F_failure); @@ -1065,7 +1067,7 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) { state_process->condition_result = fake_condition_result_error_e; - fake_print_error(&main->program.error, macro_fake_f(fake_make_get_id_mode)); + fake_print_error(&main->program.error, F_status_debug_source_d); main->setting.state.status = F_status_set_error(F_failure); @@ -1077,7 +1079,7 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) { state_process->condition_result = fake_condition_result_error_e; - fake_print_error(&main->program.error, macro_fake_f(f_file_mode_to_mode)); + fake_print_error(&main->program.error, F_status_debug_source_d); main->setting.state.status = F_status_set_error(F_failure); @@ -1096,7 +1098,7 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) { state_process->condition_result = fake_condition_result_error_e; - fake_print_error_file(&main->program.error, macro_fake_f(f_file_mode_read), main->cache_arguments.array[i], f_file_operation_get_mode_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[i], f_file_operation_get_mode_s, fll_error_file_type_file_e); main->setting.state.status = F_status_set_error(F_failure); @@ -1164,7 +1166,7 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) { state_process->condition_result = fake_condition_result_error_e; - fake_print_error(&main->program.error, macro_fake_f(fake_make_get_id)); + fake_print_error(&main->program.error, F_status_debug_source_d); main->setting.state.status = F_status_set_error(F_failure); @@ -1180,7 +1182,7 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) { state_process->condition_result = fake_condition_result_error_e; - fake_print_error_file(&main->program.error, macro_fake_f(f_file_owner_read), main->cache_arguments.array[i], f_file_operation_get_owner_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[i], f_file_operation_get_owner_s, fll_error_file_type_file_e); main->setting.state.status = F_status_set_error(F_failure); @@ -1398,7 +1400,7 @@ extern "C" { main->setting.state.status = f_directory_remove(main->cache_arguments.array[main->cache_arguments.used - 1], F_directory_max_descriptors_d, F_false); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file(&main->program.error, macro_fake_f(f_directory_remove), main->cache_arguments.array[main->cache_arguments.used - 1], f_file_operation_delete_s, fll_error_file_type_directory_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[main->cache_arguments.used - 1], f_file_operation_delete_s, fll_error_file_type_directory_e); main->setting.state.status = F_status_set_error(F_failure); @@ -1409,7 +1411,7 @@ extern "C" { main->setting.state.status = f_file_remove(main->cache_arguments.array[main->cache_arguments.used - 1]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file(&main->program.error, macro_fake_f(f_file_remove), main->cache_arguments.array[main->cache_arguments.used - 1], f_file_operation_delete_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[main->cache_arguments.used - 1], f_file_operation_delete_s, fll_error_file_type_file_e); main->setting.state.status = F_status_set_error(F_failure); @@ -1421,7 +1423,7 @@ extern "C" { main->setting.state.status = f_file_link(main->cache_arguments.array[0], main->cache_arguments.array[main->cache_arguments.used - 1]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file(&main->program.error, macro_fake_f(f_file_link), main->cache_arguments.array[main->cache_arguments.used - 1], f_file_operation_link_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[main->cache_arguments.used - 1], f_file_operation_link_s, fll_error_file_type_file_e); main->setting.state.status = F_status_set_error(F_failure); @@ -1449,7 +1451,7 @@ extern "C" { fake_make_get_id_mode(data_make, main->cache_arguments.array[0], &mode_rule, &replace); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fake_make_get_id_mode)); + fake_print_error(&main->program.error, F_status_debug_source_d); main->setting.state.status = F_status_set_error(F_failure); @@ -1464,7 +1466,7 @@ extern "C" { main->setting.state.status = f_file_mode_read(main->cache_arguments.array[i], F_true, &mode_file); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file(&main->program.error, macro_fake_f(f_file_mode_read), main->cache_arguments.array[i], f_file_operation_change_group_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[i], f_file_operation_change_group_s, fll_error_file_type_file_e); main->setting.state.status = F_status_set_error(F_failure); @@ -1474,7 +1476,7 @@ extern "C" { main->setting.state.status = f_file_mode_determine(mode_file, mode_rule, replace, macro_f_file_type_is_directory(mode_file), &mode); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file(&main->program.error, macro_fake_f(f_file_mode_determine), main->cache_arguments.array[i], f_file_operation_change_group_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[i], f_file_operation_change_group_s, fll_error_file_type_file_e); main->setting.state.status = F_status_set_error(F_failure); @@ -1489,7 +1491,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file(&main->program.error, all ? macro_fake_f(fll_file_mode_set_all) : macro_fake_f(f_file_mode_set), main->cache_arguments.array[i], f_file_operation_change_group_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[i], f_file_operation_change_group_s, fll_error_file_type_file_e); main->setting.state.status = F_status_set_error(F_failure); @@ -1519,7 +1521,7 @@ extern "C" { main->setting.state.status = f_directory_is(main->cache_arguments.array[1]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file(&main->program.error, macro_fake_f(f_directory_is), main->cache_arguments.array[1], f_file_operation_identify_s, fll_error_file_type_directory_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[1], f_file_operation_identify_s, fll_error_file_type_directory_e); main->setting.state.status = F_status_set_error(F_failure); @@ -1531,10 +1533,6 @@ extern "C" { } } - const f_string_t *function = 0; - const f_string_static_t *operation = 0; - f_string_static_t *file = 0; - for (f_number_unsigned_t i = 0; i < total; ++i) { fake_string_dynamic_reset(&main->cache_argument); @@ -1542,9 +1540,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_nulless(main->cache_arguments.array[total], &main->cache_argument); if (F_status_is_error(main->setting.state.status)) { - function = ¯o_fake_f(f_string_dynamic_append_nulless); - operation = &f_file_operation_process_s; - file = &main->cache_arguments.array[i]; + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_argument, f_file_operation_process_s, fll_error_file_type_path_e); break; } @@ -1553,9 +1549,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_assure(f_path_separator_s, &main->cache_argument); if (F_status_is_error(main->setting.state.status)) { - function = ¯o_fake_f(f_string_dynamic_append_assure); - operation = &f_file_operation_process_s; - file = &main->cache_arguments.array[i]; + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_argument, f_file_operation_process_s, fll_error_file_type_path_e); break; } @@ -1563,9 +1557,7 @@ extern "C" { main->setting.state.status = f_file_name_base(main->cache_arguments.array[i], &main->cache_argument); if (F_status_is_error(main->setting.state.status)) { - function = ¯o_fake_f(f_file_name_base); - operation = &f_file_operation_process_s; - file = &main->cache_arguments.array[i]; + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_argument, f_file_operation_process_s, fll_error_file_type_path_e); return; } @@ -1576,17 +1568,13 @@ extern "C" { main->setting.state.status = f_file_rename(main->cache_arguments.array[i], main->cache_argument); if (F_status_is_error(main->setting.state.status)) { - function = ¯o_fake_f(f_file_rename); - operation = &f_file_operation_move_s; - file = &main->cache_argument; + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_argument, f_file_operation_move_s, fll_error_file_type_path_e); break; } } // for if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file(&main->program.error, *function, *file, *operation, fll_error_file_type_path_e); - main->setting.state.status = F_status_set_error(F_failure); } else { @@ -1646,7 +1634,7 @@ extern "C" { id = (f_uid_t) fake_make_get_id(data_make, F_true, main->cache_arguments.array[i++]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fake_make_get_id)); + fake_print_error(&main->program.error, F_status_debug_source_d); main->setting.state.status = F_status_set_error(F_failure); @@ -1658,7 +1646,7 @@ extern "C" { fake_make_assure_inside_project(data_make, main->cache_arguments.array[i]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_operation_path_outside(&data_make->error, macro_fake_f(fake_make_assure_inside_project), main->cache_argument.used ? main->cache_argument : main->cache_arguments.array[i]); + fake_print_error_operation_path_outside(&data_make->error, F_status_debug_source_d, main->cache_argument.used ? main->cache_argument : main->cache_arguments.array[i]); continue; } @@ -1671,7 +1659,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file(&main->program.error, all ? macro_fake_f(fll_file_role_change_all) : macro_fake_f(f_file_role_change), main->cache_arguments.array[i], f_file_operation_change_owner_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[i], f_file_operation_change_owner_s, fll_error_file_type_file_e); main->setting.state.status = F_status_set_error(F_failure); @@ -1710,7 +1698,7 @@ extern "C" { main->setting.state.status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &data_make->setting_make.parameter.array[i].value.array[j].string, &data_make->setting_make.parameter.array[i].value.array[j].used, &data_make->setting_make.parameter.array[i].value.array[j].size); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_memory_array_resize)); + fake_print_error(&main->program.error, F_status_debug_source_d); main->setting.state.status = F_status_set_error(F_failure); @@ -1722,7 +1710,7 @@ extern "C" { main->setting.state.status = f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &data_make->setting_make.parameter.array[i].value.array, &data_make->setting_make.parameter.array[i].value.used, &data_make->setting_make.parameter.array[i].value.size, &f_string_dynamics_delete_callback); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_memory_array_resize)); + fake_print_error(&main->program.error, F_status_debug_source_d); main->setting.state.status = F_status_set_error(F_failure); } @@ -1732,7 +1720,7 @@ extern "C" { main->setting.state.status = f_memory_arrays_resize(fake_allocation_small_d, sizeof(f_string_map_multi_t), (void **) &data_make->setting_make.parameter.array, &data_make->setting_make.parameter.used, &data_make->setting_make.parameter.size, &f_string_map_multis_delete_callback); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_memory_arrays_resize)); + fake_print_error(&main->program.error, F_status_debug_source_d); main->setting.state.status = F_status_set_error(F_failure); @@ -1742,7 +1730,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_nulless(main->cache_arguments.array[0], &data_make->setting_make.parameter.array[data_make->setting_make.parameter.used].key); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); main->setting.state.status = F_status_set_error(F_failure); @@ -1758,7 +1746,7 @@ extern "C" { main->setting.state.status = f_memory_arrays_resize(main->cache_arguments.used - 1, sizeof(f_string_dynamic_t), (void **) &data_make->setting_make.parameter.array[i].value.array, &data_make->setting_make.parameter.array[i].value.used, &data_make->setting_make.parameter.array[i].value.size, &f_string_dynamics_delete_callback); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_memory_arrays_resize)); + fake_print_error(&main->program.error, F_status_debug_source_d); main->setting.state.status = F_status_set_error(F_failure); @@ -1770,7 +1758,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_nulless(main->cache_arguments.array[j + 1], &data_make->setting_make.parameter.array[i].value.array[j]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); main->setting.state.status = F_status_set_error(F_failure); } @@ -1799,7 +1787,7 @@ extern "C" { main->setting.state.status = f_path_change(*argument); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_operation_path_stack_max(&data_make->error, macro_fake_f(f_path_change), macro_fake_f(f_path_change), *argument); + fake_print_error_operation_path_stack_max(&data_make->error, F_status_debug_source_d, macro_fake_f(f_path_change), *argument); main->setting.state.status = F_status_set_error(F_failure); @@ -1811,7 +1799,7 @@ extern "C" { // The created relative path is for verbosity purposes and as such its failure to be processed should not be treated as a failure of the function. if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fake_make_path_relative)); + fake_print_error(&main->program.error, F_status_debug_source_d); fake_make_print_verbose_operate_set_path(&main->program.message, *argument); @@ -1850,7 +1838,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(total, sizeof(f_char_t), (void **) &main->cache_1.string, &main->cache_1.used, &main->cache_1.size); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_file_stream_open)); + fake_print_error(&main->program.error, F_status_debug_source_d); main->setting.state.status = F_status_set_error(F_failure); @@ -1864,7 +1852,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append(f_string_space_s, &main->cache_1); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append)); + fake_print_error(&main->program.error, F_status_debug_source_d); main->setting.state.status = F_status_set_error(F_failure); @@ -1875,7 +1863,7 @@ extern "C" { fake_make_operate_process_buffer_escape(data_make, main->cache_arguments.array[i], &main->cache_1); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_file_stream_open)); + fake_print_error(&main->program.error, F_status_debug_source_d); main->setting.state.status = F_status_set_error(F_failure); @@ -1919,7 +1907,7 @@ extern "C" { fake_make_assure_inside_project(data_make, main->cache_arguments.array[0]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_operation_path_outside(&data_make->error, macro_fake_f(fake_make_assure_inside_project), main->cache_argument.used ? main->cache_argument : main->cache_arguments.array[0]); + fake_print_error_operation_path_outside(&data_make->error, F_status_debug_source_d, main->cache_argument.used ? main->cache_argument : main->cache_arguments.array[0]); if (F_status_set_fine(main->setting.state.status) == F_false) { main->setting.state.status = F_status_set_error(F_failure); @@ -1933,21 +1921,21 @@ extern "C" { main->setting.state.status = f_path_change(main->cache_arguments.array[0]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_operation_path_stack_max(&data_make->error, macro_fake_f(f_path_change), macro_fake_f(f_path_change), main->cache_arguments.array[0]); + fake_print_error_operation_path_stack_max(&data_make->error, F_status_debug_source_d, macro_fake_f(f_path_change), main->cache_arguments.array[0]); } else { main->setting.state.status = f_memory_array_increase_by(fake_allocation_small_d, sizeof(f_string_dynamic_t), (void **) &data_make->path.stack.array, &data_make->path.stack.used, &data_make->path.stack.size); if (F_status_is_error(main->setting.state.status)) { if (F_status_set_fine(main->setting.state.status) == F_array_too_large) { - fake_print_error_operation_path_stack_max(&data_make->error, macro_fake_f(f_memory_array_increase_by), macro_fake_f(f_memory_array_increase_by), fake_common_file_path_stack_s); + fake_print_error_operation_path_stack_max(&data_make->error, F_status_debug_source_d, macro_fake_f(f_memory_array_increase_by), fake_common_file_path_stack_s); main->setting.state.status = F_status_set_error(F_failure); return; } - fake_print_error(&main->program.error, macro_fake_f(f_memory_array_increase_by)); + fake_print_error(&main->program.error, F_status_debug_source_d); main->setting.state.status = F_status_set_error(F_failure); @@ -1960,7 +1948,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_nulless(main->cache_argument, &data_make->path.stack.array[data_make->path.stack.used]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_nulless)); + fake_print_error(&main->program.error, F_status_debug_source_d); main->setting.state.status = F_status_set_error(F_failure); @@ -1972,7 +1960,7 @@ extern "C" { // The created relative path is for verbosity purposes and as such its failure to be processed should not be treated as a failure of the function. if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fake_make_path_relative)); + fake_print_error(&main->program.error, F_status_debug_source_d); fake_make_print_verbose_operate_set_path(&main->program.message, data_make->path.stack.array[data_make->path.stack.used]); } @@ -1999,7 +1987,7 @@ extern "C" { main->setting.state.status = f_path_change_at(data_make->path.top.id); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_operation_path_stack_max(&data_make->error, macro_fake_f(f_path_change), macro_fake_f(f_path_change), main->cache_arguments.array[0]); + fake_print_error_operation_path_stack_max(&data_make->error, F_status_debug_source_d, macro_fake_f(f_path_change), main->cache_arguments.array[0]); main->setting.state.status = F_status_set_error(F_failure); @@ -2038,10 +2026,10 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) { if (F_status_is_error_not(fl_path_canonical(main->cache_arguments.array[i], &main->cache_argument))) { - fake_print_error_file(&main->program.error, macro_fake_f(f_file_touch), main->cache_argument, f_file_operation_touch_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_argument, f_file_operation_touch_s, fll_error_file_type_file_e); } else { - fake_print_error_file(&main->program.error, macro_fake_f(f_file_touch), main->cache_arguments.array[i], f_file_operation_touch_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[i], f_file_operation_touch_s, fll_error_file_type_file_e); } main->setting.state.status = F_status_set_error(F_failure); @@ -2054,10 +2042,10 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) { if (F_status_is_error_not(fl_path_canonical(main->cache_arguments.array[i], &main->cache_argument))) { - fake_print_error_file(&main->program.error, macro_fake_f(f_directory_touch), main->cache_argument, f_file_operation_touch_s, fll_error_file_type_directory_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_argument, f_file_operation_touch_s, fll_error_file_type_directory_e); } else { - fake_print_error_file(&main->program.error, macro_fake_f(f_directory_touch), main->cache_arguments.array[i], f_file_operation_touch_s, fll_error_file_type_directory_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[i], f_file_operation_touch_s, fll_error_file_type_directory_e); } main->setting.state.status = F_status_set_error(F_failure); @@ -2089,10 +2077,10 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) { if (F_status_is_error_not(fl_path_canonical(main->cache_arguments.array[0], &main->cache_argument))) { - fake_print_error_file(&main->program.error, macro_fake_f(f_file_stream_open), main->cache_argument, f_file_operation_open_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_argument, f_file_operation_open_s, fll_error_file_type_file_e); } else { - fake_print_error_file(&main->program.error, macro_fake_f(f_file_stream_open), main->cache_arguments.array[0], f_file_operation_open_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[0], f_file_operation_open_s, fll_error_file_type_file_e); } main->setting.state.status = F_status_set_error(F_failure); @@ -2118,10 +2106,10 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) { if (F_status_is_error_not(fl_path_canonical(main->cache_arguments.array[0], &main->cache_argument))) { - fake_print_error_file(&main->program.error, macro_fake_f(f_file_stream_open), main->cache_argument, f_file_operation_open_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_argument, f_file_operation_open_s, fll_error_file_type_file_e); } else { - fake_print_error_file(&main->program.error, macro_fake_f(f_file_stream_open), main->cache_arguments.array[0], f_file_operation_open_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[0], f_file_operation_open_s, fll_error_file_type_file_e); } } } @@ -2135,10 +2123,10 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) { if (F_status_is_error_not(fl_path_canonical(main->cache_arguments.array[0], &main->cache_argument))) { - fake_print_error_file(&main->program.error, macro_fake_f(fake_make_operate_process_buffer_escape), main->cache_argument, f_file_operation_write_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_argument, f_file_operation_write_s, fll_error_file_type_file_e); } else { - fake_print_error_file(&main->program.error, macro_fake_f(fake_make_operate_process_buffer_escape), main->cache_arguments.array[0], f_file_operation_write_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[0], f_file_operation_write_s, fll_error_file_type_file_e); } break; @@ -2148,10 +2136,10 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) { if (F_status_is_error_not(fl_path_canonical(main->cache_arguments.array[0], &main->cache_argument))) { - fake_print_error_file(&main->program.error, macro_fake_f(f_file_stream_write), main->cache_argument, f_file_operation_write_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_argument, f_file_operation_write_s, fll_error_file_type_file_e); } else { - fake_print_error_file(&main->program.error, macro_fake_f(f_file_stream_write), main->cache_arguments.array[0], f_file_operation_write_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[0], f_file_operation_write_s, fll_error_file_type_file_e); } break; @@ -2161,7 +2149,7 @@ extern "C" { main->setting.state.status = f_file_stream_write(file, f_string_ascii_space_s, 0); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_file_stream_write)); + fake_print_error(&main->program.error, F_status_debug_source_d); break; } diff --git a/level_3/fake/c/main/make/operate_validate_type.c b/level_3/fake/c/main/make/operate_validate_type.c index 5c0b05e1f..d1ae477b4 100644 --- a/level_3/fake/c/main/make/operate_validate_type.c +++ b/level_3/fake/c/main/make/operate_validate_type.c @@ -57,7 +57,7 @@ extern "C" { main->setting.state.status = f_file_is(path_file, F_file_type_regular_d, F_false); if (main->setting.state.status == F_file_found_not || F_status_is_error(main->setting.state.status)) { - fake_print_error_file_simple(&main->program.error, macro_fake_f(f_file_is), path_file, f_file_operation_find_s, fll_error_file_type_file_e); + fake_print_error_file_simple(&main->program.error, F_status_debug_source_d, path_file, f_file_operation_find_s, fll_error_file_type_file_e); main->setting.state.status = F_status_set_error(F_failure); @@ -118,7 +118,7 @@ extern "C" { fake_make_assure_inside_project(data_make, main->cache_arguments.array[i]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_operation_path_outside(&data_make->error, macro_fake_f(fake_make_assure_inside_project), main->cache_argument.used ? main->cache_argument : main->cache_arguments.array[i]); + fake_print_error_operation_path_outside(&data_make->error, F_status_debug_source_d, main->cache_argument.used ? main->cache_argument : main->cache_arguments.array[i]); main->setting.state.status = F_status_set_error(F_failure); } @@ -127,7 +127,7 @@ extern "C" { for (f_number_unsigned_t i = 0; i < main->cache_arguments.used - 1; ++i) { if (f_file_exists(main->cache_arguments.array[i], F_true) != F_true) { - fake_print_error_file_simple(&main->program.error, macro_fake_f(f_file_is), main->cache_arguments.array[i], f_file_operation_find_s, fll_error_file_type_file_e); + fake_print_error_file_simple(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[i], f_file_operation_find_s, fll_error_file_type_file_e); status = F_status_set_error(F_failure); } @@ -145,7 +145,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file(&main->program.error, macro_fake_f(f_directory_is), main->cache_arguments.array[main->cache_arguments.used - 1], f_file_operation_find_s, fll_error_file_type_directory_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[main->cache_arguments.used - 1], f_file_operation_find_s, fll_error_file_type_directory_e); status = F_status_set_error(F_failure); } @@ -566,7 +566,7 @@ extern "C" { fake_make_assure_inside_project(data_make, main->cache_arguments.array[i]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_operation_path_outside(&data_make->error, macro_fake_f(fake_make_assure_inside_project), main->cache_argument.used ? main->cache_argument : main->cache_arguments.array[i]); + fake_print_error_operation_path_outside(&data_make->error, F_status_debug_source_d, main->cache_argument.used ? main->cache_argument : main->cache_arguments.array[i]); status = F_status_set_error(F_failure); } @@ -580,7 +580,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file(&main->program.error, macro_fake_f(f_file_exists), main->cache_arguments.array[i], f_file_operation_find_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[i], f_file_operation_find_s, fll_error_file_type_file_e); status = F_status_set_error(F_failure); } @@ -678,7 +678,7 @@ extern "C" { fake_make_assure_inside_project(data_make, main->cache_arguments.array[i]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_operation_path_outside(&data_make->error, macro_fake_f(fake_make_assure_inside_project), main->cache_argument.used ? main->cache_argument : main->cache_arguments.array[i]); + fake_print_error_operation_path_outside(&data_make->error, F_status_debug_source_d, main->cache_argument.used ? main->cache_argument : main->cache_arguments.array[i]); status = F_status_set_error(F_failure); } @@ -687,7 +687,7 @@ extern "C" { for (i = 0; i < main->cache_arguments.used - 1; ++i) { if (f_file_exists(main->cache_arguments.array[i], F_true) != F_true) { - fake_print_error_file_simple(&main->program.error, macro_fake_f(f_file_is), main->cache_arguments.array[i], f_file_operation_find_s, fll_error_file_type_file_e); + fake_print_error_file_simple(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[i], f_file_operation_find_s, fll_error_file_type_file_e); status = F_status_set_error(F_failure); } @@ -705,7 +705,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file(&main->program.error, macro_fake_f(f_directory_is), main->cache_arguments.array[main->cache_arguments.used - 1], f_file_operation_identify_s, fll_error_file_type_directory_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[main->cache_arguments.used - 1], f_file_operation_identify_s, fll_error_file_type_directory_e); status = F_status_set_error(F_failure); } @@ -782,7 +782,7 @@ extern "C" { fake_make_assure_inside_project(data_make, main->cache_arguments.array[i]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_operation_path_outside(&data_make->error, macro_fake_f(fake_make_assure_inside_project), main->cache_argument.used ? main->cache_argument : main->cache_arguments.array[i]); + fake_print_error_operation_path_outside(&data_make->error, F_status_debug_source_d, main->cache_argument.used ? main->cache_argument : main->cache_arguments.array[i]); status = F_status_set_error(F_failure); } @@ -977,7 +977,7 @@ extern "C" { fake_make_assure_inside_project(data_make, main->cache_arguments.array[main->cache_arguments.used - 1]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_operation_path_outside(&data_make->error, macro_fake_f(fake_make_assure_inside_project), main->cache_argument.used ? main->cache_argument : main->cache_arguments.array[main->cache_arguments.used - 1]); + fake_print_error_operation_path_outside(&data_make->error, F_status_debug_source_d, main->cache_argument.used ? main->cache_argument : main->cache_arguments.array[main->cache_arguments.used - 1]); status = F_status_set_error(F_failure); } @@ -994,7 +994,7 @@ extern "C" { fake_make_assure_inside_project(data_make, main->cache_arguments.array[main->cache_arguments.used - 2]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_operation_path_outside(&data_make->error, macro_fake_f(fake_make_assure_inside_project), main->cache_arguments.array[main->cache_arguments.used - 2]); + fake_print_error_operation_path_outside(&data_make->error, F_status_debug_source_d, main->cache_arguments.array[main->cache_arguments.used - 2]); status = F_status_set_error(F_failure); } @@ -1023,7 +1023,7 @@ extern "C" { main->setting.state.status = f_file_name_directory(full, &main->cache_argument); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file(&main->program.error, macro_fake_f(f_file_name_directory), full, f_file_operation_analyze_s, fll_error_file_type_path_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, full, f_file_operation_analyze_s, fll_error_file_type_path_e); status = F_status_set_error(F_failure); } @@ -1032,7 +1032,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_assure(f_path_separator_s, &main->cache_argument); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append_assure)); + fake_print_error(&main->program.error, F_status_debug_source_d); status = F_status_set_error(F_failure); } @@ -1040,7 +1040,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append(main->cache_arguments.array[main->cache_arguments.used - 2], &main->cache_argument); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(f_string_dynamic_append)); + fake_print_error(&main->program.error, F_status_debug_source_d); status = F_status_set_error(F_failure); } @@ -1058,7 +1058,7 @@ extern "C" { fake_make_assure_inside_project(data_make, target); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_operation_path_outside(&data_make->error, macro_fake_f(fake_make_assure_inside_project), target); + fake_print_error_operation_path_outside(&data_make->error, F_status_debug_source_d, target); status = F_status_set_error(F_failure); } @@ -1106,7 +1106,7 @@ extern "C" { fake_make_assure_inside_project(data_make, main->cache_arguments.array[i]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_operation_path_outside(&data_make->error, macro_fake_f(fake_make_assure_inside_project), main->cache_argument.used ? main->cache_argument : main->cache_arguments.array[i]); + fake_print_error_operation_path_outside(&data_make->error, F_status_debug_source_d, main->cache_argument.used ? main->cache_argument : main->cache_arguments.array[i]); status = F_status_set_error(F_failure); } @@ -1116,7 +1116,7 @@ extern "C" { for (f_number_unsigned_t i = 0; i < main->cache_arguments.used - 1; ++i) { if (f_file_exists(main->cache_arguments.array[i], F_true) != F_true) { - fake_print_error_file_simple(&main->program.error, macro_fake_f(f_file_is), main->cache_arguments.array[i], f_file_operation_find_s, fll_error_file_type_file_e); + fake_print_error_file_simple(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[i], f_file_operation_find_s, fll_error_file_type_file_e); status = F_status_set_error(F_failure); } @@ -1142,7 +1142,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file(&main->program.error, macro_fake_f(f_directory_is), main->cache_arguments.array[main->cache_arguments.used - 1], f_file_operation_identify_s, fll_error_file_type_directory_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[main->cache_arguments.used - 1], f_file_operation_identify_s, fll_error_file_type_directory_e); main->setting.state.status = F_status_set_error(F_failure); @@ -1323,14 +1323,14 @@ extern "C" { main->setting.state.status = f_file_is(main->cache_arguments.array[i], F_file_type_regular_d, F_false); if (main->setting.state.status == F_file_found_not) { - fake_print_error_file_simple(&main->program.error, macro_fake_f(f_file_is), main->cache_arguments.array[i], f_file_operation_find_s, fll_error_file_type_file_e); + fake_print_error_file_simple(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[i], f_file_operation_find_s, fll_error_file_type_file_e); status = F_status_set_error(F_failure); } if (F_status_is_error(main->setting.state.status)) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && main->program.error.to.stream) { - fake_print_error_file(&main->program.error, macro_fake_f(f_file_is), main->cache_arguments.array[i], f_file_operation_find_s, fll_error_file_type_directory_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[i], f_file_operation_find_s, fll_error_file_type_directory_e); } status = F_status_set_error(F_failure); @@ -1412,7 +1412,7 @@ extern "C" { main->setting.state.status = f_file_is(main->cache_arguments.array[0], F_file_type_directory_d, F_false); if (main->setting.state.status == F_file_found_not) { - fake_print_error_file_simple(&main->program.error, macro_fake_f(f_file_is), main->cache_arguments.array[0], f_file_operation_find_s, fll_error_file_type_file_e); + fake_print_error_file_simple(&main->program.error, F_status_debug_source_d, main->cache_arguments.array[0], f_file_operation_find_s, fll_error_file_type_file_e); main->setting.state.status = F_status_set_error(F_failure); @@ -1421,7 +1421,7 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && main->program.error.to.stream) { - fake_print_error_file(&main->program.error, macro_fake_f(f_file_is), data_make->data->file_data_build_fakefile, f_file_operation_find_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, data_make->data->file_data_build_fakefile, f_file_operation_find_s, fll_error_file_type_file_e); } main->setting.state.status = F_status_set_error(F_failure); @@ -1475,7 +1475,7 @@ extern "C" { fake_make_assure_inside_project(data_make, main->cache_arguments.array[i]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_operation_path_outside(&data_make->error, macro_fake_f(fake_make_assure_inside_project), main->cache_argument.used ? main->cache_argument : main->cache_arguments.array[i]); + fake_print_error_operation_path_outside(&data_make->error, F_status_debug_source_d, main->cache_argument.used ? main->cache_argument : main->cache_arguments.array[i]); status = F_status_set_error(F_failure); } @@ -1510,7 +1510,7 @@ extern "C" { fake_make_assure_inside_project(data_make, main->cache_arguments.array[0]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_operation_path_outside(&data_make->error, macro_fake_f(fake_make_assure_inside_project), main->cache_argument.used ? main->cache_argument : main->cache_arguments.array[0]); + fake_print_error_operation_path_outside(&data_make->error, F_status_debug_source_d, main->cache_argument.used ? main->cache_argument : main->cache_arguments.array[0]); main->setting.state.status = F_status_set_error(F_failure); } diff --git a/level_3/fake/c/main/skeleton.c b/level_3/fake/c/main/skeleton.c index bd869c457..6e7f66414 100644 --- a/level_3/fake/c/main/skeleton.c +++ b/level_3/fake/c/main/skeleton.c @@ -89,7 +89,7 @@ extern "C" { fake_skeleton_operate_directory_create(data, path[i]); if (F_status_is_error(main->setting.state.status)) { - fake_print_error(&main->program.error, macro_fake_f(fake_skeleton_operate_directory_create)); + fake_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -158,7 +158,7 @@ extern "C" { fake_print_error_directory_create_parent_missing(&main->program.error, path); } else { - fake_print_error_file(&main->program.error, macro_fake_f(f_directory_create), path, f_file_operation_create_s, fll_error_file_type_directory_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, path, f_file_operation_create_s, fll_error_file_type_directory_e); } return; @@ -167,7 +167,7 @@ extern "C" { fake_print_verbose_create_directory(&main->program.message, path); } else if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file(&main->program.error, macro_fake_f(f_directory_exists), path, f_file_operation_create_s, fll_error_file_type_directory_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, path, f_file_operation_create_s, fll_error_file_type_directory_e); return; } @@ -228,7 +228,7 @@ extern "C" { fake_print_error_file_create_parent_missing(&main->program.error, path); } else { - fake_print_error_file(&main->program.error, macro_fake_f(f_file_create), path, f_file_operation_create_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, path, f_file_operation_create_s, fll_error_file_type_file_e); } return; @@ -245,7 +245,7 @@ extern "C" { main->setting.state.status = f_file_open(path, 0, &file); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file(&main->program.error, macro_fake_f(f_file_open), path, fake_common_file_populate_pre_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, path, fake_common_file_populate_pre_s, fll_error_file_type_file_e); return; } @@ -253,7 +253,7 @@ extern "C" { main->setting.state.status = f_file_write(file, content, 0); if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file(&main->program.error, macro_fake_f(f_file_write), path, fake_common_file_populate_pre_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, path, fake_common_file_populate_pre_s, fll_error_file_type_file_e); f_file_stream_flush(file); f_file_stream_close(&file); @@ -268,7 +268,7 @@ extern "C" { } } else if (F_status_is_error(main->setting.state.status)) { - fake_print_error_file(&main->program.error, macro_fake_f(f_file_is), path, f_file_operation_create_s, fll_error_file_type_file_e); + fake_print_error_file(&main->program.error, F_status_debug_source_d, path, f_file_operation_create_s, fll_error_file_type_file_e); return; } diff --git a/level_3/firewall/c/main/common.c b/level_3/firewall/c/main/common.c index 60ff2f30c..2bdae6a8d 100644 --- a/level_3/firewall/c/main/common.c +++ b/level_3/firewall/c/main/common.c @@ -18,7 +18,7 @@ extern "C" { main->setting.state.step_small = firewall_allocation_small_d; if (F_status_is_error(main->setting.state.status)) { - firewall_print_error(&main->program.error, macro_firewall_f(f_console_parameter_process)); + firewall_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -26,7 +26,7 @@ extern "C" { main->setting.state.status = fll_program_parameter_process_context_standard(F_true, &main->program); if (F_status_is_error(main->setting.state.status)) { - firewall_print_error(&main->program.error, macro_firewall_f(fll_program_parameter_process_context_standard)); + firewall_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -34,7 +34,7 @@ extern "C" { main->setting.state.status = fll_program_parameter_process_verbosity_standard(F_true, &main->program); if (F_status_is_error(main->setting.state.status)) { - firewall_print_error(&main->program.error, macro_firewall_f(fll_program_parameter_process_verbosity_standard)); + firewall_print_error(&main->program.error, F_status_debug_source_d); return; } diff --git a/level_3/firewall/c/main/common/print.c b/level_3/firewall/c/main/common/print.c deleted file mode 100644 index 1844ea83e..000000000 --- a/level_3/firewall/c/main/common/print.c +++ /dev/null @@ -1,33 +0,0 @@ -#include "../firewall.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef _di_firewall_f_a_ - const f_string_t firewall_f_a[] = { - "f_console_parameter_process", - "f_directory_list", - "f_file_open", - "f_file_read", - "f_fss_apply_delimit", - "f_memory_array_increase", - "f_memory_array_increase_by", - "f_string_dynamic_append", - "f_string_dynamic_partial_append", - "f_string_dynamic_partial_append_nulless", - "f_string_dynamic_terminate_after", - "f_thread_create", - "firewall_operate_process_rules", - "fll_execute_program", - "fll_fss_basic_read", - "fll_fss_basic_list_read", - "fll_fss_extended_read", - "fll_program_parameter_process_context_standard", - "fll_program_parameter_process_verbosity_standard", - }; -#endif // _di_firewall_f_a_ - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/level_3/firewall/c/main/common/print.h b/level_3/firewall/c/main/common/print.h deleted file mode 100644 index a4251cd41..000000000 --- a/level_3/firewall/c/main/common/print.h +++ /dev/null @@ -1,68 +0,0 @@ -/** - * FLL - Level 3 - * - * Project: Firewall - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Provides the common print functionality. - * - * This is auto-included and should not need to be explicitly included. - */ -#ifndef _firewall_common_print_h -#define _firewall_common_print_h - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * A special array of strings intended for representing function names. - * - * These are primarily used for printing errors with the function names. - * - * The macro macro_firewall_f() is used to reference the array index by the enum name. - * - * macro_firewall_f(): - * - name: The name of the function. - */ -#ifndef _di_firewall_f_a_ - extern const f_string_t firewall_f_a[]; - - #define macro_firewall_f(name) firewall_f_a[firewall_f_##name##_e] -#endif // _di_firewall_f_a_ - -/** - * An enum representing specific indexes within the above array. - * - * This is a convenience enum used to make code slightly more readable. - */ -#ifndef _di_firewall_f_e_ - enum { - firewall_f_f_console_parameter_process_e, - firewall_f_f_directory_list_e, - firewall_f_f_file_open_e, - firewall_f_f_file_read_e, - firewall_f_f_fss_apply_delimit_e, - firewall_f_f_memory_array_increase_e, - firewall_f_f_memory_array_increase_by_e, - firewall_f_f_string_dynamic_append_e, - firewall_f_f_string_dynamic_partial_append_e, - firewall_f_f_string_dynamic_partial_append_nulless_e, - firewall_f_f_string_dynamic_terminate_after_e, - firewall_f_f_thread_create_e, - firewall_f_firewall_operate_process_rules_e, - firewall_f_fll_execute_program_e, - firewall_f_fll_fss_basic_read_e, - firewall_f_fll_fss_basic_list_read_e, - firewall_f_fll_fss_extended_read_e, - firewall_f_fll_program_parameter_process_context_standard_e, - firewall_f_fll_program_parameter_process_verbosity_standard_e, - }; // enum -#endif // _di_firewall_f_e_ - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif // _firewall_common_print_h diff --git a/level_3/firewall/c/main/firewall.h b/level_3/firewall/c/main/firewall.h index 31e58164a..47f046834 100644 --- a/level_3/firewall/c/main/firewall.h +++ b/level_3/firewall/c/main/firewall.h @@ -47,7 +47,6 @@ // Firewall includes. #include #include -#include #include #include #include diff --git a/level_3/firewall/c/main/main.c b/level_3/firewall/c/main/main.c index 9f2428dab..9cfcb4747 100644 --- a/level_3/firewall/c/main/main.c +++ b/level_3/firewall/c/main/main.c @@ -48,7 +48,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { data.setting.state.status = f_thread_create(0, &id_signal, &firewall_thread_signal, (void *) &data); if (F_status_is_error(data.setting.state.status)) { - firewall_print_error(&data.program.error, macro_firewall_f(f_thread_create)); + firewall_print_error(&data.program.error, F_status_debug_source_d); } else { { diff --git a/level_3/firewall/c/main/operate.c b/level_3/firewall/c/main/operate.c index 0e4e32dbc..dddf91a63 100644 --- a/level_3/firewall/c/main/operate.c +++ b/level_3/firewall/c/main/operate.c @@ -24,10 +24,10 @@ extern "C" { firewall_print_error_network_device_none(&main->program.error); } else if (F_status_set_fine(main->setting.state.status) == F_failure) { - firewall_print_error_file(&main->program.error, macro_firewall_f(f_directory_list), firewall_network_devices_s, f_file_operation_read_s, fll_error_file_type_directory_e); + firewall_print_error_file(&main->program.error, F_status_debug_source_d, firewall_network_devices_s, f_file_operation_read_s, fll_error_file_type_directory_e); } else { - firewall_print_error(&main->program.error, macro_firewall_f(f_console_parameter_process)); + firewall_print_error(&main->program.error, F_status_debug_source_d); } return; @@ -175,7 +175,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(firewall_network_firewall_path_s.used + main->setting.devices.array[j].used + firewall_file_suffix_s.used + 1, sizeof(f_char_t), (void **) &main->cache.path_file.string, &main->cache.path_file.used, &main->cache.path_file.size); if (F_status_is_error(main->setting.state.status)) { - firewall_print_error(&main->program.error, macro_firewall_f(f_memory_array_increase_by)); + firewall_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -193,7 +193,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - firewall_print_error(&main->program.error, macro_firewall_f(f_string_dynamic_append)); + firewall_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -217,7 +217,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - firewall_print_error(&main->program.error, macro_firewall_f(f_string_dynamic_append)); + firewall_print_error(&main->program.error, F_status_debug_source_d); return; } diff --git a/level_3/firewall/c/main/operate/buffer.c b/level_3/firewall/c/main/operate/buffer.c index c15fed208..a5728dea8 100644 --- a/level_3/firewall/c/main/operate/buffer.c +++ b/level_3/firewall/c/main/operate/buffer.c @@ -18,7 +18,7 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) { if (!optional || optional && F_status_set_fine(main->setting.state.status) != F_file_found_not && F_status_set_fine(main->setting.state.status) != F_file_open && F_status_set_fine(main->setting.state.status) != F_file_descriptor) { - firewall_print_error_file(&main->program.error, macro_firewall_f(f_file_open), file, f_file_operation_open_s, fll_error_file_type_file_e); + firewall_print_error_file(&main->program.error, F_status_debug_source_d, file, f_file_operation_open_s, fll_error_file_type_file_e); return; } @@ -30,7 +30,7 @@ extern "C" { f_file_stream_close(&main->cache.file); if (F_status_is_error(main->setting.state.status)) { - firewall_print_error_file(&main->program.error, macro_firewall_f(f_file_read), file, f_file_operation_read_s, fll_error_file_type_file_e); + firewall_print_error_file(&main->program.error, F_status_debug_source_d, file, f_file_operation_read_s, fll_error_file_type_file_e); return; } @@ -46,7 +46,7 @@ extern "C" { firewall_print_error_file_empty(&main->program.error, file); } else { - firewall_print_error_file(&main->program.error, macro_firewall_f(fll_fss_basic_list_read), file, f_file_operation_process_s, fll_error_file_type_file_e); + firewall_print_error_file(&main->program.error, F_status_debug_source_d, file, f_file_operation_process_s, fll_error_file_type_file_e); } return; @@ -55,7 +55,7 @@ extern "C" { f_fss_apply_delimit(main->cache.delimits, &main->data.buffer, &main->setting.state); if (F_status_is_error(main->setting.state.status)) { - firewall_print_error(&main->program.error, macro_firewall_f(f_fss_apply_delimit)); + firewall_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -78,7 +78,7 @@ extern "C" { fll_fss_extended_read(main->data.buffer, &main->data.range, &main->data.rule_objects, &main->data.rule_contents, 0, 0, &main->cache.delimits, 0, &main->setting.state); if (F_status_is_error(main->setting.state.status)) { - firewall_print_error(&main->program.error, macro_firewall_f(fll_fss_extended_read)); + firewall_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -86,7 +86,7 @@ extern "C" { f_fss_apply_delimit(main->cache.delimits, &main->data.buffer, &main->setting.state); if (F_status_is_error(main->setting.state.status)) { - firewall_print_error(&main->program.error, macro_firewall_f(f_fss_apply_delimit)); + firewall_print_error(&main->program.error, F_status_debug_source_d); return; } diff --git a/level_3/firewall/c/main/operate/create.c b/level_3/firewall/c/main/operate/create.c index 5cb570c94..ff6d37bcb 100644 --- a/level_3/firewall/c/main/operate/create.c +++ b/level_3/firewall/c/main/operate/create.c @@ -30,7 +30,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - firewall_print_error(&main->program.error, macro_firewall_f(f_memory_array_increase_by)); + firewall_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -43,7 +43,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append(firewall_chain_create_operation_s, &main->cache.arguments.array[0]); if (F_status_is_error(main->setting.state.status)) { - firewall_print_error(&main->program.error, macro_firewall_f(f_string_dynamic_append)); + firewall_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -51,7 +51,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase(F_memory_default_allocation_small_d, sizeof(f_char_t), (void **) &main->cache.arguments.array[1].string, &main->cache.arguments.array[1].used, &main->cache.arguments.array[1].size); if (F_status_is_error(main->setting.state.status)) { - firewall_print_error(&main->program.error, macro_firewall_f(f_memory_array_increase)); + firewall_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -108,7 +108,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase(firewall_allocation_small_d, sizeof(f_string_dynamic_t), (void **) &main->setting.chains.array, &main->setting.chains.used, &main->setting.chains.size); if (F_status_is_error(main->setting.state.status)) { - firewall_print_error(&main->program.error, macro_firewall_f(f_memory_array_increase)); + firewall_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -125,7 +125,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - firewall_print_error(&main->program.error, macro_firewall_f(f_memory_array_increase_by)); + firewall_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -137,7 +137,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - firewall_print_error(&main->program.error, macro_firewall_f(f_string_dynamic_partial_append_nulless)); + firewall_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -149,7 +149,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - firewall_print_error(&main->program.error, macro_firewall_f(f_string_dynamic_terminate_after)); + firewall_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -206,7 +206,7 @@ extern "C" { firewall_print_error_operation(&main->program.error, tools[t], main->cache.arguments); } else { - firewall_print_error(&main->program.error, macro_firewall_f(fll_execute_program)); + firewall_print_error(&main->program.error, F_status_debug_source_d); } return; diff --git a/level_3/firewall/c/main/operate/default.c b/level_3/firewall/c/main/operate/default.c index f256e6b78..3dbb2c56b 100644 --- a/level_3/firewall/c/main/operate/default.c +++ b/level_3/firewall/c/main/operate/default.c @@ -53,7 +53,7 @@ extern "C" { firewall_print_error_operation(&main->program.error, tools[t], arguments); } else { - firewall_print_error(&main->program.error, macro_firewall_f(fll_execute_program)); + firewall_print_error(&main->program.error, F_status_debug_source_d); } return; diff --git a/level_3/firewall/c/main/operate/delete.c b/level_3/firewall/c/main/operate/delete.c index d20c29ee2..837908e44 100644 --- a/level_3/firewall/c/main/operate/delete.c +++ b/level_3/firewall/c/main/operate/delete.c @@ -50,7 +50,7 @@ extern "C" { firewall_print_error_operation(&main->program.error, tools[t], arguments); } else { - firewall_print_error(&main->program.error, macro_firewall_f(fll_execute_program)); + firewall_print_error(&main->program.error, F_status_debug_source_d); } return; diff --git a/level_3/firewall/c/main/operate/process.c b/level_3/firewall/c/main/operate/process.c index c1ec53a4c..dcdbd3897 100644 --- a/level_3/firewall/c/main/operate/process.c +++ b/level_3/firewall/c/main/operate/process.c @@ -444,7 +444,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - firewall_print_error(&main->program.error, macro_firewall_f(f_string_dynamic_append)); + firewall_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -452,7 +452,7 @@ extern "C" { main->setting.state.status = f_file_open(main->cache.path_file_specific, 0, &main->cache.file); if (F_status_is_error(main->setting.state.status)) { - firewall_print_error_file(&main->program.error, macro_firewall_f(f_file_open), main->cache.path_file_specific, f_file_operation_open_s, fll_error_file_type_file_e); + firewall_print_error_file(&main->program.error, F_status_debug_source_d, main->cache.path_file_specific, f_file_operation_open_s, fll_error_file_type_file_e); f_file_stream_close(&main->cache.file); @@ -464,7 +464,7 @@ extern "C" { f_file_stream_close(&main->cache.file); if (F_status_is_error(main->setting.state.status)) { - firewall_print_error_file(&main->program.error, macro_firewall_f(f_file_read), main->cache.path_file_specific, f_file_operation_read_s, fll_error_file_type_file_e); + firewall_print_error_file(&main->program.error, F_status_debug_source_d, main->cache.path_file_specific, f_file_operation_read_s, fll_error_file_type_file_e); return; } @@ -487,7 +487,7 @@ extern "C" { // Empty files are to be silently ignored. } else { - firewall_print_error_file(&main->program.error, macro_firewall_f(fll_fss_basic_read), main->cache.path_file_specific, f_file_operation_read_s, fll_error_file_type_file_e); + firewall_print_error_file(&main->program.error, F_status_debug_source_d, main->cache.path_file_specific, f_file_operation_read_s, fll_error_file_type_file_e); return; } @@ -496,14 +496,14 @@ extern "C" { f_fss_apply_delimit(main->cache.delimits, &main->cache.buffer, &main->setting.state); if (F_status_is_error(main->setting.state.status)) { - firewall_print_error(&main->program.error, macro_firewall_f(f_fss_apply_delimit)); + firewall_print_error(&main->program.error, F_status_debug_source_d); } if (F_status_is_error_not(main->setting.state.status)) { main->setting.state.status = f_memory_array_increase_by(2, sizeof(f_string_dynamic_t), (void **) &main->cache.arguments.array, &main->cache.arguments.used, &main->cache.arguments.size); if (F_status_is_error(main->setting.state.status)) { - firewall_print_error(&main->program.error, macro_firewall_f(f_memory_array_increase_by)); + firewall_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -513,7 +513,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append(ip_list_direction ? firewall_ip_list_destination_action_s : firewall_ip_list_source_action_s, &main->cache.arguments.array[main->cache.arguments.used]); if (F_status_is_error(main->setting.state.status)) { - firewall_print_error(&main->program.error, macro_firewall_f(f_string_dynamic_append)); + firewall_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -530,7 +530,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_partial_append(main->cache.buffer, main->cache.basic_objects.array[at], &main->cache.arguments.array[main->cache.arguments.used]); if (F_status_is_error(main->setting.state.status)) { - firewall_print_error(&main->program.error, macro_firewall_f(f_string_dynamic_partial_append)); + firewall_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -556,7 +556,7 @@ extern "C" { firewall_print_error_operation(&main->program.error, tools[t], main->cache.arguments); } else { - firewall_print_error(&main->program.error, macro_firewall_f(fll_execute_program)); + firewall_print_error(&main->program.error, F_status_debug_source_d); } return; @@ -590,7 +590,7 @@ extern "C" { firewall_print_error_operation(&main->program.error, tools[t], main->cache.arguments); } else { - firewall_print_error(&main->program.error, macro_firewall_f(fll_execute_program)); + firewall_print_error(&main->program.error, F_status_debug_source_d); } return; diff --git a/level_3/firewall/c/main/operate/rules.c b/level_3/firewall/c/main/operate/rules.c index a18a6092f..c049efd0c 100644 --- a/level_3/firewall/c/main/operate/rules.c +++ b/level_3/firewall/c/main/operate/rules.c @@ -13,7 +13,7 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) { if (F_status_set_fine(main->setting.state.status) != F_failure && F_status_set_fine(main->setting.state.status) != F_interrupt) { - firewall_print_error_unhandled(&main->program.error, macro_firewall_f(firewall_operate_process_rules), f_string_empty_s); + firewall_print_error_unhandled(&main->program.error, F_status_debug_source_d, f_string_empty_s); } return; diff --git a/level_3/firewall/c/main/print/error.c b/level_3/firewall/c/main/print/error.c index fc951fee8..d63015059 100644 --- a/level_3/firewall/c/main/print/error.c +++ b/level_3/firewall/c/main/print/error.c @@ -5,26 +5,24 @@ extern "C" { #endif #ifndef _di_firewall_print_error_ - f_status_t firewall_print_error(fl_print_t * const print, const f_string_t function) { + f_status_t firewall_print_error(fl_print_t * const print, const f_string_t debug) { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - fll_error_print(print, F_status_set_fine(((firewall_main_t *) print->custom)->setting.state.status), function, fll_error_file_flag_fallback_e); + fll_error_print(print, F_status_set_fine(((firewall_main_t *) print->custom)->setting.state.status), debug, fll_error_file_flag_fallback_e); return F_okay; } #endif // _di_firewall_print_error_ #ifndef _di_firewall_print_error_file_ - f_status_t firewall_print_error_file(fl_print_t * const print, const f_string_t function, const f_string_static_t name, const f_string_static_t operation, const uint8_t type) { + f_status_t firewall_print_error_file(fl_print_t * const print, const f_string_t debug, const f_string_static_t name, const f_string_static_t operation, const uint8_t type) { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - firewall_main_t * const main = (firewall_main_t *) print->custom; - - fll_error_file_print(print, F_status_set_fine(main->setting.state.status), function, fll_error_file_flag_fallback_e, name, operation, type); + fll_error_file_print(print, F_status_set_fine(((firewall_main_t *) print->custom)->setting.state.status), debug, fll_error_file_flag_fallback_e, name, operation, type); return F_okay; } @@ -153,7 +151,7 @@ extern "C" { #endif // _di_firewall_print_error_operation_specified_not_ #ifndef _di_firewall_print_error_unhandled_ - f_status_t firewall_print_error_unhandled(fl_print_t * const print, const f_string_t function, const f_string_static_t file) { + f_status_t firewall_print_error_unhandled(fl_print_t * const print, const f_string_t debug, const f_string_static_t file) { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; @@ -165,7 +163,7 @@ extern "C" { fl_print_format("%[%QAn unhandled error (%]", print->to, f_string_eol_s, print->context, print->prefix, print->context); fl_print_format(f_string_format_ui_single_s.string, print->to, print->notable, F_status_set_fine(main->setting.state.status), print->notable); fl_print_format("%[) has occurred while calling%] ", print->to, print->context, print->prefix, print->context); - fl_print_format(f_string_format_S_single_s.string, print->to, print->notable, function, print->notable); + fl_print_format(f_string_format_S_single_s.string, print->to, print->notable, debug, print->notable); if (file.used) { fl_print_format("%[() for the file%] ", print->to, print->context, print->prefix, print->context); diff --git a/level_3/firewall/c/main/print/error.h b/level_3/firewall/c/main/print/error.h index 957726612..c39b4d876 100644 --- a/level_3/firewall/c/main/print/error.h +++ b/level_3/firewall/c/main/print/error.h @@ -23,8 +23,10 @@ extern "C" { * The output structure to print to. * * This does not alter print.custom.setting.state.status. - * @param function - * The name of the function associated with the error. + * @param debug + * (optional) The debug details, such as file, line number, and function. + * + * Set to NULL to disable. * * @return * F_okay on success. @@ -35,7 +37,7 @@ extern "C" { * @see fll_error_print() */ #ifndef _di_firewall_print_error_ - extern f_status_t firewall_print_error(fl_print_t * const print, const f_string_t function); + extern f_status_t firewall_print_error(fl_print_t * const print, const f_string_t debug); #endif // _di_firewall_print_error_ /** @@ -45,8 +47,8 @@ extern "C" { * The output structure to print to. * * This does not alter print.custom.setting.state.status. - * @param function - * (optional) The name of the function where the error happened. + * @param debug + * (optional) The debug details, such as file, line number, and function. * * Set to NULL to disable. * @param name @@ -65,7 +67,7 @@ extern "C" { * @see fll_error_file_print() */ #ifndef _di_firewall_print_error_file_ - extern f_status_t firewall_print_error_file(fl_print_t * const print, const f_string_t function, const f_string_static_t name, const f_string_static_t operation, const uint8_t type); + extern f_status_t firewall_print_error_file(fl_print_t * const print, const f_string_t debug, const f_string_static_t name, const f_string_static_t operation, const uint8_t type); #endif // _di_firewall_print_error_file_ /** @@ -77,8 +79,10 @@ extern "C" { * The output structure to print to. * * This does not alter print.custom.setting.state.status. - * @param file - * The name of the file. + * @param debug + * (optional) The debug details, such as file, line number, and function. + * + * Set to NULL to disable. * * @return * F_okay on success. @@ -208,8 +212,10 @@ extern "C" { * The output structure to print to. * * This does not alter print.custom.setting.state.status. - * @param function - * The name of the function associated with the error. + * @param debug + * (optional) The debug details, such as file, line number, and function. + * + * Set to NULL to disable. * @param file * The name of the file, if this error is assocaited with a file. * Otherwise, set file.used to 0 to not have an file related error message. @@ -221,7 +227,7 @@ extern "C" { * F_output_not (with error bit) if setting is NULL. */ #ifndef _di_firewall_print_error_unhandled_ - extern f_status_t firewall_print_error_unhandled(fl_print_t * const print, const f_string_t function, const f_string_static_t file); + extern f_status_t firewall_print_error_unhandled(fl_print_t * const print, const f_string_t debug, const f_string_static_t file); #endif // _di_firewall_print_error_unhandled_ #ifdef __cplusplus diff --git a/level_3/firewall/data/build/settings b/level_3/firewall/data/build/settings index 4f91169f1..ea51076bb 100644 --- a/level_3/firewall/data/build/settings +++ b/level_3/firewall/data/build/settings @@ -46,14 +46,14 @@ build_libraries_static-individual_thread -l:libf_thread.a build_libraries_static-level -l:libfll_2.a -l:libfll_1.a -l:libfll_0.a build_libraries_static-monolithic -l:libfll.a -build_sources_library main/common.c main/common/define.c main/common/enumeration.c main/common/print.c main/common/string.c main/common/type.c +build_sources_library main/common.c main/common/define.c main/common/enumeration.c main/common/string.c main/common/type.c build_sources_library main/print/debug.c main/print/error.c main/print/message.c main/print/warning.c build_sources_library main/operate.c main/operate/buffer.c main/operate/chains.c main/operate/create.c main/operate/default.c main/operate/delete.c main/operate/process.c main/operate/rules.c main/operate/show.c build_sources_library main/firewall.c main/signal.c main/thread.c build_sources_program main/main.c -build_sources_headers main/common.h main/common/define.h main/common/enumeration.h main/common/print.h main/common/string.h main/common/type.h +build_sources_headers main/common.h main/common/define.h main/common/enumeration.h main/common/string.h main/common/type.h build_sources_headers main/print/debug.h main/print/error.h main/print/message.h main/print/warning.h build_sources_headers main/operate.h main/operate/buffer.h main/operate/chains.h main/operate/create.h main/operate/default.h main/operate/delete.h main/operate/process.h main/operate/rules.h main/operate/show.h build_sources_headers main/firewall.h main/operate.h main/signal.h main/thread.h diff --git a/level_3/fss_identify/c/main/common.c b/level_3/fss_identify/c/main/common.c index 7523e1e99..61140a865 100644 --- a/level_3/fss_identify/c/main/common.c +++ b/level_3/fss_identify/c/main/common.c @@ -18,7 +18,7 @@ extern "C" { main->setting.state.step_small = fss_identify_allocation_small_d; if (F_status_is_error(main->setting.state.status)) { - fss_identify_print_error(&main->program.error, macro_fss_identify_f(f_console_parameter_process)); + fss_identify_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -26,7 +26,7 @@ extern "C" { main->setting.state.status = fll_program_parameter_process_context_standard(F_true, &main->program); if (F_status_is_error(main->setting.state.status)) { - fss_identify_print_error(&main->program.error, macro_fss_identify_f(fll_program_parameter_process_context_standard)); + fss_identify_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -34,7 +34,7 @@ extern "C" { main->setting.state.status = fll_program_parameter_process_verbosity_standard(F_true, &main->program); if (F_status_is_error(main->setting.state.status)) { - fss_identify_print_error(&main->program.error, macro_fss_identify_f(fll_program_parameter_process_verbosity_standard)); + fss_identify_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -115,7 +115,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(parameters->array[fss_identify_parameter_name_e].values.used, sizeof(f_string_dynamic_t), (void **) &main->setting.names.array, &main->setting.names.used, &main->setting.names.size); if (F_status_is_error(main->setting.state.status)) { - fss_identify_print_error(&main->program.error, macro_fss_identify_f(f_memory_array_increase_by)); + fss_identify_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -136,7 +136,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_nulless(parameters->arguments.array[index], &main->setting.names.array[i]); if (F_status_is_error(main->setting.state.status)) { - fss_identify_print_error(&main->program.error, macro_fss_identify_f(f_string_dynamic_append_nulless)); + fss_identify_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -149,7 +149,7 @@ extern "C" { main->setting.state.status = f_utf_is_word_dash(main->setting.names.array[i].string + j, main->setting.names.array[i].used, F_true); if (F_status_is_error(main->setting.state.status)) { - fss_identify_print_error(&main->program.error, macro_fss_identify_f(f_utf_is_word_dash)); + fss_identify_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -203,7 +203,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(parameters->remaining.used, sizeof(f_string_dynamic_t), (void **) &main->setting.files.array, &main->setting.files.used, &main->setting.files.size); if (F_status_is_error(main->setting.state.status)) { - fss_identify_print_error(&main->program.error, macro_fss_identify_f(f_memory_array_increase_by)); + fss_identify_print_error(&main->program.error, F_status_debug_source_d); return; } diff --git a/level_3/fss_identify/c/main/common/print.c b/level_3/fss_identify/c/main/common/print.c deleted file mode 100644 index e48446db4..000000000 --- a/level_3/fss_identify/c/main/common/print.c +++ /dev/null @@ -1,25 +0,0 @@ -#include "../fss_identify.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef _di_fss_identify_f_a_ - const f_string_t fss_identify_f_a[] = { - "f_console_parameter_prioritize_right", - "f_console_parameter_process", - "f_file_stream_open", - "f_file_stream_read_block", - "f_memory_array_increase_by", - "f_string_dynamic_append_nulless", - "f_thread_create", - "f_utf_is_word_dash", - "fll_fss_identify", - "fll_program_parameter_process_context_standard", - "fll_program_parameter_process_verbosity_standard", - }; -#endif // _di_fss_identify_f_a_ - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/level_3/fss_identify/c/main/common/print.h b/level_3/fss_identify/c/main/common/print.h deleted file mode 100644 index 9168364ef..000000000 --- a/level_3/fss_identify/c/main/common/print.h +++ /dev/null @@ -1,60 +0,0 @@ -/** - * FLL - Level 3 - * - * Project: FSS Identify - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Provides the common print functionality. - * - * This is auto-included and should not need to be explicitly included. - */ -#ifndef _fss_identify_common_print_h -#define _fss_identify_common_print_h - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * A special array of strings intended for representing function names. - * - * These are primarily used for printing errors with the function names. - * - * The macro macro_fss_identify_f() is used to reference the array index by the enum name. - * - * macro_fss_identify_f(): - * - name: The name of the function. - */ -#ifndef _di_fss_identify_f_a_ - extern const f_string_t fss_identify_f_a[]; - - #define macro_fss_identify_f(name) fss_identify_f_a[fss_identify_f_##name##_e] -#endif // _di_fss_identify_f_a_ - -/** - * An enum representing specific indexes within the above array. - * - * This is a convenience enum used to make code slightly more readable. - */ -#ifndef _di_fss_identify_f_e_ - enum { - fss_identify_f_f_console_parameter_prioritize_right_e, - fss_identify_f_f_console_parameter_process_e, - fss_identify_f_f_file_stream_open_e, - fss_identify_f_f_file_stream_read_block_e, - fss_identify_f_f_memory_array_increase_by_e, - fss_identify_f_f_string_dynamic_append_nulless_e, - fss_identify_f_f_thread_create_e, - fss_identify_f_f_utf_is_word_dash_e, - fss_identify_f_fll_fss_identify_e, - fss_identify_f_fll_program_parameter_process_context_standard_e, - fss_identify_f_fll_program_parameter_process_verbosity_standard_e, - }; // enum -#endif // _di_fss_identify_f_e_ - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif // _fss_identify_common_print_h diff --git a/level_3/fss_identify/c/main/fss_identify.c b/level_3/fss_identify/c/main/fss_identify.c index 7e1e5eaa4..880f71c4c 100644 --- a/level_3/fss_identify/c/main/fss_identify.c +++ b/level_3/fss_identify/c/main/fss_identify.c @@ -53,7 +53,7 @@ extern "C" { main->setting.state.status = f_file_stream_open(main->setting.files.array[i], f_string_empty_s, &main->setting.file); if (F_status_is_error(main->setting.state.status)) { - fss_identify_print_error_file(&main->program.error, macro_fss_identify_f(f_file_stream_open), main->setting.files.array[i], f_file_operation_open_s, fll_error_file_type_file_e); + fss_identify_print_error_file(&main->program.error, F_status_debug_source_d, main->setting.files.array[i], f_file_operation_open_s, fll_error_file_type_file_e); } else { fss_identify_load_line(main, main->setting.files.array[i]); diff --git a/level_3/fss_identify/c/main/fss_identify.h b/level_3/fss_identify/c/main/fss_identify.h index f003f1774..edfab78fd 100644 --- a/level_3/fss_identify/c/main/fss_identify.h +++ b/level_3/fss_identify/c/main/fss_identify.h @@ -50,7 +50,6 @@ // FSS Identify includes. #include #include -#include #include #include #include diff --git a/level_3/fss_identify/c/main/load.c b/level_3/fss_identify/c/main/load.c index 99f2c134b..97480e8d9 100644 --- a/level_3/fss_identify/c/main/load.c +++ b/level_3/fss_identify/c/main/load.c @@ -20,7 +20,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(main->setting.file.size_read, sizeof(f_char_t), (void **) &main->setting.buffer.string, &main->setting.buffer.used, &main->setting.buffer.size); if (F_status_is_error(main->setting.state.status)) { - fss_identify_print_error_file(&main->program.error, macro_fss_identify_f(f_memory_array_increase_by), name.used ? name : f_string_ascii_minus_s, f_file_operation_read_s, name.used ? fll_error_file_type_file_e : fll_error_file_type_pipe_e); + fss_identify_print_error_file(&main->program.error, F_status_debug_source_d, name.used ? name : f_string_ascii_minus_s, f_file_operation_read_s, name.used ? fll_error_file_type_file_e : fll_error_file_type_pipe_e); return; } @@ -28,7 +28,7 @@ extern "C" { main->setting.state.status = f_file_stream_read_block(main->setting.file, &main->setting.buffer); if (F_status_is_error(main->setting.state.status)) { - fss_identify_print_error_file(&main->program.error, macro_fss_identify_f(f_file_stream_read_block), name.used ? name : f_string_ascii_minus_s, f_file_operation_read_s, name.used ? fll_error_file_type_file_e : fll_error_file_type_pipe_e); + fss_identify_print_error_file(&main->program.error, F_status_debug_source_d, name.used ? name : f_string_ascii_minus_s, f_file_operation_read_s, name.used ? fll_error_file_type_file_e : fll_error_file_type_pipe_e); return; } diff --git a/level_3/fss_identify/c/main/main.c b/level_3/fss_identify/c/main/main.c index 9dd317cd9..294adb6c3 100644 --- a/level_3/fss_identify/c/main/main.c +++ b/level_3/fss_identify/c/main/main.c @@ -46,7 +46,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { data.setting.state.status = f_thread_create(0, &id_signal, &fss_identify_thread_signal, (void *) &data); if (F_status_is_error(data.setting.state.status)) { - fss_identify_print_error(&data.program.error, macro_fss_identify_f(f_thread_create)); + fss_identify_print_error(&data.program.error, F_status_debug_source_d); } else { { diff --git a/level_3/fss_identify/c/main/print/error.c b/level_3/fss_identify/c/main/print/error.c index 1ebb39f27..2fbdbd0ab 100644 --- a/level_3/fss_identify/c/main/print/error.c +++ b/level_3/fss_identify/c/main/print/error.c @@ -5,26 +5,24 @@ extern "C" { #endif #ifndef _di_fss_identify_print_error_ - f_status_t fss_identify_print_error(fl_print_t * const print, const f_string_t function) { + f_status_t fss_identify_print_error(fl_print_t * const print, const f_string_t debug) { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - fll_error_print(print, F_status_set_fine(((fss_identify_main_t *) print->custom)->setting.state.status), function, fll_error_file_flag_fallback_e); + fll_error_print(print, F_status_set_fine(((fss_identify_main_t *) print->custom)->setting.state.status), debug, fll_error_file_flag_fallback_e); return F_okay; } #endif // _di_fss_identify_print_error_ #ifndef _di_fss_identify_print_error_file_ - f_status_t fss_identify_print_error_file(fl_print_t * const print, const f_string_t function, const f_string_static_t name, const f_string_static_t operation, const uint8_t type) { + f_status_t fss_identify_print_error_file(fl_print_t * const print, const f_string_t debug, const f_string_static_t name, const f_string_static_t operation, const uint8_t type) { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - fss_identify_main_t * const main = (fss_identify_main_t *) print->custom; - - fll_error_file_print(print, F_status_set_fine(main->setting.state.status), function, fll_error_file_flag_fallback_e, name, operation, type); + fll_error_file_print(print, F_status_set_fine(((fss_identify_main_t *) print->custom)->setting.state.status), debug, fll_error_file_flag_fallback_e, name, operation, type); return F_okay; } diff --git a/level_3/fss_identify/c/main/print/error.h b/level_3/fss_identify/c/main/print/error.h index 0034cf0ac..8ae8cd37a 100644 --- a/level_3/fss_identify/c/main/print/error.h +++ b/level_3/fss_identify/c/main/print/error.h @@ -23,8 +23,10 @@ extern "C" { * The output structure to print to. * * This does not alter print.custom.setting.state.status. - * @param function - * The name of the function associated with the error. + * @param debug + * (optional) The debug details, such as file, line number, and function. + * + * Set to NULL to disable. * * @return * F_okay on success. @@ -35,7 +37,7 @@ extern "C" { * @see fll_error_print() */ #ifndef _di_fss_identify_print_error_ - extern f_status_t fss_identify_print_error(fl_print_t * const print, const f_string_t function); + extern f_status_t fss_identify_print_error(fl_print_t * const print, const f_string_t debug); #endif // _di_fss_identify_print_error_ /** @@ -45,8 +47,8 @@ extern "C" { * The output structure to print to. * * This does not alter print.custom.setting.state.status. - * @param function - * (optional) The name of the function where the error happened. + * @param debug + * (optional) The debug details, such as file, line number, and function. * * Set to NULL to disable. * @param name @@ -65,7 +67,7 @@ extern "C" { * @see fll_error_file_print() */ #ifndef _di_fss_identify_print_error_file_ - extern f_status_t fss_identify_print_error_file(fl_print_t * const print, const f_string_t function, const f_string_static_t name, const f_string_static_t operation, const uint8_t type); + extern f_status_t fss_identify_print_error_file(fl_print_t * const print, const f_string_t debug, const f_string_static_t name, const f_string_static_t operation, const uint8_t type); #endif // _di_fss_identify_print_error_file_ /** diff --git a/level_3/fss_identify/c/main/process.c b/level_3/fss_identify/c/main/process.c index 25fa345d0..dc82db46a 100644 --- a/level_3/fss_identify/c/main/process.c +++ b/level_3/fss_identify/c/main/process.c @@ -14,7 +14,7 @@ extern "C" { main->setting.state.status = fll_fss_identify(main->setting.buffer, &main->setting.range, &main->setting.ids); if (F_status_is_error(main->setting.state.status)) { - fss_identify_print_error_file(&main->program.error, macro_fss_identify_f(fll_fss_identify), name.used ? name : f_string_ascii_minus_s, f_file_operation_read_s, name.used ? fll_error_file_type_file_e : fll_error_file_type_pipe_e); + fss_identify_print_error_file(&main->program.error, F_status_debug_source_d, name.used ? name : f_string_ascii_minus_s, f_file_operation_read_s, name.used ? fll_error_file_type_file_e : fll_error_file_type_pipe_e); return; } diff --git a/level_3/fss_identify/data/build/settings b/level_3/fss_identify/data/build/settings index fbf64e249..822ae4403 100644 --- a/level_3/fss_identify/data/build/settings +++ b/level_3/fss_identify/data/build/settings @@ -46,11 +46,11 @@ build_libraries_static-individual_thread -l:libf_thread.a build_libraries_static-level -l:libfll_2.a -l:libfll_1.a -l:libfll_0.a build_libraries_static-monolithic -l:libfll.a -build_sources_library main/common.c main/common/define.c main/common/enumeration.c main/common/print.c main/common/string.c main/common/type.c main/load.c main/print/data.c main/print/error.c main/print/message.c main/process.c main/signal.c main/thread.c main/fss_identify.c +build_sources_library main/common.c main/common/define.c main/common/enumeration.c main/common/string.c main/common/type.c main/load.c main/print/data.c main/print/error.c main/print/message.c main/process.c main/signal.c main/thread.c main/fss_identify.c build_sources_program main/main.c -build_sources_headers main/common.h main/common/define.h main/common/enumeration.h main/common/print.h main/common/string.h main/common/type.h main/load.h main/print/data.h main/print/error.h main/print/message.h main/process.h main/signal.h main/thread.h main/fss_identify.h +build_sources_headers main/common.h main/common/define.h main/common/enumeration.h main/common/string.h main/common/type.h main/load.h main/print/data.h main/print/error.h main/print/message.h main/process.h main/signal.h main/thread.h main/fss_identify.h build_sources_documentation man diff --git a/level_3/fss_read/c/basic/fss_read.c b/level_3/fss_read/c/basic/fss_read.c index 783959330..2f4c495f3 100644 --- a/level_3/fss_read/c/basic/fss_read.c +++ b/level_3/fss_read/c/basic/fss_read.c @@ -22,7 +22,7 @@ extern "C" { fll_fss_basic_read(main->setting.buffer, &main->setting.range, &main->setting.objects, &main->setting.contents, &main->setting.quotes_object, &main->setting.delimits_object, &main->setting.delimits_content, &main->setting.state); if (F_status_is_error(main->setting.state.status)) { - fss_read_print_error_fss_read(&main->program.error, macro_fss_read_f(fll_fss_basic_read)); + fss_read_print_error_fss_read(&main->program.error, F_status_debug_source_d); return; } @@ -38,7 +38,7 @@ extern "C" { fss_read_ensure_quotes_length(main); if (F_status_is_error(main->setting.state.status)) { - fss_read_print_error(&main->program.error, macro_fss_read_f(fss_read_ensure_quotes_length)); + fss_read_print_error(&main->program.error, F_status_debug_source_d); return; } diff --git a/level_3/fss_read/c/basic/fss_read.h b/level_3/fss_read/c/basic/fss_read.h index 134cdd47b..1c55524b6 100644 --- a/level_3/fss_read/c/basic/fss_read.h +++ b/level_3/fss_read/c/basic/fss_read.h @@ -47,7 +47,6 @@ // FSS Read includes. #include #include -#include #include #include #include diff --git a/level_3/fss_read/c/basic/main.c b/level_3/fss_read/c/basic/main.c index 24e5ffc5a..55cf6d38d 100644 --- a/level_3/fss_read/c/basic/main.c +++ b/level_3/fss_read/c/basic/main.c @@ -76,7 +76,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { data.setting.state.status = f_thread_create(0, &id_signal, &fss_read_thread_signal, (void *) &data); if (F_status_is_error(data.setting.state.status)) { - fss_read_print_error(&data.program.error, macro_fss_read_f(f_thread_create)); + fss_read_print_error(&data.program.error, F_status_debug_source_d); } else { { diff --git a/level_3/fss_read/c/basic_list/fss_read.c b/level_3/fss_read/c/basic_list/fss_read.c index 4a0bb1a3a..f322dfef8 100644 --- a/level_3/fss_read/c/basic_list/fss_read.c +++ b/level_3/fss_read/c/basic_list/fss_read.c @@ -22,7 +22,7 @@ extern "C" { fll_fss_basic_list_read(main->setting.buffer, &main->setting.range, &main->setting.objects, &main->setting.contents, &main->setting.delimits_object, &main->setting.delimits_content, &main->setting.comments, &main->setting.state); if (F_status_is_error(main->setting.state.status)) { - fss_read_print_error_fss_read(&main->program.error, macro_fss_read_f(fll_fss_basic_list_read)); + fss_read_print_error_fss_read(&main->program.error, F_status_debug_source_d); return; } @@ -38,7 +38,7 @@ extern "C" { fss_read_ensure_quotes_length(main); if (F_status_is_error(main->setting.state.status)) { - fss_read_print_error(&main->program.error, macro_fss_read_f(fss_read_ensure_quotes_length)); + fss_read_print_error(&main->program.error, F_status_debug_source_d); return; } diff --git a/level_3/fss_read/c/basic_list/fss_read.h b/level_3/fss_read/c/basic_list/fss_read.h index 531e0249e..752ef2582 100644 --- a/level_3/fss_read/c/basic_list/fss_read.h +++ b/level_3/fss_read/c/basic_list/fss_read.h @@ -47,7 +47,6 @@ // FSS Read includes. #include #include -#include #include #include #include diff --git a/level_3/fss_read/c/basic_list/main.c b/level_3/fss_read/c/basic_list/main.c index b317128ad..33f1a4adc 100644 --- a/level_3/fss_read/c/basic_list/main.c +++ b/level_3/fss_read/c/basic_list/main.c @@ -75,7 +75,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { data.setting.state.status = f_thread_create(0, &id_signal, &fss_read_thread_signal, (void *) &data); if (F_status_is_error(data.setting.state.status)) { - fss_read_print_error(&data.program.error, macro_fss_read_f(f_thread_create)); + fss_read_print_error(&data.program.error, F_status_debug_source_d); } else { { diff --git a/level_3/fss_read/c/embedded_list/fss_read.c b/level_3/fss_read/c/embedded_list/fss_read.c index 29611b92b..45d57b5ba 100644 --- a/level_3/fss_read/c/embedded_list/fss_read.c +++ b/level_3/fss_read/c/embedded_list/fss_read.c @@ -31,7 +31,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fss_read_print_error_fss_read(&main->program.error, macro_fss_read_f(fll_fss_embedded_list_read)); + fss_read_print_error_fss_read(&main->program.error, F_status_debug_source_d); return; } diff --git a/level_3/fss_read/c/embedded_list/fss_read.h b/level_3/fss_read/c/embedded_list/fss_read.h index 60b98094c..0272e7c22 100644 --- a/level_3/fss_read/c/embedded_list/fss_read.h +++ b/level_3/fss_read/c/embedded_list/fss_read.h @@ -47,7 +47,6 @@ // FSS Read includes. #include #include -#include #include #include #include diff --git a/level_3/fss_read/c/embedded_list/main.c b/level_3/fss_read/c/embedded_list/main.c index 88673f480..2cd8f56da 100644 --- a/level_3/fss_read/c/embedded_list/main.c +++ b/level_3/fss_read/c/embedded_list/main.c @@ -76,7 +76,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { data.setting.state.status = f_thread_create(0, &id_signal, &fss_read_thread_signal, (void *) &data); if (F_status_is_error(data.setting.state.status)) { - fss_read_print_error(&data.program.error, macro_fss_read_f(f_thread_create)); + fss_read_print_error(&data.program.error, F_status_debug_source_d); } else { { diff --git a/level_3/fss_read/c/extended/fss_read.c b/level_3/fss_read/c/extended/fss_read.c index e5ee3443d..5b6599618 100644 --- a/level_3/fss_read/c/extended/fss_read.c +++ b/level_3/fss_read/c/extended/fss_read.c @@ -22,7 +22,7 @@ extern "C" { fll_fss_extended_read(main->setting.buffer, &main->setting.range, &main->setting.objects, &main->setting.contents, &main->setting.quotes_object, &main->setting.quotes_content, &main->setting.delimits_object, &main->setting.delimits_content, &main->setting.state); if (F_status_is_error(main->setting.state.status)) { - fss_read_print_error_fss_read(&main->program.error, macro_fss_read_f(fll_fss_extended_read)); + fss_read_print_error_fss_read(&main->program.error, F_status_debug_source_d); return; } @@ -38,7 +38,7 @@ extern "C" { fss_read_ensure_quotes_length(main); if (F_status_is_error(main->setting.state.status)) { - fss_read_print_error(&main->program.error, macro_fss_read_f(fss_read_ensure_quotes_length)); + fss_read_print_error(&main->program.error, F_status_debug_source_d); return; } diff --git a/level_3/fss_read/c/extended/fss_read.h b/level_3/fss_read/c/extended/fss_read.h index 2a50d8fcb..b0525ccc3 100644 --- a/level_3/fss_read/c/extended/fss_read.h +++ b/level_3/fss_read/c/extended/fss_read.h @@ -47,7 +47,6 @@ // FSS Read includes. #include #include -#include #include #include #include diff --git a/level_3/fss_read/c/extended/main.c b/level_3/fss_read/c/extended/main.c index 8d2c1023a..bf366f7ba 100644 --- a/level_3/fss_read/c/extended/main.c +++ b/level_3/fss_read/c/extended/main.c @@ -76,7 +76,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { data.setting.state.status = f_thread_create(0, &id_signal, &fss_read_thread_signal, (void *) &data); if (F_status_is_error(data.setting.state.status)) { - fss_read_print_error(&data.program.error, macro_fss_read_f(f_thread_create)); + fss_read_print_error(&data.program.error, F_status_debug_source_d); } else { { diff --git a/level_3/fss_read/c/extended_list/fss_read.c b/level_3/fss_read/c/extended_list/fss_read.c index 6f9df6693..80710d9c6 100644 --- a/level_3/fss_read/c/extended_list/fss_read.c +++ b/level_3/fss_read/c/extended_list/fss_read.c @@ -22,7 +22,7 @@ extern "C" { fll_fss_extended_list_read(main->setting.buffer, &main->setting.range, &main->setting.objects, &main->setting.closes, &main->setting.contents, &main->setting.delimits_object, &main->setting.delimits_content, &main->setting.comments, &main->setting.state); if (F_status_is_error(main->setting.state.status)) { - fss_read_print_error_fss_read(&main->program.error, macro_fss_read_f(fll_fss_extended_list_read)); + fss_read_print_error_fss_read(&main->program.error, F_status_debug_source_d); return; } @@ -38,7 +38,7 @@ extern "C" { fss_read_ensure_quotes_length(main); if (F_status_is_error(main->setting.state.status)) { - fss_read_print_error(&main->program.error, macro_fss_read_f(fss_read_ensure_quotes_length)); + fss_read_print_error(&main->program.error, F_status_debug_source_d); return; } diff --git a/level_3/fss_read/c/extended_list/fss_read.h b/level_3/fss_read/c/extended_list/fss_read.h index a691f19d5..c981f67b0 100644 --- a/level_3/fss_read/c/extended_list/fss_read.h +++ b/level_3/fss_read/c/extended_list/fss_read.h @@ -47,7 +47,6 @@ // FSS Read includes. #include #include -#include #include #include #include diff --git a/level_3/fss_read/c/extended_list/main.c b/level_3/fss_read/c/extended_list/main.c index 8545d889f..1aa2d4bb1 100644 --- a/level_3/fss_read/c/extended_list/main.c +++ b/level_3/fss_read/c/extended_list/main.c @@ -75,7 +75,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { data.setting.state.status = f_thread_create(0, &id_signal, &fss_read_thread_signal, (void *) &data); if (F_status_is_error(data.setting.state.status)) { - fss_read_print_error(&data.program.error, macro_fss_read_f(f_thread_create)); + fss_read_print_error(&data.program.error, F_status_debug_source_d); } else { { diff --git a/level_3/fss_read/c/main/common.c b/level_3/fss_read/c/main/common.c index f2f787393..1c54c5ffe 100644 --- a/level_3/fss_read/c/main/common.c +++ b/level_3/fss_read/c/main/common.c @@ -58,7 +58,7 @@ extern "C" { main->setting.state.step_small = fss_read_allocation_small_d; if (F_status_is_error(main->setting.state.status)) { - fss_read_print_error(&main->program.error, macro_fss_read_f(f_console_parameter_process)); + fss_read_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -66,7 +66,7 @@ extern "C" { main->setting.state.status = fll_program_parameter_process_context_standard(F_true, &main->program); if (F_status_is_error(main->setting.state.status)) { - fss_read_print_error(&main->program.error, macro_fss_read_f(fll_program_parameter_process_context_standard)); + fss_read_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -74,7 +74,7 @@ extern "C" { main->setting.state.status = fll_program_parameter_process_verbosity_standard(F_true, &main->program); if (F_status_is_error(main->setting.state.status)) { - fss_read_print_error(&main->program.error, macro_fss_read_f(fll_program_parameter_process_verbosity_standard)); + fss_read_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -177,7 +177,7 @@ extern "C" { main->setting.state.status = fl_conversion_dynamic_to_unsigned_detect(fl_conversion_data_base_10_c, parameters->arguments.array[index], parameter_value_digit[i]); if (F_status_is_error(main->setting.state.status)) { - fll_error_parameter_integer_print(&main->program.error, F_status_set_fine(main->setting.state.status), macro_fss_read_f(fl_conversion_dynamic_to_unsigned_detect), F_true, parameter_name[i], parameters->arguments.array[index]); + fll_error_parameter_integer_print(&main->program.error, F_status_set_fine(main->setting.state.status), F_status_debug_source_d, F_true, parameter_name[i], parameters->arguments.array[index]); return; } @@ -365,7 +365,7 @@ extern "C" { main->setting.state.status = fl_conversion_dynamic_partial_to_unsigned_detect(fl_conversion_data_base_10_c, parameters->arguments.array[index], main->setting.range, &main->setting.delimit_depth); if (F_status_is_error(main->setting.state.status)) { - fll_error_parameter_integer_print(&main->program.error, F_status_set_fine(main->setting.state.status), macro_fss_read_f(fl_conversion_dynamic_partial_to_unsigned_detect), F_true, fss_read_long_delimit_s, parameters->arguments.array[index]); + fll_error_parameter_integer_print(&main->program.error, F_status_set_fine(main->setting.state.status), F_status_debug_source_d, F_true, fss_read_long_delimit_s, parameters->arguments.array[index]); return; } @@ -438,7 +438,7 @@ extern "C" { fss_read_files_resize(((main->program.pipe & fll_program_data_pipe_input_e) ? 1 : 0) + parameters->remaining.used, &main->setting.files); if (F_status_is_error(main->setting.state.status)) { - fss_read_print_error(&main->program.error, macro_fss_read_f(fss_read_files_resize)); + fss_read_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -458,7 +458,7 @@ extern "C" { } // while if (F_status_is_error(main->setting.state.status)) { - fll_error_file_print(&main->program.error, F_status_set_fine(main->setting.state.status), macro_fss_read_f(f_file_stream_read_block), fll_error_file_flag_fallback_e, f_string_ascii_minus_s, f_file_operation_read_s, fll_error_file_type_pipe_e); + fll_error_file_print(&main->program.error, F_status_set_fine(main->setting.state.status), F_status_debug_source_d, fll_error_file_flag_fallback_e, f_string_ascii_minus_s, f_file_operation_read_s, fll_error_file_type_pipe_e); return; } @@ -500,7 +500,7 @@ extern "C" { main->setting.state.status = f_file_stream_open(file_data->name, f_string_empty_s, &file); if (F_status_is_error(main->setting.state.status)) { - fll_error_file_print(&main->program.error, F_status_set_fine(main->setting.state.status), macro_fss_read_f(f_file_stream_open), fll_error_file_flag_fallback_e, parameters->arguments.array[index], f_file_operation_open_s, fll_error_file_type_file_e); + fll_error_file_print(&main->program.error, F_status_set_fine(main->setting.state.status), F_status_debug_source_d, fll_error_file_flag_fallback_e, parameters->arguments.array[index], f_file_operation_open_s, fll_error_file_type_file_e); break; } @@ -510,7 +510,7 @@ extern "C" { main->setting.state.status = f_file_size(file_data->name, F_true, &size_file); if (F_status_is_error(main->setting.state.status)) { - fll_error_file_print(&main->program.error, F_status_set_fine(main->setting.state.status), macro_fss_read_f(f_file_size), fll_error_file_flag_fallback_e, parameters->arguments.array[index], f_file_operation_read_s, fll_error_file_type_file_e); + fll_error_file_print(&main->program.error, F_status_set_fine(main->setting.state.status), F_status_debug_source_d, fll_error_file_flag_fallback_e, parameters->arguments.array[index], f_file_operation_read_s, fll_error_file_type_file_e); break; } @@ -531,7 +531,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(size_file + 1, sizeof(f_char_t), (void **) &main->setting.buffer.string, &main->setting.buffer.used, &main->setting.buffer.size); if (F_status_is_error(main->setting.state.status)) { - fll_error_file_print(&main->program.error, F_status_set_fine(main->setting.state.status), macro_fss_read_f(f_memory_array_increase_by), fll_error_file_flag_fallback_e, parameters->arguments.array[index], f_file_operation_process_s, fll_error_file_type_file_e); + fll_error_file_print(&main->program.error, F_status_set_fine(main->setting.state.status), F_status_debug_source_d, fll_error_file_flag_fallback_e, parameters->arguments.array[index], f_file_operation_process_s, fll_error_file_type_file_e); break; } @@ -546,7 +546,7 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) { if (F_status_set_fine(main->setting.state.status) != F_interrupt) { - fll_error_file_print(&main->program.error, F_status_set_fine(main->setting.state.status), macro_fss_read_f(f_file_stream_read_until), fll_error_file_flag_fallback_e, parameters->arguments.array[index], f_file_operation_read_s, fll_error_file_type_file_e); + fll_error_file_print(&main->program.error, F_status_set_fine(main->setting.state.status), F_status_debug_source_d, fll_error_file_flag_fallback_e, parameters->arguments.array[index], f_file_operation_read_s, fll_error_file_type_file_e); } break; @@ -591,7 +591,7 @@ extern "C" { main->setting.state.status = fss_read_depths_resize(i, &main->setting.depths); if (F_status_is_error(main->setting.state.status)) { - fss_read_print_error(&main->program.error, macro_fss_read_f(fss_read_depths_resize)); + fss_read_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -621,7 +621,7 @@ extern "C" { main->setting.state.status = fl_conversion_dynamic_to_unsigned_detect(fl_conversion_data_base_10_c, parameters->arguments.array[position_depth], ¤t->depth); if (F_status_is_error(main->setting.state.status)) { - fll_error_parameter_integer_print(&main->program.error, F_status_set_fine(main->setting.state.status), macro_fss_read_f(fl_conversion_dynamic_to_unsigned_detect), F_true, fss_read_long_depth_s, parameters->arguments.array[position_depth]); + fll_error_parameter_integer_print(&main->program.error, F_status_set_fine(main->setting.state.status), F_status_debug_source_d, F_true, fss_read_long_depth_s, parameters->arguments.array[position_depth]); return; } @@ -646,7 +646,7 @@ extern "C" { main->setting.state.status = fl_conversion_dynamic_to_unsigned_detect(fl_conversion_data_base_10_c, parameters->arguments.array[current->index_at], ¤t->value_at); if (F_status_is_error(main->setting.state.status)) { - fll_error_parameter_integer_print(&main->program.error, F_status_set_fine(main->setting.state.status), macro_fss_read_f(fl_conversion_dynamic_to_unsigned_detect), F_true, fss_read_long_at_s, parameters->arguments.array[current->index_at]); + fll_error_parameter_integer_print(&main->program.error, F_status_set_fine(main->setting.state.status), F_status_debug_source_d, F_true, fss_read_long_at_s, parameters->arguments.array[current->index_at]); return; } @@ -674,7 +674,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fss_read_print_error(&main->program.error, (parameters->array[fss_read_parameter_trim_e].result & f_console_result_found_d) ? macro_fss_read_f(f_rip_dynamic) : macro_fss_read_f(f_string_dynamic_append)); + fss_read_print_error(&main->program.error, F_status_debug_source_d); return; } diff --git a/level_3/fss_read/c/main/common/print.c b/level_3/fss_read/c/main/common/print.c deleted file mode 100644 index c43a7aeac..000000000 --- a/level_3/fss_read/c/main/common/print.c +++ /dev/null @@ -1,56 +0,0 @@ -#include "../fss_read.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef _di_fss_read_f_a_ - const f_string_t fss_read_f_a[] = { - "f_console_parameter_process", - "f_console_parameter_reset", - "f_file_read_block", - "f_file_size", - "f_file_stream_open", - "f_file_stream_read", - "f_file_stream_read_block", - "f_file_stream_read_until", - "f_fss_is_space", - "f_memory_array_increase", - "f_memory_array_increase_by", - "f_rip_dynamic", - "f_string_dynamic_append", - "f_string_dynamic_append_assure", - "f_string_dynamic_append_nulless", - "f_string_read_block_increase", - "f_thread_create", - "fl_conversion_dynamic_partial_to_unsigned_detect", - "fl_conversion_dynamic_to_unsigned_detect", - "fl_fss_basic_content_read", - "fl_fss_basic_list_content_read", - "fl_fss_basic_list_object_read", - "fl_fss_basic_object_read", - "fl_fss_embedded_list_content_read", - "fl_fss_embedded_list_object_read", - "fl_fss_extended_content_read", - "fl_fss_extended_list_content_read", - "fl_fss_extended_list_object_read", - "fl_fss_extended_object_read", - "fl_fss_payload_content_read", - "fll_fss_basic_read", - "fll_fss_basic_list_read", - "fll_fss_embedded_list_read", - "fll_fss_extended_read", - "fll_fss_extended_list_read", - "fll_fss_payload_read", - "fll_program_parameter_process_context_standard", - "fll_program_parameter_process_verbosity_standard", - "fss_read_depths_resize", - "fss_read_ensure_quotes_length", - "fss_read_files_resize", - "fss_read_setting_load_depth", - }; -#endif // _di_fss_read_f_a_ - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/level_3/fss_read/c/main/common/print.h b/level_3/fss_read/c/main/common/print.h deleted file mode 100644 index a732ed293..000000000 --- a/level_3/fss_read/c/main/common/print.h +++ /dev/null @@ -1,91 +0,0 @@ -/** - * FLL - Level 3 - * - * Project: FSS Read - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Provides the common print functionality. - * - * This is auto-included and should not need to be explicitly included. - */ -#ifndef _fss_read_common_print_h -#define _fss_read_common_print_h - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * A special array of strings intended for representing function names. - * - * These are primarily used for printing errors with the function names. - * - * The macro macro_fss_read_f() is used to reference the array index by the enum name. - * - * macro_fss_read_f(): - * - name: The name of the function. - */ -#ifndef _di_fss_read_f_a_ - extern const f_string_t fss_read_f_a[]; - - #define macro_fss_read_f(name) fss_read_f_a[fss_read_f_##name##_e] -#endif // _di_fss_read_f_a_ - -/** - * An enum representing specific indexes within the above array. - * - * This is a convenience enum used to make code slightly more readable. - */ -#ifndef _di_fss_read_f_e_ - enum { - fss_read_f_f_console_parameter_process_e, - fss_read_f_f_console_parameter_reset_e, - fss_read_f_f_file_read_block_e, - fss_read_f_f_file_size_e, - fss_read_f_f_file_stream_open_e, - fss_read_f_f_file_stream_read_e, - fss_read_f_f_file_stream_read_block_e, - fss_read_f_f_file_stream_read_until_e, - fss_read_f_f_fss_is_space_e, - fss_read_f_f_memory_array_increase_e, - fss_read_f_f_memory_array_increase_by_e, - fss_read_f_f_rip_dynamic_e, - fss_read_f_f_string_dynamic_append_e, - fss_read_f_f_string_dynamic_append_assure_e, - fss_read_f_f_string_dynamic_append_nulless_e, - fss_read_f_f_string_read_block_increase_e, - fss_read_f_f_thread_create_e, - fss_read_f_fl_conversion_dynamic_partial_to_unsigned_detect_e, - fss_read_f_fl_conversion_dynamic_to_unsigned_detect_e, - fss_read_f_fl_fss_basic_content_read_e, - fss_read_f_fl_fss_basic_list_content_read_e, - fss_read_f_fl_fss_basic_list_object_read_e, - fss_read_f_fl_fss_basic_object_read_e, - fss_read_f_fl_fss_embedded_list_content_read_e, - fss_read_f_fl_fss_embedded_list_object_read_e, - fss_read_f_fl_fss_extended_content_read_e, - fss_read_f_fl_fss_extended_list_content_read_e, - fss_read_f_fl_fss_extended_list_object_read_e, - fss_read_f_fl_fss_extended_object_read_e, - fss_read_f_fl_fss_payload_content_read_e, - fss_read_f_fll_fss_basic_read_e, - fss_read_f_fll_fss_basic_list_read_e, - fss_read_f_fll_fss_embedded_list_read_e, - fss_read_f_fll_fss_extended_read_e, - fss_read_f_fll_fss_extended_list_read_e, - fss_read_f_fll_fss_payload_read_e, - fss_read_f_fll_program_parameter_process_context_standard_e, - fss_read_f_fll_program_parameter_process_verbosity_standard_e, - fss_read_f_fss_read_depths_resize_e, - fss_read_f_fss_read_ensure_quotes_length_e, - fss_read_f_fss_read_files_resize_e, - fss_read_f_fss_read_setting_load_depth_e, - }; // enum -#endif // _di_fss_read_f_e_ - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif // _fss_read_common_print_h diff --git a/level_3/fss_read/c/main/fss_read.c b/level_3/fss_read/c/main/fss_read.c index cdb9f0ff0..fb6cae291 100644 --- a/level_3/fss_read/c/main/fss_read.c +++ b/level_3/fss_read/c/main/fss_read.c @@ -109,7 +109,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_assure(f_string_eol_s, &main->setting.buffer); if (F_status_is_error(main->setting.state.status)) { - fll_error_file_print(&main->program.error, F_status_set_fine(main->setting.state.status), macro_fss_read_f(f_string_dynamic_append_assure), fll_error_file_flag_fallback_e, f_string_ascii_minus_s, f_file_operation_read_s, fll_error_file_type_pipe_e); + fll_error_file_print(&main->program.error, F_status_set_fine(main->setting.state.status), F_status_debug_source_d, fll_error_file_flag_fallback_e, f_string_ascii_minus_s, f_file_operation_read_s, fll_error_file_type_pipe_e); } } #endif // _di_fss_read_process_last_line_ diff --git a/level_3/fss_read/c/main/fss_read.h b/level_3/fss_read/c/main/fss_read.h index 378a40739..e107090d5 100644 --- a/level_3/fss_read/c/main/fss_read.h +++ b/level_3/fss_read/c/main/fss_read.h @@ -49,7 +49,6 @@ // FSS Read includes. #include #include -#include #include #include #include diff --git a/level_3/fss_read/c/main/main.c b/level_3/fss_read/c/main/main.c index 74fc370fa..d2a3ab87e 100644 --- a/level_3/fss_read/c/main/main.c +++ b/level_3/fss_read/c/main/main.c @@ -57,7 +57,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { data.setting.state.status = f_thread_create(0, &id_signal, &fss_read_thread_signal, (void *) &data); if (F_status_is_error(data.setting.state.status)) { - fss_read_print_error(&data.program.error, macro_fss_read_f(f_thread_create)); + fss_read_print_error(&data.program.error, F_status_debug_source_d); } else { { @@ -392,7 +392,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { fss_read_main_process_help(main); } else { - fss_read_print_error(&main->program.error, macro_fss_read_f(f_console_parameter_reset)); + fss_read_print_error(&main->program.error, F_status_debug_source_d); } return; @@ -405,7 +405,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { fss_read_main_process_help(main); } else { - fss_read_print_error(&main->program.error, macro_fss_read_f(f_console_parameter_process)); + fss_read_print_error(&main->program.error, F_status_debug_source_d); } return; diff --git a/level_3/fss_read/c/main/print/error.c b/level_3/fss_read/c/main/print/error.c index 3fccd9ce6..a57f5973a 100644 --- a/level_3/fss_read/c/main/print/error.c +++ b/level_3/fss_read/c/main/print/error.c @@ -5,24 +5,24 @@ extern "C" { #endif #ifndef _di_fss_read_print_error_ - f_status_t fss_read_print_error(fl_print_t * const print, const f_string_t function) { + f_status_t fss_read_print_error(fl_print_t * const print, const f_string_t debug) { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity == f_console_verbosity_quiet_e) return F_output_not; - fll_error_print(print, F_status_set_fine(((fss_read_main_t *) print->custom)->setting.state.status), function, fll_error_file_flag_fallback_e); + fll_error_print(print, F_status_set_fine(((fss_read_main_t *) print->custom)->setting.state.status), debug, fll_error_file_flag_fallback_e); return F_okay; } #endif // _di_fss_read_print_error_ #ifndef _di_fss_read_print_error_file_ - f_status_t fss_read_print_error_file(fl_print_t * const print, const f_string_t function, const f_string_static_t name, const f_string_static_t operation, const uint8_t type) { + f_status_t fss_read_print_error_file(fl_print_t * const print, const f_string_t debug, const f_string_static_t name, const f_string_static_t operation, const uint8_t type) { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity == f_console_verbosity_quiet_e) return F_output_not; - fll_error_file_print(print, F_status_set_fine(((fss_read_main_t *) print->custom)->setting.state.status), function, fll_error_file_flag_fallback_e, name, operation, type); + fll_error_file_print(print, F_status_set_fine(((fss_read_main_t *) print->custom)->setting.state.status), debug, fll_error_file_flag_fallback_e, name, operation, type); return F_okay; } @@ -47,7 +47,7 @@ extern "C" { #endif // _di_fss_read_print_error_fss_end_early_ #ifndef _di_fss_read_print_error_fss_read_ - f_status_t fss_read_print_error_fss_read(fl_print_t * const print, const f_string_t function) { + f_status_t fss_read_print_error_fss_read(fl_print_t * const print, const f_string_t debug) { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity == f_console_verbosity_quiet_e) return F_output_not; @@ -70,7 +70,7 @@ extern "C" { return fll_error_file_print( &main->program.error, F_status_set_fine(main->setting.state.status), - function, + debug, fll_error_file_flag_fallback_e, fss_read_file_identify(main->setting.range.start, main->setting.files), f_file_operation_process_s, diff --git a/level_3/fss_read/c/main/print/error.h b/level_3/fss_read/c/main/print/error.h index 2eeb64c75..8d1ee16b5 100644 --- a/level_3/fss_read/c/main/print/error.h +++ b/level_3/fss_read/c/main/print/error.h @@ -25,6 +25,10 @@ extern "C" { * The print.custom is expected to be of type fss_read_main_t. * * This does not alter print.custom.setting.state.status. + * @param debug + * (optional) The debug details, such as file, line number, and function. + * + * Set to NULL to disable. * * @return * F_okay on success. @@ -35,7 +39,7 @@ extern "C" { * @see fll_error_print() */ #ifndef _di_fss_read_print_error_ - extern f_status_t fss_read_print_error(fl_print_t * const print, const f_string_t function); + extern f_status_t fss_read_print_error(fl_print_t * const print, const f_string_t debug); #endif // _di_fss_read_print_error_ /** @@ -47,8 +51,8 @@ extern "C" { * The print.custom is expected to be of type fss_read_main_t. * * This does not alter print.custom.setting.state.status. - * @param function - * (optional) The name of the function where the error happened. + * @param debug + * (optional) The debug details, such as file, line number, and function. * * Set to NULL to disable. * @param name @@ -67,7 +71,7 @@ extern "C" { * @see fll_error_file_print() */ #ifndef _di_fss_read_print_error_file_ - extern f_status_t fss_read_print_error_file(fl_print_t * const print, const f_string_t function, const f_string_static_t name, const f_string_static_t operation, const uint8_t type); + extern f_status_t fss_read_print_error_file(fl_print_t * const print, const f_string_t debug, const f_string_static_t name, const f_string_static_t operation, const uint8_t type); #endif // _di_fss_read_print_error_file_ /** @@ -103,8 +107,8 @@ extern "C" { * The print.custom is expected to be of type fss_read_main_t. * * This does not alter print.custom.setting.state.status. - * @param function - * (optional) The name of the function where the error happened. + * @param debug + * (optional) The debug details, such as file, line number, and function. * * Set to NULL to disable. * @@ -117,7 +121,7 @@ extern "C" { * @see fll_error_file_print() */ #ifndef _di_fss_read_print_error_fss_read_ - extern f_status_t fss_read_print_error_fss_read(fl_print_t * const print, const f_string_t function); + extern f_status_t fss_read_print_error_fss_read(fl_print_t * const print, const f_string_t debug); #endif // _di_fss_read_print_error_fss_read_ /** diff --git a/level_3/fss_read/c/payload/fss_read.c b/level_3/fss_read/c/payload/fss_read.c index 000b5cc95..fad8ce42f 100644 --- a/level_3/fss_read/c/payload/fss_read.c +++ b/level_3/fss_read/c/payload/fss_read.c @@ -60,7 +60,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_assure(f_string_eol_s, &main->setting.buffer); if (F_status_is_error(main->setting.state.status)) { - fss_read_print_error(&main->program.error, macro_fss_read_f(f_string_dynamic_append_assure)); + fss_read_print_error(&main->program.error, F_status_debug_source_d); } else { main->setting.state.status = f_memory_array_increase(main->setting.state.step_small, sizeof(f_range_t), (void **) &main->setting.objects.array, &main->setting.objects.used, &main->setting.objects.size); @@ -70,7 +70,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fss_read_print_error(&main->program.error, macro_fss_read_f(f_memory_array_increase)); + fss_read_print_error(&main->program.error, F_status_debug_source_d); } else { main->setting.objects.array[main->setting.objects.used].start = main->setting.buffer.used; @@ -86,7 +86,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fss_read_print_error(&main->program.error, macro_fss_read_f(f_string_dynamic_append)); + fss_read_print_error(&main->program.error, F_status_debug_source_d); } else { main->setting.objects.array[main->setting.objects.used].stop = main->setting.objects.array[main->setting.objects.used].start + f_fss_payload_s.used - 1; @@ -102,7 +102,7 @@ extern "C" { break; default: - fss_read_print_error_fss_read(&main->program.error, macro_fss_read_f(fll_fss_payload_read)); + fss_read_print_error_fss_read(&main->program.error, F_status_debug_source_d); } return; @@ -119,7 +119,7 @@ extern "C" { fss_read_ensure_quotes_length(main); if (F_status_is_error(main->setting.state.status)) { - fss_read_print_error(&main->program.error, macro_fss_read_f(fss_read_ensure_quotes_length)); + fss_read_print_error(&main->program.error, F_status_debug_source_d); return; } diff --git a/level_3/fss_read/c/payload/fss_read.h b/level_3/fss_read/c/payload/fss_read.h index d85e81f85..d2405c419 100644 --- a/level_3/fss_read/c/payload/fss_read.h +++ b/level_3/fss_read/c/payload/fss_read.h @@ -48,7 +48,6 @@ // FSS Read includes. #include #include -#include #include #include #include diff --git a/level_3/fss_read/c/payload/main.c b/level_3/fss_read/c/payload/main.c index 111b3856c..23ac40e87 100644 --- a/level_3/fss_read/c/payload/main.c +++ b/level_3/fss_read/c/payload/main.c @@ -77,7 +77,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { data.setting.state.status = f_thread_create(0, &id_signal, &fss_read_thread_signal, (void *) &data); if (F_status_is_error(data.setting.state.status)) { - fss_read_print_error(&data.program.error, macro_fss_read_f(f_thread_create)); + fss_read_print_error(&data.program.error, F_status_debug_source_d); } else { { diff --git a/level_3/fss_read/data/build/settings b/level_3/fss_read/data/build/settings index 42697c261..f31f3a42a 100644 --- a/level_3/fss_read/data/build/settings +++ b/level_3/fss_read/data/build/settings @@ -48,7 +48,7 @@ build_libraries_static-individual_thread -l:libf_thread.a build_libraries_static-level -l:libfll_2.a -l:libfll_1.a -l:libfll_0.a build_libraries_static-monolithic -l:libfll.a -build_sources_library main/fss_read.c main/common.c main/common/define.c main/common/enumeration.c main/common/print.c main/common/static.c main/common/string.c main/common/type.c main/print/data.c main/print/error.c main/print/message.c main/process.c main/signal.c main/thread.c +build_sources_library main/fss_read.c main/common.c main/common/define.c main/common/enumeration.c main/common/static.c main/common/string.c main/common/type.c main/print/data.c main/print/error.c main/print/message.c main/process.c main/signal.c main/thread.c build_sources_library basic/fss_read.c basic/common.c basic/print.c build_sources_library basic_list/fss_read.c basic_list/common.c basic_list/print.c build_sources_library embedded_list/fss_read.c embedded_list/common.c embedded_list/print.c embedded_list/process.c @@ -56,7 +56,7 @@ build_sources_library extended/fss_read.c extended/common.c extended/print.c build_sources_library extended_list/fss_read.c extended_list/common.c extended_list/print.c build_sources_library payload/fss_read.c payload/common.c payload/print.c -build_sources_headers main/fss_read.h main/common.h main/common/define.h main/common/enumeration.h main/common/print.h main/common/static.h main/common/string.h main/common/type.h main/print/data.h main/print/error.h main/print/message.h main/process.h main/signal.h main/thread.h +build_sources_headers main/fss_read.h main/common.h main/common/define.h main/common/enumeration.h main/common/static.h main/common/string.h main/common/type.h main/print/data.h main/print/error.h main/print/message.h main/process.h main/signal.h main/thread.h build_sources_headers basic/fss_read.h basic/common.h basic/print.h build_sources_headers basic_list/fss_read.h basic_list/common.h basic_list/print.h build_sources_headers embedded_list/fss_read.h embedded_list/common.h embedded_list/print.h embedded_list/process.h diff --git a/level_3/fss_read/data/build/settings.basic b/level_3/fss_read/data/build/settings.basic index e2412e85e..1fcc33f8d 100644 --- a/level_3/fss_read/data/build/settings.basic +++ b/level_3/fss_read/data/build/settings.basic @@ -28,7 +28,7 @@ version_micro 3 version_file micro version_target minor -modes android clang coverage fanalyzer gcc gcc_13 individual individual_thread level monolithic test thread threadless +modes android clang coverage debug fanalyzer gcc gcc_13 individual individual_thread level monolithic test thread threadless modes_default debug gcc monolithic thread build_compiler gcc diff --git a/level_3/fss_read/data/build/settings.basic_list b/level_3/fss_read/data/build/settings.basic_list index c77f45c17..1c26b5df5 100644 --- a/level_3/fss_read/data/build/settings.basic_list +++ b/level_3/fss_read/data/build/settings.basic_list @@ -28,7 +28,7 @@ version_micro 3 version_file micro version_target minor -modes android clang coverage fanalyzer gcc gcc_13 individual individual_thread level monolithic test thread threadless +modes android clang coverage debug fanalyzer gcc gcc_13 individual individual_thread level monolithic test thread threadless modes_default debug gcc monolithic thread build_compiler gcc diff --git a/level_3/fss_read/data/build/settings.embedded_list b/level_3/fss_read/data/build/settings.embedded_list index b3ef44d79..dec875531 100644 --- a/level_3/fss_read/data/build/settings.embedded_list +++ b/level_3/fss_read/data/build/settings.embedded_list @@ -28,7 +28,7 @@ version_micro 3 version_file micro version_target minor -modes android clang coverage fanalyzer gcc gcc_13 individual individual_thread level monolithic test thread threadless +modes android clang coverage debug fanalyzer gcc gcc_13 individual individual_thread level monolithic test thread threadless modes_default debug gcc monolithic thread build_compiler gcc diff --git a/level_3/fss_read/data/build/settings.extended b/level_3/fss_read/data/build/settings.extended index b56566834..5f723eeda 100644 --- a/level_3/fss_read/data/build/settings.extended +++ b/level_3/fss_read/data/build/settings.extended @@ -28,7 +28,7 @@ version_micro 3 version_file micro version_target minor -modes android clang coverage fanalyzer gcc gcc_13 individual individual_thread level monolithic test thread threadless +modes android clang coverage debug fanalyzer gcc gcc_13 individual individual_thread level monolithic test thread threadless modes_default debug gcc monolithic thread build_compiler gcc diff --git a/level_3/fss_read/data/build/settings.extended_list b/level_3/fss_read/data/build/settings.extended_list index 2a014a387..b290895e3 100644 --- a/level_3/fss_read/data/build/settings.extended_list +++ b/level_3/fss_read/data/build/settings.extended_list @@ -28,7 +28,7 @@ version_micro 3 version_file micro version_target minor -modes android clang coverage fanalyzer gcc gcc_13 individual individual_thread level monolithic test thread threadless +modes android clang coverage debug fanalyzer gcc gcc_13 individual individual_thread level monolithic test thread threadless modes_default debug gcc monolithic thread build_compiler gcc diff --git a/level_3/fss_read/data/build/settings.main b/level_3/fss_read/data/build/settings.main index 13498eeee..e64b72dfb 100644 --- a/level_3/fss_read/data/build/settings.main +++ b/level_3/fss_read/data/build/settings.main @@ -28,7 +28,7 @@ version_micro 3 version_file micro version_target minor -modes android clang coverage fanalyzer gcc gcc_13 individual individual_thread level monolithic test thread threadless +modes android clang coverage debug fanalyzer gcc gcc_13 individual individual_thread level monolithic test thread threadless modes_default debug gcc monolithic thread build_compiler gcc diff --git a/level_3/fss_read/data/build/settings.payload b/level_3/fss_read/data/build/settings.payload index 8141cb266..8d02d1624 100644 --- a/level_3/fss_read/data/build/settings.payload +++ b/level_3/fss_read/data/build/settings.payload @@ -28,7 +28,7 @@ version_micro 3 version_file micro version_target minor -modes android clang coverage fanalyzer gcc gcc_13 individual individual_thread level monolithic test thread threadless +modes android clang coverage debug fanalyzer gcc gcc_13 individual individual_thread level monolithic test thread threadless modes_default debug gcc monolithic thread build_compiler gcc diff --git a/level_3/fss_write/c/basic/fss_write.c b/level_3/fss_write/c/basic/fss_write.c index 50cc7e489..ce4eb2363 100644 --- a/level_3/fss_write/c/basic/fss_write.c +++ b/level_3/fss_write/c/basic/fss_write.c @@ -30,7 +30,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(fl_fss_basic_content_write)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -41,7 +41,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append(f_fss_basic_close_s, &main->setting.buffer); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_string_dynamic_append)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); } } } @@ -89,7 +89,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(fl_fss_basic_object_write)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -100,7 +100,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append(f_fss_basic_open_s, &main->setting.buffer); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_string_dynamic_append)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); } } } diff --git a/level_3/fss_write/c/basic/fss_write.h b/level_3/fss_write/c/basic/fss_write.h index f17885a2f..01413f251 100644 --- a/level_3/fss_write/c/basic/fss_write.h +++ b/level_3/fss_write/c/basic/fss_write.h @@ -46,7 +46,6 @@ // FSS Write includes. #include #include -#include #include #include #include diff --git a/level_3/fss_write/c/basic/main.c b/level_3/fss_write/c/basic/main.c index e89f01c14..4998ec179 100644 --- a/level_3/fss_write/c/basic/main.c +++ b/level_3/fss_write/c/basic/main.c @@ -57,7 +57,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { data.setting.state.status = f_thread_create(0, &id_signal, &fss_write_thread_signal, (void *) &data); if (F_status_is_error(data.setting.state.status)) { - fss_write_print_error(&data.program.error, macro_fss_write_f(f_thread_create)); + fss_write_print_error(&data.program.error, F_status_debug_source_d); } else { { diff --git a/level_3/fss_write/c/basic_list/fss_write.c b/level_3/fss_write/c/basic_list/fss_write.c index 7256293e1..395d13840 100644 --- a/level_3/fss_write/c/basic_list/fss_write.c +++ b/level_3/fss_write/c/basic_list/fss_write.c @@ -33,7 +33,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(fl_fss_basic_list_content_write)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -44,7 +44,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append(f_fss_basic_list_close_s, &main->setting.buffer); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_string_dynamic_append)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); } } } @@ -89,7 +89,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(fl_fss_basic_list_object_write)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -104,7 +104,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_string_dynamic_append)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); } } } diff --git a/level_3/fss_write/c/basic_list/fss_write.h b/level_3/fss_write/c/basic_list/fss_write.h index 0f0a6c35b..34720bc22 100644 --- a/level_3/fss_write/c/basic_list/fss_write.h +++ b/level_3/fss_write/c/basic_list/fss_write.h @@ -47,7 +47,6 @@ // FSS Write includes. #include #include -#include #include #include #include diff --git a/level_3/fss_write/c/basic_list/main.c b/level_3/fss_write/c/basic_list/main.c index cc34636c2..e546fd69d 100644 --- a/level_3/fss_write/c/basic_list/main.c +++ b/level_3/fss_write/c/basic_list/main.c @@ -57,7 +57,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { data.setting.state.status = f_thread_create(0, &id_signal, &fss_write_thread_signal, (void *) &data); if (F_status_is_error(data.setting.state.status)) { - fss_write_print_error(&data.program.error, macro_fss_write_f(f_thread_create)); + fss_write_print_error(&data.program.error, F_status_debug_source_d); } else { { diff --git a/level_3/fss_write/c/embedded_list/fss_write.c b/level_3/fss_write/c/embedded_list/fss_write.c index 3aca9c08d..a1eb4cd19 100644 --- a/level_3/fss_write/c/embedded_list/fss_write.c +++ b/level_3/fss_write/c/embedded_list/fss_write.c @@ -34,7 +34,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(fl_fss_embedded_list_content_write)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -49,7 +49,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_string_dynamic_append)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); } } } @@ -94,7 +94,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(fl_fss_embedded_list_object_write)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -109,7 +109,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_string_dynamic_append)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); } } } diff --git a/level_3/fss_write/c/embedded_list/fss_write.h b/level_3/fss_write/c/embedded_list/fss_write.h index b0424556a..598a07ddf 100644 --- a/level_3/fss_write/c/embedded_list/fss_write.h +++ b/level_3/fss_write/c/embedded_list/fss_write.h @@ -46,7 +46,6 @@ // FSS Write includes. #include #include -#include #include #include #include diff --git a/level_3/fss_write/c/embedded_list/main.c b/level_3/fss_write/c/embedded_list/main.c index f1b6e5030..875ba2b00 100644 --- a/level_3/fss_write/c/embedded_list/main.c +++ b/level_3/fss_write/c/embedded_list/main.c @@ -60,7 +60,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { data.setting.state.status = f_thread_create(0, &id_signal, &fss_write_thread_signal, (void *) &data); if (F_status_is_error(data.setting.state.status)) { - fss_write_print_error(&data.program.error, macro_fss_write_f(f_thread_create)); + fss_write_print_error(&data.program.error, F_status_debug_source_d); } else { { diff --git a/level_3/fss_write/c/extended/fss_write.c b/level_3/fss_write/c/extended/fss_write.c index 464f12fe6..21f852e79 100644 --- a/level_3/fss_write/c/extended/fss_write.c +++ b/level_3/fss_write/c/extended/fss_write.c @@ -35,7 +35,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(fl_fss_extended_content_write)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -46,14 +46,14 @@ extern "C" { main->setting.state.status = f_string_dynamic_append(f_fss_extended_close_s, &main->setting.buffer); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_string_dynamic_append)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); } } else if (main->setting.flag & fss_write_main_flag_content_next_d) { main->setting.state.status = f_string_dynamic_append(f_fss_extended_next_s, &main->setting.buffer); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_string_dynamic_append)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); } } } @@ -101,7 +101,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(fl_fss_extended_object_write)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -111,7 +111,7 @@ extern "C" { if (main->setting.flag & fss_write_main_flag_object_open_d) { main->setting.state.status = f_string_dynamic_append(f_fss_extended_open_s, &main->setting.buffer); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_string_dynamic_append)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); } } } diff --git a/level_3/fss_write/c/extended/fss_write.h b/level_3/fss_write/c/extended/fss_write.h index ef7519405..2d65ee041 100644 --- a/level_3/fss_write/c/extended/fss_write.h +++ b/level_3/fss_write/c/extended/fss_write.h @@ -46,7 +46,6 @@ // FSS Write includes. #include #include -#include #include #include #include diff --git a/level_3/fss_write/c/extended/main.c b/level_3/fss_write/c/extended/main.c index 6c0fad974..a7478f0e9 100644 --- a/level_3/fss_write/c/extended/main.c +++ b/level_3/fss_write/c/extended/main.c @@ -59,7 +59,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { data.setting.state.status = f_thread_create(0, &id_signal, &fss_write_thread_signal, (void *) &data); if (F_status_is_error(data.setting.state.status)) { - fss_write_print_error(&data.program.error, macro_fss_write_f(f_thread_create)); + fss_write_print_error(&data.program.error, F_status_debug_source_d); } else { { diff --git a/level_3/fss_write/c/extended_list/fss_write.c b/level_3/fss_write/c/extended_list/fss_write.c index 97cc1acd5..8a3b9ba3a 100644 --- a/level_3/fss_write/c/extended_list/fss_write.c +++ b/level_3/fss_write/c/extended_list/fss_write.c @@ -34,7 +34,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(fl_fss_extended_list_content_write)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -49,7 +49,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_string_dynamic_append)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); } } } @@ -94,7 +94,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(fl_fss_extended_list_object_write)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -109,7 +109,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_string_dynamic_append)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); } } } diff --git a/level_3/fss_write/c/extended_list/fss_write.h b/level_3/fss_write/c/extended_list/fss_write.h index ea8fbf0fe..8137a4e50 100644 --- a/level_3/fss_write/c/extended_list/fss_write.h +++ b/level_3/fss_write/c/extended_list/fss_write.h @@ -46,7 +46,6 @@ // FSS Write includes. #include #include -#include #include #include #include diff --git a/level_3/fss_write/c/extended_list/main.c b/level_3/fss_write/c/extended_list/main.c index c33d0ccbe..cb9cb8b3f 100644 --- a/level_3/fss_write/c/extended_list/main.c +++ b/level_3/fss_write/c/extended_list/main.c @@ -59,7 +59,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { data.setting.state.status = f_thread_create(0, &id_signal, &fss_write_thread_signal, (void *) &data); if (F_status_is_error(data.setting.state.status)) { - fss_write_print_error(&data.program.error, macro_fss_write_f(f_thread_create)); + fss_write_print_error(&data.program.error, F_status_debug_source_d); } else { { diff --git a/level_3/fss_write/c/main/common.c b/level_3/fss_write/c/main/common.c index 2f2b608ac..980bb4eae 100644 --- a/level_3/fss_write/c/main/common.c +++ b/level_3/fss_write/c/main/common.c @@ -18,7 +18,7 @@ extern "C" { main->setting.state.step_small = fss_write_allocation_small_d; if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_console_parameter_process)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -26,7 +26,7 @@ extern "C" { main->setting.state.status = fll_program_parameter_process_context_standard(F_true, &main->program); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(fll_program_parameter_process_context_standard)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -34,7 +34,7 @@ extern "C" { main->setting.state.status = fll_program_parameter_process_verbosity_standard(F_true, &main->program); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(fll_program_parameter_process_verbosity_standard)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -93,7 +93,7 @@ extern "C" { main->setting.state.status = f_file_stream_open(parameters->arguments.array[index], f_string_empty_s, &main->program.output.to); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error_file(&main->program.error, macro_fss_write_f(f_file_stream_open), parameters->arguments.array[index], f_file_operation_open_s, fll_error_file_type_file_e); + fss_write_print_error_file(&main->program.error, F_status_debug_source_d, parameters->arguments.array[index], f_file_operation_open_s, fll_error_file_type_file_e); return; } @@ -116,7 +116,7 @@ extern "C" { main->setting.state.status = f_memory_arrays_resize(values->used, sizeof(f_string_dynamic_t), (void **) &main->setting.objects.array, &main->setting.objects.used, &main->setting.objects.size, &f_string_dynamics_delete_callback); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_memory_arrays_resize)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -168,7 +168,7 @@ extern "C" { main->setting.state.status = f_memory_arrays_resize(values_object->used, sizeof(f_string_dynamic_t), (void **) &main->setting.contentss.array, &main->setting.contentss.used, &main->setting.contentss.size, &f_string_dynamics_delete_callback); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_memory_arrays_resize)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -199,7 +199,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(total, sizeof(f_string_dynamic_t), (void **) &main->setting.contentss.array[j].array, &main->setting.contentss.array[j].used, &main->setting.contentss.array[j].size); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_memory_array_increase_by)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -236,7 +236,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_nulless(parameters->arguments.array[index], &main->setting.prepend); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_string_dynamic_append_nulless)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -248,7 +248,7 @@ extern "C" { if (f_fss_is_space(parameters->arguments.array[index], range, &main->setting.state) == F_false) { if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_fss_is_space)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); } else { main->setting.state.status = F_status_set_error(F_parameter); @@ -297,7 +297,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(values_data->used, sizeof(f_ranges_t), (void **) &main->setting.ignoress.array, &main->setting.ignoress.used, &main->setting.ignoress.size); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_memory_array_increase_by)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -327,7 +327,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(total, sizeof(f_range_t), (void **) &main->setting.ignoress.array[j].array, &main->setting.ignoress.array[j].used, &main->setting.ignoress.array[j].size); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_memory_array_increase_by)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } diff --git a/level_3/fss_write/c/main/common/print.c b/level_3/fss_write/c/main/common/print.c deleted file mode 100644 index 9101d78e7..000000000 --- a/level_3/fss_write/c/main/common/print.c +++ /dev/null @@ -1,39 +0,0 @@ -#include "../fss_write.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef _di_fss_write_f_a_ - const f_string_t fss_write_f_a[] = { - "f_console_parameter_process", - "f_file_read_block", - "f_file_stream_open", - "f_fss_is_space", - "f_memory_array_increase", - "f_memory_array_increase_by", - "f_memory_arrays_resize", - "f_string_dynamic_append", - "f_string_dynamic_append_nulless", - "f_string_read_block_increase", - "f_thread_create", - "fl_fss_basic_content_write", - "fl_fss_basic_list_content_write", - "fl_fss_basic_list_object_write", - "fl_fss_basic_object_write", - "fl_fss_embedded_list_content_write", - "fl_fss_embedded_list_object_write", - "fl_fss_extended_content_write", - "fl_fss_extended_list_content_write", - "fl_fss_extended_list_object_write", - "fl_fss_extended_object_write", - "fl_fss_payload_content_write", - "fll_program_parameter_process_context_standard", - "fll_program_parameter_process_verbosity_standard", - "fll_fss_payload_write", - }; -#endif // _di_fss_write_f_a_ - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/level_3/fss_write/c/main/common/print.h b/level_3/fss_write/c/main/common/print.h deleted file mode 100644 index b9dfb231a..000000000 --- a/level_3/fss_write/c/main/common/print.h +++ /dev/null @@ -1,74 +0,0 @@ -/** - * FLL - Level 3 - * - * Project: FSS Write - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Provides the common print functionality. - * - * This is auto-included and should not need to be explicitly included. - */ -#ifndef _fss_write_common_print_h -#define _fss_write_common_print_h - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * A special array of strings intended for representing function names. - * - * These are primarily used for printing errors with the function names. - * - * The macro macro_fss_write_f() is used to reference the array index by the enum name. - * - * macro_fss_write_f(): - * - name: The name of the function. - */ -#ifndef _di_fss_write_f_a_ - extern const f_string_t fss_write_f_a[]; - - #define macro_fss_write_f(name) fss_write_f_a[fss_write_f_##name##_e] -#endif // _di_fss_write_f_a_ - -/** - * An enum representing specific indexes within the above array. - * - * This is a convenience enum used to make code slightly more readable. - */ -#ifndef _di_fss_write_f_e_ - enum { - fss_write_f_f_console_parameter_process_e, - fss_write_f_f_file_read_block_e, - fss_write_f_f_file_stream_open_e, - fss_write_f_f_fss_is_space_e, - fss_write_f_f_memory_array_increase_e, - fss_write_f_f_memory_array_increase_by_e, - fss_write_f_f_memory_arrays_resize_e, - fss_write_f_f_string_dynamic_append_e, - fss_write_f_f_string_dynamic_append_nulless_e, - fss_write_f_f_string_read_block_increase_e, - fss_write_f_f_thread_create_e, - fss_write_f_fl_fss_basic_content_write_e, - fss_write_f_fl_fss_basic_list_content_write_e, - fss_write_f_fl_fss_basic_list_object_write_e, - fss_write_f_fl_fss_basic_object_write_e, - fss_write_f_fl_fss_embedded_list_content_write_e, - fss_write_f_fl_fss_embedded_list_object_write_e, - fss_write_f_fl_fss_extended_content_write_e, - fss_write_f_fl_fss_extended_list_content_write_e, - fss_write_f_fl_fss_extended_list_object_write_e, - fss_write_f_fl_fss_extended_object_write_e, - fss_write_f_fl_fss_payload_content_write_e, - fss_write_f_fll_program_parameter_process_context_standard_e, - fss_write_f_fll_program_parameter_process_verbosity_standard_e, - fss_write_f_fll_fss_payload_write_e, - }; // enum -#endif // _di_fss_write_f_e_ - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif // _fss_write_common_print_h diff --git a/level_3/fss_write/c/main/fss_write.c b/level_3/fss_write/c/main/fss_write.c index 2662d1607..f3b3e480b 100644 --- a/level_3/fss_write/c/main/fss_write.c +++ b/level_3/fss_write/c/main/fss_write.c @@ -138,7 +138,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase(main->setting.state.step_small, sizeof(f_string_dynamic_t), (void **) &main->setting.objects.array, &main->setting.objects.used, &main->setting.objects.size); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_memory_array_increase)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -147,7 +147,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase(main->setting.state.step_small, sizeof(f_string_dynamics_t), (void **) &main->setting.contentss.array, &main->setting.contentss.used, &main->setting.contentss.size); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_memory_array_increase)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -155,7 +155,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase(main->setting.state.step_small, sizeof(f_string_dynamic_t), (void **) &main->setting.contents->array, &main->setting.contents->used, &main->setting.contents->size); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_memory_array_increase)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -164,7 +164,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase(main->setting.state.step_small, sizeof(f_ranges_t), (void **) &main->setting.ignoress.array, &main->setting.ignoress.used, &main->setting.ignoress.size); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_memory_array_increase)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -195,7 +195,7 @@ extern "C" { status_pipe = f_file_read_block(input, &main->setting.block); if (F_status_is_error(status_pipe)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_file_read_block)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); status_pipe = F_status_set_error(F_pipe); @@ -223,7 +223,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(main->setting.block.used, sizeof(f_char_t), (void **) &main->setting.object->string, &main->setting.object->used, &main->setting.object->size); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_memory_array_increase_by)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -289,7 +289,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase(main->setting.state.step_small, sizeof(f_string_dynamic_t), (void **) &main->setting.contents->array, &main->setting.contents->used, &main->setting.contents->size); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_memory_array_increase)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -306,7 +306,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(total, sizeof(f_char_t), (void **) &main->setting.contents->array[main->setting.contents->used].string, &main->setting.contents->array[main->setting.contents->used].used, &main->setting.contents->array[main->setting.contents->used].size); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_memory_array_increase_by)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -340,7 +340,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase(main->setting.state.step_small, sizeof(f_range_t), (void **) &main->setting.ignores->array, &main->setting.ignores->used, &main->setting.ignores->size); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_memory_array_increase)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); break; } diff --git a/level_3/fss_write/c/main/fss_write.h b/level_3/fss_write/c/main/fss_write.h index ee8e3f669..8e0fb41ba 100644 --- a/level_3/fss_write/c/main/fss_write.h +++ b/level_3/fss_write/c/main/fss_write.h @@ -49,7 +49,6 @@ // FSS Write includes. #include #include -#include #include #include #include diff --git a/level_3/fss_write/c/main/main.c b/level_3/fss_write/c/main/main.c index a53a4920d..2fb2de6b5 100644 --- a/level_3/fss_write/c/main/main.c +++ b/level_3/fss_write/c/main/main.c @@ -56,7 +56,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { data.setting.state.status = f_thread_create(0, &id_signal, &fss_write_thread_signal, (void *) &data); if (F_status_is_error(data.setting.state.status)) { - fss_write_print_error(&data.program.error, macro_fss_write_f(f_thread_create)); + fss_write_print_error(&data.program.error, F_status_debug_source_d); } else { { diff --git a/level_3/fss_write/c/main/print/error.c b/level_3/fss_write/c/main/print/error.c index a1d1641cc..751d0bd59 100644 --- a/level_3/fss_write/c/main/print/error.c +++ b/level_3/fss_write/c/main/print/error.c @@ -5,24 +5,24 @@ extern "C" { #endif #ifndef _di_fss_write_print_error_ - f_status_t fss_write_print_error(fl_print_t * const print, const f_string_t function) { + f_status_t fss_write_print_error(fl_print_t * const print, const f_string_t debug) { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity == f_console_verbosity_quiet_e) return F_output_not; - fll_error_print(print, F_status_set_fine(((fss_write_main_t *) print->custom)->setting.state.status), function, fll_error_file_flag_fallback_e); + fll_error_print(print, F_status_set_fine(((fss_write_main_t *) print->custom)->setting.state.status), debug, fll_error_file_flag_fallback_e); return F_okay; } #endif // _di_fss_write_print_error_ #ifndef _di_fss_write_print_error_file_ - f_status_t fss_write_print_error_file(fl_print_t * const print, const f_string_t function, const f_string_static_t name, const f_string_static_t operation, const uint8_t type) { + f_status_t fss_write_print_error_file(fl_print_t * const print, const f_string_t debug, const f_string_static_t name, const f_string_static_t operation, const uint8_t type) { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity == f_console_verbosity_quiet_e) return F_output_not; - fll_error_file_print(print, F_status_set_fine(((fss_write_main_t *) print->custom)->setting.state.status), function, fll_error_file_flag_fallback_e, name, operation, type); + fll_error_file_print(print, F_status_set_fine(((fss_write_main_t *) print->custom)->setting.state.status), debug, fll_error_file_flag_fallback_e, name, operation, type); return F_okay; } diff --git a/level_3/fss_write/c/main/print/error.h b/level_3/fss_write/c/main/print/error.h index 6604b3d74..411dc16df 100644 --- a/level_3/fss_write/c/main/print/error.h +++ b/level_3/fss_write/c/main/print/error.h @@ -25,6 +25,10 @@ extern "C" { * The print.custom is expected to be of type fss_read_main_t. * * This does not alter print.custom.setting.state.status. + * @param debug + * (optional) The debug details, such as file, line number, and function. + * + * Set to NULL to disable. * * @return * F_okay on success. @@ -33,7 +37,7 @@ extern "C" { * F_output_not (with error bit) if a parameter is NULL. */ #ifndef _di_fss_write_print_error_ - extern f_status_t fss_write_print_error(fl_print_t * const print, const f_string_t function); + extern f_status_t fss_write_print_error(fl_print_t * const print, const f_string_t debug); #endif // _di_fss_write_print_error_ /** @@ -45,8 +49,8 @@ extern "C" { * The print.custom is expected to be of type fss_read_main_t. * * This does not alter print.custom.setting.state.status. - * @param function - * (optional) The name of the function where the error happened. + * @param debug + * (optional) The debug details, such as file, line number, and function. * * Set to NULL to disable. * @param name @@ -65,7 +69,7 @@ extern "C" { * @see fll_error_file_print() */ #ifndef _di_fss_write_print_error_file_ - extern f_status_t fss_write_print_error_file(fl_print_t * const print, const f_string_t function, const f_string_static_t name, const f_string_static_t operation, const uint8_t type); + extern f_status_t fss_write_print_error_file(fl_print_t * const print, const f_string_t debug, const f_string_static_t name, const f_string_static_t operation, const uint8_t type); #endif // _di_fss_write_print_error_file_ /** diff --git a/level_3/fss_write/c/payload/fss_write.c b/level_3/fss_write/c/payload/fss_write.c index d8f4ce7e3..87f55e376 100644 --- a/level_3/fss_write/c/payload/fss_write.c +++ b/level_3/fss_write/c/payload/fss_write.c @@ -46,7 +46,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase(main->setting.state.step_small, sizeof(f_string_dynamic_t), (void **) &main->setting.objects.array, &main->setting.objects.used, &main->setting.objects.size); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_memory_array_increase)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -55,7 +55,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase(main->setting.state.step_small, sizeof(f_string_dynamics_t), (void **) &main->setting.contentss.array, &main->setting.contentss.used, &main->setting.contentss.size); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_memory_array_increase)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -63,7 +63,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase(main->setting.state.step_small, sizeof(f_string_dynamic_t), (void **) &main->setting.objects.array, &main->setting.objects.used, &main->setting.objects.size); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_memory_array_increase)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -72,7 +72,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase(main->setting.state.step_small, sizeof(f_ranges_t), (void **) &main->setting.ignoress.array, &main->setting.ignoress.used, &main->setting.ignoress.size); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_memory_array_increase)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -94,7 +94,7 @@ extern "C" { status_pipe = f_file_read_block(input, &main->setting.block); if (F_status_is_error(status_pipe)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_file_read_block)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); status_pipe = F_status_set_error(F_pipe); @@ -123,7 +123,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(main->setting.block.used, sizeof(f_char_t), (void **) &main->setting.object->string, &main->setting.object->used, &main->setting.object->size); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_memory_array_increase_by)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -189,7 +189,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase(main->setting.state.step_small, sizeof(f_string_dynamic_t), (void **) &main->setting.objects.array, &main->setting.objects.used, &main->setting.objects.size); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_memory_array_increase)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -208,7 +208,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(total, sizeof(f_char_t), (void **) &main->setting.contents->array[main->setting.contents->used].string, &main->setting.contents->array[main->setting.contents->used].used, &main->setting.contents->array[main->setting.contents->used].size); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_memory_array_increase_by)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -232,7 +232,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(total, sizeof(f_char_t), (void **) &main->setting.contents->array[main->setting.contents->used].string, &main->setting.contents->array[main->setting.contents->used].used, &main->setting.contents->array[main->setting.contents->used].size); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_memory_array_increase_by)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -308,7 +308,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(length + 1, sizeof(f_char_t), (void **) &main->setting.contents->array[main->setting.contents->used].string, &main->setting.contents->array[main->setting.contents->used].used, &main->setting.contents->array[main->setting.contents->used].size); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_memory_array_increase_by)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); break; } @@ -402,7 +402,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(fll_fss_payload_write)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -441,7 +441,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(fl_fss_basic_list_object_write)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -456,7 +456,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_string_dynamic_append)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -489,7 +489,7 @@ extern "C" { ); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(fl_fss_payload_content_write)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -500,7 +500,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append(f_fss_basic_list_close_s, &main->setting.buffer); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_string_dynamic_append)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -512,7 +512,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append(f_string_eol_s, &main->setting.buffer); if (F_status_is_error(main->setting.state.status)) { - fss_write_print_error(&main->program.error, macro_fss_write_f(f_string_dynamic_append)); + fss_write_print_error(&main->program.error, F_status_debug_source_d); return; } diff --git a/level_3/fss_write/c/payload/fss_write.h b/level_3/fss_write/c/payload/fss_write.h index 43d774824..407d2561a 100644 --- a/level_3/fss_write/c/payload/fss_write.h +++ b/level_3/fss_write/c/payload/fss_write.h @@ -47,7 +47,6 @@ // FSS Write includes. #include #include -#include #include #include #include diff --git a/level_3/fss_write/c/payload/main.c b/level_3/fss_write/c/payload/main.c index 41d8c4c81..7513c34aa 100644 --- a/level_3/fss_write/c/payload/main.c +++ b/level_3/fss_write/c/payload/main.c @@ -58,7 +58,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { data.setting.state.status = f_thread_create(0, &id_signal, &fss_write_thread_signal, (void *) &data); if (F_status_is_error(data.setting.state.status)) { - fss_write_print_error(&data.program.error, macro_fss_write_f(f_thread_create)); + fss_write_print_error(&data.program.error, F_status_debug_source_d); } else { { diff --git a/level_3/fss_write/data/build/settings b/level_3/fss_write/data/build/settings index 912d47627..490a70247 100644 --- a/level_3/fss_write/data/build/settings +++ b/level_3/fss_write/data/build/settings @@ -48,7 +48,7 @@ build_libraries_static-individual_thread -l:libf_thread.a build_libraries_static-level -l:libfll_2.a -l:libfll_1.a -l:libfll_0.a build_libraries_static-monolithic -l:libfll.a -build_sources_library main/fss_write.c main/common.c main/common/define.c main/common/enumeration.c main/common/print.c main/common/string.c main/common/type.c main/print/error.c main/print/message.c main/signal.c main/thread.c +build_sources_library main/fss_write.c main/common.c main/common/define.c main/common/enumeration.c main/common/string.c main/common/type.c main/print/error.c main/print/message.c main/signal.c main/thread.c build_sources_library basic/fss_write.c basic/common.c basic/print.c build_sources_library basic_list/fss_write.c basic_list/common.c basic_list/print.c build_sources_library embedded_list/fss_write.c embedded_list/common.c embedded_list/print.c @@ -56,7 +56,7 @@ build_sources_library extended/fss_write.c extended/common.c extended/print.c build_sources_library extended_list/fss_write.c extended_list/common.c extended_list/print.c build_sources_library payload/fss_write.c payload/common.c payload/print.c -build_sources_headers main/fss_write.h main/common.h main/common/define.h main/common/enumeration.h main/common/print.h main/common/string.h main/common/type.h main/print/error.h main/print/message.h main/signal.h main/thread.h +build_sources_headers main/fss_write.h main/common.h main/common/define.h main/common/enumeration.h main/common/string.h main/common/type.h main/print/error.h main/print/message.h main/signal.h main/thread.h build_sources_headers basic/fss_write.h basic/common.h basic/print.h build_sources_headers basic_list/fss_write.h basic_list/common.h basic_list/print.h build_sources_headers embedded_list/fss_write.h embedded_list/common.h embedded_list/print.h diff --git a/level_3/iki_read/c/eki/eki_read.h b/level_3/iki_read/c/eki/eki_read.h index af6ccfb23..c99dd15d2 100644 --- a/level_3/iki_read/c/eki/eki_read.h +++ b/level_3/iki_read/c/eki/eki_read.h @@ -54,7 +54,6 @@ // IKI Read includes. #include #include -#include #include #include #include diff --git a/level_3/iki_read/c/eki/identify.c b/level_3/iki_read/c/eki/identify.c index f71dae7a9..7ac845010 100644 --- a/level_3/iki_read/c/eki/identify.c +++ b/level_3/iki_read/c/eki/identify.c @@ -33,7 +33,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase(main->setting.state.step_small, sizeof(f_number_unsigned_t), (void **) &main->setting.map_replacess.array[i].array, &main->setting.map_replacess.array[i].used, &main->setting.map_replacess.array[i].size); if (F_status_is_error(main->setting.state.status)) { - iki_read_print_error(&main->program.error, macro_iki_read_f(f_memory_array_increase)); + iki_read_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -52,7 +52,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase(main->setting.state.step_small, sizeof(f_number_unsigned_t), (void **) &main->setting.map_wrapss.array[i].array, &main->setting.map_wrapss.array[i].used, &main->setting.map_wrapss.array[i].size); if (F_status_is_error(main->setting.state.status)) { - iki_read_print_error(&main->program.error, macro_iki_read_f(f_memory_array_increase)); + iki_read_print_error(&main->program.error, F_status_debug_source_d); return; } diff --git a/level_3/iki_read/c/eki/main.c b/level_3/iki_read/c/eki/main.c index 7c4c26ba3..ccae28460 100644 --- a/level_3/iki_read/c/eki/main.c +++ b/level_3/iki_read/c/eki/main.c @@ -60,7 +60,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { data.setting.state.status = f_thread_create(0, &id_signal, &iki_read_thread_signal, (void *) &data); if (F_status_is_error(data.setting.state.status)) { - iki_read_print_error(&data.program.error, macro_iki_read_f(f_thread_create)); + iki_read_print_error(&data.program.error, F_status_debug_source_d); } else { { diff --git a/level_3/iki_read/c/eki/process.c b/level_3/iki_read/c/eki/process.c index 5b575e6f2..641406c9f 100644 --- a/level_3/iki_read/c/eki/process.c +++ b/level_3/iki_read/c/eki/process.c @@ -200,7 +200,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - iki_read_print_error(&main->program.error, macro_iki_read_f(iki_read_callback_process_buffer_line)); + iki_read_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -445,7 +445,7 @@ extern "C" { fl_iki_eki_read(&main->cache.buffer, range_buffer, data, &main->setting.state); if (F_status_is_error(main->setting.state.status)) { - iki_read_print_error(&main->program.error, macro_iki_read_f(fl_iki_read)); + iki_read_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -470,7 +470,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - iki_read_print_error(&main->program.error, macro_iki_read_f(f_memory_arrays_resize)); + iki_read_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -630,7 +630,7 @@ extern "C" { fl_iki_eki_read(&main->cache.buffer, &range, data, &main->setting.state); if (F_status_is_error(main->setting.state.status)) { - iki_read_print_error(&main->program.error, macro_iki_read_f(fl_iki_eki_read)); + iki_read_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -664,7 +664,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_nulless(main->program.parameters.arguments.array[index], &name); if (F_status_is_error(main->setting.state.status)) { - iki_read_print_error(&main->program.error, macro_iki_read_f(f_string_dynamic_append_nulless)); + iki_read_print_error(&main->program.error, F_status_debug_source_d); f_memory_array_resize(0, sizeof(f_char_t), (void **) &name.string, &name.used, &name.size); diff --git a/level_3/iki_read/c/iki/identify.c b/level_3/iki_read/c/iki/identify.c index 00fd94153..32a2e714d 100644 --- a/level_3/iki_read/c/iki/identify.c +++ b/level_3/iki_read/c/iki/identify.c @@ -31,7 +31,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(1, sizeof(f_number_unsigned_t), (void **) &main->setting.map_replacess.array[i].array, &main->setting.map_replacess.array[i].used, &main->setting.map_replacess.array[i].size); if (F_status_is_error(main->setting.state.status)) { - iki_read_print_error(&main->program.error, macro_iki_read_f(f_memory_array_increase_by)); + iki_read_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -56,7 +56,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(1, sizeof(f_number_unsigned_t), (void **) &main->setting.map_wrapss.array[i].array, &main->setting.map_wrapss.array[i].used, &main->setting.map_wrapss.array[i].size); if (F_status_is_error(main->setting.state.status)) { - iki_read_print_error(&main->program.error, macro_iki_read_f(f_memory_array_increase_by)); + iki_read_print_error(&main->program.error, F_status_debug_source_d); return; } diff --git a/level_3/iki_read/c/iki/iki_read.h b/level_3/iki_read/c/iki/iki_read.h index 63e816946..2d2f05e70 100644 --- a/level_3/iki_read/c/iki/iki_read.h +++ b/level_3/iki_read/c/iki/iki_read.h @@ -54,7 +54,6 @@ // IKI Read includes. #include #include -#include #include #include #include diff --git a/level_3/iki_read/c/iki/main.c b/level_3/iki_read/c/iki/main.c index b6f97d656..48da3a66c 100644 --- a/level_3/iki_read/c/iki/main.c +++ b/level_3/iki_read/c/iki/main.c @@ -61,7 +61,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { data.setting.state.status = f_thread_create(0, &id_signal, &iki_read_thread_signal, (void *) &data); if (F_status_is_error(data.setting.state.status)) { - iki_read_print_error(&data.program.error, macro_iki_read_f(f_thread_create)); + iki_read_print_error(&data.program.error, F_status_debug_source_d); } else { { diff --git a/level_3/iki_read/c/iki/process.c b/level_3/iki_read/c/iki/process.c index 34f8a5231..7082fd0b1 100644 --- a/level_3/iki_read/c/iki/process.c +++ b/level_3/iki_read/c/iki/process.c @@ -172,7 +172,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - iki_read_print_error(&main->program.error, macro_iki_read_f(iki_read_callback_process_buffer_line)); + iki_read_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -402,7 +402,7 @@ extern "C" { fl_iki_read(&main->cache.buffer, range_buffer, data, &main->setting.state); if (F_status_is_error(main->setting.state.status)) { - iki_read_print_error(&main->program.error, macro_iki_read_f(fl_iki_read)); + iki_read_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -427,7 +427,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - iki_read_print_error(&main->program.error, macro_iki_read_f(f_memory_arrays_resize)); + iki_read_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -581,7 +581,7 @@ extern "C" { fl_iki_read(&main->cache.buffer, &range, data, &main->setting.state); if (F_status_is_error(main->setting.state.status)) { - iki_read_print_error(&main->program.error, macro_iki_read_f(fl_iki_read)); + iki_read_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -614,7 +614,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_nulless(main->program.parameters.arguments.array[index], &name); if (F_status_is_error(main->setting.state.status)) { - iki_read_print_error(&main->program.error, macro_iki_read_f(f_string_dynamic_append_nulless)); + iki_read_print_error(&main->program.error, F_status_debug_source_d); f_memory_array_resize(0, sizeof(f_char_t), (void **) &name.string, &name.used, &name.size); diff --git a/level_3/iki_read/c/main/common.c b/level_3/iki_read/c/main/common.c index c6dc45b85..7b2f28bf5 100644 --- a/level_3/iki_read/c/main/common.c +++ b/level_3/iki_read/c/main/common.c @@ -22,7 +22,7 @@ extern "C" { main->setting.state.step_small = iki_read_allocation_small_d; if (F_status_is_error(main->setting.state.status)) { - iki_read_print_error(&main->program.error, macro_iki_read_f(f_console_parameter_process)); + iki_read_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -30,7 +30,7 @@ extern "C" { main->setting.state.status = fll_program_parameter_process_context_standard(F_true, &main->program); if (F_status_is_error(main->setting.state.status)) { - iki_read_print_error(&main->program.error, macro_iki_read_f(fll_program_parameter_process_context_standard)); + iki_read_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -38,7 +38,7 @@ extern "C" { main->setting.state.status = fll_program_parameter_process_verbosity_standard(F_true, &main->program); if (F_status_is_error(main->setting.state.status)) { - iki_read_print_error(&main->program.error, macro_iki_read_f(fll_program_parameter_process_verbosity_standard)); + iki_read_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -158,7 +158,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(parameters->array[iki_read_parameter_name_e].values.used, sizeof(f_string_dynamic_t), (void **) &main->setting.names.array, &main->setting.names.used, &main->setting.names.size); if (F_status_is_error(main->setting.state.status)) { - iki_read_print_error(&main->program.error, macro_iki_read_f(f_memory_array_increase_by)); + iki_read_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -189,7 +189,7 @@ extern "C" { } // for if (F_status_is_error(main->setting.state.status)) { - iki_read_print_error(&main->program.error, macro_iki_read_f(f_string_dynamics_append)); + iki_read_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -218,7 +218,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(parameters->array[iki_read_parameter_replace_e].values.used / 2, sizeof(f_string_map_t), (void **) &main->setting.replace.array, &main->setting.replace.used, &main->setting.replace.size); if (F_status_is_error(main->setting.state.status)) { - iki_read_print_error(&main->program.error, macro_iki_read_f(f_memory_array_increase_by)); + iki_read_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -247,7 +247,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - iki_read_print_error(&main->program.error, macro_iki_read_f(f_memory_array_resize)); + iki_read_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -327,7 +327,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(parameters->array[iki_read_parameter_wrap_e].values.used / 3, sizeof(f_string_triple_t), (void **) &main->setting.wrap.array, &main->setting.wrap.used, &main->setting.wrap.size); if (F_status_is_error(main->setting.state.status)) { - iki_read_print_error(&main->program.error, macro_iki_read_f(f_memory_array_increase_by)); + iki_read_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -360,7 +360,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - iki_read_print_error(&main->program.error, macro_iki_read_f(f_memory_array_resize)); + iki_read_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -462,7 +462,7 @@ extern "C" { main->setting.state.status = f_memory_arrays_resize(parameters->remaining.used, sizeof(f_string_dynamic_t), (void **) &main->setting.files.array, &main->setting.files.used, &main->setting.files.size, &f_string_dynamics_delete_callback); if (F_status_is_error(main->setting.state.status)) { - iki_read_print_error(&main->program.error, macro_iki_read_f(f_memory_arrays_resize)); + iki_read_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -476,7 +476,7 @@ extern "C" { main->setting.state.status = f_memory_array_resize(0, sizeof(f_char_t), (void **) &main->setting.files.array[main->setting.files.used].string, &main->setting.files.array[main->setting.files.used].used, &main->setting.files.array[main->setting.files.used].size); if (F_status_is_error(main->setting.state.status)) { - iki_read_print_error(&main->program.error, macro_iki_read_f(f_memory_array_resize)); + iki_read_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -491,7 +491,7 @@ extern "C" { main->setting.state.status = f_file_exists(main->setting.files.array[main->setting.files.used], F_true); if (F_status_is_error(main->setting.state.status)) { - fll_error_file_print(&main->program.error, F_status_set_fine(main->setting.state.status), macro_iki_read_f(f_file_exists), fll_error_file_flag_fallback_e, main->setting.files.array[main->setting.files.used], f_file_operation_verify_s, fll_error_file_type_file_e); + fll_error_file_print(&main->program.error, F_status_set_fine(main->setting.state.status), F_status_debug_source_d, fll_error_file_flag_fallback_e, main->setting.files.array[main->setting.files.used], f_file_operation_verify_s, fll_error_file_type_file_e); return; } @@ -518,7 +518,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(parameter.values.used / 3, sizeof(f_string_triple_t), (void **) &triple->array, &triple->used, &triple->size); if (F_status_is_error(main->setting.state.status)) { - iki_read_print_error(&main->program.error, macro_iki_read_f(f_memory_array_increase_by)); + iki_read_print_error(&main->program.error, F_status_debug_source_d); return F_false; } @@ -560,7 +560,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - iki_read_print_error(&main->program.error, macro_iki_read_f(f_memory_array_resize)); + iki_read_print_error(&main->program.error, F_status_debug_source_d); return F_false; } diff --git a/level_3/iki_read/c/main/common/print.c b/level_3/iki_read/c/main/common/print.c deleted file mode 100644 index 115468068..000000000 --- a/level_3/iki_read/c/main/common/print.c +++ /dev/null @@ -1,38 +0,0 @@ -#include "../iki_read.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef _di_iki_read_f_a_ - const f_string_t iki_read_f_a[] = { - "f_console_parameter_process", - "f_file_descriptor", - "f_file_exists", - "f_file_read", - "f_file_size_by_id", - "f_file_stream_open", - "f_file_stream_read_until", - "f_memory_array_increase", - "f_memory_array_increase_by", - "f_memory_array_resize", - "f_memory_arrays_resize", - "f_string_dynamic_append_nulless", - "f_string_dynamic_partial_append_nulless", - "f_string_dynamics_append", - "f_string_dynamics_increase_by", - "f_string_dynamics_resize", - "f_thread_create", - "fl_iki_eki_read", - "fl_iki_read", - "fll_program_parameter_process_context_standard", - "fll_program_parameter_process_verbosity_standard", - "iki_read_callback_process_buffer_line", - "iki_read_process_wrap_append", - "iki_read_process_wrap_prepend", - }; -#endif // _di_iki_read_f_a_ - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/level_3/iki_read/c/main/common/print.h b/level_3/iki_read/c/main/common/print.h deleted file mode 100644 index c72f71382..000000000 --- a/level_3/iki_read/c/main/common/print.h +++ /dev/null @@ -1,73 +0,0 @@ -/** - * FLL - Level 3 - * - * Project: FSS Write - * API Version: 0.7 - * Licenses: lgpl-2.1-or-later - * - * Provides the common print functionality. - * - * This is auto-included and should not need to be explicitly included. - */ -#ifndef _iki_read_common_print_h -#define _iki_read_common_print_h - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * A special array of strings intended for representing function names. - * - * These are primarily used for printing errors with the function names. - * - * The macro macro_iki_read_f() is used to reference the array index by the enum name. - * - * macro_iki_read_f(): - * - name: The name of the function. - */ -#ifndef _di_iki_read_f_a_ - extern const f_string_t iki_read_f_a[]; - - #define macro_iki_read_f(name) iki_read_f_a[iki_read_f_##name##_e] -#endif // _di_iki_read_f_a_ - -/** - * An enum representing specific indexes within the above array. - * - * This is a convenience enum used to make code slightly more readable. - */ -#ifndef _di_iki_read_f_e_ - enum { - iki_read_f_f_console_parameter_process_e, - iki_read_f_f_file_descriptor_e, - iki_read_f_f_file_exists_e, - iki_read_f_f_file_read_e, - iki_read_f_f_file_size_by_id_e, - iki_read_f_f_file_stream_open_e, - iki_read_f_f_file_stream_read_until_e, - iki_read_f_f_memory_array_increase_e, - iki_read_f_f_memory_array_increase_by_e, - iki_read_f_f_memory_array_resize_e, - iki_read_f_f_memory_arrays_resize_e, - iki_read_f_f_string_dynamic_append_nulless_e, - iki_read_f_f_string_dynamic_partial_append_nulless_e, - iki_read_f_f_string_dynamics_append_e, - iki_read_f_f_string_dynamics_increase_by_e, - iki_read_f_f_string_dynamics_resize_e, - iki_read_f_f_thread_create_e, - iki_read_f_fl_iki_eki_read_e, - iki_read_f_fl_iki_read_e, - iki_read_f_fll_program_parameter_process_context_standard_e, - iki_read_f_fll_program_parameter_process_verbosity_standard_e, - iki_read_f_iki_read_callback_process_buffer_line_e, - iki_read_f_iki_read_process_wrap_append_e, - iki_read_f_iki_read_process_wrap_prepend_e, - }; // enum -#endif // _di_iki_read_f_e_ - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif // _iki_read_common_print_h diff --git a/level_3/iki_read/c/main/iki_read.c b/level_3/iki_read/c/main/iki_read.c index f3b7f4735..8119d24fe 100644 --- a/level_3/iki_read/c/main/iki_read.c +++ b/level_3/iki_read/c/main/iki_read.c @@ -41,7 +41,7 @@ extern "C" { main->setting.state.status = f_file_read(file, &main->cache.buffer); if (F_status_is_error(main->setting.state.status)) { - iki_read_print_error_file(&main->program.error, macro_iki_read_f(f_file_read), f_string_ascii_minus_s, f_file_operation_process_s, fll_error_file_type_file_e); + iki_read_print_error_file(&main->program.error, F_status_debug_source_d, f_string_ascii_minus_s, f_file_operation_process_s, fll_error_file_type_file_e); } else { iki_read_process_buffer(main); @@ -63,7 +63,7 @@ extern "C" { main->setting.state.status = f_file_stream_open(main->setting.files.array[i], f_string_empty_s, &file); if (F_status_is_error(main->setting.state.status)) { - iki_read_print_error_file(&main->program.error, macro_iki_read_f(f_file_stream_open), main->setting.files.array[i], f_file_operation_process_s, fll_error_file_type_file_e); + iki_read_print_error_file(&main->program.error, F_status_debug_source_d, main->setting.files.array[i], f_file_operation_process_s, fll_error_file_type_file_e); break; } @@ -71,7 +71,7 @@ extern "C" { main->setting.state.status = f_file_descriptor(&file); if (F_status_is_error(main->setting.state.status)) { - iki_read_print_error_file(&main->program.error, macro_iki_read_f(f_file_descriptor), main->setting.files.array[i], f_file_operation_process_s, fll_error_file_type_file_e); + iki_read_print_error_file(&main->program.error, F_status_debug_source_d, main->setting.files.array[i], f_file_operation_process_s, fll_error_file_type_file_e); break; } @@ -81,7 +81,7 @@ extern "C" { main->setting.state.status = f_file_size_by_id(file, &size_file); if (F_status_is_error(main->setting.state.status)) { - iki_read_print_error_file(&main->program.error, macro_iki_read_f(f_file_size_by_id), main->setting.files.array[i], f_file_operation_analyze_s, fll_error_file_type_file_e); + iki_read_print_error_file(&main->program.error, F_status_debug_source_d, main->setting.files.array[i], f_file_operation_analyze_s, fll_error_file_type_file_e); break; } @@ -108,7 +108,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(size_file + 1, sizeof(f_char_t), (void **) &main->cache.buffer.string, &main->cache.buffer.used, &main->cache.buffer.size); if (F_status_is_error(main->setting.state.status)) { - iki_read_print_error_file(&main->program.error, macro_iki_read_f(f_memory_array_increase_by), main->setting.files.array[i], f_file_operation_process_s, fll_error_file_type_file_e); + iki_read_print_error_file(&main->program.error, F_status_debug_source_d, main->setting.files.array[i], f_file_operation_process_s, fll_error_file_type_file_e); break; } @@ -123,7 +123,7 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) { if (F_status_set_fine(main->setting.state.status) != F_interrupt) { - iki_read_print_error_file(&main->program.error, macro_iki_read_f(f_file_stream_read_until), main->setting.files.array[i], f_file_operation_process_s, fll_error_file_type_file_e); + iki_read_print_error_file(&main->program.error, F_status_debug_source_d, main->setting.files.array[i], f_file_operation_process_s, fll_error_file_type_file_e); } break; diff --git a/level_3/iki_read/c/main/iki_read.h b/level_3/iki_read/c/main/iki_read.h index 969be581d..02728937e 100644 --- a/level_3/iki_read/c/main/iki_read.h +++ b/level_3/iki_read/c/main/iki_read.h @@ -57,7 +57,6 @@ // IKI Read includes. #include #include -#include #include #include #include diff --git a/level_3/iki_read/c/main/print/error.c b/level_3/iki_read/c/main/print/error.c index c18788d3d..11e3cbd81 100644 --- a/level_3/iki_read/c/main/print/error.c +++ b/level_3/iki_read/c/main/print/error.c @@ -5,26 +5,24 @@ extern "C" { #endif #ifndef _di_iki_read_print_error_ - f_status_t iki_read_print_error(fl_print_t * const print, const f_string_t function) { + f_status_t iki_read_print_error(fl_print_t * const print, const f_string_t debug) { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - fll_error_print(print, F_status_set_fine(((iki_read_main_t *) print->custom)->setting.state.status), function, fll_error_file_flag_fallback_e); + fll_error_print(print, F_status_set_fine(((iki_read_main_t *) print->custom)->setting.state.status), debug, fll_error_file_flag_fallback_e); return F_okay; } #endif // _di_iki_read_print_error_ #ifndef _di_iki_read_print_error_file_ - f_status_t iki_read_print_error_file(fl_print_t * const print, const f_string_t function, const f_string_static_t name, const f_string_static_t operation, const uint8_t type) { + f_status_t iki_read_print_error_file(fl_print_t * const print, const f_string_t debug, const f_string_static_t name, const f_string_static_t operation, const uint8_t type) { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - iki_read_main_t * const main = (iki_read_main_t *) print->custom; - - fll_error_file_print(print, F_status_set_fine(main->setting.state.status), function, fll_error_file_flag_fallback_e, name, operation, type); + fll_error_file_print(print, F_status_set_fine(((iki_read_main_t *) print->custom)->setting.state.status), debug, fll_error_file_flag_fallback_e, name, operation, type); return F_okay; } diff --git a/level_3/iki_read/c/main/print/error.h b/level_3/iki_read/c/main/print/error.h index 9b4fad56b..840ae09b9 100644 --- a/level_3/iki_read/c/main/print/error.h +++ b/level_3/iki_read/c/main/print/error.h @@ -23,8 +23,10 @@ extern "C" { * The output structure to print to. * * This does not alter print.custom.setting.state.status. - * @param function - * The name of the function associated with the error. + * @param debug + * (optional) The debug details, such as file, line number, and function. + * + * Set to NULL to disable. * * @return * F_okay on success. @@ -35,7 +37,7 @@ extern "C" { * @see fll_error_print() */ #ifndef _di_iki_read_print_error_ - extern f_status_t iki_read_print_error(fl_print_t * const print, const f_string_t function); + extern f_status_t iki_read_print_error(fl_print_t * const print, const f_string_t debug); #endif // _di_iki_read_print_error_ /** @@ -45,8 +47,8 @@ extern "C" { * The output structure to print to. * * This does not alter print.custom.setting.state.status. - * @param function - * (optional) The name of the function where the error happened. + * @param debug + * (optional) The debug details, such as file, line number, and function. * * Set to NULL to disable. * @param name @@ -65,7 +67,7 @@ extern "C" { * @see fll_error_file_print() */ #ifndef _di_iki_read_print_error_file_ - extern f_status_t iki_read_print_error_file(fl_print_t * const print, const f_string_t function, const f_string_static_t name, const f_string_static_t operation, const uint8_t type); + extern f_status_t iki_read_print_error_file(fl_print_t * const print, const f_string_t debug, const f_string_static_t name, const f_string_static_t operation, const uint8_t type); #endif // _di_iki_read_print_error_file_ #ifdef __cplusplus diff --git a/level_3/iki_read/data/build/settings b/level_3/iki_read/data/build/settings index 681ddd87a..177c982e4 100644 --- a/level_3/iki_read/data/build/settings +++ b/level_3/iki_read/data/build/settings @@ -48,9 +48,9 @@ build_libraries_static-individual_thread -l:libf_thread.a build_libraries_static-level -l:libfll_2.a -l:libfll_1.a -l:libfll_0.a build_libraries_static-monolithic -l:libfll.a -build_sources_library main/iki_read.c main/common.c main/identify.c main/common/define.c main/common/enumeration.c main/common/print.c main/common/string.c main/common/type.c main/print/data.c main/print/error.c main/print/message.c main/process.c main/signal.c main/thread.c +build_sources_library main/iki_read.c main/common.c main/identify.c main/common/define.c main/common/enumeration.c main/common/string.c main/common/type.c main/print/data.c main/print/error.c main/print/message.c main/process.c main/signal.c main/thread.c -build_sources_headers main/iki_read.h main/common.h main/identify.h main/common/define.h main/common/enumeration.h main/common/print.h main/common/string.h main/common/type.h main/print/data.h main/print/error.h main/print/message.h main/process.h main/signal.h main/thread.h +build_sources_headers main/iki_read.h main/common.h main/identify.h main/common/define.h main/common/enumeration.h main/common/string.h main/common/type.h main/print/data.h main/print/error.h main/print/message.h main/process.h main/signal.h main/thread.h build_sources_documentation man diff --git a/level_3/iki_read/data/build/settings.eki_read b/level_3/iki_read/data/build/settings.eki_read index bca32054b..145a7e5b3 100644 --- a/level_3/iki_read/data/build/settings.eki_read +++ b/level_3/iki_read/data/build/settings.eki_read @@ -28,7 +28,7 @@ version_micro 3 version_file micro version_target minor -modes android clang coverage fanalyzer gcc gcc_13 individual individual_thread level monolithic test thread threadless +modes android clang coverage debug fanalyzer gcc gcc_13 individual individual_thread level monolithic test thread threadless modes_default debug gcc monolithic thread build_compiler gcc diff --git a/level_3/iki_read/data/build/settings.iki_read b/level_3/iki_read/data/build/settings.iki_read index 5d6090112..350ba02e2 100644 --- a/level_3/iki_read/data/build/settings.iki_read +++ b/level_3/iki_read/data/build/settings.iki_read @@ -28,7 +28,7 @@ version_micro 3 version_file micro version_target minor -modes android clang coverage fanalyzer gcc gcc_13 individual individual_thread level monolithic test thread threadless +modes android clang coverage debug fanalyzer gcc gcc_13 individual individual_thread level monolithic test thread threadless modes_default debug gcc monolithic thread build_compiler gcc diff --git a/level_3/iki_write/c/eki/common.c b/level_3/iki_write/c/eki/common.c index 9e6ec6f97..c44f1bcfe 100644 --- a/level_3/iki_write/c/eki/common.c +++ b/level_3/iki_write/c/eki/common.c @@ -30,7 +30,7 @@ extern "C" { main->setting.state.status = f_memory_arrays_resize(object->values.used, sizeof(f_string_dynamics_t), (void **) &objectss->array, &objectss->used, &objectss->size, &f_string_dynamicss_delete_callback); if (F_status_is_error(main->setting.state.status)) { - iki_write_print_error(&main->program.error, macro_iki_write_f(f_memory_arrays_resize)); + iki_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -46,7 +46,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase(main->setting.state.step_small, sizeof(f_string_dynamic_t), (void **) &objectss->array[objectss->used].array, &objectss->array[objectss->used].used, &objectss->array[objectss->used].size); if (F_status_is_error(main->setting.state.status)) { - iki_write_print_error(&main->program.error, macro_iki_write_f(f_memory_array_increase)); + iki_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -62,7 +62,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase(main->setting.state.step_small, sizeof(f_string_dynamics_t), (void **) &objectss->array, &objectss->used, &objectss->size); if (F_status_is_error(main->setting.state.status)) { - iki_write_print_error(&main->program.error, macro_iki_write_f(f_memory_array_increase)); + iki_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -97,7 +97,7 @@ extern "C" { main->setting.state.status = f_memory_arrays_resize(content->values.used, sizeof(f_string_dynamic_t), (void **) &main->setting.contents.array, &main->setting.contents.used, &main->setting.contents.size, &f_string_dynamics_delete_callback); if (F_status_is_error(main->setting.state.status)) { - iki_write_print_error(&main->program.error, macro_iki_write_f(f_memory_arrays_resize)); + iki_write_print_error(&main->program.error, F_status_debug_source_d); return; } diff --git a/level_3/iki_write/c/eki/eki_write.h b/level_3/iki_write/c/eki/eki_write.h index 01f4c32ad..1342e48d8 100644 --- a/level_3/iki_write/c/eki/eki_write.h +++ b/level_3/iki_write/c/eki/eki_write.h @@ -53,7 +53,6 @@ // IKI Write includes. #include #include -#include #include #include #include diff --git a/level_3/iki_write/c/eki/main.c b/level_3/iki_write/c/eki/main.c index e0bf33fa5..c5e60f229 100644 --- a/level_3/iki_write/c/eki/main.c +++ b/level_3/iki_write/c/eki/main.c @@ -50,7 +50,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { data.setting.state.status = f_thread_create(0, &id_signal, &iki_write_thread_signal, (void *) &data); if (F_status_is_error(data.setting.state.status)) { - iki_write_print_error(&data.program.error, macro_iki_write_f(f_thread_create)); + iki_write_print_error(&data.program.error, F_status_debug_source_d); } else { { diff --git a/level_3/iki_write/c/eki/process.c b/level_3/iki_write/c/eki/process.c index 72a9e8f3d..23c16cd23 100644 --- a/level_3/iki_write/c/eki/process.c +++ b/level_3/iki_write/c/eki/process.c @@ -12,7 +12,7 @@ extern "C" { if (!pipe_state || !main->call.process_objects_content) { main->setting.state.status = F_status_set_error(F_parameter); - iki_write_print_error(&main->program.error, macro_iki_write_f(iki_write_callback_load_objects_content_pipe)); + iki_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -22,7 +22,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_partial_append_nulless(main->cache.buffer, range, &main->cache.content); if (F_status_is_error(main->setting.state.status)) { - iki_write_print_error(&main->program.error, macro_iki_write_f(f_string_dynamic_partial_append_nulless)); + iki_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -48,7 +48,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_seek_to(main->cache.buffer, f_string_ascii_space_back_s.string[0], &range_object); if (F_status_is_error(main->setting.state.status)) { - iki_write_print_error(&main->program.error, macro_iki_write_f(f_string_dynamic_seek_to)); + iki_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -70,7 +70,7 @@ extern "C" { f_memory_array_increase_by(total, sizeof(f_string_dynamic_t), (void **) &main->cache.objects.array, &main->cache.objects.used, &main->cache.objects.size); if (F_status_is_error(main->setting.state.status)) { - iki_write_print_error(&main->program.error, macro_iki_write_f(f_memory_array_increase_by)); + iki_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -90,7 +90,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_seek_to(main->cache.buffer, f_string_ascii_space_back_s.string[0], &range_next); if (F_status_is_error(main->setting.state.status)) { - iki_write_print_error(&main->program.error, macro_iki_write_f(f_string_dynamic_seek_to)); + iki_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -100,7 +100,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_partial_append_nulless(main->cache.buffer, range_object, &main->cache.objects.array[main->cache.objects.used]); if (F_status_is_error(main->setting.state.status)) { - iki_write_print_error(&main->program.error, macro_iki_write_f(f_string_dynamic_partial_append_nulless)); + iki_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -144,7 +144,7 @@ extern "C" { iki_write_eki_print_error_objects_not_valid(&main->program.error, objects); } else { - iki_write_print_error(&main->program.error, macro_iki_write_f(f_iki_write)); + iki_write_print_error(&main->program.error, F_status_debug_source_d); } return; diff --git a/level_3/iki_write/c/iki/common.c b/level_3/iki_write/c/iki/common.c index a98bc70d3..060db9438 100644 --- a/level_3/iki_write/c/iki/common.c +++ b/level_3/iki_write/c/iki/common.c @@ -28,7 +28,7 @@ extern "C" { main->setting.state.status = f_memory_arrays_resize(values->used, sizeof(f_string_dynamics_t), (void **) &main->setting.objectss.array, &main->setting.objectss.used, &main->setting.objectss.size, &f_string_dynamicss_delete_callback); if (F_status_is_error(main->setting.state.status)) { - iki_write_print_error(&main->program.error, macro_iki_write_f(f_memory_arrays_resize)); + iki_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -41,7 +41,7 @@ extern "C" { main->setting.state.status = f_memory_arrays_resize(1, sizeof(f_string_dynamic_t), (void **) &main->setting.objectss.array[main->setting.objectss.used].array, &main->setting.objectss.array[main->setting.objectss.used].used, &main->setting.objectss.array[main->setting.objectss.used].size, &f_string_dynamics_delete_callback); if (F_status_is_error(main->setting.state.status)) { - iki_write_print_error(&main->program.error, macro_iki_write_f(f_memory_arrays_resize)); + iki_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -72,7 +72,7 @@ extern "C" { main->setting.state.status = f_memory_arrays_resize(values->used, sizeof(f_string_dynamic_t), (void **) &main->setting.contents.array, &main->setting.contents.used, &main->setting.contents.size, &f_string_dynamics_delete_callback); if (F_status_is_error(main->setting.state.status)) { - iki_write_print_error(&main->program.error, macro_iki_write_f(f_memory_arrays_resize)); + iki_write_print_error(&main->program.error, F_status_debug_source_d); return; } diff --git a/level_3/iki_write/c/iki/iki_write.h b/level_3/iki_write/c/iki/iki_write.h index f2f2c45c9..3b0a1f753 100644 --- a/level_3/iki_write/c/iki/iki_write.h +++ b/level_3/iki_write/c/iki/iki_write.h @@ -53,7 +53,6 @@ // IKI Write includes. #include #include -#include #include #include #include diff --git a/level_3/iki_write/c/iki/main.c b/level_3/iki_write/c/iki/main.c index 0164f4a2d..b1ed911c4 100644 --- a/level_3/iki_write/c/iki/main.c +++ b/level_3/iki_write/c/iki/main.c @@ -50,7 +50,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { data.setting.state.status = f_thread_create(0, &id_signal, &iki_write_thread_signal, (void *) &data); if (F_status_is_error(data.setting.state.status)) { - iki_write_print_error(&data.program.error, macro_iki_write_f(f_thread_create)); + iki_write_print_error(&data.program.error, F_status_debug_source_d); } else { { diff --git a/level_3/iki_write/c/iki/process.c b/level_3/iki_write/c/iki/process.c index ea8efaedb..e70dbbcd3 100644 --- a/level_3/iki_write/c/iki/process.c +++ b/level_3/iki_write/c/iki/process.c @@ -12,7 +12,7 @@ extern "C" { if (!pipe_state || !main->call.process_objects_content) { main->setting.state.status = F_status_set_error(F_parameter); - iki_write_print_error(&main->program.error, macro_iki_write_f(iki_write_callback_load_objects_content_pipe)); + iki_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -24,7 +24,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_partial_append_nulless(main->cache.buffer, range, &main->cache.content); if (F_status_is_error(main->setting.state.status)) { - iki_write_print_error(&main->program.error, macro_iki_write_f(f_string_dynamic_partial_append_nulless)); + iki_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -44,7 +44,7 @@ extern "C" { f_memory_array_increase(main->setting.state.step_small, sizeof(f_string_dynamic_t), (void **) &main->cache.objects.array, &main->cache.objects.used, &main->cache.objects.size); if (F_status_is_error(main->setting.state.status)) { - iki_write_print_error(&main->program.error, macro_iki_write_f(f_memory_array_increase)); + iki_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -54,7 +54,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_partial_append_nulless(main->cache.buffer, range, &main->cache.objects.array[0]); if (F_status_is_error(main->setting.state.status)) { - iki_write_print_error(&main->program.error, macro_iki_write_f(f_string_dynamic_partial_append_nulless)); + iki_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -88,7 +88,7 @@ extern "C" { iki_write_iki_print_error_object_not_valid(&main->program.error, objects.array[0]); } else { - iki_write_print_error(&main->program.error, macro_iki_write_f(f_iki_write)); + iki_write_print_error(&main->program.error, F_status_debug_source_d); } return; diff --git a/level_3/iki_write/c/main/common.c b/level_3/iki_write/c/main/common.c index 94d1df51a..1350dc607 100644 --- a/level_3/iki_write/c/main/common.c +++ b/level_3/iki_write/c/main/common.c @@ -22,7 +22,7 @@ extern "C" { main->setting.state.step_small = iki_write_allocation_small_d; if (F_status_is_error(main->setting.state.status)) { - iki_write_print_error(&main->program.error, macro_iki_write_f(f_console_parameter_process)); + iki_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -30,7 +30,7 @@ extern "C" { main->setting.state.status = fll_program_parameter_process_context_standard(F_true, &main->program); if (F_status_is_error(main->setting.state.status)) { - iki_write_print_error(&main->program.error, macro_iki_write_f(fll_program_parameter_process_context_standard)); + iki_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -38,7 +38,7 @@ extern "C" { main->setting.state.status = fll_program_parameter_process_verbosity_standard(F_true, &main->program); if (F_status_is_error(main->setting.state.status)) { - iki_write_print_error(&main->program.error, macro_iki_write_f(fll_program_parameter_process_verbosity_standard)); + iki_write_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -96,7 +96,7 @@ extern "C" { main->setting.state.status = f_file_stream_open(parameters->arguments.array[index], f_string_empty_s, &main->program.output.to); if (F_status_is_error(main->setting.state.status)) { - fll_error_file_print(&main->program.error, F_status_set_fine(main->setting.state.status), macro_iki_write_f(f_file_stream_open), fll_error_file_flag_fallback_e, parameters->arguments.array[index], f_file_operation_open_s, fll_error_file_type_file_e); + fll_error_file_print(&main->program.error, F_status_set_fine(main->setting.state.status), F_status_debug_source_d, fll_error_file_flag_fallback_e, parameters->arguments.array[index], f_file_operation_open_s, fll_error_file_type_file_e); return; } diff --git a/level_3/iki_write/c/main/iki_write.c b/level_3/iki_write/c/main/iki_write.c index 5461f3d8b..ff20f42c3 100644 --- a/level_3/iki_write/c/main/iki_write.c +++ b/level_3/iki_write/c/main/iki_write.c @@ -56,7 +56,7 @@ extern "C" { if (F_status_is_error(status)) { main->setting.state.status = F_status_set_error(F_pipe); - iki_write_print_error_file(&main->program.error, macro_iki_write_f(f_file_read), f_string_ascii_minus_s, f_file_operation_read_s, fll_error_file_type_pipe_e); + iki_write_print_error_file(&main->program.error, F_status_debug_source_d, f_string_ascii_minus_s, f_file_operation_read_s, fll_error_file_type_pipe_e); break; } @@ -80,7 +80,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - iki_write_print_error(&main->program.error, macro_iki_write_f(f_string_dynamic_seek_to)); + iki_write_print_error(&main->program.error, F_status_debug_source_d); break; } diff --git a/level_3/iki_write/c/main/iki_write.h b/level_3/iki_write/c/main/iki_write.h index c46b6ef04..bd57fbda6 100644 --- a/level_3/iki_write/c/main/iki_write.h +++ b/level_3/iki_write/c/main/iki_write.h @@ -58,7 +58,6 @@ // IKI Write includes. #include #include -#include #include #include #include diff --git a/level_3/iki_write/c/main/print/error.c b/level_3/iki_write/c/main/print/error.c index a234f3455..d1c818144 100644 --- a/level_3/iki_write/c/main/print/error.c +++ b/level_3/iki_write/c/main/print/error.c @@ -5,26 +5,24 @@ extern "C" { #endif #ifndef _di_iki_write_print_error_ - f_status_t iki_write_print_error(fl_print_t * const print, const f_string_t function) { + f_status_t iki_write_print_error(fl_print_t * const print, const f_string_t debug) { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - fll_error_print(print, F_status_set_fine(((iki_write_main_t *) print->custom)->setting.state.status), function, fll_error_file_flag_fallback_e); + fll_error_print(print, F_status_set_fine(((iki_write_main_t *) print->custom)->setting.state.status), debug, fll_error_file_flag_fallback_e); return F_okay; } #endif // _di_iki_write_print_error_ #ifndef _di_iki_write_print_error_file_ - f_status_t iki_write_print_error_file(fl_print_t * const print, const f_string_t function, const f_string_static_t name, const f_string_static_t operation, const uint8_t type) { + f_status_t iki_write_print_error_file(fl_print_t * const print, const f_string_t debug, const f_string_static_t name, const f_string_static_t operation, const uint8_t type) { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - iki_write_main_t * const main = (iki_write_main_t *) print->custom; - - fll_error_file_print(print, F_status_set_fine(main->setting.state.status), function, fll_error_file_flag_fallback_e, name, operation, type); + fll_error_file_print(print, F_status_set_fine(((iki_write_main_t *) print->custom)->setting.state.status), debug, fll_error_file_flag_fallback_e, name, operation, type); return F_okay; } diff --git a/level_3/iki_write/c/main/print/error.h b/level_3/iki_write/c/main/print/error.h index 1bb156a48..443a62ccc 100644 --- a/level_3/iki_write/c/main/print/error.h +++ b/level_3/iki_write/c/main/print/error.h @@ -23,8 +23,10 @@ extern "C" { * The output structure to print to. * * This does not alter print.custom.setting.state.status. - * @param function - * The name of the function associated with the error. + * @param debug + * (optional) The debug details, such as file, line number, and function. + * + * Set to NULL to disable. * * @return * F_okay on success. @@ -35,7 +37,7 @@ extern "C" { * @see fll_error_print() */ #ifndef _di_iki_write_print_error_ - extern f_status_t iki_write_print_error(fl_print_t * const print, const f_string_t function); + extern f_status_t iki_write_print_error(fl_print_t * const print, const f_string_t debug); #endif // _di_iki_write_print_error_ /** @@ -45,8 +47,8 @@ extern "C" { * The output structure to print to. * * This does not alter print.custom.setting.state.status. - * @param function - * (optional) The name of the function where the error happened. + * @param debug + * (optional) The debug details, such as file, line number, and function. * * Set to NULL to disable. * @param name @@ -65,7 +67,7 @@ extern "C" { * @see fll_error_file_print() */ #ifndef _di_iki_write_print_error_file_ - extern f_status_t iki_write_print_error_file(fl_print_t * const print, const f_string_t function, const f_string_static_t name, const f_string_static_t operation, const uint8_t type); + extern f_status_t iki_write_print_error_file(fl_print_t * const print, const f_string_t debug, const f_string_static_t name, const f_string_static_t operation, const uint8_t type); #endif // _di_iki_write_print_error_file_ /** diff --git a/level_3/iki_write/data/build/settings b/level_3/iki_write/data/build/settings index a90452722..b536cc0b9 100644 --- a/level_3/iki_write/data/build/settings +++ b/level_3/iki_write/data/build/settings @@ -48,9 +48,9 @@ build_libraries_static-individual_thread -l:libf_thread.a build_libraries_static-level -l:libfll_2.a -l:libfll_1.a -l:libfll_0.a build_libraries_static-monolithic -l:libfll.a -build_sources_library main/iki_write.c main/common.c main/common/define.c main/common/enumeration.c main/common/print.c main/common/string.c main/common/type.c main/print/error.c main/print/message.c main/signal.c main/thread.c +build_sources_library main/iki_write.c main/common.c main/common/define.c main/common/enumeration.c main/common/string.c main/common/type.c main/print/error.c main/print/message.c main/signal.c main/thread.c -build_sources_headers main/iki_write.h main/common.h main/common/define.h main/common/enumeration.h main/common/print.h main/common/string.h main/common/type.h main/print/error.h main/print/message.h main/signal.h main/thread.h +build_sources_headers main/iki_write.h main/common.h main/common/define.h main/common/enumeration.h main/common/string.h main/common/type.h main/print/error.h main/print/message.h main/signal.h main/thread.h build_sources_documentation man diff --git a/level_3/iki_write/data/build/settings.eki_write b/level_3/iki_write/data/build/settings.eki_write index d1c98dc1f..845b4de18 100644 --- a/level_3/iki_write/data/build/settings.eki_write +++ b/level_3/iki_write/data/build/settings.eki_write @@ -28,7 +28,7 @@ version_micro 3 version_file micro version_target minor -modes android clang coverage fanalyzer gcc gcc_13 individual individual_thread level monolithic test thread threadless +modes android clang coverage debug fanalyzer gcc gcc_13 individual individual_thread level monolithic test thread threadless modes_default debug gcc monolithic thread build_compiler gcc diff --git a/level_3/iki_write/data/build/settings.iki_write b/level_3/iki_write/data/build/settings.iki_write index 027e5f6ac..c17e49fde 100644 --- a/level_3/iki_write/data/build/settings.iki_write +++ b/level_3/iki_write/data/build/settings.iki_write @@ -28,7 +28,7 @@ version_micro 3 version_file micro version_target minor -modes android clang coverage fanalyzer gcc gcc_13 individual individual_thread level monolithic test thread threadless +modes android clang coverage debug fanalyzer gcc gcc_13 individual individual_thread level monolithic test thread threadless modes_default debug gcc monolithic thread build_compiler gcc diff --git a/level_3/status_code/c/fss/main.c b/level_3/status_code/c/fss/main.c index 78c5107b4..577e46ea7 100644 --- a/level_3/status_code/c/fss/main.c +++ b/level_3/status_code/c/fss/main.c @@ -54,7 +54,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { data.setting.state.status = f_thread_create(0, &id_signal, &status_code_thread_signal, (void *) &data); if (F_status_is_error(data.setting.state.status)) { - status_code_print_error(&data.program.error, macro_status_code_f(f_thread_create)); + status_code_print_error(&data.program.error, F_status_debug_source_d); } else { { diff --git a/level_3/status_code/c/fss/status_code.h b/level_3/status_code/c/fss/status_code.h index 310e1a739..baaab6f34 100644 --- a/level_3/status_code/c/fss/status_code.h +++ b/level_3/status_code/c/fss/status_code.h @@ -45,7 +45,6 @@ // Status Code includes. #include #include -#include #include #include #include diff --git a/level_3/status_code/c/main/common.c b/level_3/status_code/c/main/common.c index 32a90bfe4..3a9175ceb 100644 --- a/level_3/status_code/c/main/common.c +++ b/level_3/status_code/c/main/common.c @@ -18,7 +18,7 @@ extern "C" { main->setting.state.step_small = status_code_allocation_small_d; if (F_status_is_error(main->setting.state.status)) { - status_code_print_error(&main->program.error, macro_status_code_f(f_console_parameter_process)); + status_code_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -26,7 +26,7 @@ extern "C" { main->setting.state.status = fll_program_parameter_process_context_standard(F_true, &main->program); if (F_status_is_error(main->setting.state.status)) { - status_code_print_error(&main->program.error, macro_status_code_f(fll_program_parameter_process_context_standard)); + status_code_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -34,7 +34,7 @@ extern "C" { main->setting.state.status = fll_program_parameter_process_verbosity_standard(F_true, &main->program); if (F_status_is_error(main->setting.state.status)) { - status_code_print_error(&main->program.error, macro_status_code_f(fll_program_parameter_process_verbosity_standard)); + status_code_print_error(&main->program.error, F_status_debug_source_d); return; } diff --git a/level_3/status_code/c/main/main.c b/level_3/status_code/c/main/main.c index fbe2be606..b924c2f02 100644 --- a/level_3/status_code/c/main/main.c +++ b/level_3/status_code/c/main/main.c @@ -52,7 +52,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { data.setting.state.status = f_thread_create(0, &id_signal, &status_code_thread_signal, (void *) &data); if (F_status_is_error(data.setting.state.status)) { - status_code_print_error(&data.program.error, macro_status_code_f(f_thread_create)); + status_code_print_error(&data.program.error, F_status_debug_source_d); } else { { diff --git a/level_3/status_code/c/main/print/error.c b/level_3/status_code/c/main/print/error.c index b1b0a3d71..ec9160c1f 100644 --- a/level_3/status_code/c/main/print/error.c +++ b/level_3/status_code/c/main/print/error.c @@ -5,12 +5,12 @@ extern "C" { #endif #ifndef _di_status_code_print_error_ - f_status_t status_code_print_error(fl_print_t * const print, const f_string_t function) { + f_status_t status_code_print_error(fl_print_t * const print, const f_string_t debug) { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - fll_error_print(print, F_status_set_fine(((status_code_main_t *) print->custom)->setting.state.status), function, fll_error_file_flag_fallback_e); + fll_error_print(print, F_status_set_fine(((status_code_main_t *) print->custom)->setting.state.status), debug, fll_error_file_flag_fallback_e); return F_okay; } diff --git a/level_3/status_code/c/main/print/error.h b/level_3/status_code/c/main/print/error.h index 48531ecd6..c8d7d5131 100644 --- a/level_3/status_code/c/main/print/error.h +++ b/level_3/status_code/c/main/print/error.h @@ -23,8 +23,10 @@ extern "C" { * The output structure to print to. * * This does not alter print.custom.setting.state.status. - * @param function - * The name of the function associated with the error. + * @param debug + * (optional) The debug details, such as file, line number, and function. + * + * Set to NULL to disable. * * @return * F_okay on success. @@ -35,7 +37,7 @@ extern "C" { * @see fll_error_print() */ #ifndef _di_status_code_print_error_ - extern f_status_t status_code_print_error(fl_print_t * const print, const f_string_t function); + extern f_status_t status_code_print_error(fl_print_t * const print, const f_string_t debug); #endif // _di_status_code_print_error_ /** diff --git a/level_3/status_code/c/main/status_code.c b/level_3/status_code/c/main/status_code.c index f224e0279..de928e6ba 100644 --- a/level_3/status_code/c/main/status_code.c +++ b/level_3/status_code/c/main/status_code.c @@ -11,11 +11,11 @@ extern "C" { if (!main->setting.status_string_from || !main->setting.status_string_to) { if (!main->setting.status_string_from) { - status_code_print_error_invalid_callback(&main->program.error, macro_status_code_f(status_string_from)); + status_code_print_error_invalid_callback(&main->program.error, F_status_debug_source_d); } if (!main->setting.status_string_to) { - status_code_print_error_invalid_callback(&main->program.error, macro_status_code_f(status_string_to)); + status_code_print_error_invalid_callback(&main->program.error, F_status_debug_source_d); } main->setting.state.status = F_status_set_error(F_parameter); diff --git a/level_3/status_code/c/main/status_code.h b/level_3/status_code/c/main/status_code.h index ca41e239a..3bfe74735 100644 --- a/level_3/status_code/c/main/status_code.h +++ b/level_3/status_code/c/main/status_code.h @@ -49,7 +49,6 @@ // Status Code includes. #include #include -#include #include #include #include diff --git a/level_3/status_code/data/build/settings b/level_3/status_code/data/build/settings index 605b3530c..a958f2bc6 100644 --- a/level_3/status_code/data/build/settings +++ b/level_3/status_code/data/build/settings @@ -48,10 +48,10 @@ build_libraries_static-individual_thread -l:libf_thread.a build_libraries_static-level -l:libfll_2.a -l:libfll_1.a -l:libfll_0.a build_libraries_static-monolithic -l:libfll.a -build_sources_library main/status_code.c main/common.c main/common/define.c main/common/enumeration.c main/common/print.c main/common/string.c main/common/type.c main/convert.c main/print/data.c main/print/error.c main/print/message.c main/process.c main/signal.c main/thread.c +build_sources_library main/status_code.c main/common.c main/common/define.c main/common/enumeration.c main/common/string.c main/common/type.c main/convert.c main/print/data.c main/print/error.c main/print/message.c main/process.c main/signal.c main/thread.c build_sources_library fss/status_code.c fss/common.c -build_sources_headers main/status_code.h main/common.h main/common/define.h main/common/enumeration.h main/common/print.h main/common/string.h main/common/type.h main/convert.h main/print/data.h main/print/error.h main/print/message.h main/process.h main/signal.h main/thread.h +build_sources_headers main/status_code.h main/common.h main/common/define.h main/common/enumeration.h main/common/string.h main/common/type.h main/convert.h main/print/data.h main/print/error.h main/print/message.h main/process.h main/signal.h main/thread.h build_sources_headers fss/status_code.h fss/common.h build_sources_documentation man diff --git a/level_3/status_code/data/build/settings.fss b/level_3/status_code/data/build/settings.fss index 3dd2935b7..430fc5e05 100644 --- a/level_3/status_code/data/build/settings.fss +++ b/level_3/status_code/data/build/settings.fss @@ -28,7 +28,7 @@ version_micro 3 version_file micro version_target minor -modes android clang coverage fanalyzer gcc gcc_13 individual individual_thread level monolithic test thread threadless +modes android clang coverage debug fanalyzer gcc gcc_13 individual individual_thread level monolithic test thread threadless modes_default debug gcc monolithic thread build_compiler gcc diff --git a/level_3/status_code/data/build/settings.main b/level_3/status_code/data/build/settings.main index f5fb01bb1..b5befc175 100644 --- a/level_3/status_code/data/build/settings.main +++ b/level_3/status_code/data/build/settings.main @@ -28,7 +28,7 @@ version_micro 3 version_file micro version_target minor -modes android clang coverage fanalyzer gcc gcc_13 individual individual_thread level monolithic test thread threadless +modes android clang coverage debug fanalyzer gcc gcc_13 individual individual_thread level monolithic test thread threadless modes_default debug gcc monolithic thread build_compiler gcc diff --git a/level_3/utf8/c/main/common.c b/level_3/utf8/c/main/common.c index e0fb2ba3f..e81c29515 100644 --- a/level_3/utf8/c/main/common.c +++ b/level_3/utf8/c/main/common.c @@ -18,7 +18,7 @@ extern "C" { main->setting.state.step_small = utf8_allocation_small_d; if (F_status_is_error(main->setting.state.status)) { - utf8_print_error(&main->program.error, macro_utf8_f(f_console_parameter_process)); + utf8_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -26,7 +26,7 @@ extern "C" { main->setting.state.status = fll_program_parameter_process_context_standard(F_true, &main->program); if (F_status_is_error(main->setting.state.status)) { - utf8_print_error(&main->program.error, macro_utf8_f(fll_program_parameter_process_context_standard)); + utf8_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -34,7 +34,7 @@ extern "C" { main->setting.state.status = fll_program_parameter_process_verbosity_standard(F_true, &main->program); if (F_status_is_error(main->setting.state.status)) { - utf8_print_error(&main->program.error, macro_utf8_f(fll_program_parameter_process_verbosity_standard)); + utf8_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -53,7 +53,7 @@ extern "C" { main->setting.state.status = f_console_parameter_prioritize_right(main->program.parameters, choices, &choice); if (F_status_is_error(main->setting.state.status)) { - utf8_print_error(&main->program.error, macro_utf8_f(f_console_parameter_prioritize_right)); + utf8_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -78,7 +78,7 @@ extern "C" { main->setting.state.status = f_console_parameter_prioritize_right(main->program.parameters, choices, &choice); if (F_status_is_error(main->setting.state.status)) { - utf8_print_error(&main->program.error, macro_utf8_f(f_console_parameter_prioritize_right)); + utf8_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -154,7 +154,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(1, sizeof(f_string_dynamic_t), (void **) &main->setting.path_files_to.array, &main->setting.path_files_to.used, &main->setting.path_files_to.size); if (F_status_is_error(main->setting.state.status)) { - utf8_print_error(&main->program.error, macro_utf8_f(f_memory_array_increase_by)); + utf8_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -164,7 +164,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append_nulless(parameters->arguments.array[parameters->array[utf8_parameter_to_file_e].values.array[0]], &main->setting.path_files_to.array[0]); if (F_status_is_error(main->setting.state.status)) { - utf8_print_error(&main->program.error, macro_utf8_f(f_string_dynamic_append_nulless)); + utf8_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -174,7 +174,7 @@ extern "C" { main->setting.state.status = f_file_stream_open(parameters->arguments.array[parameters->array[utf8_parameter_to_file_e].values.array[0]], f_file_open_mode_write_append_s, &main->program.output.to); if (F_status_is_error(main->setting.state.status)) { - utf8_print_error_file(&main->program.error, macro_utf8_f(f_file_stream_open), parameters->arguments.array[parameters->array[utf8_parameter_to_file_e].values.array[0]], f_file_operation_open_s, fll_error_file_type_file_e); + utf8_print_error_file(&main->program.error, F_status_debug_source_d, parameters->arguments.array[parameters->array[utf8_parameter_to_file_e].values.array[0]], f_file_operation_open_s, fll_error_file_type_file_e); return; } @@ -209,7 +209,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(parameters->array[utf8_parameter_from_file_e].values.used, sizeof(f_string_dynamic_t), (void **) &main->setting.path_files_from.array, &main->setting.path_files_from.used, &main->setting.path_files_from.size); if (F_status_is_error(main->setting.state.status)) { - utf8_print_error(&main->program.error, macro_utf8_f(f_memory_array_increase_by)); + utf8_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -226,7 +226,7 @@ extern "C" { main->setting.state.status = f_string_dynamic_append(parameters->arguments.array[index], &main->setting.path_files_from.array[i]); if (F_status_is_error(main->setting.state.status)) { - fll_error_print(&main->program.error, F_status_set_fine(main->setting.state.status), macro_utf8_f(f_string_dynamic_append_nulless), fll_error_file_flag_fallback_e); + fll_error_print(&main->program.error, F_status_set_fine(main->setting.state.status), F_status_debug_source_d, fll_error_file_flag_fallback_e); break; } @@ -270,7 +270,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(parameters->remaining.used, sizeof(f_string_dynamic_t), (void **) &main->setting.remaining.array, &main->setting.remaining.used, &main->setting.remaining.size); if (F_status_is_error(main->setting.state.status)) { - utf8_print_error(&main->program.error, macro_utf8_f(f_memory_array_increase_by)); + utf8_print_error(&main->program.error, F_status_debug_source_d); return; } diff --git a/level_3/utf8/c/main/main.c b/level_3/utf8/c/main/main.c index 7d83edc89..5d0828605 100644 --- a/level_3/utf8/c/main/main.c +++ b/level_3/utf8/c/main/main.c @@ -46,7 +46,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { data.setting.state.status = f_thread_create(0, &id_signal, &utf8_thread_signal, (void *) &data); if (F_status_is_error(data.setting.state.status)) { - utf8_print_error(&data.program.error, macro_utf8_f(f_thread_create)); + utf8_print_error(&data.program.error, F_status_debug_source_d); } else { { diff --git a/level_3/utf8/c/main/print/error.c b/level_3/utf8/c/main/print/error.c index 91d9ed73e..c089ae108 100644 --- a/level_3/utf8/c/main/print/error.c +++ b/level_3/utf8/c/main/print/error.c @@ -5,12 +5,12 @@ extern "C" { #endif #ifndef _di_utf8_print_error_ - f_status_t utf8_print_error(fl_print_t * const print, const f_string_t function) { + f_status_t utf8_print_error(fl_print_t * const print, const f_string_t debug) { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - fll_error_print(print, F_status_set_fine(((utf8_main_t *) print->custom)->setting.state.status), function, fll_error_file_flag_fallback_e); + fll_error_print(print, F_status_set_fine(((utf8_main_t *) print->custom)->setting.state.status), debug, fll_error_file_flag_fallback_e); return F_okay; } @@ -84,14 +84,12 @@ extern "C" { #endif // _di_utf8_print_error_encode_ #ifndef _di_utf8_print_error_file_ - f_status_t utf8_print_error_file(fl_print_t * const print, const f_string_t function, const f_string_static_t name, const f_string_static_t operation, const uint8_t type) { + f_status_t utf8_print_error_file(fl_print_t * const print, const f_string_t debug, const f_string_static_t name, const f_string_static_t operation, const uint8_t type) { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - utf8_main_t * const main = (utf8_main_t *) print->custom; - - fll_error_file_print(print, F_status_set_fine(main->setting.state.status), function, fll_error_file_flag_fallback_e, name, operation, type); + fll_error_file_print(print, F_status_set_fine(((utf8_main_t *) print->custom)->setting.state.status), debug, fll_error_file_flag_fallback_e, name, operation, type); return F_okay; } diff --git a/level_3/utf8/c/main/process.c b/level_3/utf8/c/main/process.c index feb8e8bc9..54642d56d 100644 --- a/level_3/utf8/c/main/process.c +++ b/level_3/utf8/c/main/process.c @@ -37,7 +37,7 @@ extern "C" { utf8_detect_codepoint(main, text, &mode_codepoint); if (F_status_is_error(main->setting.state.status)) { - fll_error_print(&main->program.error, F_status_set_fine(main->setting.state.status), macro_utf8_f(utf8_detect_codepoint), fll_error_file_flag_fallback_e); + fll_error_print(&main->program.error, F_status_set_fine(main->setting.state.status), F_status_debug_source_d, fll_error_file_flag_fallback_e); break; } diff --git a/level_3/utf8/c/main/utf8.c b/level_3/utf8/c/main/utf8.c index 16fdcd48b..09335e6f0 100644 --- a/level_3/utf8/c/main/utf8.c +++ b/level_3/utf8/c/main/utf8.c @@ -55,7 +55,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status) && F_status_set_fine(main->setting.state.status) != F_utf_fragment && F_status_set_fine(main->setting.state.status) != F_complete_not_utf) { - utf8_print_error_file(&main->program.error, main->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); + utf8_print_error_file(&main->program.error, F_status_debug_source_d, f_string_empty_s, f_file_operation_process_s, fll_error_file_type_pipe_e); } } @@ -72,7 +72,7 @@ extern "C" { main->setting.state.status = f_file_stream_open(main->setting.path_files_from.array[i], f_string_empty_s, &file); if (F_status_is_error(main->setting.state.status)) { - utf8_print_error_file(&main->program.error, macro_utf8_f(f_file_stream_open), main->setting.path_files_from.array[i], f_file_operation_open_s, fll_error_file_type_file_e); + utf8_print_error_file(&main->program.error, F_status_debug_source_d, main->setting.path_files_from.array[i], f_file_operation_open_s, fll_error_file_type_file_e); break; } @@ -110,15 +110,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status) && F_status_set_fine(main->setting.state.status) != F_utf_fragment && F_status_set_fine(main->setting.state.status) != F_complete_not_utf) { - utf8_print_error_file( - &main->program.error, - (main->setting.mode & utf8_mode_from_bytesequence_e) - ? macro_utf8_f(utf8_process_file_bytesequence) - : macro_utf8_f(utf8_process_file_codepoint), - main->setting.path_files_from.array[i], - f_file_operation_process_s, - fll_error_file_type_file_e - ); + utf8_print_error_file(&main->program.error, F_status_debug_source_d, main->setting.path_files_from.array[i], f_file_operation_process_s, fll_error_file_type_file_e); break; } diff --git a/level_3/utf8/c/main/utf8.h b/level_3/utf8/c/main/utf8.h index 4af3f1eca..404be71b7 100644 --- a/level_3/utf8/c/main/utf8.h +++ b/level_3/utf8/c/main/utf8.h @@ -60,7 +60,6 @@ // UTF-8 includes. #include #include -#include #include #include #include diff --git a/level_3/utf8/data/build/settings b/level_3/utf8/data/build/settings index 4baf43438..cf8e60ce4 100644 --- a/level_3/utf8/data/build/settings +++ b/level_3/utf8/data/build/settings @@ -46,11 +46,11 @@ build_libraries_static-individual_thread -l:libf_thread.a build_libraries_static-level -l:libfll_2.a -l:libfll_1.a -l:libfll_0.a build_libraries_static-monolithic -l:libfll.a -build_sources_library main/common.c main/common/define.c main/common/enumeration.c main/common/print.c main/common/string.c main/common/type.c main/bytesequence.c main/codepoint.c main/print/data.c main/print/error.c main/print/message.c main/process.c main/signal.c main/thread.c main/utf8.c +build_sources_library main/common.c main/common/define.c main/common/enumeration.c main/common/string.c main/common/type.c main/bytesequence.c main/codepoint.c main/print/data.c main/print/error.c main/print/message.c main/process.c main/signal.c main/thread.c main/utf8.c build_sources_program main/main.c -build_sources_headers main/common.h main/common/define.h main/common/enumeration.h main/common/print.h main/common/string.h main/common/type.h main/bytesequence.h main/codepoint.h main/print/data.h main/print/error.h main/print/message.h main/process.h main/signal.h main/thread.h main/utf8.h +build_sources_headers main/common.h main/common/define.h main/common/enumeration.h main/common/string.h main/common/type.h main/bytesequence.h main/codepoint.h main/print/data.h main/print/error.h main/print/message.h main/process.h main/signal.h main/thread.h main/utf8.h build_sources_documentation man