Update: Main program structures to follow consistent styling.

diff --git a/level_3/byte_dump/c/main/common/type.h b/level_3/byte_dump/c/main/common/type.h
index e82c5fd..b9c0f77 100644 (file)
--- a/level_3/byte_dump/c/main/common/type.h
+++ b/level_3/byte_dump/c/main/common/type.h
@@ -120,6 +120,7 @@ extern "C" {
 #ifndef _di_byte_dump_main_t_
   struct byte_dump_main_t_ {
     fll_program_data_t program;
+
     byte_dump_setting_t setting;
   };
 

diff --git a/level_3/example/c/main/common/type.h b/level_3/example/c/main/common/type.h
index fd954af..c11243f 100644 (file)
--- a/level_3/example/c/main/common/type.h
+++ b/level_3/example/c/main/common/type.h
@@ -71,20 +71,23 @@ extern "C" {
 /**
  * The main program data as a single structure.
  *
- * program: The main program data.
- * setting: The settings data.
+ * Properties:
+ *   - program: The main program data.
+ *   - cache:   The program cache.
+ *   - setting: The settings data.
  */
 #ifndef _di_example_main_t_
   struct example_main_t_ {
     fll_program_data_t program;
-    example_setting_t setting;
+
     example_cache_t cache;
+    example_setting_t setting;
   };
 
   #define example_main_t_initialize { \
     .program = fll_program_data_t_initialize, \
-    .setting = example_setting_t_initialize, \
     .cache   = example_cache_t_initialize, \
+    .setting = example_setting_t_initialize, \
   }
 #endif // _di_example_main_t_
 

diff --git a/level_3/fake/c/main/common/type.h b/level_3/fake/c/main/common/type.h
index fcad9cc..9069f68 100644 (file)
--- a/level_3/fake/c/main/common/type.h
+++ b/level_3/fake/c/main/common/type.h
@@ -130,10 +130,9 @@ extern "C" {
 /**
  * The main program data as a single structure.
  *
- * program: The main program data.
- * setting: The settings data.
- *
  * Properties:
+ *   - program:          The main program data.
+ *   - setting:          The settings data.
  *   - buffer:           A string buffer cache often used for files and often held longe than other caches.
  *   - cache_1:          A string cache.
  *   - cache_2:          A string cache.
@@ -147,6 +146,7 @@ extern "C" {
 #ifndef _di_fake_main_t_
   struct fake_main_t_ {
     fll_program_data_t program;
+
     fake_setting_t setting;
 
     f_string_dynamic_t buffer;

diff --git a/level_3/fss_identify/c/main/common/type.h b/level_3/fss_identify/c/main/common/type.h
index 210d397..5156db7 100644 (file)
--- a/level_3/fss_identify/c/main/common/type.h
+++ b/level_3/fss_identify/c/main/common/type.h
@@ -88,6 +88,7 @@ extern "C" {
 #ifndef _di_fss_identify_main_t_
   struct fss_identify_main_t_ {
     fll_program_data_t program;
+
     fss_identify_setting_t setting;
   };
 

diff --git a/level_3/fss_read/c/main/common/type.h b/level_3/fss_read/c/main/common/type.h
index 9917af9..76543fa 100644 (file)
--- a/level_3/fss_read/c/main/common/type.h
+++ b/level_3/fss_read/c/main/common/type.h
@@ -337,25 +337,26 @@ extern "C" {
  * The main program data as a single structure.
  *
  * Properties:
- *   - cache:   The cache data.
- *   - call:    The callbacks.
  *   - program: The main program data.
+ *   - cache:   The cache data.
+ *   - call:    The call backs.
  *   - setting: The settings data.
  */
 #ifndef _di_fss_read_main_t_
   typedef void (*fss_read_settings_load_call_t)(const f_console_arguments_t arguments, fss_read_main_t * const main);
 
   struct fss_read_main_t_ {
+    fll_program_data_t program;
+
     fss_read_cache_t cache;
     fss_read_call_t call;
-    fll_program_data_t program;
     fss_read_setting_t setting;
   };
 
   #define fss_read_main_t_initialize { \
+    .program = fll_program_data_t_initialize, \
     .cache   = fss_read_cache_t_initialize, \
     .call    = fss_read_call_t_initialize, \
-    .program = fll_program_data_t_initialize, \
     .setting = fss_read_setting_t_initialize, \
   }
 #endif // _di_fss_read_main_t_

diff --git a/level_3/fss_write/c/main/common/type.h b/level_3/fss_write/c/main/common/type.h
index f305981..82e08df 100644 (file)
--- a/level_3/fss_write/c/main/common/type.h
+++ b/level_3/fss_write/c/main/common/type.h
@@ -133,23 +133,23 @@ extern "C" {
  * The main program data as a single structure.
  *
  * Properties:
- *   - call:    The callbacks.
  *   - program: The main program data.
+ *   - call:    The call backs.
  *   - setting: The settings data.
  */
 #ifndef _di_fss_write_main_t_
   struct fss_write_main_t_ {
-    fss_write_call_t call;
     fll_program_data_t program;
+
+    fss_write_call_t call;
     fss_write_setting_t setting;
   };
 
-  #define fss_write_main_t_initialize \
-    { \
-      .call    = fss_write_call_t_initialize, \
-      .program = fll_program_data_t_initialize, \
-      .setting = fss_write_setting_t_initialize, \
-    }
+  #define fss_write_main_t_initialize { \
+    .program = fll_program_data_t_initialize, \
+    .call    = fss_write_call_t_initialize, \
+    .setting = fss_write_setting_t_initialize, \
+  }
 #endif // _di_fss_write_main_t_
 
 /**

diff --git a/level_3/iki_read/c/main/common/type.h b/level_3/iki_read/c/main/common/type.h
index 01de371..934d721 100644 (file)
--- a/level_3/iki_read/c/main/common/type.h
+++ b/level_3/iki_read/c/main/common/type.h
@@ -154,27 +154,29 @@ extern "C" {
  * The main program data as a single structure.
  *
  * Properties:
- *   - cache:   The cache data.
- *   - call:    The callbacks.
- *   - data:    A pointer for the structure representing IKI data (or EKI data).
  *   - program: The main program data.
+ *   - cache:   The cache data.
+ *   - call:    The call backs.
  *   - setting: The settings data.
+ *   - data:    A pointer for the structure representing IKI data (or EKI data).
  */
 #ifndef _di_iki_read_main_t_
   struct iki_read_main_t_ {
+    fll_program_data_t program;
+
     iki_read_cache_t cache;
     iki_read_callback_t call;
-    void * data;
-    fll_program_data_t program;
     iki_read_setting_t setting;
+
+    void * data;
   };
 
   #define iki_read_main_t_initialize { \
+    .program = fll_program_data_t_initialize, \
     .cache   = iki_read_cache_t_initialize, \
     .call    = iki_read_callback_t_initialize, \
-    .data    = 0, \
-    .program = fll_program_data_t_initialize, \
     .setting = iki_read_setting_t_initialize, \
+    .data    = 0, \
   }
 #endif // _di_iki_read_main_t_
 

