From 730cea245f5eac2b6144b6b55fc2e952e4100b54 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Mon, 17 Apr 2023 19:29:59 -0500 Subject: [PATCH] Progress: Address incomplete updates to several programs. 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(). --- level_3/fss_write/c/basic/common.c | 1 + level_3/fss_write/c/basic/common.h | 15 +++++++++------ level_3/fss_write/c/basic/main.c | 4 ++-- level_3/fss_write/c/basic_list/common.c | 1 + level_3/fss_write/c/basic_list/common.h | 15 +++++++++------ level_3/fss_write/c/basic_list/main.c | 4 ++-- level_3/fss_write/c/embedded_list/common.c | 1 + level_3/fss_write/c/embedded_list/common.h | 15 +++++++++------ level_3/fss_write/c/embedded_list/main.c | 4 ++-- level_3/fss_write/c/extended/common.c | 1 + level_3/fss_write/c/extended/common.h | 15 +++++++++------ level_3/fss_write/c/extended/main.c | 4 ++-- level_3/fss_write/c/extended_list/common.c | 1 + level_3/fss_write/c/extended_list/common.h | 15 +++++++++------ level_3/fss_write/c/extended_list/main.c | 4 ++-- level_3/fss_write/c/main/common/print.c | 1 + level_3/fss_write/c/main/common/print.h | 1 + level_3/fss_write/c/main/common/type.h | 2 +- level_3/fss_write/c/main/main.c | 22 ++++++++++++++-------- level_3/fss_write/c/main/main/print.c | 19 +++++++++++-------- level_3/fss_write/c/main/print/message.c | 2 +- level_3/fss_write/c/payload/common.c | 1 + level_3/fss_write/c/payload/common.h | 15 +++++++++------ level_3/fss_write/c/payload/fss_write.c | 1 - level_3/fss_write/c/payload/main.c | 4 ++-- level_3/iki_read/c/main/common/type.h | 4 ++-- level_3/iki_write/c/main/common/define.h | 12 ------------ level_3/iki_write/c/main/common/type.h | 1 + 28 files changed, 104 insertions(+), 81 deletions(-) diff --git a/level_3/fss_write/c/basic/common.c b/level_3/fss_write/c/basic/common.c index 8370c64..5e81c09 100644 --- a/level_3/fss_write/c/basic/common.c +++ b/level_3/fss_write/c/basic/common.c @@ -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 diff --git a/level_3/fss_write/c/basic/common.h b/level_3/fss_write/c/basic/common.h index d3ad084..0fa359e 100644 --- a/level_3/fss_write/c/basic/common.h +++ b/level_3/fss_write/c/basic/common.h @@ -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 diff --git a/level_3/fss_write/c/basic/main.c b/level_3/fss_write/c/basic/main.c index 2b8e780..dd7d32f 100644 --- a/level_3/fss_write/c/basic/main.c +++ b/level_3/fss_write/c/basic/main.c @@ -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)) { diff --git a/level_3/fss_write/c/basic_list/common.c b/level_3/fss_write/c/basic_list/common.c index 78e9483..9f4f80b 100644 --- a/level_3/fss_write/c/basic_list/common.c +++ b/level_3/fss_write/c/basic_list/common.c @@ -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 diff --git a/level_3/fss_write/c/basic_list/common.h b/level_3/fss_write/c/basic_list/common.h index 4d240f3..3afef3f 100644 --- a/level_3/fss_write/c/basic_list/common.h +++ b/level_3/fss_write/c/basic_list/common.h @@ -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 diff --git a/level_3/fss_write/c/basic_list/main.c b/level_3/fss_write/c/basic_list/main.c index e8d53d2..38669d1 100644 --- a/level_3/fss_write/c/basic_list/main.c +++ b/level_3/fss_write/c/basic_list/main.c @@ -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)) { diff --git a/level_3/fss_write/c/embedded_list/common.c b/level_3/fss_write/c/embedded_list/common.c index 68384be..7644fdc 100644 --- a/level_3/fss_write/c/embedded_list/common.c +++ b/level_3/fss_write/c/embedded_list/common.c @@ -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 diff --git a/level_3/fss_write/c/embedded_list/common.h b/level_3/fss_write/c/embedded_list/common.h index 31952cd..cde14a9 100644 --- a/level_3/fss_write/c/embedded_list/common.h +++ b/level_3/fss_write/c/embedded_list/common.h @@ -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 diff --git a/level_3/fss_write/c/embedded_list/main.c b/level_3/fss_write/c/embedded_list/main.c index 9d6ec4f..c01de7e 100644 --- a/level_3/fss_write/c/embedded_list/main.c +++ b/level_3/fss_write/c/embedded_list/main.c @@ -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)) { diff --git a/level_3/fss_write/c/extended/common.c b/level_3/fss_write/c/extended/common.c index c220e9b..6b6263b 100644 --- a/level_3/fss_write/c/extended/common.c +++ b/level_3/fss_write/c/extended/common.c @@ -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 diff --git a/level_3/fss_write/c/extended/common.h b/level_3/fss_write/c/extended/common.h index 95c1cf7..4fbcce9 100644 --- a/level_3/fss_write/c/extended/common.h +++ b/level_3/fss_write/c/extended/common.h @@ -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 diff --git a/level_3/fss_write/c/extended/main.c b/level_3/fss_write/c/extended/main.c index c0ee472..b6c9813 100644 --- a/level_3/fss_write/c/extended/main.c +++ b/level_3/fss_write/c/extended/main.c @@ -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)) { diff --git a/level_3/fss_write/c/extended_list/common.c b/level_3/fss_write/c/extended_list/common.c index 2e9fcca..a2ca4c4 100644 --- a/level_3/fss_write/c/extended_list/common.c +++ b/level_3/fss_write/c/extended_list/common.c @@ -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 diff --git a/level_3/fss_write/c/extended_list/common.h b/level_3/fss_write/c/extended_list/common.h index 0e7a1e8..e00cd13 100644 --- a/level_3/fss_write/c/extended_list/common.h +++ b/level_3/fss_write/c/extended_list/common.h @@ -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 diff --git a/level_3/fss_write/c/extended_list/main.c b/level_3/fss_write/c/extended_list/main.c index dbd9b8b..7d64807 100644 --- a/level_3/fss_write/c/extended_list/main.c +++ b/level_3/fss_write/c/extended_list/main.c @@ -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)) { diff --git a/level_3/fss_write/c/main/common/print.c b/level_3/fss_write/c/main/common/print.c index 9484a0a..7ed91f8 100644 --- a/level_3/fss_write/c/main/common/print.c +++ b/level_3/fss_write/c/main/common/print.c @@ -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", diff --git a/level_3/fss_write/c/main/common/print.h b/level_3/fss_write/c/main/common/print.h index b3ce4c0..1f33f98 100644 --- a/level_3/fss_write/c/main/common/print.h +++ b/level_3/fss_write/c/main/common/print.h @@ -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, diff --git a/level_3/fss_write/c/main/common/type.h b/level_3/fss_write/c/main/common/type.h index 1165c27..ef7a094 100644 --- a/level_3/fss_write/c/main/common/type.h +++ b/level_3/fss_write/c/main/common/type.h @@ -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, \ diff --git a/level_3/fss_write/c/main/main.c b/level_3/fss_write/c/main/main.c index 30d3fec..ba9ce2b 100644 --- a/level_3/fss_write/c/main/main.c +++ b/level_3/fss_write/c/main/main.c @@ -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. diff --git a/level_3/fss_write/c/main/main/print.c b/level_3/fss_write/c/main/main/print.c index 065eee8..b13eb79 100644 --- a/level_3/fss_write/c/main/main/print.c +++ b/level_3/fss_write/c/main/main/print.c @@ -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); diff --git a/level_3/fss_write/c/main/print/message.c b/level_3/fss_write/c/main/print/message.c index 1d1889d..3140447 100644 --- a/level_3/fss_write/c/main/print/message.c +++ b/level_3/fss_write/c/main/print/message.c @@ -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); diff --git a/level_3/fss_write/c/payload/common.c b/level_3/fss_write/c/payload/common.c index 49328e3..9cfe46d 100644 --- a/level_3/fss_write/c/payload/common.c +++ b/level_3/fss_write/c/payload/common.c @@ -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 diff --git a/level_3/fss_write/c/payload/common.h b/level_3/fss_write/c/payload/common.h index 30f9910..a42e342 100644 --- a/level_3/fss_write/c/payload/common.h +++ b/level_3/fss_write/c/payload/common.h @@ -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 diff --git a/level_3/fss_write/c/payload/fss_write.c b/level_3/fss_write/c/payload/fss_write.c index 3c6a376..6b2b4c8 100644 --- a/level_3/fss_write/c/payload/fss_write.c +++ b/level_3/fss_write/c/payload/fss_write.c @@ -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) { diff --git a/level_3/fss_write/c/payload/main.c b/level_3/fss_write/c/payload/main.c index b1af9ee..e306c25 100644 --- a/level_3/fss_write/c/payload/main.c +++ b/level_3/fss_write/c/payload/main.c @@ -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)) { diff --git a/level_3/iki_read/c/main/common/type.h b/level_3/iki_read/c/main/common/type.h index 51a8bce..39929f3 100644 --- a/level_3/iki_read/c/main/common/type.h +++ b/level_3/iki_read/c/main/common/type.h @@ -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, \ diff --git a/level_3/iki_write/c/main/common/define.h b/level_3/iki_write/c/main/common/define.h index 0714d6c..0f44566 100644 --- a/level_3/iki_write/c/main/common/define.h +++ b/level_3/iki_write/c/main/common/define.h @@ -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 diff --git a/level_3/iki_write/c/main/common/type.h b/level_3/iki_write/c/main/common/type.h index d199ea3..326f37f 100644 --- a/level_3/iki_write/c/main/common/type.h +++ b/level_3/iki_write/c/main/common/type.h @@ -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, \ -- 1.8.3.1