From: Kevin Day Date: Wed, 12 Nov 2025 05:16:07 +0000 (-0600) Subject: Update: Utilize the F_status_debug_source_d for handling the errors. X-Git-Tag: 0.7.3^0 X-Git-Url: https://www.git.kevux.org/?a=commitdiff_plain;h=9298130f0132efb4dab130a445a5198a37430c2b;p=kevux-tools 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. --- diff --git a/data/build/remove/settings b/data/build/remove/settings index 3e061f8..165dac9 100644 --- a/data/build/remove/settings +++ b/data/build/remove/settings @@ -53,9 +53,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 common.c common/define.c common/enumeration.c common/print.c common/string.c common/type.c convert.c operate.c preprocess.c print/debug.c print/error.c print/message.c print/simulate.c print/verbose.c print/warning.c remove.c signal.c thread.c +build_sources_library common.c common/define.c common/enumeration.c common/string.c common/type.c convert.c operate.c preprocess.c print/debug.c print/error.c print/message.c print/simulate.c print/verbose.c print/warning.c remove.c signal.c thread.c -build_sources_headers common.h common/define.h common/enumeration.h common/print.h common/string.h common/type.h convert.h operate.h preprocess.h print/debug.h print/error.h print/message.h print/simulate.h print/verbose.h print/warning.h remove.h signal.h thread.h +build_sources_headers common.h common/define.h common/enumeration.h common/string.h common/type.h convert.h operate.h preprocess.h print/debug.h print/error.h print/message.h print/simulate.h print/verbose.h print/warning.h remove.h signal.h thread.h build_sources_documentation man diff --git a/data/build/remove/settings-mocks.remove b/data/build/remove/settings-mocks.remove index 37e4827..eea2f93 100644 --- a/data/build/remove/settings-mocks.remove +++ b/data/build/remove/settings-mocks.remove @@ -45,7 +45,7 @@ build_sources_library ../../../../../../../tests/unit/remove/c/mock-remove.c build_sources_headers remove.h main.h string.h -build_objects_library common.o common/define.o common/enumeration.o common/print.o common/string.o common/type.o convert.o operate.o preprocess.o print/debug.o print/error.o print/message.o print/simulate.o print/verbose.o print/warning.o remove.o signal.o thread.o +build_objects_library common.o common/define.o common/enumeration.o common/string.o common/type.o convert.o operate.o preprocess.o print/debug.o print/error.o print/message.o print/simulate.o print/verbose.o print/warning.o remove.o signal.o thread.o build_script no build_shared yes diff --git a/data/build/remove/settings-objects b/data/build/remove/settings-objects index b5c9120..c4691c5 100644 --- a/data/build/remove/settings-objects +++ b/data/build/remove/settings-objects @@ -37,9 +37,9 @@ build_indexer ar build_indexer_arguments rcs build_language c -build_sources_object common.c common/define.c common/enumeration.c common/print.c common/string.c common/type.c convert.c operate.c preprocess.c print/debug.c print/error.c print/message.c print/simulate.c print/verbose.c print/warning.c remove.c signal.c thread.c +build_sources_object common.c common/define.c common/enumeration.c common/string.c common/type.c convert.c operate.c preprocess.c print/debug.c print/error.c print/message.c print/simulate.c print/verbose.c print/warning.c remove.c signal.c thread.c -build_sources_headers common.h common/define.h common/enumeration.h common/print.h common/string.h common/type.h convert.h operate.h preprocess.h print/debug.h print/error.h print/message.h print/simulate.h print/verbose.h print/warning.h remove.h signal.h thread.h +build_sources_headers common.h common/define.h common/enumeration.h common/string.h common/type.h convert.h operate.h preprocess.h print/debug.h print/error.h print/message.h print/simulate.h print/verbose.h print/warning.h remove.h signal.h thread.h build_sources_documentation man diff --git a/data/build/stand_alone/settings/settings.remove b/data/build/stand_alone/settings/settings.remove index 1ffc774..c255077 100644 --- a/data/build/stand_alone/settings/settings.remove +++ b/data/build/stand_alone/settings/settings.remove @@ -84,7 +84,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/kevux/tools/remove/main/common.c program/kevux/tools/remove/main/common/define.c program/kevux/tools/remove/main/common/enumeration.c program/kevux/tools/remove/main/common/print.c program/kevux/tools/remove/main/common/string.c program/kevux/tools/remove/main/common/type.c program/kevux/tools/remove/main/convert.c program/kevux/tools/remove/main/operate.c program/kevux/tools/remove/main/preprocess.c program/kevux/tools/remove/main/print/debug.c program/kevux/tools/remove/main/print/error.c program/kevux/tools/remove/main/print/message.c program/kevux/tools/remove/main/print/simulate.c program/kevux/tools/remove/main/print/verbose.c program/kevux/tools/remove/main/print/warning.c program/kevux/tools/remove/main/remove.c program/kevux/tools/remove/main/signal.c program/kevux/tools/remove/main/thread.c +build_sources_program program/kevux/tools/remove/main/common.c program/kevux/tools/remove/main/common/define.c program/kevux/tools/remove/main/common/enumeration.c program/kevux/tools/remove/main/common/string.c program/kevux/tools/remove/main/common/type.c program/kevux/tools/remove/main/convert.c program/kevux/tools/remove/main/operate.c program/kevux/tools/remove/main/preprocess.c program/kevux/tools/remove/main/print/debug.c program/kevux/tools/remove/main/print/error.c program/kevux/tools/remove/main/print/message.c program/kevux/tools/remove/main/print/simulate.c program/kevux/tools/remove/main/print/verbose.c program/kevux/tools/remove/main/print/warning.c program/kevux/tools/remove/main/remove.c program/kevux/tools/remove/main/signal.c program/kevux/tools/remove/main/thread.c build_sources_program program/kevux/tools/remove/remove/config.c program/kevux/tools/remove/remove/remove.c program/kevux/tools/remove/remove/main.c program/kevux/tools/remove/remove/string.c diff --git a/data/build/stand_alone/settings/settings.rm b/data/build/stand_alone/settings/settings.rm index 7fba176..ee1b4e8 100644 --- a/data/build/stand_alone/settings/settings.rm +++ b/data/build/stand_alone/settings/settings.rm @@ -83,7 +83,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/kevux/tools/remove/main/common.c program/kevux/tools/remove/main/common/define.c program/kevux/tools/remove/main/common/enumeration.c program/kevux/tools/remove/main/common/print.c program/kevux/tools/remove/main/common/string.c program/kevux/tools/remove/main/common/type.c program/kevux/tools/remove/main/convert.c program/kevux/tools/remove/main/operate.c program/kevux/tools/remove/main/preprocess.c program/kevux/tools/remove/main/print/debug.c program/kevux/tools/remove/main/print/error.c program/kevux/tools/remove/main/print/message.c program/kevux/tools/remove/main/print/simulate.c program/kevux/tools/remove/main/print/verbose.c program/kevux/tools/remove/main/print/warning.c program/kevux/tools/remove/main/remove.c program/kevux/tools/remove/main/signal.c program/kevux/tools/remove/main/thread.c +build_sources_program program/kevux/tools/remove/main/common.c program/kevux/tools/remove/main/common/define.c program/kevux/tools/remove/main/common/enumeration.c program/kevux/tools/remove/main/common/string.c program/kevux/tools/remove/main/common/type.c program/kevux/tools/remove/main/convert.c program/kevux/tools/remove/main/operate.c program/kevux/tools/remove/main/preprocess.c program/kevux/tools/remove/main/print/debug.c program/kevux/tools/remove/main/print/error.c program/kevux/tools/remove/main/print/message.c program/kevux/tools/remove/main/print/simulate.c program/kevux/tools/remove/main/print/verbose.c program/kevux/tools/remove/main/print/warning.c program/kevux/tools/remove/main/remove.c program/kevux/tools/remove/main/signal.c program/kevux/tools/remove/main/thread.c build_sources_program program/kevux/tools/remove/rm/config.c program/kevux/tools/remove/rm/enumeration.c program/kevux/tools/remove/rm/main.c program/kevux/tools/remove/rm/print.c program/kevux/tools/remove/rm/string.c program/kevux/tools/remove/rm/rm.c diff --git a/data/build/stand_alone/settings/settings.rmdir b/data/build/stand_alone/settings/settings.rmdir index d8fe850..16c9f65 100644 --- a/data/build/stand_alone/settings/settings.rmdir +++ b/data/build/stand_alone/settings/settings.rmdir @@ -83,7 +83,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/kevux/tools/remove/main/common.c program/kevux/tools/remove/main/common/define.c program/kevux/tools/remove/main/common/enumeration.c program/kevux/tools/remove/main/common/print.c program/kevux/tools/remove/main/common/string.c program/kevux/tools/remove/main/common/type.c program/kevux/tools/remove/main/convert.c program/kevux/tools/remove/main/operate.c program/kevux/tools/remove/main/preprocess.c program/kevux/tools/remove/main/print/debug.c program/kevux/tools/remove/main/print/error.c program/kevux/tools/remove/main/print/message.c program/kevux/tools/remove/main/print/simulate.c program/kevux/tools/remove/main/print/verbose.c program/kevux/tools/remove/main/print/warning.c program/kevux/tools/remove/main/remove.c program/kevux/tools/remove/main/signal.c program/kevux/tools/remove/main/thread.c +build_sources_program program/kevux/tools/remove/main/common.c program/kevux/tools/remove/main/common/define.c program/kevux/tools/remove/main/common/enumeration.c program/kevux/tools/remove/main/common/string.c program/kevux/tools/remove/main/common/type.c program/kevux/tools/remove/main/convert.c program/kevux/tools/remove/main/operate.c program/kevux/tools/remove/main/preprocess.c program/kevux/tools/remove/main/print/debug.c program/kevux/tools/remove/main/print/error.c program/kevux/tools/remove/main/print/message.c program/kevux/tools/remove/main/print/simulate.c program/kevux/tools/remove/main/print/verbose.c program/kevux/tools/remove/main/print/warning.c program/kevux/tools/remove/main/remove.c program/kevux/tools/remove/main/signal.c program/kevux/tools/remove/main/thread.c build_sources_program program/kevux/tools/remove/rmdir/config.c program/kevux/tools/remove/rmdir/enumeration.c program/kevux/tools/remove/rmdir/main.c program/kevux/tools/remove/rmdir/print.c program/kevux/tools/remove/rmdir/string.c program/kevux/tools/remove/rmdir/rmdir.c diff --git a/data/build/stand_alone/settings/settings.tacocat b/data/build/stand_alone/settings/settings.tacocat index b19e731..42ae7d5 100644 --- a/data/build/stand_alone/settings/settings.tacocat +++ b/data/build/stand_alone/settings/settings.tacocat @@ -88,7 +88,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/kevux/tools/tacocat/main/common.c program/kevux/tools/tacocat/main/common/define.c program/kevux/tools/tacocat/main/common/enumeration.c program/kevux/tools/tacocat/main/common/print.c program/kevux/tools/tacocat/main/common/string.c program/kevux/tools/tacocat/main/common/type.c program/kevux/tools/tacocat/main/print/error.c program/kevux/tools/tacocat/main/print/message.c program/kevux/tools/tacocat/main/print/verbose.c program/kevux/tools/tacocat/main/print/warning.c program/kevux/tools/tacocat/main/packet.c program/kevux/tools/tacocat/main/process.c program/kevux/tools/tacocat/main/receive.c program/kevux/tools/tacocat/main/send.c program/kevux/tools/tacocat/main/signal.c program/kevux/tools/tacocat/main/tacocat.c program/kevux/tools/tacocat/main/thread.c +build_sources_program program/kevux/tools/tacocat/main/common.c program/kevux/tools/tacocat/main/common/define.c program/kevux/tools/tacocat/main/common/enumeration.c program/kevux/tools/tacocat/main/common/string.c program/kevux/tools/tacocat/main/common/type.c program/kevux/tools/tacocat/main/print/error.c program/kevux/tools/tacocat/main/print/message.c program/kevux/tools/tacocat/main/print/verbose.c program/kevux/tools/tacocat/main/print/warning.c program/kevux/tools/tacocat/main/packet.c program/kevux/tools/tacocat/main/process.c program/kevux/tools/tacocat/main/receive.c program/kevux/tools/tacocat/main/send.c program/kevux/tools/tacocat/main/signal.c program/kevux/tools/tacocat/main/tacocat.c program/kevux/tools/tacocat/main/thread.c build_sources_program program/kevux/tools/tacocat/tacocat/config.c program/kevux/tools/tacocat/tacocat/tacocat.c program/kevux/tools/tacocat/tacocat/main.c program/kevux/tools/tacocat/tacocat/string.c diff --git a/data/build/stand_alone/settings/settings.unlink b/data/build/stand_alone/settings/settings.unlink index ccf81c0..b5049a6 100644 --- a/data/build/stand_alone/settings/settings.unlink +++ b/data/build/stand_alone/settings/settings.unlink @@ -83,7 +83,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/kevux/tools/remove/main/common.c program/kevux/tools/remove/main/common/define.c program/kevux/tools/remove/main/common/enumeration.c program/kevux/tools/remove/main/common/print.c program/kevux/tools/remove/main/common/string.c program/kevux/tools/remove/main/common/type.c program/kevux/tools/remove/main/convert.c program/kevux/tools/remove/main/operate.c program/kevux/tools/remove/main/preprocess.c program/kevux/tools/remove/main/print/debug.c program/kevux/tools/remove/main/print/error.c program/kevux/tools/remove/main/print/message.c program/kevux/tools/remove/main/print/simulate.c program/kevux/tools/remove/main/print/verbose.c program/kevux/tools/remove/main/print/warning.c program/kevux/tools/remove/main/remove.c program/kevux/tools/remove/main/signal.c program/kevux/tools/remove/main/thread.c +build_sources_program program/kevux/tools/remove/main/common.c program/kevux/tools/remove/main/common/define.c program/kevux/tools/remove/main/common/enumeration.c program/kevux/tools/remove/main/common/string.c program/kevux/tools/remove/main/common/type.c program/kevux/tools/remove/main/convert.c program/kevux/tools/remove/main/operate.c program/kevux/tools/remove/main/preprocess.c program/kevux/tools/remove/main/print/debug.c program/kevux/tools/remove/main/print/error.c program/kevux/tools/remove/main/print/message.c program/kevux/tools/remove/main/print/simulate.c program/kevux/tools/remove/main/print/verbose.c program/kevux/tools/remove/main/print/warning.c program/kevux/tools/remove/main/remove.c program/kevux/tools/remove/main/signal.c program/kevux/tools/remove/main/thread.c build_sources_program program/kevux/tools/remove/unlink/config.c program/kevux/tools/remove/unlink/enumeration.c program/kevux/tools/remove/unlink/main.c program/kevux/tools/remove/unlink/print.c program/kevux/tools/remove/unlink/string.c program/kevux/tools/remove/unlink/unlink.c diff --git a/data/build/tacocat/settings b/data/build/tacocat/settings index f086d91..229e4ec 100644 --- a/data/build/tacocat/settings +++ b/data/build/tacocat/settings @@ -53,9 +53,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 common.c common/define.c common/enumeration.c common/print.c common/string.c common/type.c print/error.c print/message.c print/verbose.c print/warning.c packet.c process.c receive.c send.c signal.c tacocat.c thread.c +build_sources_library common.c common/define.c common/enumeration.c common/string.c common/type.c print/error.c print/message.c print/verbose.c print/warning.c packet.c process.c receive.c send.c signal.c tacocat.c thread.c -build_sources_headers common.h common/define.h common/enumeration.h common/print.h common/string.h common/type.h print/error.h print/message.h print/verbose.h print/warning.h packet.h process.h receive.h send.h signal.h tacocat.h thread.h +build_sources_headers common.h common/define.h common/enumeration.h common/string.h common/type.h print/error.h print/message.h print/verbose.h print/warning.h packet.h process.h receive.h send.h signal.h tacocat.h thread.h build_sources_documentation man diff --git a/sources/c/program/kevux/tools/remove/main/common.c b/sources/c/program/kevux/tools/remove/main/common.c index 061bdb6..281b7ae 100644 --- a/sources/c/program/kevux/tools/remove/main/common.c +++ b/sources/c/program/kevux/tools/remove/main/common.c @@ -152,7 +152,7 @@ extern "C" { main->setting.state.status = f_memory_array_resize(dates[p]->size + (total_locations - dates[p]->size), sizeof(kt_remove_date_t), (void **) &dates[p]->array, &dates[p]->used, &dates[p]->size); if (F_status_is_error(main->setting.state.status)) { - kt_remove_print_error(&main->program.error, macro_kt_remove_f(f_memory_array_resize)); + kt_remove_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -304,7 +304,7 @@ extern "C" { main->setting.state.status = f_memory_array_resize(main->setting.modes.size + (total_locations - main->setting.modes.size), sizeof(kt_remove_mode_t), (void **) &main->setting.modes.array, &main->setting.modes.used, &main->setting.modes.size); if (F_status_is_error(main->setting.state.status)) { - kt_remove_print_error(&main->program.error, macro_kt_remove_f(f_memory_array_resize)); + kt_remove_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -488,7 +488,7 @@ extern "C" { if (!parameter || !ids) { main->setting.state.status = F_status_set_error(F_parameter); - kt_remove_print_error(&main->program.error, macro_kt_remove_f(kt_remove_setting_load)); + kt_remove_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -508,7 +508,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(total_arguments, sizeof(f_id_t), (void **) &ids->array, &ids->used, &ids->size); if (F_status_is_error(main->setting.state.status)) { - kt_remove_print_error(&main->program.error, macro_kt_remove_f(f_memory_array_increase_by)); + kt_remove_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -518,7 +518,7 @@ extern "C" { ids->array[ids->used] = kt_remove_get_id(main, main->program.parameters.arguments.array[parameter->values.array[i]], is_user); if (F_status_is_error(main->setting.state.status)) { - kt_remove_print_error_id(&main->program.error, macro_kt_remove_f(kt_remove_get_id), main->program.parameters.arguments.array[parameter->values.array[i]], is_user); + kt_remove_print_error_id(&main->program.error, F_status_debug_source_d, main->program.parameters.arguments.array[parameter->values.array[i]], is_user); return; } @@ -550,7 +550,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(main->program.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)) { - kt_remove_print_error(&main->program.error, macro_kt_remove_f(f_memory_array_increase_by)); + kt_remove_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -566,7 +566,7 @@ extern "C" { fl_path_clean(main->program.parameters.arguments.array[index], &main->setting.files.array[main->setting.files.used]); if (F_status_is_error(main->setting.state.status)) { - kt_remove_print_error_file(&main->program.error, macro_kt_remove_f(fl_path_clean), main->program.parameters.arguments.array[index], f_file_operation_process_s, fll_error_file_type_path_e); + kt_remove_print_error_file(&main->program.error, F_status_debug_source_d, main->program.parameters.arguments.array[index], f_file_operation_process_s, fll_error_file_type_path_e); return; } @@ -591,7 +591,7 @@ extern "C" { main->setting.state.step_small = kt_remove_allocation_small_d; if (F_status_is_error(main->setting.state.status)) { - kt_remove_print_error(&main->program.error, macro_kt_remove_f(f_console_parameter_process)); + kt_remove_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -610,7 +610,7 @@ extern "C" { main->setting.state.status = fll_program_parameter_process_context(choices, modes, F_true, &main->program); if (F_status_is_error(main->setting.state.status)) { - kt_remove_print_error(&main->program.error, macro_kt_remove_f(fll_program_parameter_process_context)); + kt_remove_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -627,7 +627,7 @@ extern "C" { main->setting.state.status = fll_program_parameter_process_verbosity(choices, verbosity, F_true, &main->program); if (F_status_is_error(main->setting.state.status)) { - kt_remove_print_error(&main->program.error, macro_kt_remove_f(fll_program_parameter_process_verbosity)); + kt_remove_print_error(&main->program.error, F_status_debug_source_d); } } } diff --git a/sources/c/program/kevux/tools/remove/main/common/print.c b/sources/c/program/kevux/tools/remove/main/common/print.c deleted file mode 100644 index c8e3ed1..0000000 --- a/sources/c/program/kevux/tools/remove/main/common/print.c +++ /dev/null @@ -1,53 +0,0 @@ -#include "../remove.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef _di_kt_remove_f_a_ - const f_string_t kt_remove_f_a[] = { - "f_console_parameter_prioritize_right", - "f_console_parameter_process", - "f_directory_empty", - "f_directory_remove", - "f_file_access_at", - "f_file_exists", - "f_file_link_read", - "f_file_mode_from_string", - "f_file_mode_to_mode", - "f_file_poll", - "f_file_read_block", - "f_file_remove", - "f_memory_array_increase", - "f_memory_array_increase_by", - "f_memory_array_resize", - "f_string_dynamic_partial_append", - "f_string_dynamic_seek_to_back", - "f_thread_create", - "f_utf_is_digit", - "f_utf_is_whitespace", - "fl_conversion_dynamic_partial_to_unsigned_detect", - "fl_conversion_dynamic_to_unsigned_detect", - "fl_directory_do", - "fl_path_clean", - "fll_program_parameter_process_context", - "fll_program_parameter_process_empty", - "fll_program_parameter_process_verbosity", - "kt_remove_convert_date_relative", - "kt_remove_convert_timezone", - "kt_remove_dates_resize", - "kt_remove_get_id", - "kt_remove_modes_resize", - "kt_remove_operate_memory_check", - "kt_remove_operate_memory_save", - "kt_remove_operate_recurse", - "kt_remove_preprocess_file", - "kt_remove_preprocess_file_access", - "kt_remove_preprocess_file_dates", - "kt_remove_setting_load", - }; -#endif // _di_kt_remove_f_a_ - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/sources/c/program/kevux/tools/remove/main/common/print.h b/sources/c/program/kevux/tools/remove/main/common/print.h deleted file mode 100644 index a16b68c..0000000 --- a/sources/c/program/kevux/tools/remove/main/common/print.h +++ /dev/null @@ -1,88 +0,0 @@ -/** - * Kevux Tools - Remove - * - * Project: Kevux Tools - * 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 _kt_remove_common_print_h -#define _kt_remove_common_print_h - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * A special array of strings intended for representing funciton names. - * - * These are primarily used for printing errors with the function names. - * - * The macro macro_kt_remove_f() is used to reference the array index by the enum name. - * - * macro_kt_remove_f(): - * - name: The name of the function. - */ -#ifndef _di_kt_remove_f_a_ - extern const f_string_t kt_remove_f_a[]; - - #define macro_kt_remove_f(name) kt_remove_f_a[kt_remove_f_##name##_e] -#endif // _di_kt_remove_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_kt_remove_f_e_ - enum { - kt_remove_f_f_console_parameter_prioritize_right_e, - kt_remove_f_f_console_parameter_process_e, - kt_remove_f_f_directory_empty_e, - kt_remove_f_f_directory_remove_e, - kt_remove_f_f_file_access_at_e, - kt_remove_f_f_file_exists_e, - kt_remove_f_f_file_link_read_e, - kt_remove_f_f_file_mode_from_string_e, - kt_remove_f_f_file_mode_to_mode_e, - kt_remove_f_f_file_poll_e, - kt_remove_f_f_file_read_block_e, - kt_remove_f_f_file_remove_e, - kt_remove_f_f_memory_array_increase_e, - kt_remove_f_f_memory_array_increase_by_e, - kt_remove_f_f_memory_array_resize_e, - kt_remove_f_f_string_dynamic_partial_append_e, - kt_remove_f_f_string_dynamic_seek_to_back_e, - kt_remove_f_f_thread_create_e, - kt_remove_f_f_utf_is_digit_e, - kt_remove_f_f_utf_is_whitespace_e, - kt_remove_f_fl_conversion_dynamic_partial_to_unsigned_detect_e, - kt_remove_f_fl_conversion_dynamic_to_unsigned_detect_e, - kt_remove_f_fl_directory_do_e, - kt_remove_f_fl_path_clean_e, - kt_remove_f_fll_program_parameter_process_context_e, - kt_remove_f_fll_program_parameter_process_empty_e, - kt_remove_f_fll_program_parameter_process_verbosity_e, - kt_remove_f_kt_remove_convert_date_relative_e, - kt_remove_f_kt_remove_convert_timezone_e, - kt_remove_f_kt_remove_dates_resize_e, - kt_remove_f_kt_remove_get_id_e, - kt_remove_f_kt_remove_modes_resize_e, - kt_remove_f_kt_remove_operate_memory_check_e, - kt_remove_f_kt_remove_operate_memory_save_e, - kt_remove_f_kt_remove_operate_recurse_e, - kt_remove_f_kt_remove_preprocess_file_e, - kt_remove_f_kt_remove_preprocess_file_access_e, - kt_remove_f_kt_remove_preprocess_file_dates_e, - kt_remove_f_kt_remove_setting_load_e, - }; // enum -#endif // _di_kt_remove_f_e_ - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif // _kt_remove_common_print_h diff --git a/sources/c/program/kevux/tools/remove/main/convert.c b/sources/c/program/kevux/tools/remove/main/convert.c index b4fda78..f159f20 100644 --- a/sources/c/program/kevux/tools/remove/main/convert.c +++ b/sources/c/program/kevux/tools/remove/main/convert.c @@ -38,7 +38,7 @@ extern "C" { kt_remove_convert_date_relative(main, date); if (F_status_is_error(main->setting.state.status)) { - kt_remove_print_error(&main->program.error, macro_kt_remove_f(kt_remove_convert_date_relative)); + kt_remove_print_error(&main->program.error, F_status_debug_source_d); } return; @@ -78,7 +78,7 @@ extern "C" { main->setting.state.status = f_utf_is_digit(buffer.string + range.start, width_max, 0); if (F_status_is_error(main->setting.state.status)) { - kt_remove_print_error(&main->program.error, macro_kt_remove_f(f_utf_is_digit)); + kt_remove_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -115,7 +115,7 @@ extern "C" { main->setting.state.status = f_utf_is_digit(buffer.string + range.start, width_max, 0); if (F_status_is_error(main->setting.state.status)) { - kt_remove_print_error(&main->program.error, macro_kt_remove_f(f_utf_is_digit)); + kt_remove_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -140,7 +140,7 @@ extern "C" { main->setting.state.status = f_utf_is_digit(buffer.string + range.start, width_max, 0); if (F_status_is_error(main->setting.state.status)) { - kt_remove_print_error(&main->program.error, macro_kt_remove_f(f_utf_is_digit)); + kt_remove_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -160,7 +160,7 @@ extern "C" { main->setting.state.status = f_utf_is_whitespace(buffer.string + range.start, width_max, F_false); if (F_status_is_error(main->setting.state.status)) { - kt_remove_print_error(&main->program.error, macro_kt_remove_f(f_utf_is_whitespace)); + kt_remove_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -176,7 +176,7 @@ extern "C" { main->setting.state.status = f_utf_is_digit(buffer.string + range.start, width_max, 0); if (F_status_is_error(main->setting.state.status)) { - kt_remove_print_error(&main->program.error, macro_kt_remove_f(f_utf_is_digit)); + kt_remove_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -210,7 +210,7 @@ extern "C" { main->setting.state.status = fl_conversion_dynamic_partial_to_unsigned_detect(conversion_data, buffer, range_first, &date->start_year); if (F_status_is_error(main->setting.state.status)) { - kt_remove_print_error(&main->program.error, macro_kt_remove_f(fl_conversion_dynamic_partial_to_unsigned_detect)); + kt_remove_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -240,7 +240,7 @@ extern "C" { main->setting.state.status = fl_conversion_dynamic_partial_to_unsigned_detect(conversion_data, buffer, range_second, &date->start_second); if (F_status_is_error(main->setting.state.status)) { - kt_remove_print_error(&main->program.error, macro_kt_remove_f(fl_conversion_dynamic_partial_to_unsigned_detect)); + kt_remove_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -250,7 +250,7 @@ extern "C" { kt_remove_convert_timezone(main, &date->start_year, &date->start_second); if (F_status_is_error(main->setting.state.status)) { - kt_remove_print_error(&main->program.error, macro_kt_remove_f(kt_remove_convert_timezone)); + kt_remove_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -264,7 +264,7 @@ extern "C" { kt_remove_convert_timezone(main, &date->start_year, &date->start_second); if (F_status_is_error(main->setting.state.status)) { - kt_remove_print_error(&main->program.error, macro_kt_remove_f(kt_remove_convert_timezone)); + kt_remove_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -286,7 +286,7 @@ extern "C" { main->setting.state.status = fl_conversion_dynamic_to_unsigned_detect(conversion_data, buffer, &date->start_second); if (F_status_is_error(main->setting.state.status)) { - kt_remove_print_error(&main->program.error, macro_kt_remove_f(fl_conversion_dynamic_to_unsigned_detect)); + kt_remove_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -294,7 +294,7 @@ extern "C" { kt_remove_convert_timezone(main, &date->start_year, &date->start_second); if (F_status_is_error(main->setting.state.status)) { - kt_remove_print_error(&main->program.error, macro_kt_remove_f(kt_remove_convert_timezone)); + kt_remove_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -515,7 +515,7 @@ extern "C" { main->setting.state.status = f_file_mode_from_string(buffer, main->program.umask, &mode_file, 0); if (F_status_is_error(main->setting.state.status)) { - kt_remove_print_error(&main->program.error, macro_kt_remove_f(f_file_mode_from_string)); + kt_remove_print_error(&main->program.error, F_status_debug_source_d); return 0; } @@ -525,7 +525,7 @@ extern "C" { main->setting.state.status = f_file_mode_to_mode(mode_file, &mode); if (F_status_is_error(main->setting.state.status)) { - kt_remove_print_error(&main->program.error, macro_kt_remove_f(f_file_mode_to_mode)); + kt_remove_print_error(&main->program.error, F_status_debug_source_d); return 0; } diff --git a/sources/c/program/kevux/tools/remove/main/operate.c b/sources/c/program/kevux/tools/remove/main/operate.c index c036434..02edb6c 100644 --- a/sources/c/program/kevux/tools/remove/main/operate.c +++ b/sources/c/program/kevux/tools/remove/main/operate.c @@ -20,9 +20,7 @@ extern "C" { if (F_status_is_error(status) || !(main->setting.flag & kt_remove_main_flag_force_simulate_d)) { kt_remove_print_error_file_status( &main->program.error, - F_status_is_error_not(status) - ? macro_kt_remove_f(kt_remove_preprocess_file) - : macro_kt_remove_f(kt_remove_operate_memory_save), + F_status_debug_source_d, path, f_file_operation_process_s, flag_operate & kt_remove_flag_operate_directory_d @@ -66,7 +64,7 @@ extern "C" { if (!(main->setting.flag & kt_remove_main_flag_force_simulate_d)) { main->setting.state.status = F_status_set_error(F_file_found_not); - kt_remove_print_error_file(&main->program.error, macro_kt_remove_f(kt_remove_preprocess_file), path, f_file_operation_delete_s, fll_error_file_type_file_e); + kt_remove_print_error_file(&main->program.error, F_status_debug_source_d, path, f_file_operation_delete_s, fll_error_file_type_file_e); return; } @@ -114,7 +112,7 @@ extern "C" { status = f_memory_array_increase(1, sizeof(f_poll_t), (void **) &main->cache.polls.array, &main->cache.polls.used, &main->cache.polls.size); if (F_status_is_error(status)) { - kt_remove_print_error(&main->program.error, macro_kt_remove_f(f_memory_array_increase)); + kt_remove_print_error(&main->program.error, F_status_debug_source_d); return status; } @@ -131,7 +129,7 @@ extern "C" { status = f_file_poll(main->cache.polls, kt_remove_poll_timeout_d); if (F_status_is_error(status)) { - kt_remove_print_error(&main->program.error, macro_kt_remove_f(f_file_poll)); + kt_remove_print_error(&main->program.error, F_status_debug_source_d); return status; } @@ -142,7 +140,7 @@ extern "C" { status = f_file_read_block(main->program.input, &main->cache.input); if (F_status_is_error(status)) { - kt_remove_print_error_file(&main->program.error, macro_kt_remove_f(f_file_read_block), f_string_empty_s, f_file_operation_read_s, fll_error_file_type_input_e); + kt_remove_print_error_file(&main->program.error, F_status_debug_source_d, f_string_empty_s, f_file_operation_read_s, fll_error_file_type_input_e); return status; } @@ -180,7 +178,7 @@ extern "C" { f_status_t kt_remove_operate_memory_check(kt_remove_main_t * const main, const f_string_static_t path, uint64_t * const flag_operate) { if (!main || !flag_operate) { - kt_remove_print_error_file(&main->program.error, macro_kt_remove_f(kt_remove_operate_memory_check), path, f_file_operation_process_s, fll_error_file_type_path_e); + kt_remove_print_error_file(&main->program.error, F_status_debug_source_d, path, f_file_operation_process_s, fll_error_file_type_path_e); return F_status_set_error(F_parameter); } @@ -304,7 +302,7 @@ extern "C" { f_status_t kt_remove_operate_recurse(kt_remove_main_t * const main, const f_string_static_t path, const uint64_t flag_operate) { if (!main) { - kt_remove_print_error(&main->program.error, macro_kt_remove_f(kt_remove_operate_recurse)); + kt_remove_print_error(&main->program.error, F_status_debug_source_d); return F_status_set_error(F_parameter); } @@ -315,7 +313,7 @@ extern "C" { const f_status_t status = f_memory_array_increase(kt_remove_allocation_small_d, sizeof(uint64_t), (void **) &main->cache.flags.array, &main->cache.flags.used, &main->cache.flags.size); if (F_status_is_error(status)) { - kt_remove_print_error(&main->program.error, macro_kt_remove_f(f_memory_array_increase)); + kt_remove_print_error(&main->program.error, F_status_debug_source_d); return status; } @@ -345,7 +343,7 @@ extern "C" { const f_status_t status = f_memory_array_resize(kt_remove_allocation_normal_d, sizeof(f_char_t), (void **) &main->cache.recurse.path.string, &main->cache.recurse.path.used, &main->cache.recurse.path.size); if (F_status_is_error(status)) { - kt_remove_print_error(&main->program.error, macro_kt_remove_f(f_memory_array_resize)); + kt_remove_print_error(&main->program.error, F_status_debug_source_d); return F_status_is_error(main->cache.recurse.state.status) ? main->cache.recurse.state.status @@ -357,7 +355,7 @@ extern "C" { const f_status_t status = f_memory_array_resize(kt_remove_allocation_normal_d, sizeof(uint64_t), (void **) &main->cache.flags.array, &main->cache.flags.used, &main->cache.flags.size); if (F_status_is_error(status)) { - kt_remove_print_error(&main->program.error, macro_kt_remove_f(f_memory_array_resize)); + kt_remove_print_error(&main->program.error, F_status_debug_source_d); return F_status_is_error(main->cache.recurse.state.status) ? main->cache.recurse.state.status @@ -446,7 +444,7 @@ extern "C" { if (!(main->setting.flag & kt_remove_main_flag_force_d)) { kt_remove_print_error_file_status( &main->program.error, - macro_kt_remove_f(fl_directory_do), + F_status_debug_source_d, (!recurse->depth && (flag & f_directory_recurse_do_flag_after_d)) ? *recurse->path_top : recurse->path, @@ -465,7 +463,7 @@ extern "C" { if (!recurse->depth && (flag == f_directory_recurse_do_flag_path_d || flag == f_directory_recurse_do_flag_path_before_d)) { kt_remove_print_error_file_status( &main->program.error, - macro_kt_remove_f(fl_directory_do), + F_status_debug_source_d, *recurse->path_top, f_file_operation_stat_s, !recurse->depth @@ -480,7 +478,7 @@ extern "C" { if (F_status_set_fine(recurse->state.status) == F_parameter || flag == f_directory_recurse_do_flag_path_list_d || F_status_set_fine(recurse->state.status) == F_access_denied && flag == f_directory_recurse_do_flag_list_d) { kt_remove_print_error_file_status( &main->program.error, - macro_kt_remove_f(fl_directory_do), + F_status_debug_source_d, !recurse->depth ? *recurse->path_top : recurse->path, @@ -498,7 +496,7 @@ extern "C" { kt_remove_print_error_file_status( &main->program.error, - macro_kt_remove_f(fl_directory_do), + F_status_debug_source_d, (!recurse->depth && (flag & f_directory_recurse_do_flag_action_d)) ? *recurse->path_top : recurse->path, @@ -531,7 +529,7 @@ extern "C" { status = f_file_link_read(path, F_false, &main->cache.buffer); if (F_status_is_error(status)) { - kt_remove_print_error_file(&main->program.error, macro_kt_remove_f(f_file_remove), path, f_file_operation_stat_s, fll_error_file_type_link_e); + kt_remove_print_error_file(&main->program.error, F_status_debug_source_d, path, f_file_operation_stat_s, fll_error_file_type_link_e); return status; } @@ -562,9 +560,7 @@ extern "C" { else if (!(main->setting.flag & kt_remove_main_flag_force_d) || F_status_set_fine(status) != F_directory_empty_not) { kt_remove_print_error_file_status( &main->program.error, - flag_operate & kt_remove_flag_operate_directory_d - ? macro_kt_remove_f(f_directory_remove) - : macro_kt_remove_f(f_file_remove), + F_status_debug_source_d, flag_operate & kt_remove_flag_operate_follow_d ? main->cache.buffer : path, @@ -589,7 +585,7 @@ extern "C" { status = kt_remove_operate_memory_save(main, target, flag_operate); if (F_status_is_error(status)) { - kt_remove_print_error_file(&main->program.error, macro_kt_remove_f(kt_remove_operate_memory_save), target, f_file_operation_process_s, fll_error_file_type_path_e); + kt_remove_print_error_file(&main->program.error, F_status_debug_source_d, target, f_file_operation_process_s, fll_error_file_type_path_e); } else { status = remove diff --git a/sources/c/program/kevux/tools/remove/main/preprocess.c b/sources/c/program/kevux/tools/remove/main/preprocess.c index c51dbe2..6fd90d7 100644 --- a/sources/c/program/kevux/tools/remove/main/preprocess.c +++ b/sources/c/program/kevux/tools/remove/main/preprocess.c @@ -8,7 +8,7 @@ extern "C" { f_status_t kt_remove_preprocess_file(kt_remove_main_t * const main, const f_string_static_t path, const uint8_t recurse, uint64_t * const flag_operate) { if (!main || !flag_operate) { - kt_remove_print_error_file(&main->program.error, macro_kt_remove_f(kt_remove_preprocess_file), path, f_file_operation_process_s, fll_error_file_type_path_e); + kt_remove_print_error_file(&main->program.error, F_status_debug_source_d, path, f_file_operation_process_s, fll_error_file_type_path_e); return F_status_set_error(F_parameter); } @@ -70,7 +70,7 @@ extern "C" { } } - kt_remove_print_error_file_status(&main->program.error, macro_kt_remove_f(f_file_exists), path, f_file_operation_delete_s, fll_error_file_type_path_e, F_status_set_error(F_file_found_not)); + kt_remove_print_error_file_status(&main->program.error, F_status_debug_source_d, path, f_file_operation_delete_s, fll_error_file_type_path_e, F_status_set_error(F_file_found_not)); main->setting.flag |= kt_remove_main_flag_return_fail_d; @@ -266,7 +266,7 @@ extern "C" { if (F_status_is_error(status)) { *flag_operate |= kt_remove_flag_operate_remove_fail_d; - kt_remove_print_error_file_status(&main->program.error, macro_kt_remove_f(f_directory_empty), path, f_file_operation_verify_s, fll_error_file_type_directory_e, status); + kt_remove_print_error_file_status(&main->program.error, F_status_debug_source_d, path, f_file_operation_verify_s, fll_error_file_type_directory_e, status); return status; } @@ -362,7 +362,7 @@ extern "C" { if (F_status_is_error(status)) { *flag_operate |= kt_remove_flag_operate_remove_fail_d; - kt_remove_print_error_file_status(&main->program.error, macro_kt_remove_f(f_memory_array_increase), path, f_file_operation_process_s, fll_error_file_type_path_e, status); + kt_remove_print_error_file_status(&main->program.error, F_status_debug_source_d, path, f_file_operation_process_s, fll_error_file_type_path_e, status); return status; } @@ -374,7 +374,7 @@ extern "C" { if (F_status_is_error(status)) { *flag_operate |= kt_remove_flag_operate_remove_fail_d; - kt_remove_print_error_file_status(&main->program.error, macro_kt_remove_f(f_string_dynamic_partial_append), path, f_file_operation_process_s, fll_error_file_type_path_e, status); + kt_remove_print_error_file_status(&main->program.error, F_status_debug_source_d, path, f_file_operation_process_s, fll_error_file_type_path_e, status); return status; } @@ -385,7 +385,7 @@ extern "C" { else if (F_status_is_error(status)) { *flag_operate |= kt_remove_flag_operate_remove_fail_d; - kt_remove_print_error_file_status(&main->program.error, macro_kt_remove_f(f_string_dynamic_seek_to_back), path, f_file_operation_process_s, fll_error_file_type_path_e, status); + kt_remove_print_error_file_status(&main->program.error, F_status_debug_source_d, path, f_file_operation_process_s, fll_error_file_type_path_e, status); return status; } @@ -412,7 +412,7 @@ extern "C" { f_status_t kt_remove_preprocess_file_access(kt_remove_main_t * const main, const f_string_static_t path, uint64_t * const flag_operate, const int access_flags) { if (!main || !flag_operate) { - kt_remove_print_error_file_status(&main->program.error, macro_kt_remove_f(kt_remove_preprocess_file_access), path, f_file_operation_process_s, fll_error_file_type_path_e, F_status_set_error(F_parameter)); + kt_remove_print_error_file_status(&main->program.error, F_status_debug_source_d, path, f_file_operation_process_s, fll_error_file_type_path_e, F_status_set_error(F_parameter)); return F_status_set_error(F_parameter); } @@ -461,7 +461,7 @@ extern "C" { if (F_status_is_error(status)) { status = F_status_set_error(F_parameter); - kt_remove_print_error_file_status(&main->program.error, macro_kt_remove_f(f_file_access_at), path, f_file_operation_access_s, fll_error_file_type_path_e, status); + kt_remove_print_error_file_status(&main->program.error, F_status_debug_source_d, path, f_file_operation_access_s, fll_error_file_type_path_e, status); return status; } @@ -474,7 +474,7 @@ extern "C" { f_status_t kt_remove_preprocess_file_dates(kt_remove_main_t * const main, const f_string_static_t path, const uint64_t flag_operate, const struct stat statistics) { if (!main) { - kt_remove_print_error_file_status(&main->program.error, macro_kt_remove_f(kt_remove_preprocess_file_dates), path, f_file_operation_process_s, fll_error_file_type_path_e, F_status_set_error(F_parameter)); + kt_remove_print_error_file_status(&main->program.error, F_status_debug_source_d, path, f_file_operation_process_s, fll_error_file_type_path_e, F_status_set_error(F_parameter)); return F_status_set_error(F_parameter); } diff --git a/sources/c/program/kevux/tools/remove/main/remove.h b/sources/c/program/kevux/tools/remove/main/remove.h index 6248e61..c0ed02f 100644 --- a/sources/c/program/kevux/tools/remove/main/remove.h +++ b/sources/c/program/kevux/tools/remove/main/remove.h @@ -52,7 +52,6 @@ // Kevux Tools includes. #include #include -#include #include #include #include diff --git a/sources/c/program/kevux/tools/remove/remove/main.c b/sources/c/program/kevux/tools/remove/remove/main.c index de5a823..11296e2 100644 --- a/sources/c/program/kevux/tools/remove/remove/main.c +++ b/sources/c/program/kevux/tools/remove/remove/main.c @@ -67,7 +67,7 @@ int data.setting.state.status = f_thread_create(0, &id_signal, &kt_remove_thread_signal, (void *) &data); if (F_status_is_error(data.setting.state.status)) { - kt_remove_print_error(&data.program.error, macro_kt_remove_f(f_thread_create)); + kt_remove_print_error(&data.program.error, F_status_debug_source_d); } else { { diff --git a/sources/c/program/kevux/tools/remove/rm/main.c b/sources/c/program/kevux/tools/remove/rm/main.c index e6993c4..e459ca2 100644 --- a/sources/c/program/kevux/tools/remove/rm/main.c +++ b/sources/c/program/kevux/tools/remove/rm/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, &kt_remove_thread_signal, (void *) &data); if (F_status_is_error(data.setting.state.status)) { - kt_remove_print_error(&data.program.error, macro_kt_remove_f(f_thread_create)); + kt_remove_print_error(&data.program.error, F_status_debug_source_d); } else { { diff --git a/sources/c/program/kevux/tools/remove/rm/rm.c b/sources/c/program/kevux/tools/remove/rm/rm.c index 5d7164a..e96f1f9 100644 --- a/sources/c/program/kevux/tools/remove/rm/rm.c +++ b/sources/c/program/kevux/tools/remove/rm/rm.c @@ -81,7 +81,7 @@ extern "C" { ); if (F_status_is_error(main->setting.state.status)) { - kt_remove_print_error(&main->program.error, macro_kt_remove_f(f_memory_array_increase_by)); + kt_remove_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -132,7 +132,7 @@ extern "C" { fl_path_clean(main->program.parameters.arguments.array[index], &main->setting.files.array[main->setting.files.used]); if (F_status_is_error(main->setting.state.status)) { - kt_remove_print_error_file(&main->program.error, macro_kt_remove_f(fl_path_clean), main->program.parameters.arguments.array[index], f_file_operation_process_s, fll_error_file_type_path_e); + kt_remove_print_error_file(&main->program.error, F_status_debug_source_d, main->program.parameters.arguments.array[index], f_file_operation_process_s, fll_error_file_type_path_e); return; } diff --git a/sources/c/program/kevux/tools/remove/rmdir/main.c b/sources/c/program/kevux/tools/remove/rmdir/main.c index 6dc1098..997e1fc 100644 --- a/sources/c/program/kevux/tools/remove/rmdir/main.c +++ b/sources/c/program/kevux/tools/remove/rmdir/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, &kt_remove_thread_signal, (void *) &data); if (F_status_is_error(data.setting.state.status)) { - kt_remove_print_error(&data.program.error, macro_kt_remove_f(f_thread_create)); + kt_remove_print_error(&data.program.error, F_status_debug_source_d); } else { { diff --git a/sources/c/program/kevux/tools/remove/unlink/main.c b/sources/c/program/kevux/tools/remove/unlink/main.c index 103f9a5..e275526 100644 --- a/sources/c/program/kevux/tools/remove/unlink/main.c +++ b/sources/c/program/kevux/tools/remove/unlink/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, &kt_remove_thread_signal, (void *) &data); if (F_status_is_error(data.setting.state.status)) { - kt_remove_print_error(&data.program.error, macro_kt_remove_f(f_thread_create)); + kt_remove_print_error(&data.program.error, F_status_debug_source_d); } else { { diff --git a/sources/c/program/kevux/tools/tacocat/main/common.c b/sources/c/program/kevux/tools/tacocat/main/common.c index 563df45..691a38f 100644 --- a/sources/c/program/kevux/tools/tacocat/main/common.c +++ b/sources/c/program/kevux/tools/tacocat/main/common.c @@ -16,7 +16,7 @@ extern "C" { main->setting.state.step_small = kt_tacocat_allocation_small_d; if (F_status_is_error(main->setting.state.status)) { - kt_tacocat_print_error(&main->program.error, macro_kt_tacocat_f(f_console_parameter_process)); + kt_tacocat_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -35,7 +35,7 @@ extern "C" { main->setting.state.status = fll_program_parameter_process_context(choices, modes, F_true, &main->program); if (F_status_is_error(main->setting.state.status)) { - kt_tacocat_print_error(&main->program.error, macro_kt_tacocat_f(fll_program_parameter_process_context)); + kt_tacocat_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -52,7 +52,7 @@ extern "C" { main->setting.state.status = fll_program_parameter_process_verbosity(choices, verbosity, F_true, &main->program); if (F_status_is_error(main->setting.state.status)) { - kt_tacocat_print_error(&main->program.error, macro_kt_tacocat_f(fll_program_parameter_process_verbosity)); + kt_tacocat_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -122,7 +122,7 @@ extern "C" { main->setting.state.status = fl_conversion_dynamic_to_unsigned_detect(fl_conversion_data_base_10_c, main->program.parameters.arguments.array[index], &number); if (F_status_is_error(main->setting.state.status)) { - kt_tacocat_print_error(&main->program.error, macro_kt_tacocat_f(fl_conversion_dynamic_to_unsigned_detect)); + kt_tacocat_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -157,7 +157,7 @@ extern "C" { main->setting.state.status = fl_conversion_dynamic_to_unsigned_detect(fl_conversion_data_base_10_c, main->program.parameters.arguments.array[index], &number); if (F_status_is_error(main->setting.state.status)) { - kt_tacocat_print_error(&main->program.error, macro_kt_tacocat_f(fl_conversion_dynamic_to_unsigned_detect)); + kt_tacocat_print_error(&main->program.error, F_status_debug_source_d); return; } @@ -282,10 +282,10 @@ extern "C" { total = main->program.parameters.array[parameters[i]].values.used / 2; main->setting.state.status = f_memory_array_increase_by(total, sizeof(f_poll_t), (void **) &polls[i]->array, &polls[i]->used, &polls[i]->size); - macro_kt_tacocat_handle_load_send_receive_error_continue_1(f_memory_array_increase_by); + macro_kt_tacocat_handle_load_send_receive_error_continue_1(); main->setting.state.status = f_memory_array_increase_by(total, sizeof(kt_tacocat_socket_set_t), (void **) &sets[i]->array, &sets[i]->used, &sets[i]->size); - macro_kt_tacocat_handle_load_send_receive_error_continue_1(f_memory_array_increase_by); + macro_kt_tacocat_handle_load_send_receive_error_continue_1(); if (F_status_is_error_not(main->setting.state.status)) { main->setting.state.status = F_okay; @@ -332,18 +332,18 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(main->program.parameters.arguments.array[index].used + 1, sizeof(f_char_t), (void **) &sets[i]->array[j].network.string, &sets[i]->array[j].network.used, &sets[i]->array[j].network.size); - macro_kt_tacocat_handle_load_send_receive_error_continue_2(f_memory_array_increase_by); + macro_kt_tacocat_handle_load_send_receive_error_continue_2(); main->setting.state.status = f_string_dynamic_append_nulless(main->program.parameters.arguments.array[index], &sets[i]->array[j].network); - macro_kt_tacocat_handle_load_send_receive_error_continue_2(f_string_dynamic_append_nulless); + macro_kt_tacocat_handle_load_send_receive_error_continue_2(); sets[i]->array[j].network.string[sets[i]->array[j].network.used] = 0; if (is_receive[i]) { main->setting.state.status = f_file_exists(sets[i]->array[j].network, F_true); - macro_kt_tacocat_handle_load_send_receive_error_continue_2(f_string_dynamic_append_nulless); + macro_kt_tacocat_handle_load_send_receive_error_continue_2(); } sets[i]->array[j].network.string[sets[i]->array[j].network.used] = 0; @@ -367,7 +367,7 @@ extern "C" { f_network_is_ip_address(address, &range_ip, &main->setting.state); if (F_status_is_error(main->setting.state.status)) { - macro_kt_tacocat_handle_load_send_receive_error_continue_2(f_network_is_ip_address); + macro_kt_tacocat_handle_load_send_receive_error_continue_2(); } if (main->setting.state.status == F_network_version_four) { @@ -390,7 +390,7 @@ extern "C" { if (F_status_is_error(main->setting.state.status)) { if (F_status_set_fine(main->setting.state.status) == F_parameter) { - kt_tacocat_print_error(&main->program.error, macro_kt_tacocat_f(kt_tacocat_setting_load_address_port_extract)); + kt_tacocat_print_error(&main->program.error, F_status_debug_source_d); } else { kt_tacocat_print_error_port_number_invalid(&main->program.error, address, range_ip); @@ -415,21 +415,21 @@ extern "C" { if (host.h_addrtype) { main->setting.state.status = f_string_dynamic_append(address, &sets[i]->array[j].network); - macro_kt_tacocat_handle_load_send_receive_error_continue_2(f_string_dynamic_append); + macro_kt_tacocat_handle_load_send_receive_error_continue_2(); main->setting.state.status = f_network_from_ip_string(address, &family); - macro_kt_tacocat_handle_load_send_receive_error_continue_2(f_network_from_ip_string); + macro_kt_tacocat_handle_load_send_receive_error_continue_2(); } else { main->setting.state.status = f_network_from_ip_name(address, &host); - macro_kt_tacocat_handle_load_send_receive_error_continue_2(f_network_from_ip_name); + macro_kt_tacocat_handle_load_send_receive_error_continue_2(); if (main->setting.state.status == F_data_not || !host.h_addr_list || !host.h_addr_list[0]) { main->setting.state.status = F_status_set_error(F_parameter); - kt_tacocat_print_error(&main->program.error, macro_kt_tacocat_f(f_network_from_ip_name)); + kt_tacocat_print_error(&main->program.error, F_status_debug_source_d); if (F_status_is_error_not(failed)) { failed = main->setting.state.status; @@ -442,7 +442,7 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(INET6_ADDRSTRLEN + 1, sizeof(f_char_t), (void **) &sets[i]->array[j].network.string, &sets[i]->array[j].network.used, &sets[i]->array[j].network.size); - macro_kt_tacocat_handle_load_send_receive_error_continue_2(f_memory_array_increase_by); + macro_kt_tacocat_handle_load_send_receive_error_continue_2(); // Randomly select one of the addresses when there are more than one. if (host.h_addr_list[1]) { @@ -460,14 +460,14 @@ extern "C" { main->setting.state.status = f_memory_array_increase_by(INET6_ADDRSTRLEN + 1, sizeof(f_char_t), (void **) &sets[i]->array[j].network.string, &sets[i]->array[j].network.used, &sets[i]->array[j].network.size); - macro_kt_tacocat_handle_load_send_receive_error_continue_2(f_memory_array_increase_by); + macro_kt_tacocat_handle_load_send_receive_error_continue_2(); main->setting.state.status = f_network_to_ip_string(family, &sets[i]->array[j].network); if (main->setting.state.status == F_data_not || !host.h_addr_list || !host.h_addr_list[0]) { main->setting.state.status = F_status_set_error(F_parameter); - kt_tacocat_print_error(&main->program.error, macro_kt_tacocat_f(f_network_from_ip_name)); + kt_tacocat_print_error(&main->program.error, F_status_debug_source_d); if (F_status_is_error_not(failed)) { failed = main->setting.state.status; @@ -539,7 +539,7 @@ extern "C" { main->setting.state.status = f_file_open(sets[i]->array[j].name, file_modes[i], &sets[i]->array[j].file); if (F_status_is_error(main->setting.state.status)) { - macro_kt_tacocat_handle_load_send_receive_error_file_continue_1(f_file_open, sets[i]->array[j].name, f_file_operation_open_s, fll_error_file_type_file_e); + macro_kt_tacocat_handle_load_send_receive_error_file_continue_1(sets[i]->array[j].name, f_file_operation_open_s, fll_error_file_type_file_e); if (F_status_is_error_not(failed)) { failed = main->setting.state.status; @@ -550,7 +550,7 @@ extern "C" { else { main->setting.state.status = f_file_close(&sets[i]->array[j].file); - macro_kt_tacocat_handle_load_send_receive_error_file_continue_1(f_file_open, sets[i]->array[j].name, f_file_operation_close_s, fll_error_file_type_file_e); + macro_kt_tacocat_handle_load_send_receive_error_file_continue_1(sets[i]->array[j].name, f_file_operation_close_s, fll_error_file_type_file_e); } } else { diff --git a/sources/c/program/kevux/tools/tacocat/main/common/define.h b/sources/c/program/kevux/tools/tacocat/main/common/define.h index 4fb39ef..a7f8260 100644 --- a/sources/c/program/kevux/tools/tacocat/main/common/define.h +++ b/sources/c/program/kevux/tools/tacocat/main/common/define.h @@ -134,9 +134,9 @@ extern "C" { * Similar to macro_kt_tacocat_handle_receive_process_error_exit_1() but calls kt_tacocat_print_error_on_packet_invalid(). */ #ifndef _di_kt_tacocat_macros_d_ - #define macro_kt_tacocat_handle_load_send_receive_error_continue_1(method) \ + #define macro_kt_tacocat_handle_load_send_receive_error_continue_1() \ if (F_status_is_error(main->setting.state.status)) { \ - kt_tacocat_print_error(&main->program.error, macro_kt_tacocat_f(method)); \ + kt_tacocat_print_error(&main->program.error, F_status_debug_source_d); \ \ if (F_status_is_error_not(failed)) { \ failed = main->setting.state.status; \ @@ -145,9 +145,9 @@ extern "C" { continue; \ } - #define macro_kt_tacocat_handle_load_send_receive_error_continue_2(method) \ + #define macro_kt_tacocat_handle_load_send_receive_error_continue_2() \ if (F_status_is_error(main->setting.state.status)) { \ - kt_tacocat_print_error(&main->program.error, macro_kt_tacocat_f(method)); \ + kt_tacocat_print_error(&main->program.error, F_status_debug_source_d); \ \ if (F_status_is_error_not(failed)) { \ failed = main->setting.state.status; \ @@ -158,9 +158,9 @@ extern "C" { continue; \ } - #define macro_kt_tacocat_handle_load_send_receive_error_file_continue_1(method, name, operation, type) \ + #define macro_kt_tacocat_handle_load_send_receive_error_file_continue_1(name, operation, type) \ if (F_status_is_error(main->setting.state.status)) { \ - kt_tacocat_print_error_file(&main->program.error, macro_kt_tacocat_f(method), name, operation, type); \ + kt_tacocat_print_error_file(&main->program.error, F_status_debug_source_d, name, operation, type); \ \ if (F_status_is_error_not(failed)) { \ failed = main->setting.state.status; \ @@ -171,9 +171,9 @@ extern "C" { continue; \ } - #define macro_kt_tacocat_handle_receive_process_error_exit_1(main, method, network, status, name, step, id_data) \ + #define macro_kt_tacocat_handle_receive_process_error_exit_1(main, network, status, name, step, id_data) \ if (F_status_is_error(status)) { \ - kt_tacocat_print_error_on(&main->program.error, macro_kt_tacocat_f(method), kt_tacocat_receive_s, network, status, name); \ + kt_tacocat_print_error_on(&main->program.error, F_status_debug_source_d, kt_tacocat_receive_s, network, status, name); \ \ if (id_data) { \ f_file_close_id(&(id_data)); \ @@ -195,18 +195,18 @@ extern "C" { \ return F_done_not; - #define macro_kt_tacocat_handle_receive_process_begin_error_exit_1(main, method, network, status, name, step) \ + #define macro_kt_tacocat_handle_receive_process_begin_error_exit_1(main, network, status, name, step) \ if (F_status_is_error(status)) { \ - kt_tacocat_print_error_on(&main->program.error, macro_kt_tacocat_f(method), kt_tacocat_receive_s, network, status, name); \ + kt_tacocat_print_error_on(&main->program.error, F_status_debug_source_d, kt_tacocat_receive_s, network, status, name); \ \ step = 0; \ \ return; \ } - #define macro_kt_tacocat_handle_send_process_error_exit_1(main, method, on, network, status, name, step) \ + #define macro_kt_tacocat_handle_send_process_error_exit_1(main, on, network, status, name, step) \ if (F_status_is_error(status)) { \ - kt_tacocat_print_error_on(&main->program.error, macro_kt_tacocat_f(method), on, network, status, name); \ + kt_tacocat_print_error_on(&main->program.error, F_status_debug_source_d, on, network, status, name); \ \ return F_done_not; \ } diff --git a/sources/c/program/kevux/tools/tacocat/main/common/print.c b/sources/c/program/kevux/tools/tacocat/main/common/print.c deleted file mode 100644 index 183a257..0000000 --- a/sources/c/program/kevux/tools/tacocat/main/common/print.c +++ /dev/null @@ -1,59 +0,0 @@ -#include "../tacocat.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef _di_kt_tacocat_f_a_ - const f_string_t kt_tacocat_f_a[] = { - "f_console_parameter_process", - "f_file_close", - "f_file_close_id", - "f_file_open", - "f_file_read_block", - "f_file_seek", - "f_file_size_by_id", - "f_file_write", - "f_file_write_range", - "f_fss_simple_packet_decode_range", - "f_fss_simple_packet_encode", - "f_memory_array_increase_by", - "f_memory_array_resize", - "f_network_from_ip_name", - "f_network_from_ip_string", - "f_network_is_ip_address", - "f_random_array_shuffle", - "f_socket_accept", - "f_socket_bind", - "f_socket_close", - "f_socket_connect", - "f_socket_create", - "f_socket_disconnect", - "f_socket_listen", - "f_socket_option_set", - "f_socket_read_stream", - "f_socket_write_stream", - "f_string_append_nulless", - "f_string_dynamic_append", - "f_string_dynamic_append_nulless", - "f_string_dynamic_terminate_after", - "f_thread_create", - "fl_conversion_dynamic_partial_to_unsigned_detect", - "fl_conversion_dynamic_to_unsigned_detect", - "fl_fss_payload_header_map", - "fl_status_string_from", - "fll_fss_extended_read", - "fll_fss_payload_read", - "fll_program_parameter_process_context", - "fll_program_parameter_process_verbosity", - "kt_tacocat_process_abstruse_initialize", - "kt_tacocat_process_socket_set_error_has", - "kt_tacocat_send_process_initialize", - "kt_tacocat_setting_load_address_port_extract", - "kt_tacocat_setting_load_send_receive_allocate", - }; -#endif // _di_kt_tacocat_f_a_ - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/sources/c/program/kevux/tools/tacocat/main/common/print.h b/sources/c/program/kevux/tools/tacocat/main/common/print.h deleted file mode 100644 index ca0ebc4..0000000 --- a/sources/c/program/kevux/tools/tacocat/main/common/print.h +++ /dev/null @@ -1,94 +0,0 @@ -/** - * Kevux Tools - TacocaT - * - * Project: Kevux Tools - * 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 _kt_tacocat_main_common_print_h -#define _kt_tacocat_main_common_print_h - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * A special array of strings intended for representing funciton names. - * - * These are primarily used for printing errors with the function names. - * - * The macro macro_kt_tacocat_f() is used to reference the array index by the enum name. - * - * macro_kt_tacocat_f(): - * - name: The name of the function. - */ -#ifndef _di_kt_tacocat_f_a_ - extern const f_string_t kt_tacocat_f_a[]; - - #define macro_kt_tacocat_f(name) kt_tacocat_f_a[kt_tacocat_f_##name##_e] -#endif // _di_kt_tacocat_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_kt_tacocat_f_e_ - enum { - kt_tacocat_f_f_console_parameter_process_e = 0, - kt_tacocat_f_f_file_close_e, - kt_tacocat_f_f_file_close_id_e, - kt_tacocat_f_f_file_open_e, - kt_tacocat_f_f_file_read_block_e, - kt_tacocat_f_f_file_seek_e, - kt_tacocat_f_f_file_size_by_id_e, - kt_tacocat_f_f_file_write_e, - kt_tacocat_f_f_file_write_range_e, - kt_tacocat_f_f_fss_simple_packet_decode_range_e, - kt_tacocat_f_f_fss_simple_packet_encode_e, - kt_tacocat_f_f_memory_array_increase_by_e, - kt_tacocat_f_f_memory_array_resize_e, - kt_tacocat_f_f_network_from_ip_name_e, - kt_tacocat_f_f_network_from_ip_string_e, - kt_tacocat_f_f_network_is_ip_address_e, - kt_tacocat_f_f_random_array_shuffle_e, - kt_tacocat_f_f_socket_accept_e, - kt_tacocat_f_f_socket_bind_e, - kt_tacocat_f_f_socket_close_e, - kt_tacocat_f_f_socket_connect_e, - kt_tacocat_f_f_socket_create_e, - kt_tacocat_f_f_socket_disconnect_e, - kt_tacocat_f_f_socket_listen_e, - kt_tacocat_f_f_socket_option_set_e, - kt_tacocat_f_f_socket_read_stream_e, - kt_tacocat_f_f_socket_write_stream_e, - kt_tacocat_f_f_string_append_nulless_e, - kt_tacocat_f_f_string_dynamic_append_e, - kt_tacocat_f_f_string_dynamic_append_nulless_e, - kt_tacocat_f_f_string_dynamic_terminate_after_e, - kt_tacocat_f_f_thread_create_e, - kt_tacocat_f_fl_conversion_dynamic_partial_to_unsigned_detect_e, - kt_tacocat_f_fl_conversion_dynamic_to_unsigned_detect_e, - kt_tacocat_f_fl_fss_payload_header_map_e, - kt_tacocat_f_fl_status_string_from_e, - kt_tacocat_f_fll_fss_extended_read_e, - kt_tacocat_f_fll_fss_payload_read_e, - kt_tacocat_f_fll_program_parameter_process_context_e, - kt_tacocat_f_fll_program_parameter_process_verbosity_e, - kt_tacocat_f_kt_tacocat_process_abstruse_initialize_e, - kt_tacocat_f_kt_tacocat_process_socket_set_error_has_e, - kt_tacocat_f_kt_tacocat_send_process_initialize_e, - kt_tacocat_f_kt_tacocat_setting_load_address_port_extract_e, - kt_tacocat_f_kt_tacocat_setting_load_send_receive_allocate_e, - }; // enum -#endif // _di_kt_tacocat_f_e_ - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif // _kt_tacocat_main_common_print_h diff --git a/sources/c/program/kevux/tools/tacocat/main/packet.c b/sources/c/program/kevux/tools/tacocat/main/packet.c index bfab262..5bdf72e 100644 --- a/sources/c/program/kevux/tools/tacocat/main/packet.c +++ b/sources/c/program/kevux/tools/tacocat/main/packet.c @@ -12,7 +12,7 @@ extern "C" { kt_tacocat_process_abstruse_initialize(main, set); if (F_status_is_error(set->status)) { - kt_tacocat_print_error_on(&main->program.error, macro_kt_tacocat_f(kt_tacocat_process_abstruse_initialize), direction, set->network, set->status, set->name); + kt_tacocat_print_error_on(&main->program.error, F_status_debug_source_d, direction, set->network, set->status, set->name); if (set->socket.id_data) { f_file_close_id(&set->socket.id_data); @@ -77,7 +77,7 @@ extern "C" { fll_fss_extended_read(set->buffer, &set->range, &set->objects_header, &set->contents_header, &set->objects_quoted_header, &set->contents_quoted_header, &set->objects_delimits_header, &set->contents_delimits_header, &set->state); if (F_status_is_error(set->state.status)) { - kt_tacocat_print_error_on(&main->program.error, macro_kt_tacocat_f(fll_fss_extended_read), direction, set->network, set->status, set->name); + kt_tacocat_print_error_on(&main->program.error, F_status_debug_source_d, direction, set->network, set->status, set->name); set->status = set->state.status; @@ -237,7 +237,7 @@ extern "C" { fll_fss_extended_read(set->buffer, &set->range, &set->objects_signature, &set->contents_signature, &set->objects_quoted_header, &set->contents_quoted_header, &set->objects_delimits_signature, &set->contents_delimits_signature, &set->state); if (F_status_is_error(set->state.status)) { - kt_tacocat_print_error_on(&main->program.error, macro_kt_tacocat_f(fll_fss_extended_read), direction, set->network, set->status, set->name); + kt_tacocat_print_error_on(&main->program.error, F_status_debug_source_d, direction, set->network, set->status, set->name); set->status = set->state.status; diff --git a/sources/c/program/kevux/tools/tacocat/main/process.c b/sources/c/program/kevux/tools/tacocat/main/process.c index 2a6f1b4..21f1e59 100644 --- a/sources/c/program/kevux/tools/tacocat/main/process.c +++ b/sources/c/program/kevux/tools/tacocat/main/process.c @@ -34,7 +34,7 @@ extern "C" { } if (F_status_is_error(main->setting.state.status)) { - kt_tacocat_print_error(&main->program.error, macro_kt_tacocat_f(f_thread_create)); + kt_tacocat_print_error(&main->program.error, F_status_debug_source_d); } } @@ -134,7 +134,7 @@ extern "C" { *status = F_status_set_error(F_parameter); } - kt_tacocat_print_error_status(&main->program.error, macro_kt_tacocat_f(kt_tacocat_process_socket_set_error_has), *status); + kt_tacocat_print_error_status(&main->program.error, F_status_debug_source_d, *status); return F_status_set_error(F_parameter); } @@ -163,7 +163,7 @@ extern "C" { if (F_status_is_error(main->setting.receive.array[i].status)) { main->setting.status_receive = main->setting.receive.array[i].status; - kt_tacocat_print_error_status(&main->program.error, macro_kt_tacocat_f(f_socket_create), main->setting.status_receive); + kt_tacocat_print_error_status(&main->program.error, F_status_debug_source_d, main->setting.status_receive); continue; } @@ -177,7 +177,7 @@ extern "C" { if (F_status_is_error(main->setting.receive.array[i].status)) { main->setting.status_receive = main->setting.receive.array[i].status; - kt_tacocat_print_error_status(&main->program.error, macro_kt_tacocat_f(f_socket_option_set), main->setting.status_receive); + kt_tacocat_print_error_status(&main->program.error, F_status_debug_source_d, main->setting.status_receive); continue; } @@ -236,7 +236,7 @@ extern "C" { kt_tacocat_print_error_on_busy(&main->program.error, kt_tacocat_receive_s, main->setting.receive.array[i].network); } else { - kt_tacocat_print_error_status(&main->program.error, macro_kt_tacocat_f(f_socket_bind), main->setting.status_receive); + kt_tacocat_print_error_status(&main->program.error, F_status_debug_source_d, main->setting.status_receive); } continue; @@ -247,7 +247,7 @@ extern "C" { if (F_status_is_error(main->setting.receive.array[i].status)) { main->setting.status_receive = main->setting.receive.array[i].status; - kt_tacocat_print_error_status(&main->program.error, macro_kt_tacocat_f(f_socket_listen), main->setting.status_receive); + kt_tacocat_print_error_status(&main->program.error, F_status_debug_source_d, main->setting.status_receive); continue; } @@ -287,7 +287,7 @@ extern "C" { if (F_status_is_error(main->setting.send.array[i].status)) { main->setting.status_send = main->setting.send.array[i].status; - kt_tacocat_print_error_status(&main->program.error, macro_kt_tacocat_f(f_socket_create), main->setting.status_send); + kt_tacocat_print_error_status(&main->program.error, F_status_debug_source_d, main->setting.status_send); continue; } @@ -353,7 +353,7 @@ extern "C" { kt_tacocat_print_error_on_busy(&main->program.error, kt_tacocat_send_s, main->setting.send.array[i].network); } else { - kt_tacocat_print_error_status(&main->program.error, macro_kt_tacocat_f(f_socket_connect), main->setting.status_send); + kt_tacocat_print_error_status(&main->program.error, F_status_debug_source_d, main->setting.status_send); } continue; diff --git a/sources/c/program/kevux/tools/tacocat/main/receive.c b/sources/c/program/kevux/tools/tacocat/main/receive.c index f819214..a16691d 100644 --- a/sources/c/program/kevux/tools/tacocat/main/receive.c +++ b/sources/c/program/kevux/tools/tacocat/main/receive.c @@ -151,7 +151,7 @@ extern "C" { // Make sure the buffer is large enough for payload processing block reads. set->status = f_memory_array_increase_by(set->socket.size_read, sizeof(f_char_t), (void **) &set->buffer.string, &set->buffer.used, &set->buffer.size); - macro_kt_tacocat_handle_receive_process_error_exit_1(main, f_memory_array_increase_by, set->network, set->status, set->name, set->step, set->socket.id_data); + macro_kt_tacocat_handle_receive_process_error_exit_1(main, set->network, set->status, set->name, set->step, set->socket.id_data); set->retry = 0; set->buffer.used = 0; @@ -162,7 +162,7 @@ extern "C" { size_t length_read = 0; set->status = f_socket_read_stream(&set->socket, 0, (void *) (set->buffer.string + set->buffer.used), &length_read); - macro_kt_tacocat_handle_receive_process_error_exit_1(main, f_socket_read_stream, set->network, set->status, set->name, set->step, set->socket.id_data); + macro_kt_tacocat_handle_receive_process_error_exit_1(main, set->network, set->status, set->name, set->step, set->socket.id_data); if (length_read) { set->retry = 0; @@ -283,7 +283,7 @@ extern "C" { set->parts.used = 0; set->status = f_memory_array_increase_by(set->abstruses.array[4].value.is.a_unsigned, sizeof(f_number_unsigned_t), (void **) &set->parts.array, &set->parts.used, &set->parts.size); - macro_kt_tacocat_handle_receive_process_error_exit_1(main, f_memory_array_increase_by, set->network, set->status, set->name, set->step, set->socket.id_data); + macro_kt_tacocat_handle_receive_process_error_exit_1(main, set->network, set->status, set->name, set->step, set->socket.id_data); memset(set->parts.array, 0, sizeof(f_number_unsigned_t)); @@ -308,7 +308,7 @@ extern "C" { set->status = f_file_open(set->name, F_file_mode_all_rw_d, &set->file); if (F_status_is_error(set->status)) { - kt_tacocat_print_error_on_file_receive(&main->program.error, macro_kt_tacocat_f(f_file_open), kt_tacocat_receive_s, set->network, set->status, set->name, f_file_operation_open_s); + kt_tacocat_print_error_on_file_receive(&main->program.error, F_status_debug_source_d, kt_tacocat_receive_s, set->network, set->status, set->name, f_file_operation_open_s); return F_done_not; // @todo consider sending a file error to caller. This should not infinitely attempt to open on failure. } @@ -319,7 +319,7 @@ extern "C" { if (F_status_is_error(set->status)) { f_file_close(&set->file); - kt_tacocat_print_error_on_file_receive(&main->program.error, macro_kt_tacocat_f(f_file_write_range), kt_tacocat_receive_s, set->network, set->status, set->name, f_file_operation_write_s); + kt_tacocat_print_error_on_file_receive(&main->program.error, F_status_debug_source_d, kt_tacocat_receive_s, set->network, set->status, set->name, f_file_operation_write_s); } f_file_close(&set->file); @@ -354,7 +354,7 @@ extern "C" { // Report the resize error but do not fail. if (F_status_is_error(set->status)) { - kt_tacocat_print_error_on(&main->program.error, macro_kt_tacocat_f(f_memory_array_resize), kt_tacocat_receive_s, set->network, set->status, set->name); + kt_tacocat_print_error_on(&main->program.error, F_status_debug_source_d, kt_tacocat_receive_s, set->network, set->status, set->name); } } @@ -376,10 +376,10 @@ extern "C" { set->status = f_socket_accept(&set->socket); // The socket failed to accept and so there is no data socket id to close. - macro_kt_tacocat_handle_receive_process_begin_error_exit_1(main, f_socket_accept, set->network, set->status, set->name, set->step); + macro_kt_tacocat_handle_receive_process_begin_error_exit_1(main, set->network, set->status, set->name, set->step); set->status = f_memory_array_increase_by(kt_tacocat_packet_peek_d + 1, sizeof(f_char_t), (void **) &set->buffer.string, &set->buffer.used, &set->buffer.size); - macro_kt_tacocat_handle_receive_process_begin_error_exit_1(main, f_memory_array_increase_by, set->network, set->status, set->name, set->step); + macro_kt_tacocat_handle_receive_process_begin_error_exit_1(main, set->network, set->status, set->name, set->step); set->socket.size_read = kt_tacocat_packet_peek_d; @@ -387,7 +387,7 @@ extern "C" { set->socket.size_read = size_read; - macro_kt_tacocat_handle_receive_process_begin_error_exit_1(main, f_socket_read_stream, set->network, set->status, set->name, set->step); + macro_kt_tacocat_handle_receive_process_begin_error_exit_1(main, set->network, set->status, set->name, set->step); set->buffer.used += length_read; @@ -431,7 +431,7 @@ extern "C" { } set->status = f_fss_simple_packet_decode_range(set->buffer, &set->packet); - macro_kt_tacocat_handle_receive_process_begin_error_exit_1(main, f_fss_simple_packet_decode_range, set->network, set->status, set->name, set->step); + macro_kt_tacocat_handle_receive_process_begin_error_exit_1(main, set->network, set->status, set->name, set->step); if (set->status == F_packet_too_small || set->packet.size < kt_tacocat_packet_minimum_d || set->packet.size > main->setting.max_buffer) { set->buffer.used = 0; @@ -441,7 +441,7 @@ extern "C" { // Report the resize error but do not fail. if (F_status_is_error(set->status)) { - kt_tacocat_print_error_on(&main->program.error, macro_kt_tacocat_f(f_memory_array_resize), kt_tacocat_receive_s, set->network, set->status, set->name); + kt_tacocat_print_error_on(&main->program.error, F_status_debug_source_d, kt_tacocat_receive_s, set->network, set->status, set->name); } } diff --git a/sources/c/program/kevux/tools/tacocat/main/send.c b/sources/c/program/kevux/tools/tacocat/main/send.c index cdb602e..5b11de8 100644 --- a/sources/c/program/kevux/tools/tacocat/main/send.c +++ b/sources/c/program/kevux/tools/tacocat/main/send.c @@ -97,7 +97,7 @@ extern "C" { kt_tacocat_send_process_initialize(main, set); if (F_status_is_error(set->status)) { - macro_kt_tacocat_handle_send_process_error_exit_1(main, kt_tacocat_send_process_initialize, kt_tacocat_send_s, set->network, set->status, set->name, set->step); + macro_kt_tacocat_handle_send_process_error_exit_1(main, kt_tacocat_send_s, set->network, set->status, set->name, set->step); } set->step = kt_tacocat_socket_step_send_size_e; @@ -124,7 +124,7 @@ extern "C" { set->status = f_file_open(set->name, F_file_mode_all_r_d, &set->file); if (F_status_is_error(set->status)) { - kt_tacocat_print_error_on_file_receive(&main->program.error, macro_kt_tacocat_f(f_file_open), kt_tacocat_send_s, set->network, set->status, set->name, f_file_operation_open_s); + kt_tacocat_print_error_on_file_receive(&main->program.error, F_status_debug_source_d, kt_tacocat_send_s, set->network, set->status, set->name, f_file_operation_open_s); return F_done_not; } @@ -136,7 +136,7 @@ extern "C" { set->status = f_file_size_by_id(set->file, &total); if (F_status_is_error(set->status)) { - kt_tacocat_print_error_on_file_receive(&main->program.error, macro_kt_tacocat_f(f_file_size_by_id), kt_tacocat_send_size_s, set->network, set->status, set->name, f_file_operation_open_s); + kt_tacocat_print_error_on_file_receive(&main->program.error, F_status_debug_source_d, kt_tacocat_send_size_s, set->network, set->status, set->name, f_file_operation_open_s); return F_done_not; } @@ -186,7 +186,7 @@ extern "C" { // Keep error bit but set state to done to designate that nothing else is to be done. set->status = F_status_set_error(F_done); - kt_tacocat_print_error_on(&main->program.error, macro_kt_tacocat_f(f_memory_array_increase_by), kt_tacocat_send_size_s, set->network, set->status, set->name); + kt_tacocat_print_error_on(&main->program.error, F_status_debug_source_d, kt_tacocat_send_size_s, set->network, set->status, set->name); return F_done_not; } @@ -202,13 +202,13 @@ extern "C" { set->status = state_local.status; - macro_kt_tacocat_handle_send_process_error_exit_1(main, fl_fss_payload_header_map, kt_tacocat_send_build_s, set->network, set->status, set->name, set->step); + macro_kt_tacocat_handle_send_process_error_exit_1(main, kt_tacocat_send_build_s, set->network, set->status, set->name, set->step); set->write_state.cache->used = 0; set->status = f_random_array_shuffle(0, set->headers.used, sizeof(f_string_map_t), set->write_state.cache, (void *) set->headers.array); - macro_kt_tacocat_handle_send_process_error_exit_1(main, f_random_array_shuffle, kt_tacocat_send_build_s, set->network, set->status, set->name, set->step); + macro_kt_tacocat_handle_send_process_error_exit_1(main, kt_tacocat_send_build_s, set->network, set->status, set->name, set->step); set->step = kt_tacocat_socket_step_send_header_e; } @@ -260,7 +260,7 @@ extern "C" { } // for } - macro_kt_tacocat_handle_send_process_error_exit_1(main, f_string_dynamic_append_nulless, kt_tacocat_send_combine_s, set->network, set->status, set->name, set->step); + macro_kt_tacocat_handle_send_process_error_exit_1(main, kt_tacocat_send_combine_s, set->network, set->status, set->name, set->step); set->step = kt_tacocat_socket_step_send_file_e; } @@ -274,21 +274,21 @@ extern "C" { set->status = f_string_dynamic_append(f_fss_payload_object_end_s, &set->buffer); } - macro_kt_tacocat_handle_send_process_error_exit_1(main, f_string_dynamic_append, kt_tacocat_send_file_s, set->network, set->status, set->name, set->step); + macro_kt_tacocat_handle_send_process_error_exit_1(main, kt_tacocat_send_file_s, set->network, set->status, set->name, set->step); // Always reset the seek position in case a retry happened after the file block is read. { off_t seeked = 0; set->status = f_file_seek(set->file, SEEK_SET, set->size_done, &seeked); - macro_kt_tacocat_handle_send_process_error_exit_1(main, f_file_seek, kt_tacocat_send_file_s, set->network, set->status, set->name, set->step); + macro_kt_tacocat_handle_send_process_error_exit_1(main, kt_tacocat_send_file_s, set->network, set->status, set->name, set->step); } set->status = f_file_read_block(set->file, &set->buffer); - macro_kt_tacocat_handle_send_process_error_exit_1(main, f_file_read_block, kt_tacocat_send_file_s, set->network, set->status, set->name, set->step); + macro_kt_tacocat_handle_send_process_error_exit_1(main, kt_tacocat_send_file_s, set->network, set->status, set->name, set->step); set->status = f_string_dynamic_terminate_after(&set->buffer); - macro_kt_tacocat_handle_send_process_error_exit_1(main, f_string_dynamic_terminate_after, kt_tacocat_send_combine_s, set->network, set->status, set->name, set->step); + macro_kt_tacocat_handle_send_process_error_exit_1(main, kt_tacocat_send_combine_s, set->network, set->status, set->name, set->step); set->retry = 0; set->step = kt_tacocat_socket_step_send_check_e; @@ -313,7 +313,7 @@ extern "C" { set->buffer.used = original; - macro_kt_tacocat_handle_send_process_error_exit_1(main, f_fss_simple_packet_encode, kt_tacocat_send_payload_s, set->network, set->status, set->name, set->step); + macro_kt_tacocat_handle_send_process_error_exit_1(main, kt_tacocat_send_payload_s, set->network, set->status, set->name, set->step); set->step = kt_tacocat_socket_step_send_packet_e; } @@ -330,7 +330,7 @@ extern "C" { set->socket.size_write = original; - macro_kt_tacocat_handle_send_process_error_exit_1(main, f_socket_write_stream, kt_tacocat_send_payload_s, set->network, set->status, set->name, set->step); + macro_kt_tacocat_handle_send_process_error_exit_1(main, kt_tacocat_send_payload_s, set->network, set->status, set->name, set->step); } // @todo handle case when written < set->buffer.used, of which each pass. The entire buffer must be sent. May need another variable for say, set->size_process. @@ -364,13 +364,13 @@ extern "C" { set->status = f_file_close(&set->file); if (F_status_is_error(set->status)) { - kt_tacocat_print_warning_on_file(&main->program.warning, macro_kt_tacocat_f(f_file_close), kt_tacocat_send_done_s, set->network, set->status, set->name, f_file_operation_close_s); + kt_tacocat_print_warning_on_file(&main->program.warning, F_status_debug_source_d, kt_tacocat_send_done_s, set->network, set->status, set->name, f_file_operation_close_s); } set->status = f_socket_disconnect(&set->socket, f_socket_close_fast_e); if (F_status_is_error(set->status)) { - kt_tacocat_print_warning_on_file(&main->program.warning, macro_kt_tacocat_f(f_socket_disconnect), kt_tacocat_send_done_s, set->network, set->status, set->name, f_file_operation_close_s); + kt_tacocat_print_warning_on_file(&main->program.warning, F_status_debug_source_d, kt_tacocat_send_done_s, set->network, set->status, set->name, f_file_operation_close_s); } set->step = 0; diff --git a/sources/c/program/kevux/tools/tacocat/main/tacocat.h b/sources/c/program/kevux/tools/tacocat/main/tacocat.h index 4fccd18..157124d 100644 --- a/sources/c/program/kevux/tools/tacocat/main/tacocat.h +++ b/sources/c/program/kevux/tools/tacocat/main/tacocat.h @@ -58,7 +58,6 @@ // Kevux Tools includes. #include #include -#include #include #include #include diff --git a/sources/c/program/kevux/tools/tacocat/tacocat/main.c b/sources/c/program/kevux/tools/tacocat/tacocat/main.c index 073bec8..441690d 100644 --- a/sources/c/program/kevux/tools/tacocat/tacocat/main.c +++ b/sources/c/program/kevux/tools/tacocat/tacocat/main.c @@ -53,7 +53,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, &kt_tacocat_thread_signal, (void *) &data); if (F_status_is_error(data.setting.state.status)) { - kt_tacocat_print_error(&data.program.error, macro_kt_tacocat_f(f_thread_create)); + kt_tacocat_print_error(&data.program.error, F_status_debug_source_d); } else { {