diff --git a/level_3/iki_write/c/main/common/type.h b/level_3/iki_write/c/main/common/type.h
index 6e59101..14ef3d3 100644 (file)
--- a/level_3/iki_write/c/main/common/type.h
+++ b/level_3/iki_write/c/main/common/type.h
@@ -117,23 +117,24 @@ extern "C" {
  * The main program data as a single structure.
  *
  * Properties:
- *   - cache:   The cache data.
- *   - call:    The callbacks.
  *   - program: The main program data.
+ *   - cache:   The cache data.
+ *   - call:    The call backs.
  *   - setting: The settings data.
  */
 #ifndef _di_iki_write_main_t_
   struct iki_write_main_t_ {
+    fll_program_data_t program;
+
     iki_write_cache_t cache;
     iki_write_call_t call;
-    fll_program_data_t program;
     iki_write_setting_t setting;
   };
 
   #define iki_write_main_t_initialize { \
+    .program = fll_program_data_t_initialize, \
     .cache   = iki_write_cache_t_initialize, \
     .call    = iki_write_call_t_initialize, \
-    .program = fll_program_data_t_initialize, \
     .setting = iki_write_setting_t_initialize, \
   }
 #endif // _di_iki_write_main_t_

diff --git a/level_3/status_code/c/main/common/type.h b/level_3/status_code/c/main/common/type.h
index 496d0d5..d335d65 100644 (file)
--- a/level_3/status_code/c/main/common/type.h
+++ b/level_3/status_code/c/main/common/type.h
@@ -77,18 +77,20 @@ extern "C" {
  *
  * Properties:
  *   - program: The main program data.
+ *   - call:    The call backs.
  *   - setting: The settings data.
  */
 #ifndef _di_status_code_main_t_
   struct status_code_main_t_ {
-    status_code_call_t call;
     fll_program_data_t program;
+
+    status_code_call_t call;
     status_code_setting_t setting;
   };
 
   #define status_code_main_t_initialize { \
-    .call = status_code_call_t_initialize, \
     .program = fll_program_data_t_initialize, \
+    .call    = status_code_call_t_initialize, \
     .setting = status_code_setting_t_initialize, \
   }
 #endif // _di_status_code_main_t_

