From 41ac6cc9b31ca4d683b864a19e29be9256f19231 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sun, 18 Feb 2024 23:00:05 -0600 Subject: [PATCH] Update: Fix inconsistencies and other minor problems discovered while writing the example program. --- build/stand_alone/byte_dump.config.h | 4 +-- build/stand_alone/byte_dump.fakefile | 2 +- build/stand_alone/byte_dump.settings | 2 +- build/stand_alone/fake.fakefile | 2 +- build/stand_alone/fake.settings | 2 +- build/stand_alone/firewall.config.h | 4 +-- build/stand_alone/firewall.fakefile | 2 +- build/stand_alone/firewall.settings | 2 +- build/stand_alone/utf8.config.h | 4 +-- build/stand_alone/utf8.fakefile | 2 +- build/stand_alone/utf8.settings | 2 +- level_3/byte_dump/c/main/common.c | 1 - level_3/byte_dump/c/main/common/type.c | 6 ++--- level_3/byte_dump/c/main/common/type.h | 18 ++++++++----- level_3/byte_dump/data/build/fakefile | 4 +-- level_3/control/c/main/common.c | 1 - level_3/control/c/main/common/type.c | 6 ++--- level_3/control/c/main/common/type.h | 16 +++++------ level_3/control/data/build/fakefile | 4 +-- level_3/controller/c/common.c | 1 - level_3/controller/data/build/fakefile | 4 +-- level_3/fake/c/main/common.c | 1 - level_3/fake/c/main/common/type.h | 33 +++++++++++++++++++++-- level_3/fake/data/build/fakefile | 4 +-- level_3/firewall/c/main/common.c | 1 - level_3/firewall/c/main/common/type.c | 6 ++--- level_3/firewall/c/main/common/type.h | 31 ++++++++++++++++----- level_3/firewall/data/build/fakefile | 4 +-- level_3/fss_identify/c/main/common.c | 1 - level_3/fss_identify/c/main/common/type.c | 6 ++--- level_3/fss_identify/c/main/common/type.h | 19 ++++++++----- level_3/fss_identify/data/build/fakefile | 4 +-- level_3/fss_read/c/main/common.c | 1 - level_3/fss_read/c/main/common/type.c | 6 ++--- level_3/fss_read/c/main/common/type.h | 17 ++++++++---- level_3/fss_read/data/build/fakefile | 4 +-- level_3/fss_write/c/main/common.c | 1 - level_3/fss_write/c/main/common/type.c | 6 ++--- level_3/fss_write/c/main/common/type.h | 19 ++++++++----- level_3/fss_write/data/build/fakefile | 4 +-- level_3/iki_read/c/main/common.c | 1 - level_3/iki_read/c/main/common/type.c | 6 ++--- level_3/iki_read/c/main/common/type.h | 20 +++++++++----- level_3/iki_read/data/build/fakefile | 4 +-- level_3/iki_write/c/main/common.c | 1 - level_3/iki_write/c/main/common/type.c | 6 ++--- level_3/iki_write/c/main/common/type.h | 19 ++++++++----- level_3/iki_write/data/build/fakefile | 4 +-- level_3/status_code/c/main/common.c | 1 - level_3/status_code/c/main/common/type.c | 6 ++--- level_3/status_code/c/main/common/type.h | 18 +++++++------ level_3/status_code/data/build/fakefile | 4 +-- level_3/utf8/c/main/common.c | 1 - level_3/utf8/c/main/common/type.c | 6 ++--- level_3/utf8/c/main/common/type.h | 19 ++++++++----- level_3/utf8/data/build/fakefile | 4 +-- 56 files changed, 215 insertions(+), 162 deletions(-) diff --git a/build/stand_alone/byte_dump.config.h b/build/stand_alone/byte_dump.config.h index b85aabbc1..b0f9770a4 100644 --- a/build/stand_alone/byte_dump.config.h +++ b/build/stand_alone/byte_dump.config.h @@ -1,5 +1,5 @@ -// A config.h file for defining all code being disabled for compiling the stand alone Featureless Make. -// To assist in building this file use (may need to omit --defined-only): "nm --defined-only -f p programs/shared/fake | grep -oP '^(f|fl|fll)_[^\s]+'". +// A config.h file for defining all code being disabled for compiling the stand alone Byte Dump. +// To assist in building this file use (may need to omit --defined-only): "nm --defined-only -f p programs/shared/byte_dump | grep -oP '^(f|fl|fll)_[^\s]+'". // To get the list of all possible functions, use something like: "grep -horP '\b_di_f_\w*\b' level_0/f_color/". // // Note that some special defines may need to be manually added, such as: diff --git a/build/stand_alone/byte_dump.fakefile b/build/stand_alone/byte_dump.fakefile index 75e8cf365..370c08b9e 100644 --- a/build/stand_alone/byte_dump.fakefile +++ b/build/stand_alone/byte_dump.fakefile @@ -15,7 +15,7 @@ install: help: print - print context:'title'Fakefile Options for Featureless Make Software.context:'reset' + print context:'title'Fakefile Options for Byte Dump Program.context:'reset' print print The following operations are available\: diff --git a/build/stand_alone/byte_dump.settings b/build/stand_alone/byte_dump.settings index 5452f5baa..846c0392e 100644 --- a/build/stand_alone/byte_dump.settings +++ b/build/stand_alone/byte_dump.settings @@ -1,6 +1,6 @@ # fss-0001 # -# A custom build for compiling utf8 as a stand alone binary building in all of the FLL dependencies. +# A custom build for compiling Byte Dump as a stand alone binary building in all of the FLL dependencies. # This will compile a program that does not have a libutf8.so library. # diff --git a/build/stand_alone/fake.fakefile b/build/stand_alone/fake.fakefile index 75e8cf365..2329adfe2 100644 --- a/build/stand_alone/fake.fakefile +++ b/build/stand_alone/fake.fakefile @@ -15,7 +15,7 @@ install: help: print - print context:'title'Fakefile Options for Featureless Make Software.context:'reset' + print context:'title'Fakefile Options for Featureless Make Program.context:'reset' print print The following operations are available\: diff --git a/build/stand_alone/fake.settings b/build/stand_alone/fake.settings index d59884c62..81e13c132 100644 --- a/build/stand_alone/fake.settings +++ b/build/stand_alone/fake.settings @@ -1,6 +1,6 @@ # fss-0001 # -# A custom build for compiling fake as a stand alone binary building in all of the FLL dependencies. +# A custom build for compiling Featureless Make as a stand alone binary building in all of the FLL dependencies. # This will compile a program that does not have a libfake.so library and builds all of the FLL dependencies into the resulting program. # # Modes: diff --git a/build/stand_alone/firewall.config.h b/build/stand_alone/firewall.config.h index a400498a4..27ce30a15 100644 --- a/build/stand_alone/firewall.config.h +++ b/build/stand_alone/firewall.config.h @@ -1,5 +1,5 @@ -// A config.h file for defining all code being disabled for compiling the stand alone Featureless Make. -// To assist in building this file use (may need to omit --defined-only): "nm --defined-only -f p programs/shared/fake | grep -oP '^(f|fl|fll)_[^\s]+'". +// A config.h file for defining all code being disabled for compiling the stand alone Firewall. +// To assist in building this file use (may need to omit --defined-only): "nm --defined-only -f p programs/shared/firewall | grep -oP '^(f|fl|fll)_[^\s]+'". // To get the list of all possible functions, use something like: "grep -horP '\b_di_f_\w*\b' level_0/f_color/". // // Note that some special defines may need to be manually added, such as: diff --git a/build/stand_alone/firewall.fakefile b/build/stand_alone/firewall.fakefile index 75e8cf365..743d4773e 100644 --- a/build/stand_alone/firewall.fakefile +++ b/build/stand_alone/firewall.fakefile @@ -15,7 +15,7 @@ install: help: print - print context:'title'Fakefile Options for Featureless Make Software.context:'reset' + print context:'title'Fakefile Options for Firewall Program.context:'reset' print print The following operations are available\: diff --git a/build/stand_alone/firewall.settings b/build/stand_alone/firewall.settings index 56cdc6a09..8d4ac3af9 100644 --- a/build/stand_alone/firewall.settings +++ b/build/stand_alone/firewall.settings @@ -1,6 +1,6 @@ # fss-0001 # -# A custom build for compiling firewall as a stand alone binary building in all of the FLL dependencies. +# A custom build for compiling Firewall as a stand alone binary building in all of the FLL dependencies. # This will compile a program that does not have a libfirewall.so library and builds all of the FLL dependencies into the resulting program. # # Modes: diff --git a/build/stand_alone/utf8.config.h b/build/stand_alone/utf8.config.h index b85aabbc1..443d2696b 100644 --- a/build/stand_alone/utf8.config.h +++ b/build/stand_alone/utf8.config.h @@ -1,5 +1,5 @@ -// A config.h file for defining all code being disabled for compiling the stand alone Featureless Make. -// To assist in building this file use (may need to omit --defined-only): "nm --defined-only -f p programs/shared/fake | grep -oP '^(f|fl|fll)_[^\s]+'". +// A config.h file for defining all code being disabled for compiling the stand alone UTF8. +// To assist in building this file use (may need to omit --defined-only): "nm --defined-only -f p programs/shared/utf8 | grep -oP '^(f|fl|fll)_[^\s]+'". // To get the list of all possible functions, use something like: "grep -horP '\b_di_f_\w*\b' level_0/f_color/". // // Note that some special defines may need to be manually added, such as: diff --git a/build/stand_alone/utf8.fakefile b/build/stand_alone/utf8.fakefile index 75e8cf365..7d2a0f1b6 100644 --- a/build/stand_alone/utf8.fakefile +++ b/build/stand_alone/utf8.fakefile @@ -15,7 +15,7 @@ install: help: print - print context:'title'Fakefile Options for Featureless Make Software.context:'reset' + print context:'title'Fakefile Options for UTF8 Program.context:'reset' print print The following operations are available\: diff --git a/build/stand_alone/utf8.settings b/build/stand_alone/utf8.settings index ed4d5151d..708890347 100644 --- a/build/stand_alone/utf8.settings +++ b/build/stand_alone/utf8.settings @@ -1,6 +1,6 @@ # fss-0001 # -# A custom build for compiling utf8 as a stand alone binary building in all of the FLL dependencies. +# A custom build for compiling UTF8 as a stand alone binary building in all of the FLL dependencies. # This will compile a program that does not have a libutf8.so library. # diff --git a/level_3/byte_dump/c/main/common.c b/level_3/byte_dump/c/main/common.c index dc9042889..d31c6d090 100644 --- a/level_3/byte_dump/c/main/common.c +++ b/level_3/byte_dump/c/main/common.c @@ -15,7 +15,6 @@ extern "C" { main->setting.state.step_small = byte_dump_allocation_small_d; - // Identify and process first/last parameters. if (main->program.parameters.array[f_console_standard_parameter_line_first_no_e].result & f_console_result_found_e) { main->setting.flag &= ~byte_dump_main_flag_print_first_e; } diff --git a/level_3/byte_dump/c/main/common/type.c b/level_3/byte_dump/c/main/common/type.c index 444cbc4cf..37b618a76 100644 --- a/level_3/byte_dump/c/main/common/type.c +++ b/level_3/byte_dump/c/main/common/type.c @@ -15,13 +15,11 @@ extern "C" { #endif // _di_byte_dump_main_delete_ #ifndef _di_byte_dump_setting_delete_ - f_status_t byte_dump_setting_delete(byte_dump_setting_t * const setting) { + void byte_dump_setting_delete(byte_dump_setting_t * const setting) { - if (!setting) return F_status_set_error(F_parameter); + if (!setting) return; f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &setting->files.array, &setting->files.used, &setting->files.size, &f_string_dynamics_delete_callback); - - return F_okay; } #endif // _di_byte_dump_setting_delete_ diff --git a/level_3/byte_dump/c/main/common/type.h b/level_3/byte_dump/c/main/common/type.h index da29b5242..f173d8ea5 100644 --- a/level_3/byte_dump/c/main/common/type.h +++ b/level_3/byte_dump/c/main/common/type.h @@ -134,10 +134,15 @@ extern "C" { /** * Deallocate main program data. * - * @param setting_make - * The make setting data. + * @param main + * The main program data. + * + * Must not be NULL. * * This does not alter main.setting.state.status. + * + * @see byte_dump_setting_delete() + * @see fll_program_data_delete() */ #ifndef _di_byte_dump_main_delete_ extern void byte_dump_main_delete(byte_dump_main_t * const main); @@ -149,15 +154,14 @@ extern "C" { * @param setting * The program main setting data. * - * This does not alter setting.state.status. + * Must not be NULL. * - * @return - * F_okay on success. + * This does not alter setting.state.status. * - * F_parameter (with error bit) if a parameter is invalid. + * @see f_memory_arrays_resize() */ #ifndef _di_byte_dump_setting_delete_ - extern f_status_t byte_dump_setting_delete(byte_dump_setting_t * const setting); + extern void byte_dump_setting_delete(byte_dump_setting_t * const setting); #endif // _di_byte_dump_setting_delete_ #ifdef __cplusplus diff --git a/level_3/byte_dump/data/build/fakefile b/level_3/byte_dump/data/build/fakefile index 8b7c56046..7101ba644 100644 --- a/level_3/byte_dump/data/build/fakefile +++ b/level_3/byte_dump/data/build/fakefile @@ -2,7 +2,7 @@ settings: fail exit - modes individual individual_thread level monolithic clang test fanalyzer thread threadless + modes individual individual_thread level monolithic clang test fanalyzer coverage thread threadlesss environment PATH LD_LIBRARY_PATH environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LOCPATH NLSPATH @@ -15,7 +15,7 @@ install: help: print - print context:'title'Fakefile Options for Byte Dump Software.context:'reset' + print context:'title'Fakefile Options for Byte Dump Program.context:'reset' print print The following operations are available\: diff --git a/level_3/control/c/main/common.c b/level_3/control/c/main/common.c index 5d5ae6c01..e74a4b067 100644 --- a/level_3/control/c/main/common.c +++ b/level_3/control/c/main/common.c @@ -15,7 +15,6 @@ extern "C" { main->setting.state.step_small = control_allocation_small_d; - // Identify and process first/last parameters. if (main->program.parameters.array[f_console_standard_parameter_line_first_no_e].result & f_console_result_found_e) { main->setting.flag &= ~control_main_flag_print_first_e; } diff --git a/level_3/control/c/main/common/type.c b/level_3/control/c/main/common/type.c index 022579e84..c68815882 100644 --- a/level_3/control/c/main/common/type.c +++ b/level_3/control/c/main/common/type.c @@ -30,17 +30,15 @@ extern "C" { #endif // _di_control_main_delete_ #ifndef _di_control_setting_delete_ - f_status_t control_setting_delete(control_setting_t * const setting) { + void control_setting_delete(control_setting_t * const setting) { - if (!setting) return F_status_set_error(F_parameter); + if (!setting) return; f_memory_array_resize(0, sizeof(f_char_t), (void **) &setting->name_socket.string, &setting->name_socket.used, &setting->name_socket.size); f_memory_array_resize(0, sizeof(f_char_t), (void **) &setting->path_settings.string, &setting->path_settings.used, &setting->path_settings.size); f_memory_array_resize(0, sizeof(f_char_t), (void **) &setting->path_socket.string, &setting->path_socket.used, &setting->path_socket.size); f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &setting->actions.array, &setting->actions.used, &setting->actions.size, &f_string_dynamics_delete_callback); - - return F_okay; } #endif // _di_control_setting_delete_ diff --git a/level_3/control/c/main/common/type.h b/level_3/control/c/main/common/type.h index ef7270c87..de3f67dd0 100644 --- a/level_3/control/c/main/common/type.h +++ b/level_3/control/c/main/common/type.h @@ -176,14 +176,17 @@ extern "C" { /** * Deallocate main program data. * - * @param setting_make - * The make setting data. + * @param main + * The main program data. + * + * Must not be NULL. * * This does not alter main.setting.state.status. * * @see f_memory_array_resize() * @see f_memory_arrays_resize() * @see fll_program_data_delete() + * @see control_setting_delete() */ #ifndef _di_control_main_delete_ extern void control_main_delete(control_main_t * const main); @@ -195,18 +198,15 @@ extern "C" { * @param setting * The program main setting data. * - * This does not alter setting.state.status. - * - * @return - * F_okay on success. + * Must not be NULL. * - * F_parameter (with error bit) if a parameter is invalid. + * This does not alter setting.state.status. * * @see f_memory_array_resize() * @see f_memory_arrays_resize() */ #ifndef _di_control_setting_delete_ - extern f_status_t control_setting_delete(control_setting_t * const setting); + extern void control_setting_delete(control_setting_t * const setting); #endif // _di_control_setting_delete_ #ifdef __cplusplus diff --git a/level_3/control/data/build/fakefile b/level_3/control/data/build/fakefile index ad0e3df8f..fc8134820 100644 --- a/level_3/control/data/build/fakefile +++ b/level_3/control/data/build/fakefile @@ -2,7 +2,7 @@ settings: fail exit - modes individual individual_thread level monolithic clang test fanalyzer thread threadless + modes individual individual_thread level monolithic clang test fanalyzer coverage thread threadlesss environment PATH LD_LIBRARY_PATH environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LOCPATH NLSPATH @@ -15,7 +15,7 @@ install: help: print - print context:'title'Fakefile Options for Control Software.context:'reset' + print context:'title'Fakefile Options for Control Program.context:'reset' print print The following operations are available\: diff --git a/level_3/controller/c/common.c b/level_3/controller/c/common.c index ea5d781d0..3aa6e1a06 100644 --- a/level_3/controller/c/common.c +++ b/level_3/controller/c/common.c @@ -631,7 +631,6 @@ extern "C" { main->setting.state.step_small = controller_allocation_small_d; - // Identify and process first/last parameters. if (main->program.parameters.array[f_console_standard_parameter_line_first_no_e].result & f_console_result_found_e) { main->setting.flag &= ~controller_main_flag_print_first_e; } diff --git a/level_3/controller/data/build/fakefile b/level_3/controller/data/build/fakefile index 486c6b80e..32ec31344 100644 --- a/level_3/controller/data/build/fakefile +++ b/level_3/controller/data/build/fakefile @@ -2,7 +2,7 @@ settings: fail exit - modes individual individual_thread level monolithic clang test fanalyzer thread threadless + modes individual individual_thread level monolithic clang test fanalyzer coverage thread threadlesss environment PATH LD_LIBRARY_PATH environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LOCPATH NLSPATH @@ -15,7 +15,7 @@ install: help: print - print context:'title'Fakefile Options for Controller Software.context:'reset' + print context:'title'Fakefile Options for Controller Program.context:'reset' print print The following operations are available\: diff --git a/level_3/fake/c/main/common.c b/level_3/fake/c/main/common.c index 4767ee1ba..4473501b5 100644 --- a/level_3/fake/c/main/common.c +++ b/level_3/fake/c/main/common.c @@ -25,7 +25,6 @@ extern "C" { main->setting.state.step_small = step_original; } - // Identify and process first/last parameters. if (main->program.parameters.array[f_console_standard_parameter_line_first_no_e].result & f_console_result_found_e) { main->setting.flag &= ~fake_main_flag_print_first_e; } diff --git a/level_3/fake/c/main/common/type.h b/level_3/fake/c/main/common/type.h index c85fa66a7..787a0a95a 100644 --- a/level_3/fake/c/main/common/type.h +++ b/level_3/fake/c/main/common/type.h @@ -903,6 +903,8 @@ extern "C" { * @param build_data * The build data. * + * Must not be NULL. + * * This does not alter setting.state.status. */ #ifndef _di_fake_build_data_delete_ @@ -915,6 +917,8 @@ extern "C" { * @param build_setting * The build setting. * + * Must not be NULL. + * * This does not alter setting.state.status. */ #ifndef _di_fake_build_setting_delete_ @@ -927,6 +931,8 @@ extern "C" { * @param build_stage * The build stage. * + * Must not be NULL. + * * This does not alter setting.state.status. */ #ifndef _di_fake_build_stage_delete_ @@ -939,6 +945,8 @@ extern "C" { * @param data * The program data. * + * Must not be NULL. + * * This does not alter data.main.settings.state.status. */ #ifndef _di_fake_data_delete_ @@ -951,6 +959,8 @@ extern "C" { * @param data_make * The make data. * + * Must not be NULL. + * * This does not alter data_make.main.setting.state.status. */ #ifndef _di_fake_make_data_delete_ @@ -960,10 +970,18 @@ extern "C" { /** * Deallocate main program data. * - * @param setting_make - * The make setting data. + * @param main + * The main program data. + * + * Must not be NULL. * * This does not alter data_make.main.setting.state.status. + * + * @see f_directory_recurse_do_delete() + * @see f_iki_data_delete() + * @see f_memory_array_resize() + * @see fll_program_data_delete() + * @see fake_setting_delete() */ #ifndef _di_fake_main_delete_ extern void fake_main_delete(fake_main_t * const main); @@ -975,7 +993,13 @@ extern "C" { * @param setting_make * The make setting data. * + * Must not be NULL. + * * This does not alter data_make.main.setting.state.status. + * + * @see f_memory_arrays_resize() + * @see fake_build_setting_delete() + * @see fake_make_setting_delete() */ #ifndef _di_fake_make_setting_delete_ extern void fake_make_setting_delete(fake_make_setting_t * const setting_make); @@ -987,7 +1011,12 @@ extern "C" { * @param setting * The program main setting data. * + * Must not be NULL. + * * This does not alter setting.state.status. + * + * @see f_memory_array_resize() + * @see f_memory_arrays_resize() */ #ifndef _di_fake_setting_delete_ extern void fake_setting_delete(fake_setting_t * const setting); diff --git a/level_3/fake/data/build/fakefile b/level_3/fake/data/build/fakefile index 7b8755195..d26bcd704 100644 --- a/level_3/fake/data/build/fakefile +++ b/level_3/fake/data/build/fakefile @@ -2,7 +2,7 @@ settings: fail exit - modes individual individual_thread level monolithic clang test fanalyzer thread threadless + modes individual individual_thread level monolithic clang test fanalyzer coverage thread threadlesss environment PATH LD_LIBRARY_PATH environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LOCPATH NLSPATH @@ -15,7 +15,7 @@ install: help: print - print context:'title'Fakefile Options for Featureless Make Software.context:'reset' + print context:'title'Fakefile Options for Featureless Make Program.context:'reset' print print The following operations are available\: diff --git a/level_3/firewall/c/main/common.c b/level_3/firewall/c/main/common.c index 68012dd5d..1d6cc3f25 100644 --- a/level_3/firewall/c/main/common.c +++ b/level_3/firewall/c/main/common.c @@ -15,7 +15,6 @@ extern "C" { main->setting.state.step_small = firewall_allocation_small_d; - // Identify and process first/last parameters. if (main->program.parameters.array[f_console_standard_parameter_line_first_no_e].result & f_console_result_found_e) { main->setting.flag &= ~firewall_main_flag_print_first_e; } diff --git a/level_3/firewall/c/main/common/type.c b/level_3/firewall/c/main/common/type.c index eec7d79b5..258714639 100644 --- a/level_3/firewall/c/main/common/type.c +++ b/level_3/firewall/c/main/common/type.c @@ -59,14 +59,12 @@ extern "C" { #endif // _di_firewall_main_delete_ #ifndef _di_firewall_setting_delete_ - f_status_t firewall_setting_delete(firewall_setting_t * const setting) { + void firewall_setting_delete(firewall_setting_t * const setting) { - if (!setting) return F_status_set_error(F_parameter); + if (!setting) return; f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &setting->chains.array, &setting->chains.used, &setting->chains.size, &f_string_dynamics_delete_callback); f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &setting->devices.array, &setting->devices.used, &setting->devices.size, &f_string_dynamics_delete_callback); - - return F_okay; } #endif // _di_firewall_setting_delete_ diff --git a/level_3/firewall/c/main/common/type.h b/level_3/firewall/c/main/common/type.h index 65a933afd..6d4f7e68d 100644 --- a/level_3/firewall/c/main/common/type.h +++ b/level_3/firewall/c/main/common/type.h @@ -206,7 +206,13 @@ extern "C" { * @param cache * The firewall cache. * + * Must not be NULL. + * * This does not alter main.setting.state.status. + * + * @see f_file_close() + * @see f_memory_array_resize() + * @see f_memory_arrays_resize() */ #ifndef _di_firewall_cache_delete_ extern void firewall_cache_delete(firewall_cache_t * const cache); @@ -218,7 +224,12 @@ extern "C" { * @param data * The firewall data. * + * Must not be NULL. + * * This does not alter main.setting.state.status. + * + * @see f_memory_array_resize() + * @see f_memory_arrays_resize() */ #ifndef _di_firewall_data_delete_ extern void firewall_data_delete(firewall_data_t * const data); @@ -227,10 +238,17 @@ extern "C" { /** * Deallocate main program data. * - * @param setting_make - * The make setting data. + * @param main + * The main program data. + * + * Must not be NULL. * * This does not alter main.setting.state.status. + * + * @see fll_program_data_delete() + * @see firewall_cache_delete() + * @see firewall_data_delete() + * @see firewall_setting_delete() */ #ifndef _di_firewall_main_delete_ extern void firewall_main_delete(firewall_main_t * const main); @@ -242,15 +260,14 @@ extern "C" { * @param setting * The program main setting data. * - * This does not alter setting.state.status. + * Must not be NULL. * - * @return - * F_okay on success. + * This does not alter setting.state.status. * - * F_parameter (with error bit) if a parameter is invalid. + * @see f_memory_arrays_resize() */ #ifndef _di_firewall_setting_delete_ - extern f_status_t firewall_setting_delete(firewall_setting_t * const setting); + extern void firewall_setting_delete(firewall_setting_t * const setting); #endif // _di_firewall_setting_delete_ #ifdef __cplusplus diff --git a/level_3/firewall/data/build/fakefile b/level_3/firewall/data/build/fakefile index 942097282..16ee010ca 100644 --- a/level_3/firewall/data/build/fakefile +++ b/level_3/firewall/data/build/fakefile @@ -2,7 +2,7 @@ settings: fail exit - modes individual individual_thread level monolithic clang test fanalyzer thread threadless + modes individual individual_thread level monolithic clang test fanalyzer coverage thread threadlesss environment PATH LD_LIBRARY_PATH environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LOCPATH NLSPATH @@ -15,7 +15,7 @@ install: help: print - print context:'title'Fakefile Options for Firewall Software.context:'reset' + print context:'title'Fakefile Options for Firewall Program.context:'reset' print print The following operations are available\: diff --git a/level_3/fss_identify/c/main/common.c b/level_3/fss_identify/c/main/common.c index d154a5578..f7da7af6d 100644 --- a/level_3/fss_identify/c/main/common.c +++ b/level_3/fss_identify/c/main/common.c @@ -15,7 +15,6 @@ extern "C" { main->setting.state.step_small = fss_identify_allocation_small_d; - // Identify and process first/last parameters. if (main->program.parameters.array[f_console_standard_parameter_line_first_no_e].result & f_console_result_found_e) { main->setting.flag &= ~fss_identify_main_flag_print_first_e; } diff --git a/level_3/fss_identify/c/main/common/type.c b/level_3/fss_identify/c/main/common/type.c index 9ccb2679d..7465ba3d5 100644 --- a/level_3/fss_identify/c/main/common/type.c +++ b/level_3/fss_identify/c/main/common/type.c @@ -15,17 +15,15 @@ extern "C" { #endif // _di_fss_identify_main_delete_ #ifndef _di_fss_identify_setting_delete_ - f_status_t fss_identify_setting_delete(fss_identify_setting_t * const setting) { + void fss_identify_setting_delete(fss_identify_setting_t * const setting) { - if (!setting) return F_status_set_error(F_parameter); + if (!setting) return; f_memory_array_resize(0, sizeof(f_char_t), (void **) &setting->buffer.string, &setting->buffer.used, &setting->buffer.size); f_memory_array_resize(0, sizeof(f_fll_id_t), (void **) &setting->ids.array, &setting->ids.used, &setting->ids.size); f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &setting->names.array, &setting->names.used, &setting->names.size, &f_string_dynamics_delete_callback); f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &setting->files.array, &setting->files.used, &setting->files.size, &f_string_dynamics_delete_callback); - - return F_okay; } #endif // _di_fss_identify_setting_delete_ diff --git a/level_3/fss_identify/c/main/common/type.h b/level_3/fss_identify/c/main/common/type.h index 62c3dfe2b..b34ce46bb 100644 --- a/level_3/fss_identify/c/main/common/type.h +++ b/level_3/fss_identify/c/main/common/type.h @@ -100,10 +100,15 @@ extern "C" { /** * Deallocate main program data. * - * @param setting_make - * The make setting data. + * @param main + * The main program data. + * + * Must not be NULL. * * This does not alter main.setting.state.status. + * + * @see fll_program_data_delete() + * @see fss_identify_setting_delete() */ #ifndef _di_fss_identify_main_delete_ extern void fss_identify_main_delete(fss_identify_main_t * const main); @@ -115,15 +120,15 @@ extern "C" { * @param setting * The program main setting data. * - * This does not alter setting.state.status. + * Must not be NULL. * - * @return - * F_okay on success. + * This does not alter setting.state.status. * - * F_parameter (with error bit) if a parameter is invalid. + * @see f_memory_array_resize() + * @see f_memory_arrays_resize() */ #ifndef _di_fss_identify_setting_delete_ - extern f_status_t fss_identify_setting_delete(fss_identify_setting_t * const setting); + extern void fss_identify_setting_delete(fss_identify_setting_t * const setting); #endif // _di_fss_identify_setting_delete_ #ifdef __cplusplus diff --git a/level_3/fss_identify/data/build/fakefile b/level_3/fss_identify/data/build/fakefile index d92117304..f422436b5 100644 --- a/level_3/fss_identify/data/build/fakefile +++ b/level_3/fss_identify/data/build/fakefile @@ -2,7 +2,7 @@ settings: fail exit - modes individual individual_thread level monolithic clang test fanalyzer thread threadless + modes individual individual_thread level monolithic clang test fanalyzer coverage thread threadlesss environment PATH LD_LIBRARY_PATH environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LOCPATH NLSPATH @@ -15,7 +15,7 @@ install: help: print - print context:'title'Fakefile Options for FSS Identify Software.context:'reset' + print context:'title'Fakefile Options for FSS Identify Program.context:'reset' print print The following operations are available\: diff --git a/level_3/fss_read/c/main/common.c b/level_3/fss_read/c/main/common.c index 8a410c7e7..b4bfa6513 100644 --- a/level_3/fss_read/c/main/common.c +++ b/level_3/fss_read/c/main/common.c @@ -53,7 +53,6 @@ extern "C" { main->setting.state.step_small = fss_read_allocation_small_d; - // Identify and process first/last parameters. if (parameters->array[f_console_standard_parameter_line_first_no_e].result & f_console_result_found_e) { main->setting.flag &= ~fss_read_main_flag_print_first_e; } diff --git a/level_3/fss_read/c/main/common/type.c b/level_3/fss_read/c/main/common/type.c index 34df7f039..948322410 100644 --- a/level_3/fss_read/c/main/common/type.c +++ b/level_3/fss_read/c/main/common/type.c @@ -68,9 +68,9 @@ extern "C" { #endif // _di_fss_read_main_delete_ #ifndef _di_fss_read_setting_delete_ - f_status_t fss_read_setting_delete(fss_read_setting_t * const setting) { + void fss_read_setting_delete(fss_read_setting_t * const setting) { - if (!setting) return F_status_set_error(F_parameter); + if (!setting) return; fss_read_files_resize(0, &setting->files); fss_read_depths_resize(0, &setting->depths); @@ -88,8 +88,6 @@ extern "C" { f_memory_array_resize(0, sizeof(uint8_t), (void **) &setting->quotes_object.array, &setting->quotes_object.used, &setting->quotes_object.size); f_memory_arrays_resize(0, sizeof(f_uint8s_t), (void **) &setting->quotes_content.array, &setting->quotes_content.used, &setting->quotes_content.size, &f_uint8ss_delete_callback); - - return F_okay; } #endif // _di_fss_read_setting_delete_ diff --git a/level_3/fss_read/c/main/common/type.h b/level_3/fss_read/c/main/common/type.h index 3fe6b37b3..f972104cd 100644 --- a/level_3/fss_read/c/main/common/type.h +++ b/level_3/fss_read/c/main/common/type.h @@ -304,6 +304,8 @@ extern "C" { * The depth to deallocate. * * Must not be NULL. + * + * @see f_memory_array_resize() */ #ifndef _di_fss_read_depth_delete_ extern void fss_read_depth_delete(fss_read_depth_t * const depth); @@ -365,6 +367,9 @@ extern "C" { * Must be of type fss_read_main_t. * * This does not alter main.setting.state.status. + * + * @see fll_program_data_delete() + * @see fss_read_setting_delete() */ #ifndef _di_fss_read_main_delete_ extern void fss_read_main_delete(fss_read_main_t * const main); @@ -380,13 +385,15 @@ extern "C" { * * This does not alter setting.state.status. * - * @return - * F_okay on success. - * - * F_parameter (with error bit) if a parameter is invalid. + * @see f_fss_nest_delete() + * @see f_memory_array_resize() + * @see fss_read_files_resize() + * @see fss_read_depths_resize() + * @see f_memory_array_resize() + * @see f_memory_arrays_resize() */ #ifndef _di_fss_read_setting_delete_ - extern f_status_t fss_read_setting_delete(fss_read_setting_t * const setting); + extern void fss_read_setting_delete(fss_read_setting_t * const setting); #endif // _di_fss_read_setting_delete_ #ifdef __cplusplus diff --git a/level_3/fss_read/data/build/fakefile b/level_3/fss_read/data/build/fakefile index 20cb6f23a..a80ff5cdd 100644 --- a/level_3/fss_read/data/build/fakefile +++ b/level_3/fss_read/data/build/fakefile @@ -5,7 +5,7 @@ settings: fail exit - modes individual individual_thread level monolithic clang test fanalyzer thread threadless + modes individual individual_thread level monolithic clang test fanalyzer coverage thread threadlesss environment PATH LD_LIBRARY_PATH environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LOCPATH NLSPATH @@ -32,7 +32,7 @@ install: help: print - print context:'title'Fakefile Options for FSS Read Software.context:'reset' + print context:'title'Fakefile Options for FSS Read Program.context:'reset' print print The following operations are available\: diff --git a/level_3/fss_write/c/main/common.c b/level_3/fss_write/c/main/common.c index ea116bb74..b38d13f19 100644 --- a/level_3/fss_write/c/main/common.c +++ b/level_3/fss_write/c/main/common.c @@ -15,7 +15,6 @@ extern "C" { main->setting.state.step_small = fss_write_allocation_small_d; - // Identify and process first/last parameters. if (main->program.parameters.array[f_console_standard_parameter_line_first_no_e].result & f_console_result_found_e) { main->setting.flag &= ~fss_write_main_flag_print_first_e; } diff --git a/level_3/fss_write/c/main/common/type.c b/level_3/fss_write/c/main/common/type.c index f1d5f036d..71b182662 100644 --- a/level_3/fss_write/c/main/common/type.c +++ b/level_3/fss_write/c/main/common/type.c @@ -15,9 +15,9 @@ extern "C" { #endif // _di_fss_write_main_delete_ #ifndef _di_fss_write_setting_delete_ - f_status_t fss_write_setting_delete(fss_write_setting_t * const setting) { + void fss_write_setting_delete(fss_write_setting_t * const setting) { - if (!setting) return F_status_set_error(F_parameter); + if (!setting) return; f_memory_array_resize(0, sizeof(f_char_t), (void **) &setting->block.string, &setting->block.used, &setting->block.size); f_memory_array_resize(0, sizeof(f_char_t), (void **) &setting->buffer.string, &setting->buffer.used, &setting->buffer.size); @@ -26,8 +26,6 @@ extern "C" { f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &setting->ignoress.array, &setting->ignoress.used, &setting->ignoress.size, &f_string_dynamics_delete_callback); f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &setting->objects.array, &setting->objects.used, &setting->objects.size, &f_string_dynamics_delete_callback); f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &setting->contentss.array, &setting->contentss.used, &setting->contentss.size, &f_string_dynamics_delete_callback); - - return F_okay; } #endif // _di_fss_write_setting_delete_ diff --git a/level_3/fss_write/c/main/common/type.h b/level_3/fss_write/c/main/common/type.h index 09a358320..57535848f 100644 --- a/level_3/fss_write/c/main/common/type.h +++ b/level_3/fss_write/c/main/common/type.h @@ -151,10 +151,15 @@ extern "C" { /** * Deallocate main program data. * - * @param setting_make - * The make setting data. + * @param main + * The main program data. + * + * Must not be NULL. * * This does not alter main.setting.state.status. + * + * @see fll_program_data_delete() + * @see fss_write_setting_delete() */ #ifndef _di_fss_write_main_delete_ extern void fss_write_main_delete(fss_write_main_t * const main); @@ -166,15 +171,15 @@ extern "C" { * @param setting * The program main setting data. * - * This does not alter setting.state.status. + * Must not be NULL. * - * @return - * F_okay on success. + * This does not alter setting.state.status. * - * F_parameter (with error bit) if a parameter is invalid. + * @see f_memory_array_resize() + * @see f_memory_arrays_resize() */ #ifndef _di_fss_write_setting_delete_ - extern f_status_t fss_write_setting_delete(fss_write_setting_t * const setting); + extern void fss_write_setting_delete(fss_write_setting_t * const setting); #endif // _di_fss_write_setting_delete_ #ifdef __cplusplus diff --git a/level_3/fss_write/data/build/fakefile b/level_3/fss_write/data/build/fakefile index 4e7cbb03c..82d64e5df 100644 --- a/level_3/fss_write/data/build/fakefile +++ b/level_3/fss_write/data/build/fakefile @@ -5,7 +5,7 @@ settings: fail exit - modes individual individual_thread level monolithic clang test fanalyzer thread threadless + modes individual individual_thread level monolithic clang test fanalyzer coverage thread threadlesss environment PATH LD_LIBRARY_PATH environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LOCPATH NLSPATH @@ -32,7 +32,7 @@ install: help: print - print context:'title'Fakefile Options for FSS Write Software.context:'reset' + print context:'title'Fakefile Options for FSS Write Program.context:'reset' print print The following operations are available\: diff --git a/level_3/iki_read/c/main/common.c b/level_3/iki_read/c/main/common.c index 4752e1ef0..9e50165ff 100644 --- a/level_3/iki_read/c/main/common.c +++ b/level_3/iki_read/c/main/common.c @@ -15,7 +15,6 @@ extern "C" { main->setting.state.step_small = iki_read_allocation_small_d; - // Identify and process first/last parameters. if (main->program.parameters.array[f_console_standard_parameter_line_first_no_e].result & f_console_result_found_e) { main->setting.flag &= ~iki_read_main_flag_print_first_e; } diff --git a/level_3/iki_read/c/main/common/type.c b/level_3/iki_read/c/main/common/type.c index c298a8ac4..6fe79a512 100644 --- a/level_3/iki_read/c/main/common/type.c +++ b/level_3/iki_read/c/main/common/type.c @@ -15,9 +15,9 @@ extern "C" { #endif // _di_iki_read_main_delete_ #ifndef _di_iki_read_setting_delete_ - f_status_t iki_read_setting_delete(iki_read_setting_t * const setting) { + void iki_read_setting_delete(iki_read_setting_t * const setting) { - if (!setting) return F_status_set_error(F_parameter); + if (!setting) return; f_memory_array_resize(0, sizeof(f_char_t), (void **) &setting->buffer.string, &setting->buffer.used, &setting->buffer.size); @@ -31,8 +31,6 @@ extern "C" { f_memory_arrays_resize(0, sizeof(f_string_triple_t), (void **) &setting->wrap.array, &setting->wrap.used, &setting->wrap.size, &f_string_triples_delete_callback); f_iki_data_delete(&setting->data); - - return F_okay; } #endif // _di_iki_read_setting_delete_ diff --git a/level_3/iki_read/c/main/common/type.h b/level_3/iki_read/c/main/common/type.h index 3dd04d368..aa5b1aebd 100644 --- a/level_3/iki_read/c/main/common/type.h +++ b/level_3/iki_read/c/main/common/type.h @@ -113,10 +113,15 @@ extern "C" { /** * Deallocate main program data. * - * @param setting_make - * The make setting data. + * @param main + * The main program data. + * + * Must not be NULL. * * This does not alter main.setting.state.status. + * + * @see fll_program_data_delete() + * @see iki_read_setting_delete() */ #ifndef _di_iki_read_main_delete_ extern void iki_read_main_delete(iki_read_main_t * const main); @@ -128,15 +133,16 @@ extern "C" { * @param setting * The program main setting data. * - * This does not alter setting.state.status. + * Must not be NULL. * - * @return - * F_okay on success. + * This does not alter setting.state.status. * - * F_parameter (with error bit) if a parameter is invalid. + * @see f_iki_data_delete() + * @see f_memory_array_resize() + * @see f_memory_arrays_resize() */ #ifndef _di_iki_read_setting_delete_ - extern f_status_t iki_read_setting_delete(iki_read_setting_t * const setting); + extern void iki_read_setting_delete(iki_read_setting_t * const setting); #endif // _di_iki_read_setting_delete_ #ifdef __cplusplus diff --git a/level_3/iki_read/data/build/fakefile b/level_3/iki_read/data/build/fakefile index 3b7cc8f6b..7e2797e04 100644 --- a/level_3/iki_read/data/build/fakefile +++ b/level_3/iki_read/data/build/fakefile @@ -2,7 +2,7 @@ settings: fail exit - modes individual individual_thread level monolithic clang test fanalyzer thread threadless + modes individual individual_thread level monolithic clang test fanalyzer coverage thread threadlesss environment PATH LD_LIBRARY_PATH environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LOCPATH NLSPATH @@ -15,7 +15,7 @@ install: help: print - print context:'title'Fakefile Options for IKI Read Software.context:'reset' + print context:'title'Fakefile Options for IKI Read Program.context:'reset' print print The following operations are available\: diff --git a/level_3/iki_write/c/main/common.c b/level_3/iki_write/c/main/common.c index 78d7df830..7f27dfb88 100644 --- a/level_3/iki_write/c/main/common.c +++ b/level_3/iki_write/c/main/common.c @@ -15,7 +15,6 @@ extern "C" { main->setting.state.step_small = iki_write_allocation_small_d; - // Identify and process first/last parameters. if (main->program.parameters.array[f_console_standard_parameter_line_first_no_e].result & f_console_result_found_e) { main->setting.flag &= ~iki_write_main_flag_print_first_e; } diff --git a/level_3/iki_write/c/main/common/type.c b/level_3/iki_write/c/main/common/type.c index 6b34a2684..ed5f5287f 100644 --- a/level_3/iki_write/c/main/common/type.c +++ b/level_3/iki_write/c/main/common/type.c @@ -15,9 +15,9 @@ extern "C" { #endif // _di_iki_write_main_delete_ #ifndef _di_iki_write_setting_delete_ - f_status_t iki_write_setting_delete(iki_write_setting_t * const setting) { + void iki_write_setting_delete(iki_write_setting_t * const setting) { - if (!setting) return F_status_set_error(F_parameter); + if (!setting) return; f_memory_array_resize(0, sizeof(f_char_t), (void **) &setting->escaped.string, &setting->escaped.used, &setting->escaped.size); f_memory_array_resize(0, sizeof(f_char_t), (void **) &setting->buffer.string, &setting->buffer.used, &setting->buffer.size); @@ -26,8 +26,6 @@ extern "C" { f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &setting->objects.array, &setting->objects.used, &setting->objects.size, &f_string_dynamics_delete_callback); f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &setting->contents.array, &setting->contents.used, &setting->contents.size, &f_string_dynamics_delete_callback); - - return F_okay; } #endif // _di_iki_write_setting_delete_ diff --git a/level_3/iki_write/c/main/common/type.h b/level_3/iki_write/c/main/common/type.h index 1aba01e7b..82ede43ab 100644 --- a/level_3/iki_write/c/main/common/type.h +++ b/level_3/iki_write/c/main/common/type.h @@ -92,10 +92,15 @@ extern "C" { /** * Deallocate main program data. * - * @param setting_make - * The make setting data. + * @param main + * The main program data. + * + * Must not be NULL. * * This does not alter main.setting.state.status. + * + * @see fll_program_data_delete() + * @see iki_write_setting_delete() */ #ifndef _di_iki_write_main_delete_ extern void iki_write_main_delete(iki_write_main_t * const main); @@ -107,15 +112,15 @@ extern "C" { * @param setting * The program main setting data. * - * This does not alter setting.state.status. + * Must not be NULL. * - * @return - * F_okay on success. + * This does not alter setting.state.status. * - * F_parameter (with error bit) if a parameter is invalid. + * @see f_memory_array_resize() + * @see f_memory_arrays_resize() */ #ifndef _di_iki_write_setting_delete_ - extern f_status_t iki_write_setting_delete(iki_write_setting_t * const setting); + extern void iki_write_setting_delete(iki_write_setting_t * const setting); #endif // _di_iki_write_setting_delete_ #ifdef __cplusplus diff --git a/level_3/iki_write/data/build/fakefile b/level_3/iki_write/data/build/fakefile index 0ab30a034..c51fad1e8 100644 --- a/level_3/iki_write/data/build/fakefile +++ b/level_3/iki_write/data/build/fakefile @@ -2,7 +2,7 @@ settings: fail exit - modes individual individual_thread level monolithic clang test fanalyzer thread threadless + modes individual individual_thread level monolithic clang test fanalyzer coverage thread threadlesss environment PATH LD_LIBRARY_PATH environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LOCPATH NLSPATH @@ -15,7 +15,7 @@ install: help: print - print context:'title'Fakefile Options for IKI Write Software.context:'reset' + print context:'title'Fakefile Options for IKI Write Program.context:'reset' print print The following operations are available\: diff --git a/level_3/status_code/c/main/common.c b/level_3/status_code/c/main/common.c index 90358390f..f65ad9b78 100644 --- a/level_3/status_code/c/main/common.c +++ b/level_3/status_code/c/main/common.c @@ -15,7 +15,6 @@ extern "C" { main->setting.state.step_small = status_code_allocation_small_d; - // Identify and process first/last parameters. if (main->program.parameters.array[f_console_standard_parameter_line_first_no_e].result & f_console_result_found_e) { main->setting.flag &= ~status_code_main_flag_print_first_e; } diff --git a/level_3/status_code/c/main/common/type.c b/level_3/status_code/c/main/common/type.c index f5129bbfc..80c59ab3e 100644 --- a/level_3/status_code/c/main/common/type.c +++ b/level_3/status_code/c/main/common/type.c @@ -15,11 +15,9 @@ extern "C" { #endif // _di_status_code_main_delete_ #ifndef _di_status_code_setting_delete_ - f_status_t status_code_setting_delete(status_code_setting_t * const setting) { + void status_code_setting_delete(status_code_setting_t * const setting) { - if (!setting) return F_status_set_error(F_parameter); - - return F_okay; + if (!setting) return; } #endif // _di_status_code_setting_delete_ diff --git a/level_3/status_code/c/main/common/type.h b/level_3/status_code/c/main/common/type.h index 26859f35d..ff7e4841a 100644 --- a/level_3/status_code/c/main/common/type.h +++ b/level_3/status_code/c/main/common/type.h @@ -81,10 +81,15 @@ extern "C" { /** * Deallocate main program data. * - * @param setting_make - * The make setting data. + * @param main + * The main program data.. + * + * Must not be NULL. * * This does not alter main.setting.state.status. + * + * @see fll_program_data_delete() + * @see status_code_setting_delete() */ #ifndef _di_status_code_main_delete_ extern void status_code_main_delete(status_code_main_t * const main); @@ -96,15 +101,12 @@ extern "C" { * @param setting * The program main setting data. * - * This does not alter setting.state.status. + * Must not be NULL. * - * @return - * F_okay on success. - * - * F_parameter (with error bit) if a parameter is invalid. + * This does not alter setting.state.status. */ #ifndef _di_status_code_setting_delete_ - extern f_status_t status_code_setting_delete(status_code_setting_t * const setting); + extern void status_code_setting_delete(status_code_setting_t * const setting); #endif // _di_status_code_setting_delete_ #ifdef __cplusplus diff --git a/level_3/status_code/data/build/fakefile b/level_3/status_code/data/build/fakefile index 5651689ba..58664eeaa 100644 --- a/level_3/status_code/data/build/fakefile +++ b/level_3/status_code/data/build/fakefile @@ -2,7 +2,7 @@ settings: fail exit - modes individual individual_thread level monolithic clang test fanalyzer thread threadless + modes individual individual_thread level monolithic clang test fanalyzer coverage thread threadlesss environment PATH LD_LIBRARY_PATH environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LOCPATH NLSPATH @@ -19,7 +19,7 @@ install: help: print - print context:'title'Fakefile Options for Status Code Software.context:'reset' + print context:'title'Fakefile Options for Status Code Program.context:'reset' print print The following operations are available\: diff --git a/level_3/utf8/c/main/common.c b/level_3/utf8/c/main/common.c index 9a79b2a43..e38db65e9 100644 --- a/level_3/utf8/c/main/common.c +++ b/level_3/utf8/c/main/common.c @@ -15,7 +15,6 @@ extern "C" { main->setting.state.step_small = utf8_allocation_small_d; - // Identify and process first/last parameters. if (main->program.parameters.array[f_console_standard_parameter_line_first_no_e].result & f_console_result_found_e) { main->setting.flag &= ~utf8_main_flag_print_first_e; } diff --git a/level_3/utf8/c/main/common/type.c b/level_3/utf8/c/main/common/type.c index f77336dc0..61efd4794 100644 --- a/level_3/utf8/c/main/common/type.c +++ b/level_3/utf8/c/main/common/type.c @@ -15,9 +15,9 @@ extern "C" { #endif // _di_utf8_main_delete_ #ifndef _di_utf8_setting_delete_ - f_status_t utf8_setting_delete(utf8_setting_t * const setting) { + void utf8_setting_delete(utf8_setting_t * const setting) { - if (!setting) return F_status_set_error(F_parameter); + if (!setting) return; f_memory_array_resize(0, sizeof(f_char_t), (void **) &setting->buffer.string, &setting->buffer.used, &setting->buffer.size); f_memory_array_resize(0, sizeof(f_char_t), (void **) &setting->text.string, &setting->text.used, &setting->text.size); @@ -25,8 +25,6 @@ extern "C" { f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &setting->path_files_from.array, &setting->path_files_from.used, &setting->path_files_from.size, &f_string_dynamics_delete_callback); f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &setting->path_files_to.array, &setting->path_files_to.used, &setting->path_files_to.size, &f_string_dynamics_delete_callback); f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &setting->remaining.array, &setting->remaining.used, &setting->remaining.size, &f_string_dynamics_delete_callback); - - return F_okay; } #endif // _di_utf8_setting_delete_ diff --git a/level_3/utf8/c/main/common/type.h b/level_3/utf8/c/main/common/type.h index e87cc1f2e..e73dd9d81 100644 --- a/level_3/utf8/c/main/common/type.h +++ b/level_3/utf8/c/main/common/type.h @@ -105,10 +105,15 @@ extern "C" { /** * Deallocate main program data. * - * @param setting_make - * The make setting data. + * @param main + * The main program data. + * + * Must not be NULL. * * This does not alter main.setting.state.status. + * + * @see fll_program_data_delete() + * @see utf8_setting_delete() */ #ifndef _di_utf8_main_delete_ extern void utf8_main_delete(utf8_main_t * const main); @@ -120,15 +125,15 @@ extern "C" { * @param setting * The program main setting data. * - * This does not alter setting.state.status. + * Must not be NULL. * - * @return - * F_okay on success. + * This does not alter setting.state.status. * - * F_parameter (with error bit) if a parameter is invalid. + * @see f_memory_array_resize() + * @see f_memory_arrays_resize() */ #ifndef _di_utf8_setting_delete_ - extern f_status_t utf8_setting_delete(utf8_setting_t * const setting); + extern void utf8_setting_delete(utf8_setting_t * const setting); #endif // _di_utf8_setting_delete_ #ifdef __cplusplus diff --git a/level_3/utf8/data/build/fakefile b/level_3/utf8/data/build/fakefile index d900d2ff9..ac0de316e 100644 --- a/level_3/utf8/data/build/fakefile +++ b/level_3/utf8/data/build/fakefile @@ -2,7 +2,7 @@ settings: fail exit - modes individual individual_thread level monolithic clang test fanalyzer thread threadless + modes individual individual_thread level monolithic clang test fanalyzer coverage thread threadlesss environment PATH LD_LIBRARY_PATH environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LOCPATH NLSPATH @@ -15,7 +15,7 @@ install: help: print - print context:'title'Fakefile Options for UTF8 Software.context:'reset' + print context:'title'Fakefile Options for UTF8 Program.context:'reset' print print The following operations are available\: -- 2.47.3