From: Kevin Day Date: Mon, 31 May 2021 04:32:35 +0000 (-0500) Subject: Cleanup: Use the number strings for version numbers and be a little more consistent... X-Git-Tag: 0.5.4~15 X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=f5c3a5a51ae7a657a070d6a84e69ed30ba9383ce;p=fll Cleanup: Use the number strings for version numbers and be a little more consistent with terminology. Using the number strings just makes the code slightly more consistent in practice. Sometimes "dash" is being used and other times "minus". I arbitrarily chose "minus". The f_conversion is missing in some dependencies. --- diff --git a/level_0/f_fss/c/fss-common.h b/level_0/f_fss/c/fss-common.h index c2d3cf1..9020565 100644 --- a/level_0/f_fss/c/fss-common.h +++ b/level_0/f_fss/c/fss-common.h @@ -23,7 +23,7 @@ extern "C" { #define f_fss_brace_close_s f_string_ascii_brace_close_s #define f_fss_brace_open_s f_string_ascii_brace_open_s #define f_fss_colon_s f_string_ascii_colon_s - #define f_fss_dash_s f_string_ascii_minus_s + #define f_fss_minus_s f_string_ascii_minus_s #define f_fss_f_s f_string_ascii_f_s #define f_fss_pound_s f_string_ascii_pound_s #define f_fss_quote_double_s f_string_ascii_quote_double_s @@ -58,7 +58,7 @@ extern "C" { #define f_fss_type_header_part2 f_fss_f_s[0] #define f_fss_type_header_part3 f_fss_s_s[0] #define f_fss_type_header_part4 f_fss_s_s[0] - #define f_fss_type_header_part5 f_fss_dash_s[0] + #define f_fss_type_header_part5 f_fss_minus_s[0] #define f_fss_type_header_close f_string_eol_s[0] #endif // _di_f_fss_types_t_ diff --git a/level_3/byte_dump/c/byte_dump.h b/level_3/byte_dump/c/byte_dump.h index 98e8241..c307d7b 100644 --- a/level_3/byte_dump/c/byte_dump.h +++ b/level_3/byte_dump/c/byte_dump.h @@ -48,9 +48,9 @@ extern "C" { #endif #ifndef _di_byte_dump_version_ - #define byte_dump_major_version "0" - #define byte_dump_minor_version "5" - #define byte_dump_micro_version "4" + #define byte_dump_major_version f_string_ascii_0 + #define byte_dump_minor_version f_string_ascii_5 + #define byte_dump_micro_version f_string_ascii_4 #define byte_dump_version byte_dump_major_version f_string_ascii_period byte_dump_minor_version f_string_ascii_period byte_dump_micro_version #endif // _di_byte_dump_version_ diff --git a/level_3/control/c/control.h b/level_3/control/c/control.h index 5273235..d43824d 100644 --- a/level_3/control/c/control.h +++ b/level_3/control/c/control.h @@ -41,9 +41,9 @@ extern "C" { #endif #ifndef _di_control_version_ - #define control_major_version "0" - #define control_minor_version "5" - #define control_micro_version "4" + #define control_major_version f_string_ascii_0 + #define control_minor_version f_string_ascii_5 + #define control_micro_version f_string_ascii_4 #define control_version control_major_version f_string_ascii_period control_minor_version f_string_ascii_period control_micro_version #endif // _di_control_version_ diff --git a/level_3/control/c/private-common.h b/level_3/control/c/private-common.h index e69de29..58879a3 100644 --- a/level_3/control/c/private-common.h +++ b/level_3/control/c/private-common.h @@ -0,0 +1,19 @@ +/** + * FLL - Level 3 + * + * Project: Control + * API Version: 0.5 + * Licenses: lgplv2.1 + */ +#ifndef _PRIVATE_common_h +#define _PRIVATE_common_h + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // _PRIVATE_common_h diff --git a/level_3/control/c/private-control.c b/level_3/control/c/private-control.c index 36996d8..de582a8 100644 --- a/level_3/control/c/private-control.c +++ b/level_3/control/c/private-control.c @@ -1,3 +1,11 @@ #include "control.h" #include "private-common.h" #include "private-control.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/level_3/controller/c/controller.h b/level_3/controller/c/controller.h index 312d613..f5a01af 100644 --- a/level_3/controller/c/controller.h +++ b/level_3/controller/c/controller.h @@ -83,9 +83,9 @@ extern "C" { #endif #ifndef _di_controller_version_ - #define controller_major_version "0" - #define controller_minor_version "5" - #define controller_micro_version "4" + #define controller_major_version f_string_ascii_0 + #define controller_minor_version f_string_ascii_5 + #define controller_micro_version f_string_ascii_4 #define controller_version controller_major_version f_string_ascii_period controller_minor_version f_string_ascii_period controller_micro_version #endif // _di_controller_version_ diff --git a/level_3/fake/c/fake.h b/level_3/fake/c/fake.h index 80792f2..5eb0cc5 100644 --- a/level_3/fake/c/fake.h +++ b/level_3/fake/c/fake.h @@ -91,9 +91,9 @@ extern "C" { #endif #ifndef _di_fake_version_ - #define fake_major_version "0" - #define fake_minor_version "5" - #define fake_micro_version "4" + #define fake_major_version f_string_ascii_0 + #define fake_minor_version f_string_ascii_5 + #define fake_micro_version f_string_ascii_4 #define fake_version fake_major_version f_string_ascii_period fake_minor_version f_string_ascii_period fake_micro_version #endif // _di_fake_version_ diff --git a/level_3/firewall/c/firewall.h b/level_3/firewall/c/firewall.h index b164c5c..8480c2d 100644 --- a/level_3/firewall/c/firewall.h +++ b/level_3/firewall/c/firewall.h @@ -49,9 +49,9 @@ extern "C" { #endif #ifndef _di_firewall_version_ - #define firewall_major_version "0" - #define firewall_minor_version "5" - #define firewall_micro_version "4" + #define firewall_major_version f_string_ascii_0 + #define firewall_minor_version f_string_ascii_5 + #define firewall_micro_version f_string_ascii_4 #define firewall_version firewall_major_version f_string_ascii_period firewall_minor_version f_string_ascii_period firewall_micro_version #endif // _di_firewall_version_ diff --git a/level_3/firewall/data/build/dependencies b/level_3/firewall/data/build/dependencies index 1530a87..7bd6534 100644 --- a/level_3/firewall/data/build/dependencies +++ b/level_3/firewall/data/build/dependencies @@ -10,6 +10,7 @@ f_account f_capability f_color f_console +f_conversion f_directory f_environment f_execute diff --git a/level_3/fss_basic_list_read/c/fss_basic_list_read.h b/level_3/fss_basic_list_read/c/fss_basic_list_read.h index 7880e5f..f9d85a2 100644 --- a/level_3/fss_basic_list_read/c/fss_basic_list_read.h +++ b/level_3/fss_basic_list_read/c/fss_basic_list_read.h @@ -50,9 +50,9 @@ extern "C" { #endif #ifndef _di_fss_basic_list_read_version_ - #define fss_basic_list_read_major_version "0" - #define fss_basic_list_read_minor_version "5" - #define fss_basic_list_read_micro_version "4" + #define fss_basic_list_read_major_version f_string_ascii_0 + #define fss_basic_list_read_minor_version f_string_ascii_5 + #define fss_basic_list_read_micro_version f_string_ascii_4 #define fss_basic_list_read_version fss_basic_list_read_major_version f_string_ascii_period fss_basic_list_read_minor_version f_string_ascii_period fss_basic_list_read_micro_version #endif // _di_fss_basic_list_read_version_ diff --git a/level_3/fss_basic_list_read/data/build/dependencies b/level_3/fss_basic_list_read/data/build/dependencies index a6e9b72..cc1beee 100644 --- a/level_3/fss_basic_list_read/data/build/dependencies +++ b/level_3/fss_basic_list_read/data/build/dependencies @@ -7,6 +7,7 @@ f_string f_utf f_color f_console +f_conversion f_directory f_environment f_file diff --git a/level_3/fss_basic_list_write/c/fss_basic_list_write.h b/level_3/fss_basic_list_write/c/fss_basic_list_write.h index 7a556e4..67ddb52 100644 --- a/level_3/fss_basic_list_write/c/fss_basic_list_write.h +++ b/level_3/fss_basic_list_write/c/fss_basic_list_write.h @@ -43,9 +43,9 @@ extern "C" { #endif #ifndef _di_fss_basic_list_write_version_ - #define fss_basic_list_write_major_version "0" - #define fss_basic_list_write_minor_version "5" - #define fss_basic_list_write_micro_version "4" + #define fss_basic_list_write_major_version f_string_ascii_0 + #define fss_basic_list_write_minor_version f_string_ascii_5 + #define fss_basic_list_write_micro_version f_string_ascii_4 #define fss_basic_list_write_version fss_basic_list_write_major_version f_string_ascii_period fss_basic_list_write_minor_version f_string_ascii_period fss_basic_list_write_micro_version #endif // _di_fss_basic_list_write_version_ diff --git a/level_3/fss_basic_list_write/data/build/dependencies b/level_3/fss_basic_list_write/data/build/dependencies index 2c5a217..00b2c3d 100644 --- a/level_3/fss_basic_list_write/data/build/dependencies +++ b/level_3/fss_basic_list_write/data/build/dependencies @@ -7,6 +7,7 @@ f_string f_utf f_color f_console +f_conversion f_directory f_environment f_file diff --git a/level_3/fss_basic_read/c/fss_basic_read.h b/level_3/fss_basic_read/c/fss_basic_read.h index c809741..6909b82 100644 --- a/level_3/fss_basic_read/c/fss_basic_read.h +++ b/level_3/fss_basic_read/c/fss_basic_read.h @@ -50,9 +50,9 @@ extern "C" { #endif #ifndef _di_fss_basic_read_version_ - #define fss_basic_read_major_version "0" - #define fss_basic_read_minor_version "5" - #define fss_basic_read_micro_version "4" + #define fss_basic_read_major_version f_string_ascii_0 + #define fss_basic_read_minor_version f_string_ascii_5 + #define fss_basic_read_micro_version f_string_ascii_4 #define fss_basic_read_version fss_basic_read_major_version f_string_ascii_period fss_basic_read_minor_version f_string_ascii_period fss_basic_read_micro_version #endif // _di_fss_basic_read_version_ diff --git a/level_3/fss_basic_read/data/build/dependencies b/level_3/fss_basic_read/data/build/dependencies index a6e9b72..cc1beee 100644 --- a/level_3/fss_basic_read/data/build/dependencies +++ b/level_3/fss_basic_read/data/build/dependencies @@ -7,6 +7,7 @@ f_string f_utf f_color f_console +f_conversion f_directory f_environment f_file diff --git a/level_3/fss_basic_write/c/fss_basic_write.h b/level_3/fss_basic_write/c/fss_basic_write.h index ac0ff9a..619a454 100644 --- a/level_3/fss_basic_write/c/fss_basic_write.h +++ b/level_3/fss_basic_write/c/fss_basic_write.h @@ -44,9 +44,9 @@ extern "C" { #endif #ifndef _di_fss_basic_write_version_ - #define fss_basic_write_major_version "0" - #define fss_basic_write_minor_version "5" - #define fss_basic_write_micro_version "4" + #define fss_basic_write_major_version f_string_ascii_0 + #define fss_basic_write_minor_version f_string_ascii_5 + #define fss_basic_write_micro_version f_string_ascii_4 #define fss_basic_write_version fss_basic_write_major_version f_string_ascii_period fss_basic_write_minor_version f_string_ascii_period fss_basic_write_micro_version #endif // _di_fss_basic_write_version_ diff --git a/level_3/fss_basic_write/data/build/dependencies b/level_3/fss_basic_write/data/build/dependencies index 2c5a217..00b2c3d 100644 --- a/level_3/fss_basic_write/data/build/dependencies +++ b/level_3/fss_basic_write/data/build/dependencies @@ -7,6 +7,7 @@ f_string f_utf f_color f_console +f_conversion f_directory f_environment f_file diff --git a/level_3/fss_embedded_list_read/c/fss_embedded_list_read.h b/level_3/fss_embedded_list_read/c/fss_embedded_list_read.h index 1f36b44..73c785b 100644 --- a/level_3/fss_embedded_list_read/c/fss_embedded_list_read.h +++ b/level_3/fss_embedded_list_read/c/fss_embedded_list_read.h @@ -50,9 +50,9 @@ extern "C" { #endif #ifndef _di_fss_embedded_list_read_version_ - #define fss_embedded_list_read_major_version "0" - #define fss_embedded_list_read_minor_version "5" - #define fss_embedded_list_read_micro_version "4" + #define fss_embedded_list_read_major_version f_string_ascii_0 + #define fss_embedded_list_read_minor_version f_string_ascii_5 + #define fss_embedded_list_read_micro_version f_string_ascii_4 #define fss_embedded_list_read_version fss_embedded_list_read_major_version f_string_ascii_period fss_embedded_list_read_minor_version f_string_ascii_period fss_embedded_list_read_micro_version #endif // _di_fss_embedded_list_read_version_ diff --git a/level_3/fss_embedded_list_read/data/build/dependencies b/level_3/fss_embedded_list_read/data/build/dependencies index a6e9b72..cc1beee 100644 --- a/level_3/fss_embedded_list_read/data/build/dependencies +++ b/level_3/fss_embedded_list_read/data/build/dependencies @@ -7,6 +7,7 @@ f_string f_utf f_color f_console +f_conversion f_directory f_environment f_file diff --git a/level_3/fss_embedded_list_write/c/fss_embedded_list_write.h b/level_3/fss_embedded_list_write/c/fss_embedded_list_write.h index 06c4ecf..184633b 100644 --- a/level_3/fss_embedded_list_write/c/fss_embedded_list_write.h +++ b/level_3/fss_embedded_list_write/c/fss_embedded_list_write.h @@ -44,9 +44,9 @@ extern "C" { #endif #ifndef _di_fss_embedded_list_write_version_ - #define fss_embedded_list_write_major_version "0" - #define fss_embedded_list_write_minor_version "5" - #define fss_embedded_list_write_micro_version "4" + #define fss_embedded_list_write_major_version f_string_ascii_0 + #define fss_embedded_list_write_minor_version f_string_ascii_5 + #define fss_embedded_list_write_micro_version f_string_ascii_4 #define fss_embedded_list_write_version fss_embedded_list_write_major_version f_string_ascii_period fss_embedded_list_write_minor_version f_string_ascii_period fss_embedded_list_write_micro_version #endif // _di_fss_embedded_list_write_version_ diff --git a/level_3/fss_embedded_list_write/data/build/dependencies b/level_3/fss_embedded_list_write/data/build/dependencies index 2c5a217..00b2c3d 100644 --- a/level_3/fss_embedded_list_write/data/build/dependencies +++ b/level_3/fss_embedded_list_write/data/build/dependencies @@ -7,6 +7,7 @@ f_string f_utf f_color f_console +f_conversion f_directory f_environment f_file diff --git a/level_3/fss_extended_list_read/c/fss_extended_list_read.h b/level_3/fss_extended_list_read/c/fss_extended_list_read.h index 82161ad..414f4a7 100644 --- a/level_3/fss_extended_list_read/c/fss_extended_list_read.h +++ b/level_3/fss_extended_list_read/c/fss_extended_list_read.h @@ -50,9 +50,9 @@ extern "C" { #endif #ifndef _di_fss_extended_list_read_version_ - #define fss_extended_list_read_major_version "0" - #define fss_extended_list_read_minor_version "5" - #define fss_extended_list_read_micro_version "4" + #define fss_extended_list_read_major_version f_string_ascii_0 + #define fss_extended_list_read_minor_version f_string_ascii_5 + #define fss_extended_list_read_micro_version f_string_ascii_4 #define fss_extended_list_read_version fss_extended_list_read_major_version f_string_ascii_period fss_extended_list_read_minor_version f_string_ascii_period fss_extended_list_read_micro_version #endif // _di_fss_extended_list_read_version_ diff --git a/level_3/fss_extended_list_read/data/build/dependencies b/level_3/fss_extended_list_read/data/build/dependencies index a6e9b72..cc1beee 100644 --- a/level_3/fss_extended_list_read/data/build/dependencies +++ b/level_3/fss_extended_list_read/data/build/dependencies @@ -7,6 +7,7 @@ f_string f_utf f_color f_console +f_conversion f_directory f_environment f_file diff --git a/level_3/fss_extended_list_write/c/fss_extended_list_write.h b/level_3/fss_extended_list_write/c/fss_extended_list_write.h index 3992778..b5737f4 100644 --- a/level_3/fss_extended_list_write/c/fss_extended_list_write.h +++ b/level_3/fss_extended_list_write/c/fss_extended_list_write.h @@ -44,9 +44,9 @@ extern "C" { #endif #ifndef _di_fss_extended_list_write_version_ - #define fss_extended_list_write_major_version "0" - #define fss_extended_list_write_minor_version "5" - #define fss_extended_list_write_micro_version "4" + #define fss_extended_list_write_major_version f_string_ascii_0 + #define fss_extended_list_write_minor_version f_string_ascii_5 + #define fss_extended_list_write_micro_version f_string_ascii_4 #define fss_extended_list_write_version fss_extended_list_write_major_version f_string_ascii_period fss_extended_list_write_minor_version f_string_ascii_period fss_extended_list_write_micro_version #endif // _di_fss_extended_list_write_version_ diff --git a/level_3/fss_extended_list_write/data/build/dependencies b/level_3/fss_extended_list_write/data/build/dependencies index 2c5a217..00b2c3d 100644 --- a/level_3/fss_extended_list_write/data/build/dependencies +++ b/level_3/fss_extended_list_write/data/build/dependencies @@ -7,6 +7,7 @@ f_string f_utf f_color f_console +f_conversion f_directory f_environment f_file diff --git a/level_3/fss_extended_read/c/fss_extended_read.h b/level_3/fss_extended_read/c/fss_extended_read.h index c4d9020..87a21a2 100644 --- a/level_3/fss_extended_read/c/fss_extended_read.h +++ b/level_3/fss_extended_read/c/fss_extended_read.h @@ -50,9 +50,9 @@ extern "C" { #endif #ifndef _di_fss_extended_read_version_ - #define fss_extended_read_major_version "0" - #define fss_extended_read_minor_version "5" - #define fss_extended_read_micro_version "4" + #define fss_extended_read_major_version f_string_ascii_0 + #define fss_extended_read_minor_version f_string_ascii_5 + #define fss_extended_read_micro_version f_string_ascii_4 #define fss_extended_read_version fss_extended_read_major_version f_string_ascii_period fss_extended_read_minor_version f_string_ascii_period fss_extended_read_micro_version #endif // _di_fss_extended_read_version_ diff --git a/level_3/fss_extended_read/data/build/dependencies b/level_3/fss_extended_read/data/build/dependencies index 41ccf44..d11524b 100644 --- a/level_3/fss_extended_read/data/build/dependencies +++ b/level_3/fss_extended_read/data/build/dependencies @@ -7,6 +7,7 @@ f_string f_utf f_color f_console +f_conversion f_directory f_environment f_file diff --git a/level_3/fss_extended_write/c/fss_extended_write.h b/level_3/fss_extended_write/c/fss_extended_write.h index df8dcaf..13b74c0 100644 --- a/level_3/fss_extended_write/c/fss_extended_write.h +++ b/level_3/fss_extended_write/c/fss_extended_write.h @@ -43,9 +43,9 @@ extern "C" { #endif #ifndef _di_fss_extended_write_version_ - #define fss_extended_write_major_version "0" - #define fss_extended_write_minor_version "5" - #define fss_extended_write_micro_version "4" + #define fss_extended_write_major_version f_string_ascii_0 + #define fss_extended_write_minor_version f_string_ascii_5 + #define fss_extended_write_micro_version f_string_ascii_4 #define fss_extended_write_version fss_extended_write_major_version f_string_ascii_period fss_extended_write_minor_version f_string_ascii_period fss_extended_write_micro_version #endif // _di_fss_extended_write_version_ diff --git a/level_3/fss_extended_write/data/build/dependencies b/level_3/fss_extended_write/data/build/dependencies index 9d2be39..79e2ed9 100644 --- a/level_3/fss_extended_write/data/build/dependencies +++ b/level_3/fss_extended_write/data/build/dependencies @@ -7,6 +7,7 @@ f_string f_utf f_color f_console +f_conversion f_directory f_environment f_file diff --git a/level_3/fss_status_code/c/fss_status_code.h b/level_3/fss_status_code/c/fss_status_code.h index 9a187af..5bb1f65 100644 --- a/level_3/fss_status_code/c/fss_status_code.h +++ b/level_3/fss_status_code/c/fss_status_code.h @@ -44,9 +44,9 @@ extern "C" { #endif #ifndef _di_fss_status_code_version_ - #define fss_status_code_major_version "0" - #define fss_status_code_minor_version "5" - #define fss_status_code_micro_version "4" + #define fss_status_code_major_version f_string_ascii_0 + #define fss_status_code_minor_version f_string_ascii_5 + #define fss_status_code_micro_version f_string_ascii_4 #define fss_status_code_version fss_status_code_major_version f_string_ascii_period fss_status_code_minor_version f_string_ascii_period fss_status_code_micro_version #endif // _di_fss_status_code_version_ diff --git a/level_3/iki_read/c/iki_read.h b/level_3/iki_read/c/iki_read.h index 6d2e92c..74c043b 100644 --- a/level_3/iki_read/c/iki_read.h +++ b/level_3/iki_read/c/iki_read.h @@ -53,9 +53,9 @@ extern "C" { #endif #ifndef _di_iki_read_version_ - #define iki_read_major_version "0" - #define iki_read_minor_version "5" - #define iki_read_micro_version "4" + #define iki_read_major_version f_string_ascii_0 + #define iki_read_minor_version f_string_ascii_5 + #define iki_read_micro_version f_string_ascii_4 #define iki_read_version iki_read_major_version f_string_ascii_period iki_read_minor_version f_string_ascii_period iki_read_micro_version #endif // _di_iki_read_version_ diff --git a/level_3/iki_write/c/iki_write.h b/level_3/iki_write/c/iki_write.h index b43cabf..fc9f67e 100644 --- a/level_3/iki_write/c/iki_write.h +++ b/level_3/iki_write/c/iki_write.h @@ -53,9 +53,9 @@ extern "C" { #endif #ifndef _di_iki_write_version_ - #define iki_write_major_version "0" - #define iki_write_minor_version "5" - #define iki_write_micro_version "4" + #define iki_write_major_version f_string_ascii_0 + #define iki_write_minor_version f_string_ascii_5 + #define iki_write_micro_version f_string_ascii_4 #define iki_write_version iki_write_major_version f_string_ascii_period iki_write_minor_version f_string_ascii_period iki_write_micro_version #endif // _di_iki_write_version_ diff --git a/level_3/status_code/c/status_code.h b/level_3/status_code/c/status_code.h index d1d5d68..2c5ac48 100644 --- a/level_3/status_code/c/status_code.h +++ b/level_3/status_code/c/status_code.h @@ -43,9 +43,9 @@ extern "C" { #endif #ifndef _di_status_code_version_ - #define status_code_major_version "0" - #define status_code_minor_version "5" - #define status_code_micro_version "4" + #define status_code_major_version f_string_ascii_0 + #define status_code_minor_version f_string_ascii_5 + #define status_code_micro_version f_string_ascii_4 #define status_code_version status_code_major_version f_string_ascii_period status_code_minor_version f_string_ascii_period status_code_micro_version #endif // _di_status_code_version_