diff --git a/level_3/utf8/c/main/common/type.h b/level_3/utf8/c/main/common/type.h
index 30b4925..84fe8af 100644 (file)
--- a/level_3/utf8/c/main/common/type.h
+++ b/level_3/utf8/c/main/common/type.h
@@ -67,21 +67,20 @@ extern "C" {
     f_string_dynamics_t remaining;
   } utf8_setting_t;
 
-  #define utf8_setting_t_initialize \
-    { \
-      utf8_mode_from_bytesequence_e | utf8_mode_to_codepoint_e, \
-      utf8_main_flag_none_d, \
-      f_state_t_initialize, \
-      f_color_set_t_initialize, \
-      f_color_set_t_initialize, \
-      f_string_static_t_initialize, \
-      f_string_static_t_initialize, \
-      f_string_dynamic_t_initialize, \
-      f_string_dynamic_t_initialize, \
-      f_string_dynamics_t_initialize, \
-      f_string_dynamics_t_initialize, \
-      f_string_dynamics_t_initialize, \
-    }
+  #define utf8_setting_t_initialize { \
+    utf8_mode_from_bytesequence_e | utf8_mode_to_codepoint_e, \
+    utf8_main_flag_none_d, \
+    f_state_t_initialize, \
+    f_color_set_t_initialize, \
+    f_color_set_t_initialize, \
+    f_string_static_t_initialize, \
+    f_string_static_t_initialize, \
+    f_string_dynamic_t_initialize, \
+    f_string_dynamic_t_initialize, \
+    f_string_dynamics_t_initialize, \
+    f_string_dynamics_t_initialize, \
+    f_string_dynamics_t_initialize, \
+  }
 #endif // _di_utf8_setting_t_
 
 /**
@@ -94,14 +93,14 @@ extern "C" {
 #ifndef _di_utf8_main_t_
   struct utf8_main_t_ {
     fll_program_data_t program;
+
     utf8_setting_t setting;
   };
 
-  #define utf8_main_t_initialize \
-    { \
-      fll_program_data_t_initialize, \
-      utf8_setting_t_initialize, \
-    }
+  #define utf8_main_t_initialize { \
+    .program = fll_program_data_t_initialize, \
+    .setting = utf8_setting_t_initialize, \
+  }
 #endif // _di_utf8_main_t_
 
 /**