From 0615ab90f99220d51bfed3647a3b9d73266e6e9c Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Mon, 26 Jun 2023 19:01:21 -0500 Subject: [PATCH] Bugfix: Incorrect wrapping disable macro names for main functions. The "_data_" should not be part of the macro name when it is not in the function name. --- level_3/fake/c/main/common/type.c | 4 ++-- level_3/fake/c/main/common/type.h | 4 ++-- level_3/fss_identify/c/main/common/type.c | 4 ++-- level_3/fss_identify/c/main/common/type.h | 4 ++-- level_3/fss_read/c/main/common/type.c | 4 ++-- level_3/fss_read/c/main/common/type.h | 4 ++-- level_3/fss_write/c/main/common/type.c | 4 ++-- level_3/fss_write/c/main/common/type.h | 4 ++-- level_3/iki_read/c/main/common/type.c | 4 ++-- level_3/iki_read/c/main/common/type.h | 4 ++-- level_3/iki_write/c/main/common/type.c | 4 ++-- level_3/iki_write/c/main/common/type.h | 4 ++-- level_3/status_code/c/main/common/type.c | 4 ++-- level_3/status_code/c/main/common/type.h | 4 ++-- level_3/utf8/c/main/common/type.c | 4 ++-- level_3/utf8/c/main/common/type.h | 4 ++-- 16 files changed, 32 insertions(+), 32 deletions(-) diff --git a/level_3/fake/c/main/common/type.c b/level_3/fake/c/main/common/type.c index 1b698be..786491a 100644 --- a/level_3/fake/c/main/common/type.c +++ b/level_3/fake/c/main/common/type.c @@ -179,7 +179,7 @@ extern "C" { } #endif // _di_fake_data_delete_ -#ifndef _di_fake_main_data_delete_ +#ifndef _di_fake_main_delete_ void fake_main_delete(fake_main_t * const main) { if (!main) return; @@ -200,7 +200,7 @@ extern "C" { f_directory_recurse_do_delete(&main->cache_recurse_do); } -#endif // _di_fake_main_data_delete_ +#endif // _di_fake_main_delete_ #ifndef _di_fake_make_data_delete_ void fake_make_data_delete(fake_make_data_t * const data_make) { diff --git a/level_3/fake/c/main/common/type.h b/level_3/fake/c/main/common/type.h index 1982fb9..5b046b7 100644 --- a/level_3/fake/c/main/common/type.h +++ b/level_3/fake/c/main/common/type.h @@ -896,9 +896,9 @@ extern "C" { * * This does not alter data_make.main.setting.state.status. */ -#ifndef _di_fake_main_data_delete_ +#ifndef _di_fake_main_delete_ extern void fake_main_delete(fake_main_t * const main); -#endif // _di_fake_main_data_delete_ +#endif // _di_fake_main_delete_ /** * Deallocate make setting data. diff --git a/level_3/fss_identify/c/main/common/type.c b/level_3/fss_identify/c/main/common/type.c index 54928c0..940fd77 100644 --- a/level_3/fss_identify/c/main/common/type.c +++ b/level_3/fss_identify/c/main/common/type.c @@ -4,7 +4,7 @@ extern "C" { #endif -#ifndef _di_fss_identify_main_data_delete_ +#ifndef _di_fss_identify_main_delete_ void fss_identify_main_delete(fss_identify_main_t * const main) { if (!main) return; @@ -12,7 +12,7 @@ extern "C" { fll_program_data_delete(&main->program); fss_identify_setting_delete(&main->setting); } -#endif // _di_fss_identify_main_data_delete_ +#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) { diff --git a/level_3/fss_identify/c/main/common/type.h b/level_3/fss_identify/c/main/common/type.h index 0ce794f..fd8fc83 100644 --- a/level_3/fss_identify/c/main/common/type.h +++ b/level_3/fss_identify/c/main/common/type.h @@ -103,9 +103,9 @@ extern "C" { * * This does not alter data_make.main.setting.state.status. */ -#ifndef _di_fss_identify_main_data_delete_ +#ifndef _di_fss_identify_main_delete_ extern void fss_identify_main_delete(fss_identify_main_t * const main); -#endif // _di_fss_identify_main_data_delete_ +#endif // _di_fss_identify_main_delete_ /** * Delete the program main setting data. diff --git a/level_3/fss_read/c/main/common/type.c b/level_3/fss_read/c/main/common/type.c index 58659a3..0a49a71 100644 --- a/level_3/fss_read/c/main/common/type.c +++ b/level_3/fss_read/c/main/common/type.c @@ -55,7 +55,7 @@ extern "C" { } #endif // _di_fss_read_files_resize_ -#ifndef _di_fss_read_main_data_delete_ +#ifndef _di_fss_read_main_delete_ void fss_read_main_delete(fss_read_main_t * const main) { if (!main) return; @@ -63,7 +63,7 @@ extern "C" { fll_program_data_delete(&main->program); fss_read_setting_delete(&main->setting); } -#endif // _di_fss_read_main_data_delete_ +#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) { diff --git a/level_3/fss_read/c/main/common/type.h b/level_3/fss_read/c/main/common/type.h index a1090c2..7464660 100644 --- a/level_3/fss_read/c/main/common/type.h +++ b/level_3/fss_read/c/main/common/type.h @@ -365,9 +365,9 @@ extern "C" { * * This does not alter main.setting.state.status. */ -#ifndef _di_fss_read_main_data_delete_ +#ifndef _di_fss_read_main_delete_ extern void fss_read_main_delete(fss_read_main_t * const main); -#endif // _di_fss_read_main_data_delete_ +#endif // _di_fss_read_main_delete_ /** * Delete the program main setting data. diff --git a/level_3/fss_write/c/main/common/type.c b/level_3/fss_write/c/main/common/type.c index 6870cb9..a929e12 100644 --- a/level_3/fss_write/c/main/common/type.c +++ b/level_3/fss_write/c/main/common/type.c @@ -4,7 +4,7 @@ extern "C" { #endif -#ifndef _di_fss_write_main_data_delete_ +#ifndef _di_fss_write_main_delete_ void fss_write_main_delete(fss_write_main_t * const main) { if (!main) return; @@ -12,7 +12,7 @@ extern "C" { fll_program_data_delete(&main->program); fss_write_setting_delete(&main->setting); } -#endif // _di_fss_write_main_data_delete_ +#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) { diff --git a/level_3/fss_write/c/main/common/type.h b/level_3/fss_write/c/main/common/type.h index 6754cb5..3036072 100644 --- a/level_3/fss_write/c/main/common/type.h +++ b/level_3/fss_write/c/main/common/type.h @@ -155,9 +155,9 @@ extern "C" { * * This does not alter data_make.main.setting.state.status. */ -#ifndef _di_fss_write_main_data_delete_ +#ifndef _di_fss_write_main_delete_ extern void fss_write_main_delete(fss_write_main_t * const main); -#endif // _di_fss_write_main_data_delete_ +#endif // _di_fss_write_main_delete_ /** * Delete the program main setting data. diff --git a/level_3/iki_read/c/main/common/type.c b/level_3/iki_read/c/main/common/type.c index 4f5faf0..bbc7a22 100644 --- a/level_3/iki_read/c/main/common/type.c +++ b/level_3/iki_read/c/main/common/type.c @@ -4,7 +4,7 @@ extern "C" { #endif -#ifndef _di_iki_read_main_data_delete_ +#ifndef _di_iki_read_main_delete_ void iki_read_main_delete(iki_read_main_t * const main) { if (!main) return; @@ -12,7 +12,7 @@ extern "C" { fll_program_data_delete(&main->program); iki_read_setting_delete(&main->setting); } -#endif // _di_iki_read_main_data_delete_ +#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) { diff --git a/level_3/iki_read/c/main/common/type.h b/level_3/iki_read/c/main/common/type.h index 962fb39..b61ffa2 100644 --- a/level_3/iki_read/c/main/common/type.h +++ b/level_3/iki_read/c/main/common/type.h @@ -116,9 +116,9 @@ extern "C" { * * This does not alter data_make.main.setting.state.status. */ -#ifndef _di_iki_read_main_data_delete_ +#ifndef _di_iki_read_main_delete_ extern void iki_read_main_delete(iki_read_main_t * const main); -#endif // _di_iki_read_main_data_delete_ +#endif // _di_iki_read_main_delete_ /** * Delete the program main setting data. diff --git a/level_3/iki_write/c/main/common/type.c b/level_3/iki_write/c/main/common/type.c index 0524181..e2e099f 100644 --- a/level_3/iki_write/c/main/common/type.c +++ b/level_3/iki_write/c/main/common/type.c @@ -4,7 +4,7 @@ extern "C" { #endif -#ifndef _di_iki_write_main_data_delete_ +#ifndef _di_iki_write_main_delete_ void iki_write_main_delete(iki_write_main_t * const main) { if (!main) return; @@ -12,7 +12,7 @@ extern "C" { fll_program_data_delete(&main->program); iki_write_setting_delete(&main->setting); } -#endif // _di_iki_write_main_data_delete_ +#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) { diff --git a/level_3/iki_write/c/main/common/type.h b/level_3/iki_write/c/main/common/type.h index 326f37f..9b9b07c 100644 --- a/level_3/iki_write/c/main/common/type.h +++ b/level_3/iki_write/c/main/common/type.h @@ -97,9 +97,9 @@ extern "C" { * * This does not alter data_make.main.setting.state.status. */ -#ifndef _di_iki_write_main_data_delete_ +#ifndef _di_iki_write_main_delete_ extern void iki_write_main_delete(iki_write_main_t * const main); -#endif // _di_iki_write_main_data_delete_ +#endif // _di_iki_write_main_delete_ /** * Delete the program main setting data. diff --git a/level_3/status_code/c/main/common/type.c b/level_3/status_code/c/main/common/type.c index 244c9c9..cfae7e3 100644 --- a/level_3/status_code/c/main/common/type.c +++ b/level_3/status_code/c/main/common/type.c @@ -4,7 +4,7 @@ extern "C" { #endif -#ifndef _di_status_code_main_data_delete_ +#ifndef _di_status_code_main_delete_ void status_code_main_delete(status_code_main_t * const main) { if (!main) return; @@ -12,7 +12,7 @@ extern "C" { fll_program_data_delete(&main->program); status_code_setting_delete(&main->setting); } -#endif // _di_status_code_main_data_delete_ +#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) { diff --git a/level_3/status_code/c/main/common/type.h b/level_3/status_code/c/main/common/type.h index 3054df6..ab2e7fb 100644 --- a/level_3/status_code/c/main/common/type.h +++ b/level_3/status_code/c/main/common/type.h @@ -86,9 +86,9 @@ extern "C" { * * This does not alter data_make.main.setting.state.status. */ -#ifndef _di_status_code_main_data_delete_ +#ifndef _di_status_code_main_delete_ extern void status_code_main_delete(status_code_main_t * const main); -#endif // _di_status_code_main_data_delete_ +#endif // _di_status_code_main_delete_ /** * Delete the program main setting data. diff --git a/level_3/utf8/c/main/common/type.c b/level_3/utf8/c/main/common/type.c index 343dfdd..26d7076 100644 --- a/level_3/utf8/c/main/common/type.c +++ b/level_3/utf8/c/main/common/type.c @@ -4,7 +4,7 @@ extern "C" { #endif -#ifndef _di_utf8_main_data_delete_ +#ifndef _di_utf8_main_delete_ void utf8_main_delete(utf8_main_t * const main) { if (!main) return; @@ -12,7 +12,7 @@ extern "C" { fll_program_data_delete(&main->program); utf8_setting_delete(&main->setting); } -#endif // _di_utf8_main_data_delete_ +#endif // _di_utf8_main_delete_ #ifndef _di_utf8_setting_delete_ f_status_t utf8_setting_delete(utf8_setting_t * const setting) { diff --git a/level_3/utf8/c/main/common/type.h b/level_3/utf8/c/main/common/type.h index b4d2166..cd62c9d 100644 --- a/level_3/utf8/c/main/common/type.h +++ b/level_3/utf8/c/main/common/type.h @@ -108,9 +108,9 @@ extern "C" { * * This does not alter data_make.main.setting.state.status. */ -#ifndef _di_utf8_main_data_delete_ +#ifndef _di_utf8_main_delete_ extern void utf8_main_delete(utf8_main_t * const main); -#endif // _di_utf8_main_data_delete_ +#endif // _di_utf8_main_delete_ /** * Delete the program main setting data. -- 1.8.3.1