Update: Use the macro_*__t_initialize_3() for static data.

diff --git a/sources/c/program/control/control/string.c b/sources/c/program/control/control/string.c
index d4d8340bbb18bcb49a03aab74a84df7183c73351..769a9eb5559ca0374e940c055974c57fc5969bb4 100644 (file)
--- a/sources/c/program/control/control/string.c
+++ b/sources/c/program/control/control/string.c
@@ -5,8 +5,8 @@ extern "C" {
 #endif
 
 #ifndef _di_control_program_name_s_
-  const f_string_static_t control_program_name_s = macro_f_string_static_t_initialize_1(CONTROL_program_name_s, CONTROL_program_name_s_length, 0);
-  const f_string_static_t control_program_name_long_s = macro_f_string_static_t_initialize_1(CONTROL_program_name_long_s, CONTROL_program_name_long_s_length, 0);
+  const f_string_static_t control_program_name_s = macro_f_string_static_t_initialize_3(CONTROL_program_name_s, CONTROL_program_name_s_length);
+  const f_string_static_t control_program_name_long_s = macro_f_string_static_t_initialize_3(CONTROL_program_name_long_s, CONTROL_program_name_long_s_length);
 #endif // _di_control_program_name_s_
 
 #ifdef __cplusplus

diff --git a/sources/c/program/control/main/common/string.c b/sources/c/program/control/main/common/string.c
index 34f8a189ea0e5cc7a34d3eef70f957734aad59f3..ac11f8631e0a29512a9581b933dfcbea553a8a37 100644 (file)
--- a/sources/c/program/control/main/common/string.c
+++ b/sources/c/program/control/main/common/string.c
@@ -5,60 +5,60 @@ extern "C" {
 #endif
 
 #ifndef _di_control_program_version_s_
-  const f_string_static_t control_program_version_s = macro_f_string_static_t_initialize_1(CONTROL_program_version_s, CONTROL_program_version_s_length, 0);
+  const f_string_static_t control_program_version_s = macro_f_string_static_t_initialize_3(CONTROL_program_version_s, CONTROL_program_version_s_length);
 #endif // _di_control_program_version_s_
 
 #ifndef _di_control_parameter_s_
-  const f_string_static_t control_short_name_s = macro_f_string_static_t_initialize_1(CONTROL_short_name_s, CONTROL_short_name_s_length, 0);
-  const f_string_static_t control_short_return_s = macro_f_string_static_t_initialize_1(CONTROL_short_return_s, CONTROL_short_return_s_length, 0);
-  const f_string_static_t control_short_settings_s = macro_f_string_static_t_initialize_1(CONTROL_short_settings_s, CONTROL_short_settings_s_length, 0);
-  const f_string_static_t control_short_socket_s = macro_f_string_static_t_initialize_1(CONTROL_short_socket_s, CONTROL_short_socket_s_length, 0);
+  const f_string_static_t control_short_name_s = macro_f_string_static_t_initialize_3(CONTROL_short_name_s, CONTROL_short_name_s_length);
+  const f_string_static_t control_short_return_s = macro_f_string_static_t_initialize_3(CONTROL_short_return_s, CONTROL_short_return_s_length);
+  const f_string_static_t control_short_settings_s = macro_f_string_static_t_initialize_3(CONTROL_short_settings_s, CONTROL_short_settings_s_length);
+  const f_string_static_t control_short_socket_s = macro_f_string_static_t_initialize_3(CONTROL_short_socket_s, CONTROL_short_socket_s_length);
 
-  const f_string_static_t control_long_name_s = macro_f_string_static_t_initialize_1(CONTROL_long_name_s, CONTROL_long_name_s_length, 0);
-  const f_string_static_t control_long_return_s = macro_f_string_static_t_initialize_1(CONTROL_long_return_s, CONTROL_long_return_s_length, 0);
-  const f_string_static_t control_long_settings_s = macro_f_string_static_t_initialize_1(CONTROL_long_settings_s, CONTROL_long_settings_s_length, 0);
-  const f_string_static_t control_long_socket_s = macro_f_string_static_t_initialize_1(CONTROL_long_socket_s, CONTROL_long_socket_s_length, 0);
+  const f_string_static_t control_long_name_s = macro_f_string_static_t_initialize_3(CONTROL_long_name_s, CONTROL_long_name_s_length);
+  const f_string_static_t control_long_return_s = macro_f_string_static_t_initialize_3(CONTROL_long_return_s, CONTROL_long_return_s_length);
+  const f_string_static_t control_long_settings_s = macro_f_string_static_t_initialize_3(CONTROL_long_settings_s, CONTROL_long_settings_s_length);
+  const f_string_static_t control_long_socket_s = macro_f_string_static_t_initialize_3(CONTROL_long_socket_s, CONTROL_long_socket_s_length);
 #endif // _di_control_parameter_s_
 
 #ifndef _di_control_strings_s_
-  const f_string_static_t control_path_settings_s = macro_f_string_static_t_initialize_1(CONTROL_path_settings_s, CONTROL_path_settings_s_length, 0);
+  const f_string_static_t control_path_settings_s = macro_f_string_static_t_initialize_3(CONTROL_path_settings_s, CONTROL_path_settings_s_length);
 
-  const f_string_static_t control_action_s = macro_f_string_static_t_initialize_1(CONTROL_action_s, CONTROL_action_s_length, 0);
-  const f_string_static_t control_at_s = macro_f_string_static_t_initialize_1(CONTROL_at_s, CONTROL_at_s_length, 0);
-  const f_string_static_t control_controller_s = macro_f_string_static_t_initialize_1(CONTROL_controller_s, CONTROL_controller_s_length, 0);
-  const f_string_static_t control_default_s = macro_f_string_static_t_initialize_1(CONTROL_default_s, CONTROL_default_s_length, 0);
-  const f_string_static_t control_error_s = macro_f_string_static_t_initialize_1(CONTROL_error_s, CONTROL_error_s_length, 0);
-  const f_string_static_t control_in_s = macro_f_string_static_t_initialize_1(CONTROL_in_s, CONTROL_in_s_length, 0);
-  const f_string_static_t control_init_s = macro_f_string_static_t_initialize_1(CONTROL_init_s, CONTROL_init_s_length, 0);
-  const f_string_static_t control_kexec_s = macro_f_string_static_t_initialize_1(CONTROL_kexec_s, CONTROL_kexec_s_length, 0);
-  const f_string_static_t control_length_s = macro_f_string_static_t_initialize_1(CONTROL_length_s, CONTROL_length_s_length, 0);
-  const f_string_static_t control_name_socket_s = macro_f_string_static_t_initialize_1(CONTROL_name_socket_s, CONTROL_name_socket_s_length, 0);
-  const f_string_static_t control_now_s = macro_f_string_static_t_initialize_1(CONTROL_now_s, CONTROL_now_s_length, 0);
-  const f_string_static_t control_path_socket_s = macro_f_string_static_t_initialize_1(CONTROL_path_socket_s, CONTROL_path_socket_s_length, 0);
-  const f_string_static_t control_path_socket_prefix_s = macro_f_string_static_t_initialize_1(CONTROL_path_socket_prefix_s, CONTROL_path_socket_prefix_s_length, 0);
-  const f_string_static_t control_path_socket_suffix_s = macro_f_string_static_t_initialize_1(CONTROL_path_socket_suffix_s, CONTROL_path_socket_suffix_s_length, 0);
-  const f_string_static_t control_status_s = macro_f_string_static_t_initialize_1(CONTROL_status_s, CONTROL_status_s_length, 0);
-  const f_string_static_t control_type_s = macro_f_string_static_t_initialize_1(CONTROL_type_s, CONTROL_type_s_length, 0);
+  const f_string_static_t control_action_s = macro_f_string_static_t_initialize_3(CONTROL_action_s, CONTROL_action_s_length);
+  const f_string_static_t control_at_s = macro_f_string_static_t_initialize_3(CONTROL_at_s, CONTROL_at_s_length);
+  const f_string_static_t control_controller_s = macro_f_string_static_t_initialize_3(CONTROL_controller_s, CONTROL_controller_s_length);
+  const f_string_static_t control_default_s = macro_f_string_static_t_initialize_3(CONTROL_default_s, CONTROL_default_s_length);
+  const f_string_static_t control_error_s = macro_f_string_static_t_initialize_3(CONTROL_error_s, CONTROL_error_s_length);
+  const f_string_static_t control_in_s = macro_f_string_static_t_initialize_3(CONTROL_in_s, CONTROL_in_s_length);
+  const f_string_static_t control_init_s = macro_f_string_static_t_initialize_3(CONTROL_init_s, CONTROL_init_s_length);
+  const f_string_static_t control_kexec_s = macro_f_string_static_t_initialize_3(CONTROL_kexec_s, CONTROL_kexec_s_length);
+  const f_string_static_t control_length_s = macro_f_string_static_t_initialize_3(CONTROL_length_s, CONTROL_length_s_length);
+  const f_string_static_t control_name_socket_s = macro_f_string_static_t_initialize_3(CONTROL_name_socket_s, CONTROL_name_socket_s_length);
+  const f_string_static_t control_now_s = macro_f_string_static_t_initialize_3(CONTROL_now_s, CONTROL_now_s_length);
+  const f_string_static_t control_path_socket_s = macro_f_string_static_t_initialize_3(CONTROL_path_socket_s, CONTROL_path_socket_s_length);
+  const f_string_static_t control_path_socket_prefix_s = macro_f_string_static_t_initialize_3(CONTROL_path_socket_prefix_s, CONTROL_path_socket_prefix_s_length);
+  const f_string_static_t control_path_socket_suffix_s = macro_f_string_static_t_initialize_3(CONTROL_path_socket_suffix_s, CONTROL_path_socket_suffix_s_length);
+  const f_string_static_t control_status_s = macro_f_string_static_t_initialize_3(CONTROL_status_s, CONTROL_status_s_length);
+  const f_string_static_t control_type_s = macro_f_string_static_t_initialize_3(CONTROL_type_s, CONTROL_type_s_length);
 
-  const f_string_static_t control_freeze_s = macro_f_string_static_t_initialize_1(CONTROL_freeze_s, CONTROL_freeze_s_length, 0);
-  const f_string_static_t control_kill_s = macro_f_string_static_t_initialize_1(CONTROL_kill_s, CONTROL_kill_s_length, 0);
-  const f_string_static_t control_pause_s = macro_f_string_static_t_initialize_1(CONTROL_pause_s, CONTROL_pause_s_length, 0);
-  const f_string_static_t control_reboot_s = macro_f_string_static_t_initialize_1(CONTROL_reboot_s, CONTROL_reboot_s_length, 0);
-  const f_string_static_t control_reload_s = macro_f_string_static_t_initialize_1(CONTROL_reload_s, CONTROL_reload_s_length, 0);
-  const f_string_static_t control_rerun_s = macro_f_string_static_t_initialize_1(CONTROL_rerun_s, CONTROL_rerun_s_length, 0);
-  const f_string_static_t control_restart_s = macro_f_string_static_t_initialize_1(CONTROL_restart_s, CONTROL_restart_s_length, 0);
-  const f_string_static_t control_resume_s = macro_f_string_static_t_initialize_1(CONTROL_resume_s, CONTROL_resume_s_length, 0);
-  const f_string_static_t control_shutdown_s = macro_f_string_static_t_initialize_1(CONTROL_shutdown_s, CONTROL_shutdown_s_length, 0);
-  const f_string_static_t control_start_s = macro_f_string_static_t_initialize_1(CONTROL_start_s, CONTROL_start_s_length, 0);
-  const f_string_static_t control_stop_s = macro_f_string_static_t_initialize_1(CONTROL_stop_s, CONTROL_stop_s_length, 0);
-  const f_string_static_t control_thaw_s = macro_f_string_static_t_initialize_1(CONTROL_thaw_s, CONTROL_thaw_s_length, 0);
+  const f_string_static_t control_freeze_s = macro_f_string_static_t_initialize_3(CONTROL_freeze_s, CONTROL_freeze_s_length);
+  const f_string_static_t control_kill_s = macro_f_string_static_t_initialize_3(CONTROL_kill_s, CONTROL_kill_s_length);
+  const f_string_static_t control_pause_s = macro_f_string_static_t_initialize_3(CONTROL_pause_s, CONTROL_pause_s_length);
+  const f_string_static_t control_reboot_s = macro_f_string_static_t_initialize_3(CONTROL_reboot_s, CONTROL_reboot_s_length);
+  const f_string_static_t control_reload_s = macro_f_string_static_t_initialize_3(CONTROL_reload_s, CONTROL_reload_s_length);
+  const f_string_static_t control_rerun_s = macro_f_string_static_t_initialize_3(CONTROL_rerun_s, CONTROL_rerun_s_length);
+  const f_string_static_t control_restart_s = macro_f_string_static_t_initialize_3(CONTROL_restart_s, CONTROL_restart_s_length);
+  const f_string_static_t control_resume_s = macro_f_string_static_t_initialize_3(CONTROL_resume_s, CONTROL_resume_s_length);
+  const f_string_static_t control_shutdown_s = macro_f_string_static_t_initialize_3(CONTROL_shutdown_s, CONTROL_shutdown_s_length);
+  const f_string_static_t control_start_s = macro_f_string_static_t_initialize_3(CONTROL_start_s, CONTROL_start_s_length);
+  const f_string_static_t control_stop_s = macro_f_string_static_t_initialize_3(CONTROL_stop_s, CONTROL_stop_s_length);
+  const f_string_static_t control_thaw_s = macro_f_string_static_t_initialize_3(CONTROL_thaw_s, CONTROL_thaw_s_length);
 #endif // _di_control_strings_s_
 
 #ifndef _di_controller_strings_s_
-  const f_string_static_t controller_name_socket_s = macro_f_string_static_t_initialize_1(CONTROLLER_name_socket_s, CONTROLLER_name_socket_s_length, 0);
-  const f_string_static_t controller_path_socket_s = macro_f_string_static_t_initialize_1(CONTROLLER_path_socket_s, CONTROLLER_path_socket_s_length, 0);
-  const f_string_static_t controller_path_socket_prefix_s = macro_f_string_static_t_initialize_1(CONTROLLER_path_socket_prefix_s, CONTROLLER_path_socket_prefix_s_length, 0);
-  const f_string_static_t controller_path_socket_suffix_s = macro_f_string_static_t_initialize_1(CONTROLLER_path_socket_suffix_s, CONTROLLER_path_socket_suffix_s_length, 0);
+  const f_string_static_t controller_name_socket_s = macro_f_string_static_t_initialize_3(CONTROLLER_name_socket_s, CONTROLLER_name_socket_s_length);
+  const f_string_static_t controller_path_socket_s = macro_f_string_static_t_initialize_3(CONTROLLER_path_socket_s, CONTROLLER_path_socket_s_length);
+  const f_string_static_t controller_path_socket_prefix_s = macro_f_string_static_t_initialize_3(CONTROLLER_path_socket_prefix_s, CONTROLLER_path_socket_prefix_s_length);
+  const f_string_static_t controller_path_socket_suffix_s = macro_f_string_static_t_initialize_3(CONTROLLER_path_socket_suffix_s, CONTROLLER_path_socket_suffix_s_length);
 #endif // _di_controller_strings_s_
 
 #ifdef __cplusplus

diff --git a/sources/c/program/control/main/packet.c b/sources/c/program/control/main/packet.c
index 9cbae7aa7b04e14108279261cc5fc8faf072c30f..0acb823dacbaedb8c20980298683e3c5ecb8173c 100644 (file)
--- a/sources/c/program/control/main/packet.c
+++ b/sources/c/program/control/main/packet.c
@@ -47,7 +47,7 @@ extern "C" {
     f_state_t state = macro_f_state_t_initialize_1(control_allocation_large_d, control_allocation_small_d, F_okay, 0, 0, 0, &fll_program_standard_signal_handle, 0, (void *) main, 0);
 
     f_string_static_t contents_array[main->setting.actions.used];
-    f_string_statics_t contents = macro_f_string_statics_t_initialize_1(contents_array, main->setting.actions.used, 0);
+    f_string_statics_t contents = macro_f_string_statics_t_initialize_3(contents_array, main->setting.actions.used);
 
     // The Packet Control Block.
     {
@@ -349,7 +349,7 @@ extern "C" {
             if (!(found & 0x1)) {
               const f_number_unsigned_t action_length = (main->cache.header_contents.array[i].array[0].stop - main->cache.header_contents.array[i].array[0].start) + 1;
               char action_string[action_length + 1];
-              const f_string_static_t action = macro_f_string_static_t_initialize_1(action_string, action_length, 0);
+              const f_string_static_t action = macro_f_string_static_t_initialize_3(action_string, action_length);
 
               memcpy(action_string, main->cache.large.string + main->cache.header_contents.array[i].array[0].start, action_length);
               action_string[action_length] = 0;
@@ -418,7 +418,7 @@ extern "C" {
                 // Not a number, so attempt get by packet status string name.
                 const f_number_unsigned_t name_length = (main->cache.header_contents.array[i].array[0].stop - main->cache.header_contents.array[i].array[0].start) + 1;
                 char name_string[name_length + 1];
-                const f_string_static_t name = macro_f_string_static_t_initialize_1(name_string, name_length, 0);
+                const f_string_static_t name = macro_f_string_static_t_initialize_3(name_string, name_length);
 
                 memcpy(name_string, main->cache.large.string + main->cache.header_contents.array[i].array[0].start, name_length);
                 name_string[name_length] = 0;