]> Kevux Git Server - fll/commitdiff
Progress: Address incomplete updates to several programs.
authorKevin Day <kevin@kevux.org>
Tue, 18 Apr 2023 00:29:59 +0000 (19:29 -0500)
committerKevin Day <kevin@kevux.org>
Tue, 18 Apr 2023 00:29:59 +0000 (19:29 -0500)
A previous progress commit (or series of commits) left these programs incompletely updated when they should otherwise compile.

Add "machine" name type to the fss_write matching logic.

Add missing macro function string fo f_thread_create.

Fix out of date initializes that now need different arguments or sets of arguments.

The changes to fss_write accidentally mass replaced the special fss_write_setting_load() uses that have a callback parameter.
The embedded list write has the wrong format code string ("basic" should be "embedded list").

The iki_write has an out of place declaration of iki_write_main_delete().

28 files changed:
level_3/fss_write/c/basic/common.c
level_3/fss_write/c/basic/common.h
level_3/fss_write/c/basic/main.c
level_3/fss_write/c/basic_list/common.c
level_3/fss_write/c/basic_list/common.h
level_3/fss_write/c/basic_list/main.c
level_3/fss_write/c/embedded_list/common.c
level_3/fss_write/c/embedded_list/common.h
level_3/fss_write/c/embedded_list/main.c
level_3/fss_write/c/extended/common.c
level_3/fss_write/c/extended/common.h
level_3/fss_write/c/extended/main.c
level_3/fss_write/c/extended_list/common.c
level_3/fss_write/c/extended_list/common.h
level_3/fss_write/c/extended_list/main.c
level_3/fss_write/c/main/common/print.c
level_3/fss_write/c/main/common/print.h
level_3/fss_write/c/main/common/type.h
level_3/fss_write/c/main/main.c
level_3/fss_write/c/main/main/print.c
level_3/fss_write/c/main/print/message.c
level_3/fss_write/c/payload/common.c
level_3/fss_write/c/payload/common.h
level_3/fss_write/c/payload/fss_write.c
level_3/fss_write/c/payload/main.c
level_3/iki_read/c/main/common/type.h
level_3/iki_write/c/main/common/define.h
level_3/iki_write/c/main/common/type.h

