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.

diff --git a/level_3/fake/c/main/common/type.c b/level_3/fake/c/main/common/type.c
index 1b698be8a8a3c15c520b5c6ddeb658c8f16a6e68..786491a83893468cdfa434cc2fcd0ae5b9b77e1c 100644 (file)
--- 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 1982fb991af87cccd2054b0530bf6653e501d345..5b046b7f102024bb3537c72526ffe90971565a9a 100644 (file)
--- 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 54928c0f709faab43967d4a84447b6490246cb58..940fd778e73997166c19278c934e655ea303e129 100644 (file)
--- 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 0ce794fe38d7c8de09fc2e24a7ea3dc541153eff..fd8fc83949da950b70caedd6ad4211e385918484 100644 (file)
--- 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 58659a3489ec914426ce32c371963d0fc6403431..0a49a7103c14bfbd9a13e85ce017d07afddc997f 100644 (file)
--- 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 a1090c2bfc1c5e6309fd7d570440f1f4c35afa9b..7464660dc868f0bfd43281cfeba21fda1aa9c913 100644 (file)
--- 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 6870cb9b3e314972ae54356ad4993620b782f6ce..a929e12c2cca0236029a58cf07f46ecc6c8a37d9 100644 (file)
--- 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 6754cb5c2f1c97068359861893b448c041c9b6a0..30360725dc02f071e45c1b90824f6bdec06d6550 100644 (file)
--- 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 4f5faf0a164444858c61d3267f4c6db0d24a7da1..bbc7a225841d1f0b98e051d2fe13987d01da3586 100644 (file)
--- 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 962fb391ca565584e6b7ddef2da7a3c0e896511c..b61ffa2ace90f37c3bee0ae49a5b92379743305d 100644 (file)
--- 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 05241817f407961bc47e56e1087f5e600cac015e..e2e099f745d951f7e27f19619aae9f1a87f3d328 100644 (file)
--- 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 326f37fc16472b87ab7874ea7a865c08e1966185..9b9b07cab46ea0d0beb885eed54b094620ae0ab4 100644 (file)
--- 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 244c9c938d7df2c749b9fbcbbf983d217ea2aa1c..cfae7e339cb6d08a3bb8b951b1bae33dffdaa37a 100644 (file)
--- 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 3054df6c796211fc4a9fd23600e944a337d8dd49..ab2e7fbd056e9c17a245299559e489fc50c5c841 100644 (file)
--- 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 343dfdd3964151468caeb257398b106a16a99bf9..26d7076f9b035804c29314d449bcaeafe4b47dfb 100644 (file)
--- 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 b4d2166720691ff168be53f26040c6733f9e4058..cd62c9d0fbea35b04d692f1de1907322a4dbd265 100644 (file)
--- 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.