index 8370c64cc9ce538a656db342592fafde0bf545f4..5e81c09893f64a053e7ad9d1006b95e0764a0d41 100644 (file)
@@ -13,6 +13,7 @@ extern "C" {
   const f_string_static_t fss_write_format_code_short_0000_s = macro_f_string_static_t_initialize(FSS_WRITE_format_code_short_0000_s, 0, FSS_WRITE_format_code_short_0000_s_length);
   const f_string_static_t fss_write_format_code_long_0000_s = macro_f_string_static_t_initialize(FSS_WRITE_format_code_long_0000_s, 0, FSS_WRITE_format_code_long_0000_s_length);
   const f_string_static_t fss_write_format_code_human_0000_s = macro_f_string_static_t_initialize(FSS_WRITE_format_code_human_0000_s, 0, FSS_WRITE_format_code_human_0000_s_length);
+  const f_string_static_t fss_write_format_code_machine_0000_s = macro_f_string_static_t_initialize(FSS_WRITE_format_code_machine_0000_s, 0, FSS_WRITE_format_code_machine_0000_s_length);
 #endif // _di_fss_write_basic_s_
 
 #ifdef __cplusplus
index d3ad084a56f2ffcbc24aa23c44fba3a83fd2776c..0fa359e464350dee8b603d14af2b1ae0f40bfad5 100644 (file)
@@ -25,18 +25,20 @@ extern "C" {
   #define FSS_WRITE_basic_program_name_s      "fss_basic_write"
   #define FSS_WRITE_basic_program_name_long_s "FSS Basic Write"
 
-  #define FSS_WRITE_format_code_short_0000_s "0000"
-  #define FSS_WRITE_format_code_long_0000_s  "fss-0000"
-  #define FSS_WRITE_format_code_human_0000_s "basic"
+  #define FSS_WRITE_format_code_short_0000_s   "0000"
+  #define FSS_WRITE_format_code_long_0000_s    "fss-0000"
+  #define FSS_WRITE_format_code_human_0000_s   "basic"
+  #define FSS_WRITE_format_code_machine_0000_s "basic"
 
   #define FSS_WRITE_basic_standard_s_length 16
 
   #define FSS_WRITE_basic_program_name_s_length      15
   #define FSS_WRITE_basic_program_name_long_s_length 15
 
-  #define FSS_WRITE_format_code_short_0000_s_length 4
-  #define FSS_WRITE_format_code_long_0000_s_length  8
-  #define FSS_WRITE_format_code_human_0000_s_length 5
+  #define FSS_WRITE_format_code_short_0000_s_length   4
+  #define FSS_WRITE_format_code_long_0000_s_length    8
+  #define FSS_WRITE_format_code_human_0000_s_length   5
+  #define FSS_WRITE_format_code_machine_0000_s_length 5
 
   extern const f_string_static_t fss_write_basic_standard_s;
 
@@ -46,6 +48,7 @@ extern "C" {
   extern const f_string_static_t fss_write_format_code_short_0000_s;
   extern const f_string_static_t fss_write_format_code_long_0000_s;
   extern const f_string_static_t fss_write_format_code_human_0000_s;
+  extern const f_string_static_t fss_write_format_code_machine_0000_s;
 #endif // _di_fss_write_basic_s_
 
 #ifdef __cplusplus
index 2b8e7805fea11232a167bf8ea067c9ec4fc5eeff..dd7d32fd6e07985558e7495e7b657dbdb08486e1 100644 (file)
@@ -43,7 +43,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
     {
       const f_console_arguments_t arguments = macro_f_console_arguments_t_initialize(argc, argv, envp);
 
-      fss_write_setting_load(arguments, &data);
+      fss_write_setting_load(arguments, &data, 0);
     }
 
     fss_write_main(&data);
@@ -62,7 +62,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
         {
           const f_console_arguments_t arguments = macro_f_console_arguments_t_initialize(argc, argv, envp);
 
-          fss_write_setting_load(arguments, &data);
+          fss_write_setting_load(arguments, &data, 0);
         }
 
         if (!fss_write_signal_check(&data)) {
index 78e9483b364181595fbd7ac8f9b69b80a48468a3..9f4f80b430101013ffcf7a6e1e631a01e19a577b 100644 (file)
@@ -13,6 +13,7 @@ extern "C" {
   const f_string_static_t fss_write_format_code_short_0002_s = macro_f_string_static_t_initialize(FSS_WRITE_format_code_short_0002_s, 0, FSS_WRITE_format_code_short_0002_s_length);
   const f_string_static_t fss_write_format_code_long_0002_s = macro_f_string_static_t_initialize(FSS_WRITE_format_code_long_0002_s, 0, FSS_WRITE_format_code_long_0002_s_length);
   const f_string_static_t fss_write_format_code_human_0002_s = macro_f_string_static_t_initialize(FSS_WRITE_format_code_human_0002_s, 0, FSS_WRITE_format_code_human_0002_s_length);
+  const f_string_static_t fss_write_format_code_machine_0002_s = macro_f_string_static_t_initialize(FSS_WRITE_format_code_machine_0002_s, 0, FSS_WRITE_format_code_machine_0002_s_length);
 #endif // _di_fss_write_basic_list_s_
 
 #ifdef __cplusplus
index 4d240f3fd47aba7fb74ee33d2c4ec94bcb21d7ad..3afef3f4be7feca22a1176f217c9e6cece4d4ba8 100644 (file)
@@ -25,18 +25,20 @@ extern "C" {
   #define FSS_WRITE_basic_list_program_name_s      "fss_basic_list_write"
   #define FSS_WRITE_basic_list_program_name_long_s "FSS Basic List Write"
 
-  #define FSS_WRITE_format_code_short_0002_s "0002"
-  #define FSS_WRITE_format_code_long_0002_s  "fss-0002"
-  #define FSS_WRITE_format_code_human_0002_s "basic list"
+  #define FSS_WRITE_format_code_short_0002_s   "0002"
+  #define FSS_WRITE_format_code_long_0002_s    "fss-0002"
+  #define FSS_WRITE_format_code_human_0002_s   "basic list"
+  #define FSS_WRITE_format_code_machine_0002_s "basic_list"
 
   #define FSS_WRITE_basic_list_standard_s_length 21
 
   #define FSS_WRITE_basic_list_program_name_s_length      20
   #define FSS_WRITE_basic_list_program_name_long_s_length 20
 
-  #define FSS_WRITE_format_code_short_0002_s_length 4
-  #define FSS_WRITE_format_code_long_0002_s_length  8
-  #define FSS_WRITE_format_code_human_0002_s_length 10
+  #define FSS_WRITE_format_code_short_0002_s_length   4
+  #define FSS_WRITE_format_code_long_0002_s_length    8
+  #define FSS_WRITE_format_code_human_0002_s_length   10
+  #define FSS_WRITE_format_code_machine_0002_s_length 10
 
   extern const f_string_static_t fss_write_basic_list_standard_s;
 
@@ -46,6 +48,7 @@ extern "C" {
   extern const f_string_static_t fss_write_format_code_short_0002_s;
   extern const f_string_static_t fss_write_format_code_long_0002_s;
   extern const f_string_static_t fss_write_format_code_human_0002_s;
+  extern const f_string_static_t fss_write_format_code_machine_0002_s;
 #endif // _di_fss_write_basic_list_s_
 
 #ifdef __cplusplus
index e8d53d26031a39ea70182a298f7ec88467cd0686..38669d12e31707b8b14acce79bd3dc3a4c0e3d1c 100644 (file)
@@ -43,7 +43,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
     {
       const f_console_arguments_t arguments = macro_f_console_arguments_t_initialize(argc, argv, envp);
 
-      fss_write_setting_load(arguments, &data);
+      fss_write_setting_load(arguments, &data, 0);
     }
 
     fss_write_main(&data);
@@ -62,7 +62,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
         {
           const f_console_arguments_t arguments = macro_f_console_arguments_t_initialize(argc, argv, envp);
 
-          fss_write_setting_load(arguments, &data);
+          fss_write_setting_load(arguments, &data, 0);
         }
 
         if (!fss_write_signal_check(&data)) {
index 68384be67a4d41129cb4092821c5cfa423f2a264..7644fdc8e437a0665aeb04b0205a73714c6bd30c 100644 (file)
@@ -13,6 +13,7 @@ extern "C" {
   const f_string_static_t fss_write_format_code_short_0008_s = macro_f_string_static_t_initialize(FSS_WRITE_format_code_short_0008_s, 0, FSS_WRITE_format_code_short_0008_s_length);
   const f_string_static_t fss_write_format_code_long_0008_s = macro_f_string_static_t_initialize(FSS_WRITE_format_code_long_0008_s, 0, FSS_WRITE_format_code_long_0008_s_length);
   const f_string_static_t fss_write_format_code_human_0008_s = macro_f_string_static_t_initialize(FSS_WRITE_format_code_human_0008_s, 0, FSS_WRITE_format_code_human_0008_s_length);
+  const f_string_static_t fss_write_format_code_machine_0008_s = macro_f_string_static_t_initialize(FSS_WRITE_format_code_machine_0008_s, 0, FSS_WRITE_format_code_machine_0008_s_length);
 #endif // _di_fss_write_embedded_list_s_
 
 #ifdef __cplusplus
index 31952cd7c13cf7f15118568e7755037302741711..cde14a936ff8d83d162e6c2eac07c7ef1f560205 100644 (file)
@@ -25,18 +25,20 @@ extern "C" {
   #define FSS_WRITE_embedded_list_program_name_s      "fss_embedded_list_write"
   #define FSS_WRITE_embedded_list_program_name_long_s "FSS Embedded List Write"
 
-  #define FSS_WRITE_format_code_short_0008_s "0008"
-  #define FSS_WRITE_format_code_long_0008_s  "fss-0008"
-  #define FSS_WRITE_format_code_human_0008_s "basic"
+  #define FSS_WRITE_format_code_short_0008_s   "0008"
+  #define FSS_WRITE_format_code_long_0008_s    "fss-0008"
+  #define FSS_WRITE_format_code_human_0008_s   "embedded list"
+  #define FSS_WRITE_format_code_machine_0008_s "embedded_list"
 
   #define FSS_WRITE_embedded_list_standard_s_length 24
 
   #define FSS_WRITE_embedded_list_program_name_s_length      23
   #define FSS_WRITE_embedded_list_program_name_long_s_length 23
 
-  #define FSS_WRITE_format_code_short_0008_s_length 4
-  #define FSS_WRITE_format_code_long_0008_s_length  8
-  #define FSS_WRITE_format_code_human_0008_s_length 5
+  #define FSS_WRITE_format_code_short_0008_s_length   4
+  #define FSS_WRITE_format_code_long_0008_s_length    8
+  #define FSS_WRITE_format_code_human_0008_s_length   13
+  #define FSS_WRITE_format_code_machine_0008_s_length 13
 
   extern const f_string_static_t fss_write_embedded_list_standard_s;
 
@@ -46,6 +48,7 @@ extern "C" {
   extern const f_string_static_t fss_write_format_code_short_0008_s;
   extern const f_string_static_t fss_write_format_code_long_0008_s;
   extern const f_string_static_t fss_write_format_code_human_0008_s;
+  extern const f_string_static_t fss_write_format_code_machine_0008_s;
 #endif // _di_fss_write_embedded_list_s_
 
 #ifdef __cplusplus
index 9d6ec4fed5942f93289ebd3399ae859cf762f6f4..c01de7e7fefe39eb13b23b4efb2128552c1d3bec 100644 (file)
@@ -45,7 +45,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
     {
       const f_console_arguments_t arguments = macro_f_console_arguments_t_initialize(argc, argv, envp);
 
-      fss_write_setting_load(arguments, &data);
+      fss_write_setting_load(arguments, &data, 0);
     }
 
     fss_write_main(&data);
@@ -64,7 +64,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
         {
           const f_console_arguments_t arguments = macro_f_console_arguments_t_initialize(argc, argv, envp);
 
-          fss_write_setting_load(arguments, &data);
+          fss_write_setting_load(arguments, &data, 0);
         }
 
         if (!fss_write_signal_check(&data)) {
index c220e9b0ec105cc13f0162499714b0621c4a45c5..6b6263b49605a60a5003d88f197e7f2312bba5a4 100644 (file)
@@ -13,6 +13,7 @@ extern "C" {
   const f_string_static_t fss_write_format_code_short_0001_s = macro_f_string_static_t_initialize(FSS_WRITE_format_code_short_0001_s, 0, FSS_WRITE_format_code_short_0001_s_length);
   const f_string_static_t fss_write_format_code_long_0001_s = macro_f_string_static_t_initialize(FSS_WRITE_format_code_long_0001_s, 0, FSS_WRITE_format_code_long_0001_s_length);
   const f_string_static_t fss_write_format_code_human_0001_s = macro_f_string_static_t_initialize(FSS_WRITE_format_code_human_0001_s, 0, FSS_WRITE_format_code_human_0001_s_length);
+  const f_string_static_t fss_write_format_code_machine_0001_s = macro_f_string_static_t_initialize(FSS_WRITE_format_code_machine_0001_s, 0, FSS_WRITE_format_code_machine_0001_s_length);
 #endif // _di_fss_write_extended_s_
 
 #ifdef __cplusplus
index 95c1cf7843b26b77f5ce0c1aa50160ee45141e5e..4fbcce902f4ee7377fb925506e852bcb933c356a 100644 (file)
@@ -25,18 +25,20 @@ extern "C" {
   #define FSS_WRITE_extended_program_name_s      "fss_extended_write"
   #define FSS_WRITE_extended_program_name_long_s "FSS Extended Write"
 
-  #define FSS_WRITE_format_code_short_0001_s "0001"
-  #define FSS_WRITE_format_code_long_0001_s  "fss-0001"
-  #define FSS_WRITE_format_code_human_0001_s "extended"
+  #define FSS_WRITE_format_code_short_0001_s   "0001"
+  #define FSS_WRITE_format_code_long_0001_s    "fss-0001"
+  #define FSS_WRITE_format_code_human_0001_s   "extended"
+  #define FSS_WRITE_format_code_machine_0001_s "extended"
 
   #define FSS_WRITE_extended_standard_s_length 19
 
   #define FSS_WRITE_extended_program_name_s_length      18
   #define FSS_WRITE_extended_program_name_long_s_length 18
 
-  #define FSS_WRITE_format_code_short_0001_s_length 4
-  #define FSS_WRITE_format_code_long_0001_s_length  8
-  #define FSS_WRITE_format_code_human_0001_s_length 8
+  #define FSS_WRITE_format_code_short_0001_s_length   4
+  #define FSS_WRITE_format_code_long_0001_s_length    8
+  #define FSS_WRITE_format_code_human_0001_s_length   8
+  #define FSS_WRITE_format_code_machine_0001_s_length 8
 
   extern const f_string_static_t fss_write_extended_standard_s;
 
@@ -46,6 +48,7 @@ extern "C" {
   extern const f_string_static_t fss_write_format_code_short_0001_s;
   extern const f_string_static_t fss_write_format_code_long_0001_s;
   extern const f_string_static_t fss_write_format_code_human_0001_s;
+  extern const f_string_static_t fss_write_format_code_machine_0001_s;
 #endif // _di_fss_write_extended_s_
 
 #ifdef __cplusplus
index c0ee4723de323f8ab4aec3cbfd2f12c0076de1a7..b6c9813cfc4ec5822a6fffb8702346c7bacbc720 100644 (file)
@@ -44,7 +44,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
     {
       const f_console_arguments_t arguments = macro_f_console_arguments_t_initialize(argc, argv, envp);
 
-      fss_write_setting_load(arguments, &data);
+      fss_write_setting_load(arguments, &data, 0);
     }
 
     fss_write_main(&data);
@@ -63,7 +63,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
         {
           const f_console_arguments_t arguments = macro_f_console_arguments_t_initialize(argc, argv, envp);
 
-          fss_write_setting_load(arguments, &data);
+          fss_write_setting_load(arguments, &data, 0);
         }
 
         if (!fss_write_signal_check(&data)) {
index 2e9fcca833efba6bf78df7f6367e10e3e6272659..a2ca4c4cfb0e4ad0d1c495f915aac76040e52493 100644 (file)
@@ -13,6 +13,7 @@ extern "C" {
   const f_string_static_t fss_write_format_code_short_0003_s = macro_f_string_static_t_initialize(FSS_WRITE_format_code_short_0003_s, 0, FSS_WRITE_format_code_short_0003_s_length);
   const f_string_static_t fss_write_format_code_long_0003_s = macro_f_string_static_t_initialize(FSS_WRITE_format_code_long_0003_s, 0, FSS_WRITE_format_code_long_0003_s_length);
   const f_string_static_t fss_write_format_code_human_0003_s = macro_f_string_static_t_initialize(FSS_WRITE_format_code_human_0003_s, 0, FSS_WRITE_format_code_human_0003_s_length);
+  const f_string_static_t fss_write_format_code_machine_0003_s = macro_f_string_static_t_initialize(FSS_WRITE_format_code_machine_0003_s, 0, FSS_WRITE_format_code_machine_0003_s_length);
 #endif // _di_fss_write_extended_list_s_
 
 #ifdef __cplusplus
index 0e7a1e8442a4e32a61ee27e30d0ea0e061b7c911..e00cd13adad5ec8c3287e1d5ee2dacba53bce31b 100644 (file)
@@ -25,18 +25,20 @@ extern "C" {
   #define FSS_WRITE_extended_list_program_name_s      "fss_extended_list_write"
   #define FSS_WRITE_extended_list_program_name_long_s "FSS Extended List Write"
 
-  #define FSS_WRITE_format_code_short_0003_s "0003"
-  #define FSS_WRITE_format_code_long_0003_s  "fss-0003"
-  #define FSS_WRITE_format_code_human_0003_s "extended list"
+  #define FSS_WRITE_format_code_short_0003_s   "0003"
+  #define FSS_WRITE_format_code_long_0003_s    "fss-0003"
+  #define FSS_WRITE_format_code_human_0003_s   "extended list"
+  #define FSS_WRITE_format_code_machine_0003_s "extended_list"
 
   #define FSS_WRITE_extended_list_standard_s_length 24
 
   #define FSS_WRITE_extended_list_program_name_s_length      23
   #define FSS_WRITE_extended_list_program_name_long_s_length 23
 
-  #define FSS_WRITE_format_code_short_0003_s_length 4
-  #define FSS_WRITE_format_code_long_0003_s_length  8
-  #define FSS_WRITE_format_code_human_0003_s_length 13
+  #define FSS_WRITE_format_code_short_0003_s_length   4
+  #define FSS_WRITE_format_code_long_0003_s_length    8
+  #define FSS_WRITE_format_code_human_0003_s_length   13
+  #define FSS_WRITE_format_code_machine_0003_s_length 13
 
   extern const f_string_static_t fss_write_extended_list_standard_s;
 
@@ -46,6 +48,7 @@ extern "C" {
   extern const f_string_static_t fss_write_format_code_short_0003_s;
   extern const f_string_static_t fss_write_format_code_long_0003_s;
   extern const f_string_static_t fss_write_format_code_human_0003_s;
+  extern const f_string_static_t fss_write_format_code_machine_0003_s;
 #endif // _di_fss_write_extended_list_s_
 
 #ifdef __cplusplus
index dbd9b8b810e7932af09366919655e8722b6bd120..7d64807ffcf22a84f0f2b35f609b764d1c1a8a7d 100644 (file)
@@ -44,7 +44,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
     {
       const f_console_arguments_t arguments = macro_f_console_arguments_t_initialize(argc, argv, envp);
 
-      fss_write_setting_load(arguments, &data);
+      fss_write_setting_load(arguments, &data, 0);
     }
 
     fss_write_main(&data);
@@ -63,7 +63,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
         {
           const f_console_arguments_t arguments = macro_f_console_arguments_t_initialize(argc, argv, envp);
 
-          fss_write_setting_load(arguments, &data);
+          fss_write_setting_load(arguments, &data, 0);
         }
 
         if (!fss_write_signal_check(&data)) {
index 9484a0a8b1f07770e4494b5d353091f6d5db5ecf..7ed91f8d48210ef245853134ab71aa448d9efdaa 100644 (file)
@@ -23,6 +23,7 @@ extern "C" {
     "f_string_rangess_increase",
     "f_string_rangess_increase_by",
     "f_string_read_block_increase",
+    "f_thread_create",
     "fl_fss_basic_content_write",
     "fl_fss_basic_list_content_write",
     "fl_fss_basic_list_object_write",
index b3ce4c07d8754a3604acf5600cb69b2595b3bfe4..1f33f989c61f0ad4b4cac8487d85848214fa29b2 100644 (file)
@@ -56,6 +56,7 @@ extern "C" {
     fss_write_f_f_string_rangess_increase_e,
     fss_write_f_f_string_rangess_increase_by_e,
     fss_write_f_f_string_read_block_increase_e,
+    fss_write_f_f_thread_create_e,
     fss_write_f_fl_fss_basic_content_write_e,
     fss_write_f_fl_fss_basic_list_content_write_e,
     fss_write_f_fl_fss_basic_list_object_write_e,
index 1165c2706feee2d68b6b6d7f2b3b96029d4f252e..ef7a094a1935ed1d4e7635e44128737c2f3c3b84 100644 (file)
@@ -92,7 +92,7 @@ extern "C" {
     { \
       fss_write_main_flag_none_e, \
       F_none, \
-      macro_f_state_t_initialize_1(fss_write_allocation_large_d, fss_write_allocation_small_d, F_none, 0, 0, &fll_program_standard_signal_handle, 0, 0, 0), \
+      macro_f_state_t_initialize_1(fss_write_allocation_large_d, fss_write_allocation_small_d, F_none, 0, 0, &fll_program_standard_signal_handle, 0, 0, 0, 0), \
       f_string_range_t_initialize, \
       f_string_static_t_initialize, \
       f_string_static_t_initialize, \
index 30d3fec00f5840f7c84a4c039bc29e6ebd6c66d1..ba9ce2ba50a387fd5a80091a6d4bf2fc12ae2958 100644 (file)
@@ -42,7 +42,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
     {
       const f_console_arguments_t arguments = macro_f_console_arguments_t_initialize(argc, argv, envp);
 
-      fss_write_setting_load(arguments, &data);
+      fss_write_setting_load(arguments, &data, 0);
     }
 
     fss_write_main(&data);
@@ -61,7 +61,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
         {
           const f_console_arguments_t arguments = macro_f_console_arguments_t_initialize(argc, argv, envp);
 
-          fss_write_setting_load(arguments, &data);
+          fss_write_setting_load(arguments, &data, &fss_write_main_setting_load_as);
         }
 
         if (!fss_write_signal_check(&data)) {
@@ -114,7 +114,8 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
 
         if (f_compare_dynamic(argv[index], fss_write_format_code_short_0000_s) == F_equal_to ||
             f_compare_dynamic(argv[index], fss_write_format_code_long_0000_s) == F_equal_to ||
-            f_compare_dynamic(argv[index], fss_write_format_code_human_0000_s) == F_equal_to) {
+            f_compare_dynamic(argv[index], fss_write_format_code_human_0000_s) == F_equal_to ||
+            f_compare_dynamic(argv[index], fss_write_format_code_machine_0000_s) == F_equal_to) {
 
           main->setting.standard = fss_write_basic_standard_s;
           main->setting.process_content = &fss_write_basic_process_content;
@@ -128,7 +129,8 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
         }
         else if (f_compare_dynamic(argv[index], fss_write_format_code_short_0001_s) == F_equal_to ||
                  f_compare_dynamic(argv[index], fss_write_format_code_long_0001_s) == F_equal_to ||
-                 f_compare_dynamic(argv[index], fss_write_format_code_human_0001_s) == F_equal_to) {
+                 f_compare_dynamic(argv[index], fss_write_format_code_human_0001_s) == F_equal_to ||
+                 f_compare_dynamic(argv[index], fss_write_format_code_machine_0001_s) == F_equal_to) {
 
           main->setting.standard = fss_write_extended_standard_s;
           main->setting.process_content = &fss_write_extended_process_content;
@@ -142,7 +144,8 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
         }
         else if (f_compare_dynamic(argv[index], fss_write_format_code_short_0002_s) == F_equal_to ||
                  f_compare_dynamic(argv[index], fss_write_format_code_long_0002_s) == F_equal_to ||
-                 f_compare_dynamic(argv[index], fss_write_format_code_human_0002_s) == F_equal_to) {
+                 f_compare_dynamic(argv[index], fss_write_format_code_human_0002_s) == F_equal_to ||
+                 f_compare_dynamic(argv[index], fss_write_format_code_machine_0002_s) == F_equal_to) {
 
           main->setting.standard = fss_write_basic_list_standard_s;
           main->setting.process_content = &fss_write_basic_list_process_content;
@@ -156,7 +159,8 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
         }
         else if (f_compare_dynamic(argv[index], fss_write_format_code_short_0003_s) == F_equal_to ||
                  f_compare_dynamic(argv[index], fss_write_format_code_long_0003_s) == F_equal_to ||
-                 f_compare_dynamic(argv[index], fss_write_format_code_human_0003_s) == F_equal_to) {
+                 f_compare_dynamic(argv[index], fss_write_format_code_human_0003_s) == F_equal_to ||
+                 f_compare_dynamic(argv[index], fss_write_format_code_machine_0003_s) == F_equal_to) {
 
           main->setting.standard = fss_write_extended_list_standard_s;
           main->setting.process_content = &fss_write_extended_list_process_content;
@@ -170,7 +174,8 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
         }
         else if (f_compare_dynamic(argv[index], fss_write_format_code_short_0008_s) == F_equal_to ||
                  f_compare_dynamic(argv[index], fss_write_format_code_long_0008_s) == F_equal_to ||
-                 f_compare_dynamic(argv[index], fss_write_format_code_human_0008_s) == F_equal_to) {
+                 f_compare_dynamic(argv[index], fss_write_format_code_human_0008_s) == F_equal_to ||
+                 f_compare_dynamic(argv[index], fss_write_format_code_machine_0008_s) == F_equal_to) {
 
           main->setting.standard = fss_write_embedded_list_standard_s;
           main->setting.process_content = &fss_write_embedded_list_process_content;
@@ -184,7 +189,8 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
         }
         else if (f_compare_dynamic(argv[index], fss_write_format_code_short_000e_s) == F_equal_to ||
                  f_compare_dynamic(argv[index], fss_write_format_code_long_000e_s) == F_equal_to ||
-                 f_compare_dynamic(argv[index], fss_write_format_code_human_000e_s) == F_equal_to) {
+                 f_compare_dynamic(argv[index], fss_write_format_code_human_000e_s) == F_equal_to ||
+                 f_compare_dynamic(argv[index], fss_write_format_code_machine_000e_s) == F_equal_to) {
 
           main->setting.standard = fss_write_payload_standard_s;
           main->setting.process_content = 0; // Not used by payload.
index 065eee8b7bb600beba412e7e8419bb681f52009c..b13eb792e89d16c84f35e41257bfe8807f12f26e 100644 (file)
@@ -60,37 +60,40 @@ extern "C" {
     fl_print_format("    - As %[%r%]         format: ", print->to, print->set->notable, fss_write_basic_standard_s, print->set->notable);
     fl_print_format("'%[%r%]', ", print->to, print->set->notable, fss_write_format_code_short_0000_s, print->set->notable);
     fl_print_format("'%[%r%]', or ", print->to, print->set->notable, fss_write_format_code_long_0000_s, print->set->notable);
-    fl_print_format("'%[%r%]'.%r", print->to, print->set->notable, fss_write_format_code_human_0000_s, print->set->notable, f_string_eol_s);
+    fl_print_format("'%[%r%]'.%r", print->to, print->set->notable, fss_write_format_code_machine_0000_s, print->set->notable, f_string_eol_s);
 
     // FSS-0001 (Extended)
     fl_print_format("    - As %[%r%]      format: ", print->to, print->set->notable, fss_write_extended_standard_s, print->set->notable);
     fl_print_format("'%[%r%]', ", print->to, print->set->notable, fss_write_format_code_short_0001_s, print->set->notable);
     fl_print_format("'%[%r%]', or ", print->to, print->set->notable, fss_write_format_code_long_0001_s, print->set->notable);
-    fl_print_format("'%[%r%]'.%r", print->to, print->set->notable, fss_write_format_code_human_0001_s, print->set->notable, f_string_eol_s);
+    fl_print_format("'%[%r%]'.%r", print->to, print->set->notable, fss_write_format_code_machine_0001_s, print->set->notable, f_string_eol_s);
 
     // FSS-0002 (Basic List)
     fl_print_format("    - As %[%r%]    format: ", print->to, print->set->notable, fss_write_basic_list_standard_s, print->set->notable);
     fl_print_format("'%[%r%]', ", print->to, print->set->notable, fss_write_format_code_short_0002_s, print->set->notable);
-    fl_print_format("'%[%r%]', or ", print->to, print->set->notable, fss_write_format_code_long_0002_s, print->set->notable);
-    fl_print_format("'%[%r%]'.%r", print->to, print->set->notable, fss_write_format_code_human_0002_s, print->set->notable, f_string_eol_s);
+    fl_print_format("'%[%r%]', ", print->to, print->set->notable, fss_write_format_code_long_0002_s, print->set->notable);
+    fl_print_format("'%[%r%]', or ", print->to, print->set->notable, fss_write_format_code_human_0002_s, print->set->notable);
+    fl_print_format("'%[%r%]'.%r", print->to, print->set->notable, fss_write_format_code_machine_0002_s, print->set->notable, f_string_eol_s);
 
     // FSS-0003 (Extended List)
     fl_print_format("    - As %[%r%] format: ", print->to, print->set->notable, fss_write_extended_list_standard_s, print->set->notable);
     fl_print_format("'%[%r%]', ", print->to, print->set->notable, fss_write_format_code_short_0003_s, print->set->notable);
     fl_print_format("'%[%r%]', or ", print->to, print->set->notable, fss_write_format_code_long_0003_s, print->set->notable);
-    fl_print_format("'%[%r%]'.%r", print->to, print->set->notable, fss_write_format_code_human_0003_s, print->set->notable, f_string_eol_s);
+    fl_print_format("'%[%r%]', ", print->to, print->set->notable, fss_write_format_code_human_0003_s, print->set->notable);
+    fl_print_format("'%[%r%]'.%r", print->to, print->set->notable, fss_write_format_code_machine_0003_s, print->set->notable, f_string_eol_s);
 
     // FSS-0008 (Embedded List)
     fl_print_format("    - As %[%r%] format: ", print->to, print->set->notable, fss_write_embedded_list_standard_s, print->set->notable);
     fl_print_format("'%[%r%]', ", print->to, print->set->notable, fss_write_format_code_short_0008_s, print->set->notable);
-    fl_print_format("'%[%r%]', or ", print->to, print->set->notable, fss_write_format_code_long_0008_s, print->set->notable);
-    fl_print_format("'%[%r%]'.%r", print->to, print->set->notable, fss_write_format_code_human_0008_s, print->set->notable, f_string_eol_s);
+    fl_print_format("'%[%r%]', ", print->to, print->set->notable, fss_write_format_code_long_0008_s, print->set->notable);
+    fl_print_format("'%[%r%]', or ", print->to, print->set->notable, fss_write_format_code_human_0008_s, print->set->notable);
+    fl_print_format("'%[%r%]'.%r", print->to, print->set->notable, fss_write_format_code_machine_0008_s, print->set->notable, f_string_eol_s);
 
     // FSS-000E (Payload)
     fl_print_format("    - As %[%r%]       format: ", print->to, print->set->notable, fss_write_payload_standard_s, print->set->notable);
     fl_print_format("'%[%r%]', ", print->to, print->set->notable, fss_write_format_code_short_000e_s, print->set->notable);
     fl_print_format("'%[%r%]', or ", print->to, print->set->notable, fss_write_format_code_long_000e_s, print->set->notable);
-    fl_print_format("'%[%r%]'.%r", print->to, print->set->notable, fss_write_format_code_human_000e_s, print->set->notable, f_string_eol_s);
+    fl_print_format("'%[%r%]'.%r", print->to, print->set->notable, fss_write_format_code_machine_000e_s, print->set->notable, f_string_eol_s);
 
     f_print_dynamic_raw(f_string_eol_s, print->to);
 
index 1d1889d62725b40113327fa23ca22d68749bca77..31404478a6a1c497db434c9c41884b073bfb54a6 100644 (file)
@@ -49,7 +49,7 @@ extern "C" {
 
     if (!print) return;
 
-    fl_print_format("  The pipe uses the Backspace character '%[\\b%]' (%[U+0008%]) to designate the start of a Content.%r", print->to, print->set->notable, print->set->notable, print->set->notable, print->set->notable, f_string_eol_s);
+    fl_print_format("%r  The pipe uses the Backspace character '%[\\b%]' (%[U+0008%]) to designate the start of a Content.%r", print->to, f_string_eol_s, print->set->notable, print->set->notable, print->set->notable, print->set->notable, f_string_eol_s);
     fl_print_format("  The pipe uses the Form Feed character '%[\\f%]' (%[U+000C%]) to designate the end of the last Content.%r", print->to, print->set->notable, print->set->notable, print->set->notable, print->set->notable, f_string_eol_s);
     fl_print_format("  The pipe uses the Vertical Line character '%[\\v%]' (%[U+000B%]) is used to ignore a Content range (use this both before and after the range).%r", print->to, print->set->notable, print->set->notable, print->set->notable, print->set->notable, f_string_eol_s);
     fl_print_format("  For the pipe, an Object is terminated by either a Backspace character '%[\\b%]' (%[U+0008%])", print->to, print->set->notable, print->set->notable, print->set->notable, print->set->notable);
index 49328e33017550d54fe2fe7def0fde05586ad80b..9cfe46d64990b9c1e59b68e1c5d445eaee53253e 100644 (file)
@@ -15,6 +15,7 @@ extern "C" {
   const f_string_static_t fss_write_format_code_short_000e_s = macro_f_string_static_t_initialize(FSS_WRITE_format_code_short_000e_s, 0, FSS_WRITE_format_code_short_000e_s_length);
   const f_string_static_t fss_write_format_code_long_000e_s = macro_f_string_static_t_initialize(FSS_WRITE_format_code_long_000e_s, 0, FSS_WRITE_format_code_long_000e_s_length);
   const f_string_static_t fss_write_format_code_human_000e_s = macro_f_string_static_t_initialize(FSS_WRITE_format_code_human_000e_s, 0, FSS_WRITE_format_code_human_000e_s_length);
+  const f_string_static_t fss_write_format_code_machine_000e_s = macro_f_string_static_t_initialize(FSS_WRITE_format_code_machine_000e_s, 0, FSS_WRITE_format_code_machine_000e_s_length);
 #endif // _di_fss_write_payload_s_
 
 #ifdef __cplusplus
index 30f9910bb7d15918dae9ea0b0934231450fac005..a42e3429e2cb0701eb18f779e4ff2d980dd5889d 100644 (file)
@@ -27,9 +27,10 @@ extern "C" {
   #define FSS_WRITE_payload_program_name_s      "fss_payload_write"
   #define FSS_WRITE_payload_program_name_long_s "FSS Payload Write"
 
-  #define FSS_WRITE_format_code_short_000e_s "000e"
-  #define FSS_WRITE_format_code_long_000e_s  "fss-000e"
-  #define FSS_WRITE_format_code_human_000e_s "payload"
+  #define FSS_WRITE_format_code_short_000e_s   "000e"
+  #define FSS_WRITE_format_code_long_000e_s    "fss-000e"
+  #define FSS_WRITE_format_code_human_000e_s   "payload"
+  #define FSS_WRITE_format_code_machine_000e_s "payload"
 
   #define FSS_WRITE_payload_s_length 7
 
@@ -38,9 +39,10 @@ extern "C" {
   #define FSS_WRITE_payload_program_name_s_length      17
   #define FSS_WRITE_payload_program_name_long_s_length 17
 
-  #define FSS_WRITE_format_code_short_000e_s_length 4
-  #define FSS_WRITE_format_code_long_000e_s_length  8
-  #define FSS_WRITE_format_code_human_000e_s_length 7
+  #define FSS_WRITE_format_code_short_000e_s_length   4
+  #define FSS_WRITE_format_code_long_000e_s_length    8
+  #define FSS_WRITE_format_code_human_000e_s_length   7
+  #define FSS_WRITE_format_code_machine_000e_s_length 7
 
   extern const f_string_static_t fss_write_payload_s;
 
@@ -52,6 +54,7 @@ extern "C" {
   extern const f_string_static_t fss_write_format_code_short_000e_s;
   extern const f_string_static_t fss_write_format_code_long_000e_s;
   extern const f_string_static_t fss_write_format_code_human_000e_s;
+  extern const f_string_static_t fss_write_format_code_machine_000e_s;
 #endif // _di_fss_write_payload_s_
 
 #ifdef __cplusplus
index 3c6a37602b232d4a7b925019b9512ea19e8f5da9..6b2b4c8444103bc57b809f9452ddfc8026df97ae 100644 (file)
@@ -548,7 +548,6 @@ extern "C" {
     f_string_static_t * const argv = main->program.parameters.arguments.array;
 
     if ((main->program.parameters.array[fss_write_parameter_object_e].result & f_console_result_value_e) && values->used) {
-
       for (f_array_length_t i = 0; i < values->used; ++i) {
 
         if (f_compare_dynamic(argv[values->array[i]], fss_write_payload_s) == F_equal_to && i + 1 < values->used) {
index b1af9ee5829ce37aaea50983d7d93d20cc10714f..e306c25e32b46db74feef0f590f6842db2ab5f1e 100644 (file)
@@ -43,7 +43,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
     {
       const f_console_arguments_t arguments = macro_f_console_arguments_t_initialize(argc, argv, envp);
 
-      fss_write_setting_load(arguments, &data);
+      fss_write_setting_load(arguments, &data, 0);
     }
 
     fss_write_main(&data);
@@ -62,7 +62,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
         {
           const f_console_arguments_t arguments = macro_f_console_arguments_t_initialize(argc, argv, envp);
 
-          fss_write_setting_load(arguments, &data);
+          fss_write_setting_load(arguments, &data, &fss_write_payload_setting_load);
         }
 
         if (!fss_write_signal_check(&data)) {
index 51a8bce3b5c36d93186c3947d99792a8fa4c947a..39929f3012d6ee4c8f4fc1e0fb10128b41b736c3 100644 (file)
@@ -73,11 +73,11 @@ extern "C" {
     { \
       iki_read_main_flag_none_e, \
       F_none, \
-      macro_f_state_t_initialize_1(iki_read_allocation_large_d, iki_read_allocation_small_d, F_none, 0, 0, 0, 0, 0, 0), \
+      macro_f_state_t_initialize_1(iki_read_allocation_large_d, iki_read_allocation_small_d, F_none, 0, 0, 0, 0, 0, 0, 0), \
       0, \
       0, \
       f_string_dynamic_t_initialize, \
-      f_string_dynamic_t_initialize, \
+      f_string_dynamics_t_initialize, \
       f_string_dynamics_t_initialize, \
       f_string_maps_t_initialize, \
       f_string_triples_t_initialize, \
index 0714d6cfcf5d649d4dffbd01d2a8f8f2334e57f8..0f44566c42c85c8434992b98bf6e1c69b461716d 100644 (file)
@@ -48,18 +48,6 @@ extern "C" {
   #define iki_write_signal_check_short_d    16
 #endif // _di_iki_write_signal_d_
 
-/**
- * Deallocate main program data.
- *
- * @param setting_make
- *   The make setting data.
- *
- *   This does not alter data_make.main.setting.state.status.
- */
-#ifndef _di_iki_write_main_data_delete_
-  extern void iki_write_main_delete(iki_write_main_t * const main);
-#endif // _di_iki_write_main_data_delete_
-
 #ifdef __cplusplus
 } // extern "C"
 #endif
index d199ea3d6a4fd3edfaea63a67010686e4ef6f7c0..326f37fc16472b87ab7874ea7a865c08e1966185 100644 (file)
@@ -60,6 +60,7 @@ extern "C" {
       iki_write_main_flag_none_e, \
       F_none, \
       f_state_t_initialize, \
+      f_string_static_t_initialize, \
       f_string_dynamic_t_initialize, \
       f_string_dynamic_t_initialize, \
       f_string_dynamic_t_initialize, \