From: Kevin Day Date: Fri, 28 Jan 2022 02:05:50 +0000 (-0600) Subject: Progress: Begin mass converting to f_string_static_t. X-Git-Tag: 0.5.8~81 X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=faa30839dfc1ac6f186840a8548da50b6213af38;p=fll Progress: Begin mass converting to f_string_static_t. While working on the control and controller programs I realized that I should move from f_string_t to f_string_static_t. This is a major change but it must be done before the API freeze for the stable release. A long time ago, early in the design process of FLL, I considered using f_string_static_t (which was only f_string_dynamic_t at that time). I had decided for simplicity and stuck with f_string_t. In practice I have found that I was doing a lot of working creating f_string_static_t only to do more work to move it back to f_string_t. This is an overall simplification of the project at the cost of some resources and some flexibility. I've only just begun but I am already seeing what I believe to be is simpler code. The biggest gotcha will be this will likely introduce bugs due to the sheer size of the changes. The primary bug that will not be easily detected are the formatted print where '%s' needs to now become '%q' and '%S' needs to now become '%Q'. There are also numerous potential optimizations that I am ignoring for now due to the size of this commit. This work is by far not done and I expect all programs to fail. I only tested compiling fake and I got it as far as running the help program. --- diff --git a/level_0/f_color/c/color-common.c b/level_0/f_color/c/color-common.c index 9f65c95..e614d01 100644 --- a/level_0/f_color/c/color-common.c +++ b/level_0/f_color/c/color-common.c @@ -50,7 +50,7 @@ extern "C" { #endif // _di_f_color_strings_s_ #ifndef _di_f_color_set_string_empty_s_ - const f_color_set_t f_color_set_empty_s = macro_f_color_set_t_initialize(&f_string_static_empty_s, &f_string_static_empty_s); + const f_color_set_t f_color_set_empty_s = macro_f_color_set_t_initialize(&f_string_empty_s, &f_string_empty_s); #endif // _di_f_color_set_string_empty_s_ #ifdef __cplusplus diff --git a/level_0/f_color/c/color-common.h b/level_0/f_color/c/color-common.h index 6b71d87..61cd343 100644 --- a/level_0/f_color/c/color-common.h +++ b/level_0/f_color/c/color-common.h @@ -640,13 +640,13 @@ extern "C" { const f_string_static_t *after; } f_color_set_t; - #define f_color_set_t_initialize { 0, 0 } + #define f_color_set_t_initialize { &f_string_empty_s, &f_string_empty_s } #define macro_f_color_set_t_initialize(before, after) { before, after } #define macro_f_color_set_t_clear(set) \ - set.before = 0; \ - set.after = 0; + set.before = &f_string_empty_s; \ + set.after = &f_string_empty_s; #endif // _di_f_color_set_t_ /** diff --git a/level_0/f_console/c/console-common.c b/level_0/f_console/c/console-common.c index 1598541..f24ba32 100644 --- a/level_0/f_console/c/console-common.c +++ b/level_0/f_console/c/console-common.c @@ -5,37 +5,37 @@ extern "C" { #endif #ifndef _di_f_console_standard_s_ - const f_string_t f_console_standard_short_dark_s = F_console_standard_short_dark_s; - const f_string_t f_console_standard_short_debug_s = F_console_standard_short_debug_s; - const f_string_t f_console_standard_short_help_s = F_console_standard_short_help_s; - const f_string_t f_console_standard_short_light_s = F_console_standard_short_light_s; - const f_string_t f_console_standard_short_no_color_s = F_console_standard_short_no_color_s; - const f_string_t f_console_standard_short_normal_s = F_console_standard_short_normal_s; - const f_string_t f_console_standard_short_quiet_s = F_console_standard_short_quiet_s; - const f_string_t f_console_standard_short_status_in_s = F_console_standard_short_status_in_s; - const f_string_t f_console_standard_short_status_out_s = F_console_standard_short_status_out_s; - const f_string_t f_console_standard_short_verbose_s = F_console_standard_short_verbose_s; - const f_string_t f_console_standard_short_version_s = F_console_standard_short_version_s; + const f_string_static_t f_console_standard_short_dark_s = macro_f_string_static_t_initialize2(F_console_standard_short_dark_s, 0, F_console_standard_short_dark_s_length); + const f_string_static_t f_console_standard_short_debug_s = macro_f_string_static_t_initialize2(F_console_standard_short_debug_s, 0, F_console_standard_short_debug_s_length); + const f_string_static_t f_console_standard_short_help_s = macro_f_string_static_t_initialize2(F_console_standard_short_help_s, 0, F_console_standard_short_help_s_length); + const f_string_static_t f_console_standard_short_light_s = macro_f_string_static_t_initialize2(F_console_standard_short_light_s, 0, F_console_standard_short_light_s_length); + const f_string_static_t f_console_standard_short_no_color_s = macro_f_string_static_t_initialize2(F_console_standard_short_no_color_s, 0, F_console_standard_short_no_color_s_length); + const f_string_static_t f_console_standard_short_normal_s = macro_f_string_static_t_initialize2(F_console_standard_short_normal_s, 0, F_console_standard_short_normal_s_length); + const f_string_static_t f_console_standard_short_quiet_s = macro_f_string_static_t_initialize2(F_console_standard_short_quiet_s, 0, F_console_standard_short_quiet_s_length); + const f_string_static_t f_console_standard_short_status_in_s = macro_f_string_static_t_initialize2(F_console_standard_short_status_in_s, 0, F_console_standard_short_status_in_s_length); + const f_string_static_t f_console_standard_short_status_out_s = macro_f_string_static_t_initialize2(F_console_standard_short_status_out_s, 0, F_console_standard_short_status_out_s_length); + const f_string_static_t f_console_standard_short_verbose_s = macro_f_string_static_t_initialize2(F_console_standard_short_verbose_s, 0, F_console_standard_short_verbose_s_length); + const f_string_static_t f_console_standard_short_version_s = macro_f_string_static_t_initialize2(F_console_standard_short_version_s, 0, F_console_standard_short_version_s_length); - const f_string_t f_console_standard_long_dark_s = F_console_standard_long_dark_s; - const f_string_t f_console_standard_long_debug_s = F_console_standard_long_debug_s; - const f_string_t f_console_standard_long_help_s = F_console_standard_long_help_s; - const f_string_t f_console_standard_long_light_s = F_console_standard_long_light_s; - const f_string_t f_console_standard_long_no_color_s = F_console_standard_long_no_color_s; - const f_string_t f_console_standard_long_normal_s = F_console_standard_long_normal_s; - const f_string_t f_console_standard_long_quiet_s = F_console_standard_long_quiet_s; - const f_string_t f_console_standard_long_status_in_s = F_console_standard_long_status_in_s; - const f_string_t f_console_standard_long_status_out_s = F_console_standard_long_status_out_s; - const f_string_t f_console_standard_long_verbose_s = F_console_standard_long_verbose_s; - const f_string_t f_console_standard_long_version_s = F_console_standard_long_version_s; + const f_string_static_t f_console_standard_long_dark_s = macro_f_string_static_t_initialize2(F_console_standard_long_dark_s, 0, F_console_standard_long_dark_s_length); + const f_string_static_t f_console_standard_long_debug_s = macro_f_string_static_t_initialize2(F_console_standard_long_debug_s, 0, F_console_standard_long_debug_s_length); + const f_string_static_t f_console_standard_long_help_s = macro_f_string_static_t_initialize2(F_console_standard_long_help_s, 0, F_console_standard_long_help_s_length); + const f_string_static_t f_console_standard_long_light_s = macro_f_string_static_t_initialize2(F_console_standard_long_light_s, 0, F_console_standard_long_light_s_length); + const f_string_static_t f_console_standard_long_no_color_s = macro_f_string_static_t_initialize2(F_console_standard_long_no_color_s, 0, F_console_standard_long_no_color_s_length); + const f_string_static_t f_console_standard_long_normal_s = macro_f_string_static_t_initialize2(F_console_standard_long_normal_s, 0, F_console_standard_long_normal_s_length); + const f_string_static_t f_console_standard_long_quiet_s = macro_f_string_static_t_initialize2(F_console_standard_long_quiet_s, 0, F_console_standard_long_quiet_s_length); + const f_string_static_t f_console_standard_long_status_in_s = macro_f_string_static_t_initialize2(F_console_standard_long_status_in_s, 0, F_console_standard_long_status_in_s_length); + const f_string_static_t f_console_standard_long_status_out_s = macro_f_string_static_t_initialize2(F_console_standard_long_status_out_s, 0, F_console_standard_long_status_out_s_length); + const f_string_static_t f_console_standard_long_verbose_s = macro_f_string_static_t_initialize2(F_console_standard_long_verbose_s, 0, F_console_standard_long_verbose_s_length); + const f_string_static_t f_console_standard_long_version_s = macro_f_string_static_t_initialize2(F_console_standard_long_version_s, 0, F_console_standard_long_version_s_length); #endif // _di_f_console_standard_s_ #ifndef _di_f_console_symbol_s_ - const f_string_t f_console_symbol_short_enable_s = F_console_symbol_short_enable_s; - const f_string_t f_console_symbol_short_disable_s = F_console_symbol_short_disable_s; + const f_string_static_t f_console_symbol_short_enable_s = macro_f_string_static_t_initialize2(F_console_symbol_short_enable_s, 0, F_console_symbol_short_enable_s_length); + const f_string_static_t f_console_symbol_short_disable_s = macro_f_string_static_t_initialize2(F_console_symbol_short_disable_s, 0, F_console_symbol_short_disable_s_length); - const f_string_t f_console_symbol_long_enable_s = F_console_symbol_long_s_enable; - const f_string_t f_console_symbol_long_disable_s = F_console_symbol_long_s_disable; + const f_string_static_t f_console_symbol_long_enable_s = macro_f_string_static_t_initialize2(F_console_symbol_long_enable_s, 0, F_console_symbol_long_enable_s_length); + const f_string_static_t f_console_symbol_long_disable_s = macro_f_string_static_t_initialize2(F_console_symbol_long_disable_s, 0, F_console_symbol_long_disable_s_length); #endif // _di_f_console_symbol_s_ #ifdef __cplusplus diff --git a/level_0/f_console/c/console-common.h b/level_0/f_console/c/console-common.h index 949bad4..5dfad18 100644 --- a/level_0/f_console/c/console-common.h +++ b/level_0/f_console/c/console-common.h @@ -59,17 +59,17 @@ extern "C" { #define F_console_symbol_short_enable_s_length 1 #define F_console_symbol_short_disable_s_length 1 - #define F_console_symbol_long_s_enable "--" - #define F_console_symbol_long_s_disable "++" + #define F_console_symbol_long_enable_s "--" + #define F_console_symbol_long_disable_s "++" #define F_console_symbol_long_enable_s_length 2 #define F_console_symbol_long_disable_s_length 2 - extern const f_string_t f_console_symbol_short_enable_s; - extern const f_string_t f_console_symbol_short_disable_s; + extern const f_string_static_t f_console_symbol_short_enable_s; + extern const f_string_static_t f_console_symbol_short_disable_s; - extern const f_string_t f_console_symbol_long_enable_s; - extern const f_string_t f_console_symbol_long_disable_s; + extern const f_string_static_t f_console_symbol_long_enable_s; + extern const f_string_static_t f_console_symbol_long_disable_s; #endif // _di_f_console_symbol_s_ /** @@ -155,29 +155,29 @@ extern "C" { #define F_console_standard_long_verbose_s_length 7 #define F_console_standard_long_version_s_length 7 - extern const f_string_t f_console_standard_short_dark_s; - extern const f_string_t f_console_standard_short_debug_s; - extern const f_string_t f_console_standard_short_help_s; - extern const f_string_t f_console_standard_short_light_s; - extern const f_string_t f_console_standard_short_no_color_s; - extern const f_string_t f_console_standard_short_normal_s; - extern const f_string_t f_console_standard_short_quiet_s; - extern const f_string_t f_console_standard_short_status_in_s; - extern const f_string_t f_console_standard_short_status_out_s; - extern const f_string_t f_console_standard_short_verbose_s; - extern const f_string_t f_console_standard_short_version_s; - - extern const f_string_t f_console_standard_long_dark_s; - extern const f_string_t f_console_standard_long_debug_s; - extern const f_string_t f_console_standard_long_help_s; - extern const f_string_t f_console_standard_long_light_s; - extern const f_string_t f_console_standard_long_no_color_s; - extern const f_string_t f_console_standard_long_normal_s; - extern const f_string_t f_console_standard_long_quiet_s; - extern const f_string_t f_console_standard_long_status_in_s; - extern const f_string_t f_console_standard_long_status_out_s; - extern const f_string_t f_console_standard_long_verbose_s; - extern const f_string_t f_console_standard_long_version_s; + extern const f_string_static_t f_console_standard_short_dark_s; + extern const f_string_static_t f_console_standard_short_debug_s; + extern const f_string_static_t f_console_standard_short_help_s; + extern const f_string_static_t f_console_standard_short_light_s; + extern const f_string_static_t f_console_standard_short_no_color_s; + extern const f_string_static_t f_console_standard_short_normal_s; + extern const f_string_static_t f_console_standard_short_quiet_s; + extern const f_string_static_t f_console_standard_short_status_in_s; + extern const f_string_static_t f_console_standard_short_status_out_s; + extern const f_string_static_t f_console_standard_short_verbose_s; + extern const f_string_static_t f_console_standard_short_version_s; + + extern const f_string_static_t f_console_standard_long_dark_s; + extern const f_string_static_t f_console_standard_long_debug_s; + extern const f_string_static_t f_console_standard_long_help_s; + extern const f_string_static_t f_console_standard_long_light_s; + extern const f_string_static_t f_console_standard_long_no_color_s; + extern const f_string_static_t f_console_standard_long_normal_s; + extern const f_string_static_t f_console_standard_long_quiet_s; + extern const f_string_static_t f_console_standard_long_status_in_s; + extern const f_string_static_t f_console_standard_long_status_out_s; + extern const f_string_static_t f_console_standard_long_verbose_s; + extern const f_string_static_t f_console_standard_long_version_s; #endif // _di_f_console_standard_s_ /** diff --git a/level_0/f_console/c/console.c b/level_0/f_console/c/console.c index f4b82b9..f5af02f 100644 --- a/level_0/f_console/c/console.c +++ b/level_0/f_console/c/console.c @@ -24,9 +24,9 @@ extern "C" { return F_data_not; } - if (input[0] == f_console_symbol_short_enable_s[0]) { + if (input[0] == f_console_symbol_short_enable_s.string[0]) { if (length > 1) { - if (input[1] == f_console_symbol_short_enable_s[0]) { + if (input[1] == f_console_symbol_short_enable_s.string[0]) { if (length > 2) { *result = f_console_long_enable_e; } @@ -36,9 +36,9 @@ extern "C" { } else *result = f_console_empty_short_enable_e; } - else if (input[0] == f_console_symbol_short_disable_s[0]) { + else if (input[0] == f_console_symbol_short_disable_s.string[0]) { if (length > 1) { - if (input[1] == f_console_symbol_short_disable_s[0]) { + if (input[1] == f_console_symbol_short_disable_s.string[0]) { if (length > 2) { *result = f_console_long_disable_e; } diff --git a/level_0/f_control_group/c/control_group-common.c b/level_0/f_control_group/c/control_group-common.c index 9ecf02e..99a0134 100644 --- a/level_0/f_control_group/c/control_group-common.c +++ b/level_0/f_control_group/c/control_group-common.c @@ -5,9 +5,9 @@ extern "C" { #endif #ifndef _di_f_control_group_defines_ - const f_string_t f_control_group_path_system_default_s = F_control_group_path_system_default_s; - const f_string_t f_control_group_path_system_prefix_s = F_control_group_path_system_prefix_s; - const f_string_t f_control_group_path_system_suffix_s = F_control_group_path_system_suffix_s; + const f_string_static_t f_control_group_path_system_default_s = macro_f_string_static_t_initialize2(F_control_group_path_system_default_s, 0, F_control_group_path_system_default_s_length); + const f_string_static_t f_control_group_path_system_prefix_s = macro_f_string_static_t_initialize2(F_control_group_path_system_prefix_s, 0, F_control_group_path_system_prefix_s_length); + const f_string_static_t f_control_group_path_system_suffix_s = macro_f_string_static_t_initialize2(F_control_group_path_system_suffix_s, 0, F_control_group_path_system_suffix_s_length); #endif // _di_f_control_group_defines_ #ifdef __cplusplus diff --git a/level_0/f_control_group/c/control_group-common.h b/level_0/f_control_group/c/control_group-common.h index ca27324..6b71e50 100644 --- a/level_0/f_control_group/c/control_group-common.h +++ b/level_0/f_control_group/c/control_group-common.h @@ -30,9 +30,9 @@ extern "C" { #define F_control_group_pid_length_max_d 64 - extern const f_string_t f_control_group_path_system_default_s; - extern const f_string_t f_control_group_path_system_prefix_s; - extern const f_string_t f_control_group_path_system_suffix_s; + extern const f_string_static_t f_control_group_path_system_default_s; + extern const f_string_static_t f_control_group_path_system_prefix_s; + extern const f_string_static_t f_control_group_path_system_suffix_s; #endif // _di_f_control_group_defines_ /** diff --git a/level_0/f_conversion/c/private-conversion.c b/level_0/f_conversion/c/private-conversion.c index 3f65cb9..7f8e8b4 100644 --- a/level_0/f_conversion/c/private-conversion.c +++ b/level_0/f_conversion/c/private-conversion.c @@ -10,47 +10,34 @@ extern "C" { int digits = 0; - if (number) { - for (register f_number_unsigned_t remaining = number; remaining; ++digits) { - remaining /= data.base; - } // for - } - else { - digits = 1; - } - - if (data.flag & F_conversion_data_flag_base_prepend_d) { - const int used = digits + 2 + (data.flag & F_conversion_data_flag_sign_always_d & F_conversion_data_flag_sign_pad_d ? 1 : 0); - - if (data.width > used) { - if (data.flag & F_conversion_data_flag_zeros_leading_d) { - if (F_status_is_error(private_f_conversion_digit_to_file_prefix(data, negative, output))) { - return F_status_set_error(F_output); - } + for (register f_number_unsigned_t remaining = number; remaining; ++digits) { + remaining /= data.base; + } // for - if (F_status_is_error(private_f_conversion_digit_to_file_pad(data, f_string_ascii_0_s[0], data.width - used, output))) { - return F_status_set_error(F_output); - } + // A zero value should always show at least 1 zero when width is not 0. + if (data.width && !number) { + ++digits; + } - if (F_status_is_error(private_f_conversion_digit_to_file_number(data, number, digits, output))) { - return F_status_set_error(F_output); - } + if (data.width > digits) { + if (data.flag & F_conversion_data_flag_zeros_leading_d) { + if (F_status_is_error(private_f_conversion_digit_to_file_prefix(data, negative, output))) { + return F_status_set_error(F_output); } - else { - if (F_status_is_error(private_f_conversion_digit_to_file_pad(data, f_string_ascii_space_s[0], data.width - used, output))) { - return F_status_set_error(F_output); - } - if (F_status_is_error(private_f_conversion_digit_to_file_prefix(data, negative, output))) { - return F_status_set_error(F_output); - } + if (F_status_is_error(private_f_conversion_digit_to_file_pad(data, f_string_ascii_0_s, data.width - digits, output))) { + return F_status_set_error(F_output); + } - if (F_status_is_error(private_f_conversion_digit_to_file_number(data, number, digits, output))) { - return F_status_set_error(F_output); - } + if (F_status_is_error(private_f_conversion_digit_to_file_number(data, number, digits, output))) { + return F_status_set_error(F_output); } } else if (number) { + if (F_status_is_error(private_f_conversion_digit_to_file_pad(data, f_string_ascii_space_s, data.width - digits, output))) { + return F_status_set_error(F_output); + } + if (F_status_is_error(private_f_conversion_digit_to_file_prefix(data, negative, output))) { return F_status_set_error(F_output); } @@ -59,56 +46,36 @@ extern "C" { return F_status_set_error(F_output); } } - else if (data.width) { + else { + if (F_status_is_error(private_f_conversion_digit_to_file_pad(data, f_string_ascii_space_s, data.width - digits, output))) { + return F_status_set_error(F_output); + } + if (F_status_is_error(private_f_conversion_digit_to_file_prefix(data, negative, output))) { return F_status_set_error(F_output); } - if (!fwrite_unlocked(f_string_ascii_0_s, 1, 1, output)) { + if (F_status_is_error(private_f_conversion_digit_to_file_number(data, number, digits, output))) { return F_status_set_error(F_output); } } } - else { - const int used = digits + (data.flag & (F_conversion_data_flag_sign_always_d | F_conversion_data_flag_sign_pad_d) ? 1 : 0); - - if (data.width > used) { - if (data.flag & F_conversion_data_flag_zeros_leading_d) { - if (F_status_is_error(private_f_conversion_digit_to_file_prefix(data, negative, output))) { - return F_status_set_error(F_output); - } - - if (F_status_is_error(private_f_conversion_digit_to_file_pad(data, f_string_ascii_0_s[0], data.width - used, output))) { - return F_status_set_error(F_output); - } - - if (F_status_is_error(private_f_conversion_digit_to_file_number(data, number, digits, output))) { - return F_status_set_error(F_output); - } - } - else { - if (F_status_is_error(private_f_conversion_digit_to_file_pad(data, f_string_ascii_space_s[0], data.width - used, output))) { - return F_status_set_error(F_output); - } - - if (F_status_is_error(private_f_conversion_digit_to_file_prefix(data, negative, output))) { - return F_status_set_error(F_output); - } + else if (number) { + if (F_status_is_error(private_f_conversion_digit_to_file_prefix(data, negative, output))) { + return F_status_set_error(F_output); + } - if (F_status_is_error(private_f_conversion_digit_to_file_number(data, number, digits, output))) { - return F_status_set_error(F_output); - } - } + if (F_status_is_error(private_f_conversion_digit_to_file_number(data, number, digits, output))) { + return F_status_set_error(F_output); } - else if (number) { - if (F_status_is_error(private_f_conversion_digit_to_file_number(data, number, digits, output))) { - return F_status_set_error(F_output); - } + } + else if (data.width) { + if (F_status_is_error(private_f_conversion_digit_to_file_prefix(data, negative, output))) { + return F_status_set_error(F_output); } - else if (data.width) { - if (!fwrite_unlocked(f_string_ascii_0_s, 1, 1, output)) { - return F_status_set_error(F_output); - } + + if (fwrite_unlocked(f_string_ascii_0_s.string, 1, f_string_ascii_0_s.used, output) < f_string_ascii_0_s.used) { + return F_status_set_error(F_output); } } @@ -130,8 +97,15 @@ extern "C" { while (digits--) { - if (!fwrite_unlocked((work & number) ? f_string_ascii_1_s : f_string_ascii_0_s, 1, 1, output)) { - return F_status_set_error(F_output); + if (work & number) { + if (fwrite_unlocked(f_string_ascii_1_s.string, 1, f_string_ascii_1_s.used, output) < f_string_ascii_1_s.used) { + return F_status_set_error(F_output); + } + } + else { + if (fwrite_unlocked(f_string_ascii_0_s.string, 1, f_string_ascii_0_s.used, output) < f_string_ascii_0_s.used) { + return F_status_set_error(F_output); + } } #ifdef _is_F_endian_big @@ -175,11 +149,11 @@ extern "C" { #endif // !defined(_di_f_conversion_number_signed_print_) || !defined(_di_f_conversion_number_unsigned_print_) #if !defined(_di_f_conversion_number_signed_print_) || !defined(_di_f_conversion_number_unsigned_print_) - f_status_t private_f_conversion_digit_to_file_pad(const f_conversion_data_t data, const char pad, int total, FILE *output) { + f_status_t private_f_conversion_digit_to_file_pad(const f_conversion_data_t data, const f_string_static_t pad, int total, FILE *output) { for (; total; --total) { - if (!fwrite_unlocked(&pad, 1, 1, output)) { + if (fwrite_unlocked(pad.string, 1, pad.used, output) < pad.used) { return F_status_set_error(F_output); } } // for @@ -193,24 +167,24 @@ extern "C" { if (negative) { if (negative == 1) { - if (!fwrite_unlocked(f_string_ascii_minus_s, 1, 1, output)) { + if (fwrite_unlocked(f_string_ascii_minus_s.string, 1, f_string_ascii_minus_s.used, output) < f_string_ascii_minus_s.used) { return F_status_set_error(F_output); } } } else if (data.flag & F_conversion_data_flag_sign_always_d) { - if (!fwrite_unlocked(f_string_ascii_plus_s, 1, 1, output)) { + if (fwrite_unlocked(f_string_ascii_plus_s.string, 1, f_string_ascii_plus_s.used, output) < f_string_ascii_plus_s.used) { return F_status_set_error(F_output); } } else if (data.flag & F_conversion_data_flag_sign_pad_d) { - if (!fwrite_unlocked(f_string_ascii_space_s, 1, 1, output)) { + if (fwrite_unlocked(f_string_ascii_space_s.string, 1, f_string_ascii_space_s.used, output) < f_string_ascii_space_s.used) { return F_status_set_error(F_output); } } if (data.flag & F_conversion_data_flag_base_prepend_d) { - if (!fwrite_unlocked(f_string_ascii_0_s, 1, 1, output)) { + if (fwrite_unlocked(f_string_ascii_0_s.string, 1, f_string_ascii_0_s.used, output) < f_string_ascii_0_s.used) { return F_status_set_error(F_output); } @@ -218,23 +192,23 @@ extern "C" { switch (data.base) { case 2: - c = data.flag & F_conversion_data_flag_base_upper_d ? f_string_ascii_B_s[0] : f_string_ascii_b_s[0]; + c = data.flag & F_conversion_data_flag_base_upper_d ? f_string_ascii_B_s.string[0] : f_string_ascii_b_s.string[0]; break; case 8: - c = data.flag & F_conversion_data_flag_base_upper_d ? f_string_ascii_O_s[0] : f_string_ascii_o_s[0]; + c = data.flag & F_conversion_data_flag_base_upper_d ? f_string_ascii_O_s.string[0] : f_string_ascii_o_s.string[0]; break; case 10: - c = data.flag & F_conversion_data_flag_base_upper_d ? f_string_ascii_T_s[0] : f_string_ascii_t_s[0]; + c = data.flag & F_conversion_data_flag_base_upper_d ? f_string_ascii_T_s.string[0] : f_string_ascii_t_s.string[0]; break; case 12: - c = data.flag & F_conversion_data_flag_base_upper_d ? f_string_ascii_D_s[0] : f_string_ascii_d_s[0]; + c = data.flag & F_conversion_data_flag_base_upper_d ? f_string_ascii_D_s.string[0] : f_string_ascii_d_s.string[0]; break; case 16: - c = data.flag & F_conversion_data_flag_base_upper_d ? f_string_ascii_X_s[0] : f_string_ascii_x_s[0]; + c = data.flag & F_conversion_data_flag_base_upper_d ? f_string_ascii_X_s.string[0] : f_string_ascii_x_s.string[0]; break; default: @@ -284,16 +258,16 @@ extern "C" { if (data.width > digits) { if (data.flag & F_conversion_data_flag_zeros_leading_d) { private_f_conversion_digit_to_string_prefix(data, negative, destination); - private_f_conversion_digit_to_string_pad(data, f_string_ascii_0_s[0], data.width - digits, destination); + private_f_conversion_digit_to_string_pad(data, f_string_ascii_0_s.string[0], data.width - digits, destination); private_f_conversion_digit_to_string_number(data, number, digits, destination); } else if (number) { - private_f_conversion_digit_to_string_pad(data, f_string_ascii_space_s[0], data.width - digits, destination); + private_f_conversion_digit_to_string_pad(data, f_string_ascii_space_s.string[0], data.width - digits, destination); private_f_conversion_digit_to_string_prefix(data, negative, destination); private_f_conversion_digit_to_string_number(data, number, digits, destination); } else { - private_f_conversion_digit_to_string_pad(data, f_string_ascii_space_s[0], data.width - digits, destination); + private_f_conversion_digit_to_string_pad(data, f_string_ascii_space_s.string[0], data.width - digits, destination); private_f_conversion_digit_to_string_prefix(data, negative, destination); private_f_conversion_digit_to_string_number(data, number, digits, destination); } @@ -305,7 +279,7 @@ extern "C" { else if (data.width) { private_f_conversion_digit_to_string_prefix(data, negative, destination); - destination->string[destination->used++] = f_string_ascii_0_s[0]; + destination->string[destination->used++] = f_string_ascii_0_s.string[0]; } return F_none; @@ -326,7 +300,12 @@ extern "C" { while (digits--) { - destination->string[destination->used++] = (work & number) ? f_string_ascii_1_s[0] : f_string_ascii_0_s[1]; + if (work & number) { + destination->string[destination->used++] = f_string_ascii_1_s.string[0]; + } + else { + destination->string[destination->used++] = f_string_ascii_0_s.string[1]; + } #ifdef _is_F_endian_big work <<= 1; // @todo review this and see if there is more that needs to be done. @@ -378,43 +357,43 @@ extern "C" { if (negative) { if (negative == 1) { - destination->string[destination->used++] = f_string_ascii_minus_s[0]; + destination->string[destination->used++] = f_string_ascii_minus_s.string[0]; } else if (data.flag & (F_conversion_data_flag_sign_always_d | F_conversion_data_flag_sign_pad_d)) { - destination->string[destination->used++] = f_string_ascii_space_s[0]; + destination->string[destination->used++] = f_string_ascii_space_s.string[0]; } } else if (data.flag & F_conversion_data_flag_sign_always_d) { - destination->string[destination->used++] = f_string_ascii_plus_s[0]; + destination->string[destination->used++] = f_string_ascii_plus_s.string[0]; } else if (data.flag & F_conversion_data_flag_sign_pad_d) { - destination->string[destination->used++] = f_string_ascii_space_s[0]; + destination->string[destination->used++] = f_string_ascii_space_s.string[0]; } if (data.flag & F_conversion_data_flag_base_prepend_d) { - destination->string[destination->used++] = f_string_ascii_0_s[0]; + destination->string[destination->used++] = f_string_ascii_0_s.string[0]; char c = 0; switch (data.base) { case 2: - c = data.flag & F_conversion_data_flag_base_upper_d ? f_string_ascii_B_s[0] : f_string_ascii_b_s[0]; + c = data.flag & F_conversion_data_flag_base_upper_d ? f_string_ascii_B_s.string[0] : f_string_ascii_b_s.string[0]; break; case 8: - c = data.flag & F_conversion_data_flag_base_upper_d ? f_string_ascii_O_s[0] : f_string_ascii_o_s[0]; + c = data.flag & F_conversion_data_flag_base_upper_d ? f_string_ascii_O_s.string[0] : f_string_ascii_o_s.string[0]; break; case 10: - c = data.flag & F_conversion_data_flag_base_upper_d ? f_string_ascii_T_s[0] : f_string_ascii_t_s[0]; + c = data.flag & F_conversion_data_flag_base_upper_d ? f_string_ascii_T_s.string[0] : f_string_ascii_t_s.string[0]; break; case 12: - c = data.flag & F_conversion_data_flag_base_upper_d ? f_string_ascii_D_s[0] : f_string_ascii_d_s[0]; + c = data.flag & F_conversion_data_flag_base_upper_d ? f_string_ascii_D_s.string[0] : f_string_ascii_d_s.string[0]; break; case 16: - c = data.flag & F_conversion_data_flag_base_upper_d ? f_string_ascii_X_s[0] : f_string_ascii_x_s[0]; + c = data.flag & F_conversion_data_flag_base_upper_d ? f_string_ascii_X_s.string[0] : f_string_ascii_x_s.string[0]; break; default: diff --git a/level_0/f_conversion/c/private-conversion.h b/level_0/f_conversion/c/private-conversion.h index 1d060ae..070c469 100644 --- a/level_0/f_conversion/c/private-conversion.h +++ b/level_0/f_conversion/c/private-conversion.h @@ -88,7 +88,7 @@ extern "C" { * The settings designating how to perform the conversion. * @param pad * The character to print as the padding character. - * Should be either f_string_ascii_space_s[0] or f_string_ascii_0_s[0]. + * Should be either f_string_ascii_space_s or f_string_ascii_0_s. * @param total * The total number of times to print the pad. * @param output @@ -107,7 +107,7 @@ extern "C" { * @see f_conversion_number_unsigned_print() */ #if !defined(_di_f_conversion_number_signed_print_) || !defined(_di_f_conversion_number_unsigned_print_) - extern f_status_t private_f_conversion_digit_to_file_pad(const f_conversion_data_t data, const char pad, int total, FILE *output) F_attribute_visibility_internal_d; + extern f_status_t private_f_conversion_digit_to_file_pad(const f_conversion_data_t data, const f_string_static_t pad, int total, FILE *output) F_attribute_visibility_internal_d; #endif // !defined(_di_f_conversion_number_signed_print_) || !defined(_di_f_conversion_number_unsigned_print_) /** @@ -202,7 +202,7 @@ extern "C" { * The settings designating how to perform the conversion. * @param pad * The character to print as the padding character. - * Should be either f_string_ascii_space_s[0] or f_string_ascii_0_s[0]. + * Should be either f_string_ascii_space_s or f_string_ascii_0_s. * @param total * The total number of times to print the pad. * @param output diff --git a/level_0/f_file/c/file-common.c b/level_0/f_file/c/file-common.c index e357bd5..e19b3b3 100644 --- a/level_0/f_file/c/file-common.c +++ b/level_0/f_file/c/file-common.c @@ -6,19 +6,19 @@ extern "C" { #endif #ifndef _di_f_file_type_ - const f_string_t f_file_type_name_blocks_s = F_file_type_name_block_s; - const f_string_t f_file_type_name_character_s = F_file_type_name_character_s; - const f_string_t f_file_type_name_directory_s = F_file_type_name_directory_s; - const f_string_t f_file_type_name_link_s = F_file_type_name_link_s; - const f_string_t f_file_type_name_regular_s = F_file_type_name_regular_s; - const f_string_t f_file_type_name_socket_s = F_file_type_name_socket_s; + const f_string_static_t f_file_type_name_blocks_s = macro_f_string_static_t_initialize2(F_file_type_name_block_s, 0, F_file_type_name_block_s_length); + const f_string_static_t f_file_type_name_character_s = macro_f_string_static_t_initialize2(F_file_type_name_character_s, 0, F_file_type_name_character_s_length); + const f_string_static_t f_file_type_name_directory_s = macro_f_string_static_t_initialize2(F_file_type_name_directory_s, 0, F_file_type_name_directory_s_length); + const f_string_static_t f_file_type_name_link_s = macro_f_string_static_t_initialize2(F_file_type_name_link_s, 0, F_file_type_name_link_s_length); + const f_string_static_t f_file_type_name_regular_s = macro_f_string_static_t_initialize2(F_file_type_name_regular_s, 0, F_file_type_name_regular_s_length); + const f_string_static_t f_file_type_name_socket_s = macro_f_string_static_t_initialize2(F_file_type_name_socket_s, 0, F_file_type_name_socket_s_length); - const f_string_t f_file_open_mode_append_s = F_file_open_mode_append_s; - const f_string_t f_file_open_mode_read_s = F_file_open_mode_read_s; - const f_string_t f_file_open_mode_read_append_s = F_file_open_mode_read_append_s; - const f_string_t f_file_open_mode_read_truncate_s = F_file_open_mode_read_truncate_s; - const f_string_t f_file_open_mode_read_write_s = F_file_open_mode_read_write_s; - const f_string_t f_file_open_mode_truncate_s = F_file_open_mode_truncate_s; + const f_string_static_t f_file_open_mode_append_s = macro_f_string_static_t_initialize2(F_file_open_mode_append_s, 0, F_file_open_mode_append_s_length); + const f_string_static_t f_file_open_mode_read_s = macro_f_string_static_t_initialize2(F_file_open_mode_read_s, 0, F_file_open_mode_read_s_length); + const f_string_static_t f_file_open_mode_read_append_s = macro_f_string_static_t_initialize2(F_file_open_mode_read_append_s, 0, F_file_open_mode_read_append_s_length); + const f_string_static_t f_file_open_mode_read_truncate_s = macro_f_string_static_t_initialize2(F_file_open_mode_read_truncate_s, 0, F_file_open_mode_read_truncate_s_length); + const f_string_static_t f_file_open_mode_read_write_s = macro_f_string_static_t_initialize2(F_file_open_mode_read_write_s, 0, F_file_open_mode_read_write_s_length); + const f_string_static_t f_file_open_mode_truncate_s = macro_f_string_static_t_initialize2(F_file_open_mode_truncate_s, 0, F_file_open_mode_truncate_s_length); #endif // _di_f_file_type_ #ifdef __cplusplus diff --git a/level_0/f_file/c/file-common.h b/level_0/f_file/c/file-common.h index e985584..f0b96d9 100644 --- a/level_0/f_file/c/file-common.h +++ b/level_0/f_file/c/file-common.h @@ -104,19 +104,19 @@ extern "C" { #define F_file_open_mode_read_write_s_length 2 #define F_file_open_mode_truncate_s_length 1 - extern const f_string_t f_file_type_name_blocks_s; - extern const f_string_t f_file_type_name_character_s; - extern const f_string_t f_file_type_name_directory_s; - extern const f_string_t f_file_type_name_link_s; - extern const f_string_t f_file_type_name_regular_s; - extern const f_string_t f_file_type_name_socket_s; - - extern const f_string_t f_file_open_mode_append_s; - extern const f_string_t f_file_open_mode_read_s; - extern const f_string_t f_file_open_mode_read_append_s; - extern const f_string_t f_file_open_mode_read_truncate_s; - extern const f_string_t f_file_open_mode_read_write_s; - extern const f_string_t f_file_open_mode_truncate_s; + extern const f_string_static_t f_file_type_name_blocks_s; + extern const f_string_static_t f_file_type_name_character_s; + extern const f_string_static_t f_file_type_name_directory_s; + extern const f_string_static_t f_file_type_name_link_s; + extern const f_string_static_t f_file_type_name_regular_s; + extern const f_string_static_t f_file_type_name_socket_s; + + extern const f_string_static_t f_file_open_mode_append_s; + extern const f_string_static_t f_file_open_mode_read_s; + extern const f_string_static_t f_file_open_mode_read_append_s; + extern const f_string_static_t f_file_open_mode_read_truncate_s; + extern const f_string_static_t f_file_open_mode_read_write_s; + extern const f_string_static_t f_file_open_mode_truncate_s; #endif // _di_f_file_type_ /** diff --git a/level_0/f_file/c/file.c b/level_0/f_file/c/file.c index 534513c..8a32a9d 100644 --- a/level_0/f_file/c/file.c +++ b/level_0/f_file/c/file.c @@ -885,21 +885,21 @@ extern "C" { uint8_t replace_result = 0; f_file_mode_t mode_result = 0; - if (string[0] == f_string_ascii_plus_s[0] || string[0] == f_string_ascii_minus_s[0] || string[0] == f_string_ascii_equal_s[0]) { - if (string[1] == f_string_ascii_r_s[0] || f_string_ascii_w_s[0] || f_string_ascii_x_s[0] || f_string_ascii_X_s[0] || f_string_ascii_s_s[0] ||f_string_ascii_t_s[0]) { + if (string[0] == f_string_ascii_plus_s.string[0] || string[0] == f_string_ascii_minus_s.string[0] || string[0] == f_string_ascii_equal_s.string[0]) { + if (string[1] == f_string_ascii_r_s.string[0] || f_string_ascii_w_s.string[0] || f_string_ascii_x_s.string[0] || f_string_ascii_X_s.string[0] || f_string_ascii_s_s.string[0] ||f_string_ascii_t_s.string[0]) { syntax = 1; } - else if (string[1] == f_string_ascii_0_s[0] || string[1] == f_string_ascii_1_s[0] || string[1] == f_string_ascii_2_s[0] || string[1] == f_string_ascii_3_s[0] || string[1] == f_string_ascii_4_s[0] || string[1] == f_string_ascii_5_s[0] || string[1] == f_string_ascii_6_s[0] || string[1] == f_string_ascii_7_s[0]) { + else if (string[1] == f_string_ascii_0_s.string[0] || string[1] == f_string_ascii_1_s.string[0] || string[1] == f_string_ascii_2_s.string[0] || string[1] == f_string_ascii_3_s.string[0] || string[1] == f_string_ascii_4_s.string[0] || string[1] == f_string_ascii_5_s.string[0] || string[1] == f_string_ascii_6_s.string[0] || string[1] == f_string_ascii_7_s.string[0]) { syntax = 2; } else { return F_status_set_error(F_syntax); } } - else if (string[0] == f_string_ascii_u_s[0] || string[0] == f_string_ascii_g_s[0] || string[0] == f_string_ascii_o_s[0] || string[0] == f_string_ascii_a_s[0]) { + else if (string[0] == f_string_ascii_u_s.string[0] || string[0] == f_string_ascii_g_s.string[0] || string[0] == f_string_ascii_o_s.string[0] || string[0] == f_string_ascii_a_s.string[0]) { syntax = 1; } - else if (string[0] == f_string_ascii_0_s[0] || string[0] == f_string_ascii_1_s[0] || string[0] == f_string_ascii_2_s[0] || string[0] == f_string_ascii_3_s[0] || string[0] == f_string_ascii_4_s[0] || string[0] == f_string_ascii_5_s[0] || string[0] == f_string_ascii_6_s[0] || string[0] == f_string_ascii_7_s[0]) { + else if (string[0] == f_string_ascii_0_s.string[0] || string[0] == f_string_ascii_1_s.string[0] || string[0] == f_string_ascii_2_s.string[0] || string[0] == f_string_ascii_3_s.string[0] || string[0] == f_string_ascii_4_s.string[0] || string[0] == f_string_ascii_5_s.string[0] || string[0] == f_string_ascii_6_s.string[0] || string[0] == f_string_ascii_7_s.string[0]) { syntax = 2; } else { @@ -965,27 +965,27 @@ extern "C" { for (f_array_length_t i = 0; syntax && string[i]; ++i) { - if (string[i] == f_string_ascii_u_s[0]) { + if (string[i] == f_string_ascii_u_s.string[0]) { on |= 1; mode_mask |= F_file_mode_t_block_owner_d; } - else if (string[i] == f_string_ascii_g_s[0]) { + else if (string[i] == f_string_ascii_g_s.string[0]) { on |= 2; mode_mask |= F_file_mode_t_block_group_d; } - else if (string[i] == f_string_ascii_o_s[0]) { + else if (string[i] == f_string_ascii_o_s.string[0]) { on |= 4; mode_mask |= F_file_mode_t_block_world_d; } - else if (string[i] == f_string_ascii_a_s[0]) { + else if (string[i] == f_string_ascii_a_s.string[0]) { on = 7; mode_mask = F_file_mode_t_block_standard_d; } - else if (string[i] == f_string_ascii_plus_s[0] || string[i] == f_string_ascii_minus_s[0] || string[i] == f_string_ascii_equal_s[0]) { - if (string[i] == f_string_ascii_plus_s[0]) { + else if (string[i] == f_string_ascii_plus_s.string[0] || string[i] == f_string_ascii_minus_s.string[0] || string[i] == f_string_ascii_equal_s.string[0]) { + if (string[i] == f_string_ascii_plus_s.string[0]) { how = on ? 1 : 4; } - else if (string[i] == f_string_ascii_minus_s[0]) { + else if (string[i] == f_string_ascii_minus_s.string[0]) { how = on ? 3 : 6; } else { @@ -1019,19 +1019,19 @@ extern "C" { for (++i; string[i]; ++i) { - if (string[i] == f_string_ascii_r_s[0]) { + if (string[i] == f_string_ascii_r_s.string[0]) { what = F_file_mode_t_mask_bit_read_d; } - else if (string[i] == f_string_ascii_w_s[0]) { + else if (string[i] == f_string_ascii_w_s.string[0]) { what = F_file_mode_t_mask_bit_write_d; } - else if (string[i] == f_string_ascii_x_s[0]) { + else if (string[i] == f_string_ascii_x_s.string[0]) { what = F_file_mode_t_mask_bit_execute_d; } - else if (string[i] == f_string_ascii_X_s[0]) { + else if (string[i] == f_string_ascii_X_s.string[0]) { what = F_file_mode_t_mask_bit_execute_only_d; } - else if (string[i] == f_string_ascii_s_s[0]) { + else if (string[i] == f_string_ascii_s_s.string[0]) { mode_mask |= F_file_mode_t_block_special_d; if (on & 1) { @@ -1044,7 +1044,7 @@ extern "C" { what = 0; } } - else if (string[i] == f_string_ascii_t_s[0]) { + else if (string[i] == f_string_ascii_t_s.string[0]) { mode_mask |= F_file_mode_t_block_special_d; if (on & 4) { @@ -1054,7 +1054,7 @@ extern "C" { what = 0; } } - else if (string[i] == f_string_ascii_comma_s[0]) { + else if (string[i] == f_string_ascii_comma_s.string[0]) { if (how > 3) { mode_result -= mode_result & mode_umask; } @@ -1065,13 +1065,13 @@ extern "C" { break; } - else if (string[i] == f_string_ascii_plus_s[0] || string[i] == f_string_ascii_minus_s[0] || string[i] == f_string_ascii_equal_s[0]) { + else if (string[i] == f_string_ascii_plus_s.string[0] || string[i] == f_string_ascii_minus_s.string[0] || string[i] == f_string_ascii_equal_s.string[0]) { what = 0; - if (string[i] == f_string_ascii_plus_s[0]) { + if (string[i] == f_string_ascii_plus_s.string[0]) { how = on ? 1 : 4; } - else if (string[i] == f_string_ascii_minus_s[0]) { + else if (string[i] == f_string_ascii_minus_s.string[0]) { how = on ? 3 : 6; } else { @@ -1142,15 +1142,15 @@ extern "C" { f_array_length_t i = 0; f_array_length_t j = 0; - if (string[0] == f_string_ascii_plus_s[0]) { + if (string[0] == f_string_ascii_plus_s.string[0]) { how = 1; i = 1; } - else if (string[0] == f_string_ascii_minus_s[0]) { + else if (string[0] == f_string_ascii_minus_s.string[0]) { how = 3; i = 1; } - else if (string[0] == f_string_ascii_equal_s[0]) { + else if (string[0] == f_string_ascii_equal_s.string[0]) { how = 2; i = 1; @@ -1163,7 +1163,7 @@ extern "C" { } // Seek past leading '0's. - while (string[i] == f_string_ascii_0_s[0]) { + while (string[i] == f_string_ascii_0_s.string[0]) { ++i; } // while @@ -1176,10 +1176,10 @@ extern "C" { mode_result <<= 8; } - if (string[i] == f_string_ascii_0_s[0]) { + if (string[i] == f_string_ascii_0_s.string[0]) { // Already is a zero. } - else if (string[i] == f_string_ascii_1_s[0] || string[i] == f_string_ascii_2_s[0] || string[i] == f_string_ascii_3_s[0] || string[i] == f_string_ascii_4_s[0] || string[i] == f_string_ascii_5_s[0] || string[i] == f_string_ascii_6_s[0] || string[i] == f_string_ascii_7_s[0]) { + else if (string[i] == f_string_ascii_1_s.string[0] || string[i] == f_string_ascii_2_s.string[0] || string[i] == f_string_ascii_3_s.string[0] || string[i] == f_string_ascii_4_s.string[0] || string[i] == f_string_ascii_5_s.string[0] || string[i] == f_string_ascii_6_s.string[0] || string[i] == f_string_ascii_7_s.string[0]) { // This assumes ASCII/UTF-8. if (how == 3) { diff --git a/level_0/f_file/c/private-file.c b/level_0/f_file/c/private-file.c index 2353a47..4f2302d 100644 --- a/level_0/f_file/c/private-file.c +++ b/level_0/f_file/c/private-file.c @@ -765,26 +765,26 @@ extern "C" { if (flag & F_file_flag_read_write_d) { if (flag & F_file_flag_truncate_d) { - return f_file_open_mode_read_truncate_s; + return f_file_open_mode_read_truncate_s.string; } else if (flag & F_file_flag_append_d) { - return f_file_open_mode_read_append_s; + return f_file_open_mode_read_append_s.string; } - // failsafe to read write prepend. - return f_file_open_mode_read_write_s; + // Failsafe to read write prepend. + return f_file_open_mode_read_write_s.string; } else if (flag & F_file_flag_write_only_d) { if (flag & F_file_flag_truncate_d) { - return f_file_open_mode_truncate_s; + return f_file_open_mode_truncate_s.string; } - // failsafe to append. - return f_file_open_mode_append_s; + // Failsafe to append. + return f_file_open_mode_append_s.string; } - // failsafe to read only. - return f_file_open_mode_read_s; + // Failsafe to read only. + return f_file_open_mode_read_s.string; } #endif // !defined(_di_f_file_stream_descriptor_) || !defined(_di_f_file_stream_open_) || !defined(_di_f_file_stream_reopen_) diff --git a/level_0/f_fss/c/fss-common.c b/level_0/f_fss/c/fss-common.c index 9953062..64e7ab9 100644 --- a/level_0/f_fss/c/fss-common.c +++ b/level_0/f_fss/c/fss-common.c @@ -6,8 +6,8 @@ extern "C" { #endif #ifndef _di_f_fss_strings_ - const f_string_t f_fss_string_header_s = F_fss_string_header_s; - const f_string_t f_fss_string_payload_s = F_fss_string_payload_s; + const f_string_static_t f_fss_string_header_s = macro_f_string_static_t_initialize2(F_fss_string_header_s, 0, F_fss_string_header_s_length); + const f_string_static_t f_fss_string_payload_s = macro_f_string_static_t_initialize2(F_fss_string_payload_s, 0, F_fss_string_payload_s_length); #endif // _di_f_fss_strings_ #ifdef __cplusplus diff --git a/level_0/f_fss/c/fss-common.h b/level_0/f_fss/c/fss-common.h index d139f27..b232360 100644 --- a/level_0/f_fss/c/fss-common.h +++ b/level_0/f_fss/c/fss-common.h @@ -91,10 +91,20 @@ extern "C" { * FSS-specific delimiters. */ #ifndef _di_f_fss_delimiters_ - #define F_fss_delimit_placeholder_s f_string_placeholder_s[0] - #define F_fss_delimit_quote_single_s f_fss_quote_single_s[0] - #define F_fss_delimit_quote_double_s f_fss_quote_double_s[0] - #define F_fss_delimit_slash_s f_fss_slash_s[0] + #define F_fss_delimit_placeholder_s F_string_placeholder_s + #define F_fss_delimit_quote_single_s F_fss_quote_single_s + #define F_fss_delimit_quote_double_s F_fss_quote_double_s + #define F_fss_delimit_slash_s F_fss_slash_s + + #define F_fss_delimit_placeholder_s_length F_string_placeholder_s_length + #define F_fss_delimit_quote_single_s_length F_fss_quote_single_s_length + #define F_fss_delimit_quote_double_s_length F_fss_quote_double_s_length + #define F_fss_delimit_slash_s_length F_fss_slash_s_length + + #define f_fss_delimit_placeholder_s f_string_placeholder_s + #define f_fss_delimit_quote_single_s f_fss_quote_single_s + #define f_fss_delimit_quote_double_s f_fss_quote_double_s + #define f_fss_delimit_slash_s f_fss_slash_s #endif //_di_f_fss_delimiters_ /** @@ -111,8 +121,8 @@ extern "C" { #define F_fss_string_header_s_length 6 #define F_fss_string_payload_s_length 7 - extern const f_string_t f_fss_string_header_s; - extern const f_string_t f_fss_string_payload_s; + extern const f_string_static_t f_fss_string_header_s; + extern const f_string_static_t f_fss_string_payload_s; #endif // _di_f_fss_strings_ /** diff --git a/level_0/f_fss/c/fss.c b/level_0/f_fss/c/fss.c index 9f6230d..eb86535 100644 --- a/level_0/f_fss/c/fss.c +++ b/level_0/f_fss/c/fss.c @@ -14,7 +14,7 @@ extern "C" { for (f_array_length_t i = 0; i < delimits.used; ++i) { if (delimits.array[i] < buffer->used) { - buffer->string[delimits.array[i]] = F_fss_delimit_placeholder_s; + buffer->string[delimits.array[i]] = f_fss_delimit_placeholder_s.string[0]; } } // for @@ -31,7 +31,7 @@ extern "C" { for (f_array_length_t i = 0; i < delimits.used; ++i) { if (delimits.array[i] < buffer->used && delimits.array[i] >= range.start && delimits.array[i] <= range.stop) { - buffer->string[delimits.array[i]] = F_fss_delimit_placeholder_s; + buffer->string[delimits.array[i]] = f_fss_delimit_placeholder_s.string[0]; } } // for @@ -51,12 +51,12 @@ extern "C" { for (f_array_length_t i = before; i > 0; --i) { - if (buffer.string[i] == f_fss_eol_s[0]) { + if (buffer.string[i] == f_fss_eol_s.string[0]) { ++(*line); } } // for - if (buffer.string[0] == f_fss_eol_s[0]) { + if (buffer.string[0] == f_fss_eol_s.string[0]) { ++(*line); } @@ -76,12 +76,12 @@ extern "C" { for (f_array_length_t i = before; i > range.start; --i) { - if (buffer.string[i] == f_fss_eol_s[0]) { + if (buffer.string[i] == f_fss_eol_s.string[0]) { ++(*line); } } // for - if (buffer.string[range.start] == f_fss_eol_s[0]) { + if (buffer.string[range.start] == f_fss_eol_s.string[0]) { ++(*line); } @@ -166,7 +166,7 @@ extern "C" { if (range->start >= buffer.used) return F_none_eos; if (range->start > range->stop) return F_none_stop; - if (buffer.string[range->start] == f_fss_eol_s[0]) break; + if (buffer.string[range->start] == f_fss_eol_s.string[0]) break; } // for return F_none; @@ -192,7 +192,7 @@ extern "C" { while (position < buffer->used && position <= range.stop) { - if (buffer->string[position] == F_fss_delimit_placeholder_s) { + if (buffer->string[position] == f_fss_delimit_placeholder_s.string[0]) { ++distance; } @@ -233,7 +233,7 @@ extern "C" { if (distance > 0) { while (position < buffer->used + distance && position <= range.stop) { - buffer->string[position] = F_fss_delimit_placeholder_s; + buffer->string[position] = f_fss_delimit_placeholder_s.string[0]; ++position; } } @@ -252,7 +252,7 @@ extern "C" { if (range->start >= buffer.used) return F_none_eos; if (range->start > range->stop) return F_none_stop; - if (buffer.string[range->start] != F_fss_delimit_placeholder_s) break; + if (buffer.string[range->start] != f_fss_delimit_placeholder_s.string[0]) break; } // for return F_none; @@ -284,11 +284,11 @@ extern "C" { for (;;) { - if (buffer.string[range->start] == f_fss_eol_s[0]) { + if (buffer.string[range->start] == f_fss_eol_s.string[0]) { return F_none_eol; } - if (buffer.string[range->start] == F_fss_delimit_placeholder_s) { + if (buffer.string[range->start] == f_fss_delimit_placeholder_s.string[0]) { ++range->start; if (range->start >= buffer.used) { @@ -381,7 +381,7 @@ extern "C" { for (;;) { - if (buffer.string[range->start] != F_fss_delimit_placeholder_s) { + if (buffer.string[range->start] != f_fss_delimit_placeholder_s.string[0]) { status = f_utf_is_graph(buffer.string + range->start, width_max); if (status == F_true) { diff --git a/level_0/f_iki/c/iki-common.c b/level_0/f_iki/c/iki-common.c index 90d6bf4..89c4156 100644 --- a/level_0/f_iki/c/iki-common.c +++ b/level_0/f_iki/c/iki-common.c @@ -6,30 +6,30 @@ extern "C" { #endif #ifndef _di_f_iki_syntax_ - const f_string_t f_iki_syntax_separator_s = F_iki_syntax_separator_s; - const f_string_t f_iki_syntax_placeholder_s = F_iki_syntax_placeholder_s; - const f_string_t f_iki_syntax_quote_double_s = F_iki_syntax_quote_double_s; - const f_string_t f_iki_syntax_quote_single_s = F_iki_syntax_quote_single_s; - const f_string_t f_iki_syntax_slash_s = F_iki_syntax_slash_s; + const f_string_static_t f_iki_syntax_separator_s = macro_f_string_static_t_initialize2(F_iki_syntax_separator_s, 0, F_iki_syntax_separator_s_length); + const f_string_static_t f_iki_syntax_placeholder_s = macro_f_string_static_t_initialize2(F_iki_syntax_placeholder_s, 0, F_iki_syntax_placeholder_s_length); + const f_string_static_t f_iki_syntax_quote_double_s = macro_f_string_static_t_initialize2(F_iki_syntax_quote_double_s, 0, F_iki_syntax_quote_double_s_length); + const f_string_static_t f_iki_syntax_quote_single_s = macro_f_string_static_t_initialize2(F_iki_syntax_quote_single_s, 0, F_iki_syntax_quote_single_s_length); + const f_string_static_t f_iki_syntax_slash_s = macro_f_string_static_t_initialize2(F_iki_syntax_slash_s, 0, F_iki_syntax_slash_s_length); #endif //_di_f_iki_syntax_ #ifndef _di_iki_vocabulary_0001_s_ - const f_string_t f_iki_vocabulary_0001_address_s = F_iki_vocabulary_0001_address_s; - const f_string_t f_iki_vocabulary_0001_code_s = F_iki_vocabulary_0001_code_s; - const f_string_t f_iki_vocabulary_0001_email_s = F_iki_vocabulary_0001_email_s; - const f_string_t f_iki_vocabulary_0001_name_s = F_iki_vocabulary_0001_name_s; - const f_string_t f_iki_vocabulary_0001_phone_s = F_iki_vocabulary_0001_phone_s; - const f_string_t f_iki_vocabulary_0001_quote_s = F_iki_vocabulary_0001_quote_s; - const f_string_t f_iki_vocabulary_0001_uri_s = F_iki_vocabulary_0001_uri_s; - const f_string_t f_iki_vocabulary_0001_url_s = F_iki_vocabulary_0001_url_s; - const f_string_t f_iki_vocabulary_0001_urn_s = F_iki_vocabulary_0001_urn_s; - const f_string_t f_iki_vocabulary_0001_variable_s = F_iki_vocabulary_0001_variable_s; + const f_string_static_t f_iki_vocabulary_0001_address_s = macro_f_string_static_t_initialize2(F_iki_vocabulary_0001_address_s, 0, F_iki_vocabulary_0001_address_s_length); + const f_string_static_t f_iki_vocabulary_0001_code_s = macro_f_string_static_t_initialize2(F_iki_vocabulary_0001_code_s, 0, F_iki_vocabulary_0001_code_s_length); + const f_string_static_t f_iki_vocabulary_0001_email_s = macro_f_string_static_t_initialize2(F_iki_vocabulary_0001_email_s, 0, F_iki_vocabulary_0001_email_s_length); + const f_string_static_t f_iki_vocabulary_0001_name_s = macro_f_string_static_t_initialize2(F_iki_vocabulary_0001_name_s, 0, F_iki_vocabulary_0001_name_s_length); + const f_string_static_t f_iki_vocabulary_0001_phone_s = macro_f_string_static_t_initialize2(F_iki_vocabulary_0001_phone_s, 0, F_iki_vocabulary_0001_phone_s_length); + const f_string_static_t f_iki_vocabulary_0001_quote_s = macro_f_string_static_t_initialize2(F_iki_vocabulary_0001_quote_s, 0, F_iki_vocabulary_0001_quote_s_length); + const f_string_static_t f_iki_vocabulary_0001_uri_s = macro_f_string_static_t_initialize2(F_iki_vocabulary_0001_uri_s, 0, F_iki_vocabulary_0001_uri_s_length); + const f_string_static_t f_iki_vocabulary_0001_url_s = macro_f_string_static_t_initialize2(F_iki_vocabulary_0001_url_s, 0, F_iki_vocabulary_0001_url_s_length); + const f_string_static_t f_iki_vocabulary_0001_urn_s = macro_f_string_static_t_initialize2(F_iki_vocabulary_0001_urn_s, 0, F_iki_vocabulary_0001_urn_s_length); + const f_string_static_t f_iki_vocabulary_0001_variable_s = macro_f_string_static_t_initialize2(F_iki_vocabulary_0001_variable_s, 0, F_iki_vocabulary_0001_variable_s_length); #endif // _di_iki_vocabulary_0001_s_ #ifndef _di_iki_vocabulary_0002_s_ - const f_string_t f_iki_vocabulary_0002_context_s = F_iki_vocabulary_0002_context_s; - const f_string_t f_iki_vocabulary_0002_define_s = F_iki_vocabulary_0002_define_s; - const f_string_t f_iki_vocabulary_0002_parameter_s = F_iki_vocabulary_0002_parameter_s; + const f_string_static_t f_iki_vocabulary_0002_context_s = macro_f_string_static_t_initialize2(F_iki_vocabulary_0002_context_s, 0, F_iki_vocabulary_0002_context_s_length); + const f_string_static_t f_iki_vocabulary_0002_define_s = macro_f_string_static_t_initialize2(F_iki_vocabulary_0002_define_s, 0, F_iki_vocabulary_0002_define_s_length); + const f_string_static_t f_iki_vocabulary_0002_parameter_s = macro_f_string_static_t_initialize2(F_iki_vocabulary_0002_parameter_s, 0, F_iki_vocabulary_0002_parameter_s_length); #endif // _di_iki_vocabulary_0002_s_ #ifdef __cplusplus diff --git a/level_0/f_iki/c/iki-common.h b/level_0/f_iki/c/iki-common.h index 67160e7..3f74b0f 100644 --- a/level_0/f_iki/c/iki-common.h +++ b/level_0/f_iki/c/iki-common.h @@ -32,11 +32,11 @@ extern "C" { #define F_iki_syntax_quote_single_s_length 1 #define F_iki_syntax_slash_s_length 1 - extern const f_string_t f_iki_syntax_separator_s; - extern const f_string_t f_iki_syntax_placeholder_s; - extern const f_string_t f_iki_syntax_quote_double_s; - extern const f_string_t f_iki_syntax_quote_single_s; - extern const f_string_t f_iki_syntax_slash_s; + extern const f_string_static_t f_iki_syntax_separator_s; + extern const f_string_static_t f_iki_syntax_placeholder_s; + extern const f_string_static_t f_iki_syntax_quote_double_s; + extern const f_string_static_t f_iki_syntax_quote_single_s; + extern const f_string_static_t f_iki_syntax_slash_s; #endif //_di_f_iki_syntax_ #ifndef _di_iki_vocabulary_0001_ @@ -62,16 +62,16 @@ extern "C" { #define F_iki_vocabulary_0001_urn_s_length 3 #define F_iki_vocabulary_0001_variable_s_length 3 - extern const f_string_t f_iki_vocabulary_0001_address_s; - extern const f_string_t f_iki_vocabulary_0001_code_s; - extern const f_string_t f_iki_vocabulary_0001_email_s; - extern const f_string_t f_iki_vocabulary_0001_name_s; - extern const f_string_t f_iki_vocabulary_0001_phone_s; - extern const f_string_t f_iki_vocabulary_0001_quote_s; - extern const f_string_t f_iki_vocabulary_0001_uri_s; - extern const f_string_t f_iki_vocabulary_0001_url_s; - extern const f_string_t f_iki_vocabulary_0001_urn_s; - extern const f_string_t f_iki_vocabulary_0001_variable_s; + extern const f_string_static_t f_iki_vocabulary_0001_address_s; + extern const f_string_static_t f_iki_vocabulary_0001_code_s; + extern const f_string_static_t f_iki_vocabulary_0001_email_s; + extern const f_string_static_t f_iki_vocabulary_0001_name_s; + extern const f_string_static_t f_iki_vocabulary_0001_phone_s; + extern const f_string_static_t f_iki_vocabulary_0001_quote_s; + extern const f_string_static_t f_iki_vocabulary_0001_uri_s; + extern const f_string_static_t f_iki_vocabulary_0001_url_s; + extern const f_string_static_t f_iki_vocabulary_0001_urn_s; + extern const f_string_static_t f_iki_vocabulary_0001_variable_s; #endif // _di_iki_vocabulary_0001_ #ifndef _di_iki_vocabulary_0002_ @@ -83,9 +83,9 @@ extern "C" { #define F_iki_vocabulary_0002_define_s_length 6 #define F_iki_vocabulary_0002_parameter_s_length 9 - extern const f_string_t f_iki_vocabulary_0002_context_s; - extern const f_string_t f_iki_vocabulary_0002_define_s; - extern const f_string_t f_iki_vocabulary_0002_parameter_s; + extern const f_string_static_t f_iki_vocabulary_0002_context_s; + extern const f_string_static_t f_iki_vocabulary_0002_define_s; + extern const f_string_static_t f_iki_vocabulary_0002_parameter_s; #endif // _di_iki_vocabulary_0002_ // @todo consider IKI-0003 = vocabulary based on context from HTML5 and accessibility-related? diff --git a/level_0/f_iki/c/iki.c b/level_0/f_iki/c/iki.c index a1fdb32..8e51fc8 100644 --- a/level_0/f_iki/c/iki.c +++ b/level_0/f_iki/c/iki.c @@ -9,7 +9,7 @@ extern "C" { f_status_t f_iki_content_is(const f_string_static_t content, const uint8_t quote) { #ifndef _di_level_0_parameter_checking_ if (content.used > content.size) return F_status_set_error(F_parameter); - if (quote != f_iki_syntax_quote_single_s[0] && quote != f_iki_syntax_quote_double_s[0]) return F_status_set_error(F_parameter); + if (quote != f_iki_syntax_quote_single_s.string[0] && quote != f_iki_syntax_quote_double_s.string[0]) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ const f_string_range_t range = macro_f_string_range_t_initialize(content.used); @@ -24,7 +24,7 @@ extern "C" { if (content.used > content.size) return F_status_set_error(F_parameter); if (range.start > range.stop) return F_status_set_error(F_parameter); if (range.start >= content.used) return F_status_set_error(F_parameter); - if (quote != f_iki_syntax_quote_single_s[0] && quote != f_iki_syntax_quote_double_s[0]) return F_status_set_error(F_parameter); + if (quote != f_iki_syntax_quote_single_s.string[0] && quote != f_iki_syntax_quote_double_s.string[0]) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ return private_f_iki_content_partial_is(content, range, quote); @@ -126,13 +126,13 @@ extern "C" { } } - if (buffer->string[range->start] == f_iki_syntax_placeholder_s[0]) { + if (buffer->string[range->start] == f_iki_syntax_placeholder_s.string[0]) { ++range->start; continue; } - if (buffer->string[range->start] == f_iki_syntax_separator_s[0]) { + if (buffer->string[range->start] == f_iki_syntax_separator_s.string[0]) { if (range->start == found_vocabulary.start) { ++range->start; @@ -144,12 +144,12 @@ extern "C" { do { status = f_utf_buffer_increment(*buffer, range, 1); - } while (F_status_is_fine(status) && buffer->string[range->start] == f_iki_syntax_placeholder_s[0]); + } while (F_status_is_fine(status) && buffer->string[range->start] == f_iki_syntax_placeholder_s.string[0]); if (F_status_is_error(status)) break; // Found a valid vocabulary name. - if (buffer->string[range->start] == f_iki_syntax_quote_single_s[0] || buffer->string[range->start] == f_iki_syntax_quote_double_s[0]) { + if (buffer->string[range->start] == f_iki_syntax_quote_single_s.string[0] || buffer->string[range->start] == f_iki_syntax_quote_double_s.string[0]) { quote = buffer->string[range->start++]; break; @@ -158,7 +158,7 @@ extern "C" { break; } - if (buffer->string[range->start] == f_iki_syntax_slash_s[0]) { + if (buffer->string[range->start] == f_iki_syntax_slash_s.string[0]) { bool separator_found = F_false; vocabulary_slash_first = range->start; @@ -166,14 +166,14 @@ extern "C" { // The slash only needs to be delimited if it were to otherwise be a valid vocabulary name. while (range->start <= range->stop && range->start < buffer->used) { - if (buffer->string[range->start] == f_iki_syntax_placeholder_s[0]) { + if (buffer->string[range->start] == f_iki_syntax_placeholder_s.string[0]) { ++range->start; continue; } if (separator_found) { - if (buffer->string[range->start] == f_iki_syntax_quote_single_s[0] || buffer->string[range->start] == f_iki_syntax_quote_double_s[0]) { + if (buffer->string[range->start] == f_iki_syntax_quote_single_s.string[0] || buffer->string[range->start] == f_iki_syntax_quote_double_s.string[0]) { vocabulary_delimited = F_true; quote = buffer->string[range->start++]; @@ -185,10 +185,10 @@ extern "C" { break; } } - else if (buffer->string[range->start] == f_iki_syntax_separator_s[0]) { + else if (buffer->string[range->start] == f_iki_syntax_separator_s.string[0]) { separator_found = F_true; } - else if (buffer->string[range->start] != f_iki_syntax_slash_s[0]) { + else if (buffer->string[range->start] != f_iki_syntax_slash_s.string[0]) { find_next = F_true; break; @@ -256,7 +256,7 @@ extern "C" { } } - if (buffer->string[range->start] == f_iki_syntax_placeholder_s[0]) { + if (buffer->string[range->start] == f_iki_syntax_placeholder_s.string[0]) { ++range->start; continue; @@ -307,13 +307,13 @@ extern "C" { return F_none; } - else if (buffer->string[range->start] == f_iki_syntax_slash_s[0]) { + else if (buffer->string[range->start] == f_iki_syntax_slash_s.string[0]) { f_array_length_t content_slash_first = range->start; f_array_length_t content_slash_total = 0; while (range->start <= range->stop && range->start < buffer->used) { - if (buffer->string[range->start] == f_iki_syntax_placeholder_s[0]) { + if (buffer->string[range->start] == f_iki_syntax_placeholder_s.string[0]) { ++range->start; continue; @@ -336,7 +336,7 @@ extern "C" { while (i < content_slash_delimits) { - if (buffer->string[content_range.start] == f_iki_syntax_slash_s[0]) { + if (buffer->string[content_range.start] == f_iki_syntax_slash_s.string[0]) { delimits->array[delimits->used++] = content_range.start; ++i; } @@ -401,7 +401,7 @@ extern "C" { break; } - if (buffer->string[range->start] != f_iki_syntax_slash_s[0]) { + if (buffer->string[range->start] != f_iki_syntax_slash_s.string[0]) { break; } diff --git a/level_0/f_iki/c/private-iki.c b/level_0/f_iki/c/private-iki.c index 0adbdc8..b4e5175 100644 --- a/level_0/f_iki/c/private-iki.c +++ b/level_0/f_iki/c/private-iki.c @@ -13,19 +13,19 @@ extern "C" { while (range->start <= range->stop && range->start < buffer.used) { - if (buffer.string[range->start] == f_iki_syntax_separator_s[0]) { + if (buffer.string[range->start] == f_iki_syntax_separator_s.string[0]) { break; } - if (buffer.string[range->start] == F_iki_syntax_quote_double_s[0]) { + if (buffer.string[range->start] == f_iki_syntax_quote_double_s.string[0]) { break; } - if (buffer.string[range->start] == F_iki_syntax_quote_single_s[0]) { + if (buffer.string[range->start] == f_iki_syntax_quote_single_s.string[0]) { break; } - if (buffer.string[range->start] == F_iki_syntax_slash_s[0]) { + if (buffer.string[range->start] == f_iki_syntax_slash_s.string[0]) { break; } @@ -63,7 +63,7 @@ extern "C" { return F_false; } - else if (buffer.string[i] == f_iki_syntax_slash_s[0]) { + else if (buffer.string[i] == f_iki_syntax_slash_s.string[0]) { ++delimits; } else { diff --git a/level_0/f_path/c/path-common.c b/level_0/f_path/c/path-common.c index c40084d..f79b750 100644 --- a/level_0/f_path/c/path-common.c +++ b/level_0/f_path/c/path-common.c @@ -6,82 +6,82 @@ extern "C" { #endif #ifndef _di_f_path_defines_ - const f_string_t f_path_separator_s = F_string_ascii_slash_forward_s; - const f_string_t f_path_separator_current_s = F_string_ascii_period_s; - const f_string_t f_path_separator_variable_s = F_string_ascii_colon_s; + const f_string_static_t f_path_separator_s = macro_f_string_static_t_initialize2(F_string_ascii_slash_forward_s, 0, F_string_ascii_slash_forward_s_length); + const f_string_static_t f_path_separator_current_s = macro_f_string_static_t_initialize2(F_string_ascii_period_s, 0, F_string_ascii_period_s_length); + const f_string_static_t f_path_separator_variable_s = macro_f_string_static_t_initialize2(F_string_ascii_colon_s, 0, F_string_ascii_colon_s_length); - const f_string_t f_path_extension_separator_s = F_string_ascii_period_s; + const f_string_static_t f_path_extension_separator_s = macro_f_string_static_t_initialize2(F_string_ascii_period_s, 0, F_string_ascii_period_s_length); - const f_string_t f_path_environment_s = F_path_environment_s; - const f_string_t f_path_home_wildcard_s = F_string_ascii_tilde_s; - const f_string_t f_path_present_working_s = F_path_present_working_s; - const f_string_t f_path_present_working_old_s = F_path_present_working_old_s; + const f_string_static_t f_path_environment_s = macro_f_string_static_t_initialize2(F_path_environment_s, 0, F_path_environment_s_length); + const f_string_static_t f_path_home_wildcard_s = macro_f_string_static_t_initialize2(F_string_ascii_tilde_s, 0, F_string_ascii_tilde_s_length); + const f_string_static_t f_path_present_working_s = macro_f_string_static_t_initialize2(F_path_present_working_s, 0, F_path_present_working_s_length); + const f_string_static_t f_path_present_working_old_s = macro_f_string_static_t_initialize2(F_path_present_working_old_s, 0, F_path_present_working_old_s_length); #endif // _di_f_path_defines_ #ifdef _di_path_tree_s_ // KFS Root Level - extern const f_string_t f_path_tree_devices_s = F_path_tree_devices_s; - extern const f_string_t f_path_tree_external_s = F_path_tree_external_s; - extern const f_string_t f_path_tree_libraries_s = F_path_tree_libraries_s; - extern const f_string_t f_path_tree_programs_s = F_path_tree_programs_s; - extern const f_string_t f_path_tree_temporary_s = F_path_tree_temporary_s; - extern const f_string_t f_path_tree_home_s = F_path_tree_home_s; - extern const f_string_t f_path_tree_run_s = F_path_tree_run_s; - extern const f_string_t f_path_tree_binary_s = F_path_tree_binary_s; + const f_string_static_t f_path_tree_devices_s = macro_f_string_static_t_initialize2(F_path_tree_devices_s, 0, F_path_tree_devices_s_length); + const f_string_static_t f_path_tree_external_s = macro_f_string_static_t_initialize2(F_path_tree_external_s, 0, F_path_tree_external_s_length); + const f_string_static_t f_path_tree_libraries_s = macro_f_string_static_t_initialize2(F_path_tree_libraries_s, 0, F_path_tree_libraries_s_length); + const f_string_static_t f_path_tree_programs_s = macro_f_string_static_t_initialize2(F_path_tree_programs_s, 0,F_path_tree_programs_s _length); + const f_string_static_t f_path_tree_temporary_s = macro_f_string_static_t_initialize2(F_path_tree_temporary_s, 0, F_path_tree_temporary_s_length); + const f_string_static_t f_path_tree_home_s = macro_f_string_static_t_initialize2(F_path_tree_home_s, 0, F_path_tree_home_s_length); + const f_string_static_t f_path_tree_run_s = macro_f_string_static_t_initialize2(F_path_tree_run_s, 0, F_path_tree_run_s_length); + const f_string_static_t f_path_tree_binary_s = macro_f_string_static_t_initialize2(F_path_tree_binary_s, 0, F_path_tree_binary_s_length); // FHS Root Level - extern const f_string_t f_path_tree_boot_s = F_path_tree_boot_s; - extern const f_string_t f_path_tree_hardware_s = F_path_tree_hardware_s; - extern const f_string_t f_path_tree_processes_s = F_path_tree_processes_s; - extern const f_string_t f_path_tree_system_s = F_path_tree_system_s; + const f_string_static_t f_path_tree_boot_s = macro_f_string_static_t_initialize2(F_path_tree_boot_s, 0, F_path_tree_boot_s_length); + const f_string_static_t f_path_tree_hardware_s = macro_f_string_static_t_initialize2(F_path_tree_hardware_s, 0, F_path_tree_hardware_s_length); + const f_string_static_t f_path_tree_processes_s = macro_f_string_static_t_initialize2(F_path_tree_processes_s, 0, F_path_tree_processes_s_length); + const f_string_static_t f_path_tree_system_s = macro_f_string_static_t_initialize2(F_path_tree_system_s, 0, F_path_tree_system_s_length); // Program Level - extern const f_string_t f_path_tree_programs_public_s = F_path_tree_programs_public_s; - extern const f_string_t f_path_tree_programs_system_s = F_path_tree_programs_system_s; - extern const f_string_t f_path_tree_programs_remote_s = F_path_tree_programs_remote_s; - extern const f_string_t f_path_tree_programs_services_s = F_path_tree_programs_services_s; - extern const f_string_t f_path_tree_programs_toolchain_s = F_path_tree_programs_toolchain_s; - extern const f_string_t f_path_tree_programs_users_s = F_path_tree_programs_users_s; - extern const f_string_t f_path_tree_programs_susers_s = F_path_tree_programs_susers_s; - extern const f_string_t f_path_tree_programs_boot_s = F_path_tree_programs_boot_s; - extern const f_string_t f_path_tree_programs_sboot_s = F_path_tree_programs_sboot_s; + const f_string_static_t f_path_tree_programs_public_s = macro_f_string_static_t_initialize2(F_path_tree_programs_public_s, 0, F_path_tree_programs_public_s_length); + const f_string_static_t f_path_tree_programs_system_s = macro_f_string_static_t_initialize2(F_path_tree_programs_system_s, 0, F_path_tree_programs_system_s_length); + const f_string_static_t f_path_tree_programs_remote_s = macro_f_string_static_t_initialize2(F_path_tree_programs_remote_s, 0, F_path_tree_programs_remote_s_length); + const f_string_static_t f_path_tree_programs_services_s = macro_f_string_static_t_initialize2(F_path_tree_programs_services_s, 0, F_path_tree_programs_services_s_length); + const f_string_static_t f_path_tree_programs_toolchain_s = macro_f_string_static_t_initialize2(F_path_tree_programs_toolchain_s, 0, F_path_tree_programs_toolchain_s_length); + const f_string_static_t f_path_tree_programs_users_s = macro_f_string_static_t_initialize2(F_path_tree_programs_users_s, 0, F_path_tree_programs_users_s_length); + const f_string_static_t f_path_tree_programs_susers_s = macro_f_string_static_t_initialize2(F_path_tree_programs_susers_s, 0, F_path_tree_programs_susers_s_length); + const f_string_static_t f_path_tree_programs_boot_s = macro_f_string_static_t_initialize2(F_path_tree_programs_boot_s, 0, F_path_tree_programs_boot_s_length); + const f_string_static_t f_path_tree_programs_sboot_s = macro_f_string_static_t_initialize2(F_path_tree_programs_sboot_s, 0, F_path_tree_programs_sboot_s_length); // Library Level - extern const f_string_t f_path_tree_libraries_public_s = F_path_tree_libraries_public_s; - extern const f_string_t f_path_tree_libraries_system_s = F_path_tree_libraries_system_s; - extern const f_string_t f_path_tree_libraries_remote_s = F_path_tree_libraries_remote_s; - extern const f_string_t f_path_tree_libraries_services_s = F_path_tree_libraries_services_s; - extern const f_string_t f_path_tree_libraries_toolchain_s = F_path_tree_libraries_toolchain_s; - extern const f_string_t f_path_tree_libraries_users_s = F_path_tree_libraries_users_s; - extern const f_string_t f_path_tree_libraries_boot_s = F_path_tree_libraries_boot_s; + const f_string_static_t f_path_tree_libraries_public_s = macro_f_string_static_t_initialize2(F_path_tree_libraries_public_s, 0, F_path_tree_libraries_public_s_length); + const f_string_static_t f_path_tree_libraries_system_s = macro_f_string_static_t_initialize2(F_path_tree_libraries_system_s, 0, F_path_tree_libraries_system_s_length); + const f_string_static_t f_path_tree_libraries_remote_s = macro_f_string_static_t_initialize2(F_path_tree_libraries_remote_s, 0, F_path_tree_libraries_remote_s_length); + const f_string_static_t f_path_tree_libraries_services_s = macro_f_string_static_t_initialize2(F_path_tree_libraries_services_s, 0, F_path_tree_libraries_services_s_length); + const f_string_static_t f_path_tree_libraries_toolchain_s = macro_f_string_static_t_initialize2(F_path_tree_libraries_toolchain_s, 0, F_path_tree_libraries_toolchain_s_length); + const f_string_static_t f_path_tree_libraries_users_s = macro_f_string_static_t_initialize2(F_path_tree_libraries_users_s, 0, F_path_tree_libraries_users_s_length); + const f_string_static_t f_path_tree_libraries_boot_s = macro_f_string_static_t_initialize2(F_path_tree_libraries_boot_s, 0, F_path_tree_libraries_boot_s_length); // Home Level - extern const f_string_t f_path_tree_home_services_s = F_path_tree_home_services_s; - extern const f_string_t f_path_tree_home_share_s = F_path_tree_home_share_s; - extern const f_string_t f_path_tree_home_users_s = F_path_tree_home_users_s; - extern const f_string_t f_path_tree_home_websites_s = F_path_tree_home_websites_s; + const f_string_static_t f_path_tree_home_services_s = macro_f_string_static_t_initialize2(F_path_tree_home_services_s, 0, F_path_tree_home_services_s_length); + const f_string_static_t f_path_tree_home_share_s = macro_f_string_static_t_initialize2(F_path_tree_home_share_s, 0, F_path_tree_home_share_s_length); + const f_string_static_t f_path_tree_home_users_s = macro_f_string_static_t_initialize2(F_path_tree_home_users_s, 0, F_path_tree_home_users_s_length); + const f_string_static_t f_path_tree_home_websites_s = macro_f_string_static_t_initialize2(F_path_tree_home_websites_s, 0, F_path_tree_home_websites_s_length); // System Level - extern const f_string_t f_path_tree_system_logs_s = F_path_tree_system_logs_s; - extern const f_string_t f_path_tree_system_settings_s = F_path_tree_system_settings_s; - extern const f_string_t f_path_tree_system_data_s = F_path_tree_system_data_s; - extern const f_string_t f_path_tree_system_variables_s = F_path_tree_system_variables_s; + const f_string_static_t f_path_tree_system_logs_s = macro_f_string_static_t_initialize2(F_path_tree_system_logs_s, 0, F_path_tree_system_logs_s_length); + const f_string_static_t f_path_tree_system_settings_s = macro_f_string_static_t_initialize2(F_path_tree_system_settings_s, 0, F_path_tree_system_settings_s_length); + const f_string_static_t f_path_tree_system_data_s = macro_f_string_static_t_initialize2(F_path_tree_system_data_s, 0, F_path_tree_system_data_s_length); + const f_string_static_t f_path_tree_system_variables_s = macro_f_string_static_t_initialize2(F_path_tree_system_variables_s, 0, F_path_tree_system_variables_s_length); // Temporary Level - extern const f_string_t f_path_tree_temporary_public_s = F_path_tree_temporary_public_s; - extern const f_string_t f_path_tree_temporary_services_s = F_path_tree_temporary_services_s; - extern const f_string_t f_path_tree_temporary_users_s = F_path_tree_temporary_users_s; - extern const f_string_t f_path_tree_temporary_variables_s = F_path_tree_temporary_variables_s; + const f_string_static_t f_path_tree_temporary_public_s = macro_f_string_static_t_initialize2(F_path_tree_temporary_public_s, 0, F_path_tree_temporary_public_s_length); + const f_string_static_t f_path_tree_temporary_services_s = macro_f_string_static_t_initialize2(F_path_tree_temporary_services_s, 0, F_path_tree_temporary_services_s_length); + const f_string_static_t f_path_tree_temporary_users_s = macro_f_string_static_t_initialize2(F_path_tree_temporary_users_s, 0, F_path_tree_temporary_users_s_length); + const f_string_static_t f_path_tree_temporary_variables_s = macro_f_string_static_t_initialize2(F_path_tree_temporary_variables_s, 0, F_path_tree_temporary_variables_s_length); // Private User Directories - extern const f_string_t f_path_user_downloads_s = F_path_user_downloads_s; - extern const f_string_t f_path_user_desktop_s = F_path_user_desktop_s; - extern const f_string_t f_path_user_private_s = F_path_user_private_s; - extern const f_string_t f_path_user_settings_s = F_path_user_settings_s; - extern const f_string_t f_path_user_data_s = F_path_user_data_s; - extern const f_string_t f_path_user_temporary_s = F_path_user_temporary_s; - extern const f_string_t f_path_user_shared_s = F_path_user_shared_s; + const f_string_static_t f_path_user_downloads_s = macro_f_string_static_t_initialize2(F_path_user_downloads_s, 0, F_path_user_downloads_s_length); + const f_string_static_t f_path_user_desktop_s = macro_f_string_static_t_initialize2(F_path_user_desktop_s, 0, F_path_user_desktop_s_length); + const f_string_static_t f_path_user_private_s = macro_f_string_static_t_initialize2(F_path_user_private_s, 0, F_path_user_private_s_length); + const f_string_static_t f_path_user_settings_s = macro_f_string_static_t_initialize2(F_path_user_settings_s, 0, F_path_user_settings_s_length); + const f_string_static_t f_path_user_data_s = macro_f_string_static_t_initialize2(F_path_user_data_s, 0, F_path_user_data_s_length); + const f_string_static_t f_path_user_temporary_s = macro_f_string_static_t_initialize2(F_path_user_temporary_s, 0, F_path_user_temporary_s_length); + const f_string_static_t f_path_user_shared_s = macro_f_string_static_t_initialize2(F_path_user_shared_s, 0, F_path_user_shared_s_length); #endif // _di_path_tree_s_ #ifdef __cplusplus diff --git a/level_0/f_path/c/path-common.h b/level_0/f_path/c/path-common.h index be81fdd..260795a 100644 --- a/level_0/f_path/c/path-common.h +++ b/level_0/f_path/c/path-common.h @@ -56,16 +56,16 @@ extern "C" { #define F_path_length_max_d PATH_MAX - extern const f_string_t f_path_separator_s; - extern const f_string_t f_path_separator_current_s; - extern const f_string_t f_path_separator_variable_s; + extern const f_string_static_t f_path_separator_s; + extern const f_string_static_t f_path_separator_current_s; + extern const f_string_static_t f_path_separator_variable_s; - extern const f_string_t f_path_extension_separator_s; + extern const f_string_static_t f_path_extension_separator_s; - extern const f_string_t f_path_environment_s; - extern const f_string_t f_path_home_wildcard_s; - extern const f_string_t f_path_present_working_s; - extern const f_string_t f_path_present_working_old_s; + extern const f_string_static_t f_path_environment_s; + extern const f_string_static_t f_path_home_wildcard_s; + extern const f_string_static_t f_path_present_working_s; + extern const f_string_static_t f_path_present_working_old_s; #endif // _di_f_path_defines_ /** @@ -74,10 +74,10 @@ extern "C" { */ #ifndef _di_path_tree_kevux_standard_ - // disable the FHS default paths + // Disable the FHS default paths. #define _di_path_tree_hierarchy_standard_ - // KFS Root Level + // KFS Root Level. #define F_path_tree_devices_s F_path_separator_s "devices" #define F_path_tree_external_s F_path_separator_s "external" #define F_path_tree_libraries_s F_path_separator_s "libraries" @@ -87,13 +87,27 @@ extern "C" { #define F_path_tree_run_s F_path_separator_s "run" #define F_path_tree_binary_s F_path_separator_s ".system" - // Kernel Level - #define F_path_tree_boot_s f_path_devices F_path_separator_s "boot" - #define F_path_tree_hardware_s f_path_devices F_path_separator_s "devices" - #define F_path_tree_processes_s f_path_devices F_path_separator_s "processes" - #define F_path_tree_system_s f_path_devices F_path_separator_s "system" - - // Program Level + #define F_path_tree_devices_s_length F_path_separator_s_length + 7 + #define F_path_tree_external_s_length F_path_separator_s_length + 8 + #define F_path_tree_libraries_s_length F_path_separator_s_length + 9 + #define F_path_tree_programs_s_length F_path_separator_s_length + 8 + #define F_path_tree_temporary_s_length F_path_separator_s_length + 9 + #define F_path_tree_home_s_length F_path_separator_s_length + 4 + #define F_path_tree_run_s_length F_path_separator_s_length + 3 + #define F_path_tree_binary_s_length F_path_separator_s_length + 7 + + // Kernel Level. + #define F_path_tree_boot_s f_path_devices_s F_path_separator_s "boot" + #define F_path_tree_hardware_s f_path_devices_s F_path_separator_s "devices" + #define F_path_tree_processes_s f_path_devices_s F_path_separator_s "processes" + #define F_path_tree_system_s f_path_devices_s F_path_separator_s "system" + + #define F_path_tree_boot_s_length F_path_separator_s_length + 4 + #define F_path_tree_hardware_s_length F_path_separator_s_length + 7 + #define F_path_tree_processes_s_length F_path_separator_s_length + 9 + #define F_path_tree_system_s_length F_path_separator_s_length + 6 + + // Program Level. #define F_path_tree_programs_public_s f_path_programs F_path_separator_s "public" #define F_path_tree_programs_system_s f_path_programs F_path_separator_s "system" #define F_path_tree_programs_remote_s f_path_programs F_path_separator_s "remote" @@ -104,34 +118,67 @@ extern "C" { #define F_path_tree_programs_boot_s f_path_boot F_path_separator_s "programs" #define F_path_tree_programs_sboot_s f_path_boot F_path_separator_s "programs" - // Library Level - #define F_path_tree_libraries_public_s f_path_libraries F_path_separator_s "public" - #define F_path_tree_libraries_system_s f_path_libraries F_path_separator_s "system" - #define F_path_tree_libraries_remote_s f_path_libraries F_path_separator_s "remote" - #define F_path_tree_libraries_services_s f_path_libraries F_path_separator_s "targets" - #define F_path_tree_libraries_toolchain_s f_path_libraries F_path_separator_s "toolchain" - #define F_path_tree_libraries_users_s f_path_libraries F_path_separator_s "users" - #define F_path_tree_libraries_boot_s f_path_boot F_path_separator_s "libraries" - - // Home Level - #define F_path_tree_home_services_s f_path_home F_path_separator_s "services" - #define F_path_tree_home_share_s f_path_home F_path_separator_s "share" - #define F_path_tree_home_users_s f_path_home F_path_separator_s "users" - #define F_path_tree_home_websites_s f_path_home F_path_separator_s "websites" - - // System Level - #define F_path_tree_system_logs_s f_path_system F_path_separator_s "logs" - #define F_path_tree_system_settings_s f_path_system F_path_separator_s "settings" - #define F_path_tree_system_data_s f_path_system F_path_separator_s "data" - #define F_path_tree_system_variables_s f_path_system F_path_separator_s "variables" // for backwards FHS support only, use of this directory is considered bad practice for KFS, use f_path_temporary_variables instead - - // Temporary Level - #define F_path_tree_temporary_public_s f_path_temporary F_path_separator_s "public" - #define F_path_tree_temporary_services_s f_path_temporary F_path_separator_s "services" - #define F_path_tree_temporary_users_s f_path_temporary F_path_separator_s "users" - #define F_path_tree_temporary_variables_s f_path_temporary F_path_separator_s "variables" - - // Private User Directories + #define F_path_tree_programs_public_s_length f_path_programs_s_length + F_path_separator_s_length + 6 + #define F_path_tree_programs_system_s_length f_path_programs_s_length + F_path_separator_s_length + 6 + #define F_path_tree_programs_remote_s_length f_path_programs_s_length + F_path_separator_s_length + 6 + #define F_path_tree_programs_services_s_length f_path_programs_s_length + F_path_separator_s_length + 7 + #define F_path_tree_programs_toolchain_s_length f_path_programs_s_length + F_path_separator_s_length + 9 + #define F_path_tree_programs_users_s_length f_path_programs_s_length + F_path_separator_s_length + 5 + #define F_path_tree_programs_susers_s_length f_path_programs_s_length + F_path_separator_s_length + 5 + #define F_path_tree_programs_boot_s_length f_path_programs_s_length + F_path_separator_s_length + 8 + #define F_path_tree_programs_sboot_s_length f_path_programs_s_length + F_path_separator_s_length + 8 + + // Library Level. + #define F_path_tree_libraries_public_s f_path_libraries_s F_path_separator_s "public" + #define F_path_tree_libraries_system_s f_path_libraries_s F_path_separator_s "system" + #define F_path_tree_libraries_remote_s f_path_libraries_s F_path_separator_s "remote" + #define F_path_tree_libraries_services_s f_path_libraries_s F_path_separator_s "targets" + #define F_path_tree_libraries_toolchain_s f_path_libraries_s F_path_separator_s "toolchain" + #define F_path_tree_libraries_users_s f_path_libraries_s F_path_separator_s "users" + #define F_path_tree_libraries_boot_s f_path_boot_s F_path_separator_s "libraries" + + #define F_path_tree_libraries_public_s_length f_path_libraries_s_length + F_path_separator_s_length + 6 + #define F_path_tree_libraries_system_s_length f_path_libraries_s_length + F_path_separator_s_length + 6 + #define F_path_tree_libraries_remote_s_length f_path_libraries_s_length + F_path_separator_s_length + 6 + #define F_path_tree_libraries_services_s_length f_path_libraries_s_length + F_path_separator_s_length + 7 + #define F_path_tree_libraries_toolchain_s_length f_path_libraries_s_length + F_path_separator_s_length + 9 + #define F_path_tree_libraries_users_s_length f_path_libraries_s_length + F_path_separator_s_length + 5 + #define F_path_tree_libraries_boot_s_length f_path_boot_s_length + F_path_separator_s_length + 9 + + // Home Level. + #define F_path_tree_home_services_s f_path_home_s F_path_separator_s "services" + #define F_path_tree_home_share_s f_path_home_s F_path_separator_s "share" + #define F_path_tree_home_users_s f_path_home_s F_path_separator_s "users" + #define F_path_tree_home_websites_s f_path_home_s F_path_separator_s "websites" + + #define F_path_tree_home_services_s_length f_path_home_s_length + F_path_separator_s_length + 8 + #define F_path_tree_home_share_s_length f_path_home_s_length + F_path_separator_s_length + 5 + #define F_path_tree_home_users_s_length f_path_home_s_length + F_path_separator_s_length + 5 + #define F_path_tree_home_websites_s_length f_path_home_s_length + F_path_separator_s_length + 8 + + // System Level. + #define F_path_tree_system_logs_s f_path_system_s F_path_separator_s "logs" + #define F_path_tree_system_settings_s f_path_system_s F_path_separator_s "settings" + #define F_path_tree_system_data_s f_path_system_s F_path_separator_s "data" + #define F_path_tree_system_variables_s f_path_system_s F_path_separator_s "variables" // for backwards FHS support only, use of this directory is considered bad practice for KFS, use f_path_temporary_variables instead. + + #define F_path_tree_system_logs_s_length f_path_system_s_length + F_path_separator_s_length + 4 + #define F_path_tree_system_settings_s_length f_path_system_s_length + F_path_separator_s_length + 8 + #define F_path_tree_system_data_s_length f_path_system_s_length + F_path_separator_s_length + 4 + #define F_path_tree_system_variables_s_length f_path_system_s_length + F_path_separator_s_length + + // Temporary Level. + #define F_path_tree_temporary_public_s f_path_temporary_s F_path_separator_s "public" + #define F_path_tree_temporary_services_s f_path_temporary_s F_path_separator_s "services" + #define F_path_tree_temporary_users_s f_path_temporary_s F_path_separator_s "users" + #define F_path_tree_temporary_variables_s f_path_temporary_s F_path_separator_s "variables" + + #define F_path_tree_temporary_public_s_length f_path_temporary_s_length + F_path_separator_s_length + 6 + #define F_path_tree_temporary_services_s_length f_path_temporary_s_length + F_path_separator_s_length + 8 + #define F_path_tree_temporary_users_s_length f_path_temporary_s_length + F_path_separator_s_length + 5 + #define F_path_tree_temporary_variables_s_length f_path_temporary_s_length + F_path_separator_s_length + 9 + + // Private User Directories. #define F_path_tree_user_downloads_s "downloads" #define F_path_tree_user_desktop_s "desktop" #define F_path_tree_user_private_s "private" @@ -139,6 +186,14 @@ extern "C" { #define F_path_tree_user_data_s "data" #define F_path_tree_user_temporary_s "temporary" #define F_path_tree_user_shared_s "shared" + + #define F_path_tree_user_downloads_s_length 9 + #define F_path_tree_user_desktop_s_length 7 + #define F_path_tree_user_private_s_length 7 + #define F_path_tree_user_settings_s_length 8 + #define F_path_tree_user_data_s_length 4 + #define F_path_tree_user_temporary_s_length 9 + #define F_path_tree_user_shared_s_length 6 #endif // _di_path_tree_kevux_standard_ /** @@ -147,10 +202,10 @@ extern "C" { */ #ifndef _di_path_tree_hierarchy_standard_ - // disable the kevux standard default paths + // Disable the kevux standard default paths. #define _di_path_tree_kevux_standard_ - // KFS Root Level + // KFS Root Level. #define F_path_tree_devices_s F_path_separator_s #define F_path_tree_external_s F_path_separator_s "mnt" #define F_path_tree_libraries_s F_path_separator_s @@ -160,13 +215,27 @@ extern "C" { #define F_path_tree_run_s F_path_separator_s "run" #define F_path_tree_binary_s F_path_separator_s ".system" - // FHS Root Level + #define F_path_tree_devices_s_length F_path_separator_s_length + #define F_path_tree_external_s_length F_path_separator_s_length + 3 + #define F_path_tree_libraries_s_length F_path_separator_s_length + #define F_path_tree_programs_s_length F_path_separator_s_length + #define F_path_tree_temporary_s_length F_path_separator_s_length + #define F_path_tree_home_s_length F_path_separator_s_length + 4 + #define F_path_tree_run_s_length F_path_separator_s_length + 3 + #define F_path_tree_binary_s_length F_path_separator_s_length + 7 + + // FHS Root Level. #define F_path_tree_boot_s F_path_separator_s "boot" #define F_path_tree_hardware_s F_path_separator_s "dev" #define F_path_tree_processes_s F_path_separator_s "proc" #define F_path_tree_system_s F_path_separator_s "sysfs" - // Program Level + #define F_path_tree_boot_s_length F_path_separator_s_length + 4 + #define F_path_tree_hardware_s_length F_path_separator_s_length + 3 + #define F_path_tree_processes_s_length F_path_separator_s_length + 4 + #define F_path_tree_system_s_length F_path_separator_s_length + 5 + + // Program Level. #define F_path_tree_programs_public_s F_path_separator_s "usr" F_path_separator_s "bin" #define F_path_tree_programs_system_s F_path_separator_s "usr" F_path_separator_s "sbin" #define F_path_tree_programs_remote_s F_path_separator_s "usr" F_path_separator_s "bin" @@ -177,7 +246,17 @@ extern "C" { #define F_path_tree_programs_boot_s F_path_separator_s "bin" #define F_path_tree_programs_sboot_s F_path_separator_s "sbin" - // Library Level + #define F_path_tree_programs_public_s_length F_path_separator_s_length + F_path_separator_s_length + 6 + #define F_path_tree_programs_system_s_length F_path_separator_s_length + F_path_separator_s_length + 7 + #define F_path_tree_programs_remote_s_length F_path_separator_s_length + F_path_separator_s_length + 6 + #define F_path_tree_programs_services_s_length F_path_separator_s_length + F_path_separator_s_length + 7 + #define F_path_tree_programs_toolchain_s_length F_path_separator_s_length + F_path_separator_s_length + 9 + #define F_path_tree_programs_users_s_length F_path_separator_s_length + F_path_separator_s_length + 5 + #define F_path_tree_programs_susers_s_length F_path_separator_s_length + F_path_separator_s_length + 5 + #define F_path_tree_programs_boot_s_length F_path_separator_s_length + F_path_separator_s_length + 8 + #define F_path_tree_programs_sboot_s_length F_path_separator_s_length + F_path_separator_s_length + 8 + + // Library Level. #define F_path_tree_libraries_public_s F_path_separator_s "usr" F_path_separator_s "lib" #define F_path_tree_libraries_system_s F_path_separator_s "usr" F_path_separator_s "lib" #define F_path_tree_libraries_remote_s F_path_separator_s "usr" F_path_separator_s "lib" @@ -186,25 +265,48 @@ extern "C" { #define F_path_tree_libraries_users_s F_path_separator_s "usr" F_path_separator_s "local" F_path_separator_s "lib" #define F_path_tree_libraries_boot_s F_path_separator_s "lib" - // Home Level + #define F_path_tree_libraries_public_s_length F_path_separator_s_length + F_path_separator_s_length + 6 + #define F_path_tree_libraries_system_s_length F_path_separator_s_length + F_path_separator_s_length + 6 + #define F_path_tree_libraries_remote_s_length F_path_separator_s_length + F_path_separator_s_length + 6 + #define F_path_tree_libraries_services_s_length F_path_separator_s_length + F_path_separator_s_length + 6 + #define F_path_tree_libraries_toolchain_s_length F_path_separator_s_length + F_path_separator_s_length + 6 + #define F_path_tree_libraries_users_s_length F_path_separator_s_length + F_path_separator_s_length + F_path_separator_s_length + 11 + #define F_path_tree_libraries_boot_s_length F_path_separator_s_length + 3 + + // Home Level. #define F_path_tree_home_services_s F_path_separator_s "srv" - #define F_path_tree_home_share_s F_path_separator_s "" - #define F_path_tree_home_users_s f_path_home + #define F_path_tree_home_share_s F_path_separator_s + #define F_path_tree_home_users_s f_path_home_s #define F_path_tree_home_websites_s F_path_separator_s "srv" F_path_separator_s "www" - // System Level + #define F_path_tree_home_services_s_length F_path_separator_s_length + 3 + #define F_path_tree_home_share_s_length F_path_separator_s_length + #define F_path_tree_home_users_s_length f_path_home_s_length + #define F_path_tree_home_websites_s_length F_path_separator_s_length + F_path_separator_s_length + 6 + + // System Level. #define F_path_tree_system_logs_s F_path_separator_s "var" F_path_separator_s "log" #define F_path_tree_system_settings_s F_path_separator_s "etc" #define F_path_tree_system_data_s F_path_separator_s "usr" F_path_separator_s "share" #define F_path_tree_system_variables_s F_path_separator_s "var" - // Temporary Level + #define F_path_tree_system_logs_s_length F_path_separator_s_length + F_path_separator_s_length + 6 + #define F_path_tree_system_settings_s_length F_path_separator_s_length + 3 + #define F_path_tree_system_data_s_length F_path_separator_s_length + F_path_separator_s_length + 8 + #define F_path_tree_system_variables_s_length F_path_separator_s_length + 3 + + // Temporary Level. #define F_path_tree_temporary_public_s F_path_separator_s "tmp" #define F_path_tree_temporary_services_s F_path_separator_s "tmp" #define F_path_tree_temporary_users_s F_path_separator_s "tmp" #define F_path_tree_temporary_variables_s F_path_separator_s "var" F_path_separator_s "tmp" - // Private User Directories + #define F_path_tree_temporary_public_s_length F_path_separator_s_length 3 + #define F_path_tree_temporary_services_s_length F_path_separator_s_length 3 + #define F_path_tree_temporary_users_s_length F_path_separator_s_length 3 + #define F_path_tree_temporary_variables_s_length F_path_separator_s_length + F_path_separator_s_length + 6 + + // Private User Directories. #define F_path_tree_user_downloads_s "downloads" #define F_path_tree_user_desktop_s "desktop" #define F_path_tree_user_private_s "" @@ -212,72 +314,80 @@ extern "C" { #define F_path_tree_user_data_s "" #define F_path_tree_user_temporary_s "" #define F_path_tree_user_shared_s "" + + #define F_path_tree_user_downloads_s_length 9 + #define F_path_tree_user_desktop_s_length 7 + #define F_path_tree_user_private_s_length 0 + #define F_path_tree_user_settings_s_length 0 + #define F_path_tree_user_data_s_length 0 + #define F_path_tree_user_temporary_s_length 0 + #define F_path_tree_user_shared_s_length 0 #endif // _di_path_tree_hierarchy_standard_ #ifdef _di_path_tree_s_ - // KFS Root Level - extern const f_string_t f_path_tree_devices_s; - extern const f_string_t f_path_tree_external_s; - extern const f_string_t f_path_tree_libraries_s; - extern const f_string_t f_path_tree_programs_s; - extern const f_string_t f_path_tree_temporary_s; - extern const f_string_t f_path_tree_home_s; - extern const f_string_t f_path_tree_run_s; - extern const f_string_t f_path_tree_binary_s; - - // FHS Root Level - extern const f_string_t f_path_tree_boot_s; - extern const f_string_t f_path_tree_hardware_s; - extern const f_string_t f_path_tree_processes_s; - extern const f_string_t f_path_tree_system_s; - - // Program Level - extern const f_string_t f_path_tree_programs_public_s; - extern const f_string_t f_path_tree_programs_system_s; - extern const f_string_t f_path_tree_programs_remote_s; - extern const f_string_t f_path_tree_programs_services_s; - extern const f_string_t f_path_tree_programs_toolchain_s; - extern const f_string_t f_path_tree_programs_users_s; - extern const f_string_t f_path_tree_programs_susers_s; - extern const f_string_t f_path_tree_programs_boot_s; - extern const f_string_t f_path_tree_programs_sboot_s; - - // Library Level - extern const f_string_t f_path_tree_libraries_public_s; - extern const f_string_t f_path_tree_libraries_system_s; - extern const f_string_t f_path_tree_libraries_remote_s; - extern const f_string_t f_path_tree_libraries_services_s; - extern const f_string_t f_path_tree_libraries_toolchain_s; - extern const f_string_t f_path_tree_libraries_users_s; - extern const f_string_t f_path_tree_libraries_boot_s; - - // Home Level - extern const f_string_t f_path_tree_home_services_s; - extern const f_string_t f_path_tree_home_share_s; - extern const f_string_t f_path_tree_home_users_s; - extern const f_string_t f_path_tree_home_websites_s; - - // system level - extern const f_string_t f_path_tree_system_logs_s; - extern const f_string_t f_path_tree_system_settings_s; - extern const f_string_t f_path_tree_system_data_s; - extern const f_string_t f_path_tree_system_variables_s; - - // temporary level - extern const f_string_t f_path_tree_temporary_public_s; - extern const f_string_t f_path_tree_temporary_services_s; - extern const f_string_t f_path_tree_temporary_users_s; - extern const f_string_t f_path_tree_temporary_variables_s; - - // private user directories - extern const f_string_t f_path_user_downloads_s; - extern const f_string_t f_path_user_desktop_s; - extern const f_string_t f_path_user_private_s; - extern const f_string_t f_path_user_settings_s; - extern const f_string_t f_path_user_data_s; - extern const f_string_t f_path_user_temporary_s; - extern const f_string_t f_path_user_shared_s; + // KFS Root Level. + extern const f_string_static_t f_path_tree_devices_s; + extern const f_string_static_t f_path_tree_external_s; + extern const f_string_static_t f_path_tree_libraries_s; + extern const f_string_static_t f_path_tree_programs_s; + extern const f_string_static_t f_path_tree_temporary_s; + extern const f_string_static_t f_path_tree_home_s; + extern const f_string_static_t f_path_tree_run_s; + extern const f_string_static_t f_path_tree_binary_s; + + // FHS Root Level. + extern const f_string_static_t f_path_tree_boot_s; + extern const f_string_static_t f_path_tree_hardware_s; + extern const f_string_static_t f_path_tree_processes_s; + extern const f_string_static_t f_path_tree_system_s; + + // Program Level. + extern const f_string_static_t f_path_tree_programs_public_s; + extern const f_string_static_t f_path_tree_programs_system_s; + extern const f_string_static_t f_path_tree_programs_remote_s; + extern const f_string_static_t f_path_tree_programs_services_s; + extern const f_string_static_t f_path_tree_programs_toolchain_s; + extern const f_string_static_t f_path_tree_programs_users_s; + extern const f_string_static_t f_path_tree_programs_susers_s; + extern const f_string_static_t f_path_tree_programs_boot_s; + extern const f_string_static_t f_path_tree_programs_sboot_s; + + // Library Level. + extern const f_string_static_t f_path_tree_libraries_public_s; + extern const f_string_static_t f_path_tree_libraries_system_s; + extern const f_string_static_t f_path_tree_libraries_remote_s; + extern const f_string_static_t f_path_tree_libraries_services_s; + extern const f_string_static_t f_path_tree_libraries_toolchain_s; + extern const f_string_static_t f_path_tree_libraries_users_s; + extern const f_string_static_t f_path_tree_libraries_boot_s; + + // Home Level. + extern const f_string_static_t f_path_tree_home_services_s; + extern const f_string_static_t f_path_tree_home_share_s; + extern const f_string_static_t f_path_tree_home_users_s; + extern const f_string_static_t f_path_tree_home_websites_s; + + // system level. + extern const f_string_static_t f_path_tree_system_logs_s; + extern const f_string_static_t f_path_tree_system_settings_s; + extern const f_string_static_t f_path_tree_system_data_s; + extern const f_string_static_t f_path_tree_system_variables_s; + + // temporary level. + extern const f_string_static_t f_path_tree_temporary_public_s; + extern const f_string_static_t f_path_tree_temporary_services_s; + extern const f_string_static_t f_path_tree_temporary_users_s; + extern const f_string_static_t f_path_tree_temporary_variables_s; + + // Private user directories. + extern const f_string_static_t f_path_user_downloads_s; + extern const f_string_static_t f_path_user_desktop_s; + extern const f_string_static_t f_path_user_private_s; + extern const f_string_static_t f_path_user_settings_s; + extern const f_string_static_t f_path_user_data_s; + extern const f_string_static_t f_path_user_temporary_s; + extern const f_string_static_t f_path_user_shared_s; #endif // _di_path_tree_s_ #ifdef __cplusplus diff --git a/level_0/f_path/c/path.c b/level_0/f_path/c/path.c index d1aef35..bad3471 100644 --- a/level_0/f_path/c/path.c +++ b/level_0/f_path/c/path.c @@ -101,7 +101,7 @@ extern "C" { for (f_array_length_t i = 0; i < length; ++i) { - if (path[i] == f_path_separator_s[0]) { + if (path[i] == f_path_separator_s.string[0]) { return F_true; } } // for @@ -123,7 +123,7 @@ extern "C" { if (path[i]) break; } // for - if (path[i] == f_path_separator_s[0]) { + if (path[i] == f_path_separator_s.string[0]) { return F_false; } @@ -144,25 +144,25 @@ extern "C" { if (path[i]) break; } // for - if (path[i] == f_path_separator_s[0]) { + if (path[i] == f_path_separator_s.string[0]) { return F_false; } - if (path[i] == f_path_separator_current_s[0]) { + if (path[i] == f_path_separator_current_s.string[0]) { for (; i < length; ++i) { if (path[i]) break; } // for - if (path[i] == f_path_separator_s[0]) { + if (path[i] == f_path_separator_s.string[0]) { return F_true; } - if (path[i] == f_path_separator_current_s[0]) { + if (path[i] == f_path_separator_current_s.string[0]) { for (; i < length; ++i) { if (path[i]) break; } // for - if (path[i] == f_path_separator_s[0]) { + if (path[i] == f_path_separator_s.string[0]) { return F_true; } } diff --git a/level_0/f_print/c/print-common.c b/level_0/f_print/c/print-common.c index 61a7024..3cb6445 100644 --- a/level_0/f_print/c/print-common.c +++ b/level_0/f_print/c/print-common.c @@ -6,76 +6,76 @@ extern "C" { #endif #ifndef _di_f_print_sequences_ - const f_string_t f_print_sequence_acknowledge_s = F_print_sequence_acknowledge_s; - const f_string_t f_print_sequence_acknowledge_negative_s = F_print_sequence_acknowledge_negative_s; - const f_string_t f_print_sequence_backspace_s = F_print_sequence_backspace_s; - const f_string_t f_print_sequence_bell_s = F_print_sequence_bell_s; - const f_string_t f_print_sequence_cancel_s = F_print_sequence_cancel_s; - const f_string_t f_print_sequence_carriage_return_s = F_print_sequence_carriage_return_s; - const f_string_t f_print_sequence_data_link_escape_s = F_print_sequence_data_link_escape_s; - const f_string_t f_print_sequence_delete_s = F_print_sequence_delete_s; - const f_string_t f_print_sequence_device_control_1_s = F_print_sequence_device_control_1_s; - const f_string_t f_print_sequence_device_control_2_s = F_print_sequence_device_control_2_s; - const f_string_t f_print_sequence_device_control_3_s = F_print_sequence_device_control_3_s; - const f_string_t f_print_sequence_device_control_4_s = F_print_sequence_device_control_4_s; - const f_string_t f_print_sequence_end_of_medium_s = F_print_sequence_end_of_medium_s; - const f_string_t f_print_sequence_end_of_text_s = F_print_sequence_end_of_text_s; - const f_string_t f_print_sequence_end_of_transmission_s = F_print_sequence_end_of_transmission_s; - const f_string_t f_print_sequence_end_of_transmission_block_s = F_print_sequence_end_of_transmission_block_s; - const f_string_t f_print_sequence_enquiry_s = F_print_sequence_enquiry_s; - const f_string_t f_print_sequence_escape_s = F_print_sequence_escape_s; - const f_string_t f_print_sequence_form_feed_s = F_print_sequence_form_feed_s; - const f_string_t f_print_sequence_line_feed_s = F_print_sequence_line_feed_s; - const f_string_t f_print_sequence_null_s = F_print_sequence_null_s; - const f_string_t f_print_sequence_separator_file_s = F_print_sequence_separator_file_s; - const f_string_t f_print_sequence_separator_group_s = F_print_sequence_separator_group_s; - const f_string_t f_print_sequence_separator_record_s = F_print_sequence_separator_record_s; - const f_string_t f_print_sequence_separator_unit_s = F_print_sequence_separator_unit_s; - const f_string_t f_print_sequence_shift_in_s = F_print_sequence_shift_in_s; - const f_string_t f_print_sequence_shift_out_s = F_print_sequence_shift_out_s; - const f_string_t f_print_sequence_start_of_header_s = F_print_sequence_start_of_header_s; - const f_string_t f_print_sequence_start_of_text_s = F_print_sequence_start_of_text_s; - const f_string_t f_print_sequence_substitute_s = F_print_sequence_substitute_s; - const f_string_t f_print_sequence_synchronous_idle_s = F_print_sequence_synchronous_idle_s; - const f_string_t f_print_sequence_tab_s = F_print_sequence_tab_s; - const f_string_t f_print_sequence_tab_vertical_s = F_print_sequence_tab_vertical_s; - const f_string_t f_print_sequence_unknown_s = F_print_sequence_unknown_s; + const f_string_static_t f_print_sequence_acknowledge_s = macro_f_string_static_t_initialize2(F_print_sequence_acknowledge_s, 0, F_print_sequence_acknowledge_s_length); + const f_string_static_t f_print_sequence_acknowledge_negative_s = macro_f_string_static_t_initialize2(F_print_sequence_acknowledge_negative_s, 0, F_print_sequence_acknowledge_negative_s_length); + const f_string_static_t f_print_sequence_backspace_s = macro_f_string_static_t_initialize2(F_print_sequence_backspace_s, 0, F_print_sequence_backspace_s_length); + const f_string_static_t f_print_sequence_bell_s = macro_f_string_static_t_initialize2(F_print_sequence_bell_s, 0, F_print_sequence_bell_s_length); + const f_string_static_t f_print_sequence_cancel_s = macro_f_string_static_t_initialize2(F_print_sequence_cancel_s, 0, F_print_sequence_cancel_s_length); + const f_string_static_t f_print_sequence_carriage_return_s = macro_f_string_static_t_initialize2(F_print_sequence_carriage_return_s, 0, F_print_sequence_carriage_return_s_length); + const f_string_static_t f_print_sequence_data_link_escape_s = macro_f_string_static_t_initialize2(F_print_sequence_data_link_escape_s, 0, F_print_sequence_data_link_escape_s_length); + const f_string_static_t f_print_sequence_delete_s = macro_f_string_static_t_initialize2(F_print_sequence_delete_s, 0, F_print_sequence_delete_s_length); + const f_string_static_t f_print_sequence_device_control_1_s = macro_f_string_static_t_initialize2(F_print_sequence_device_control_1_s, 0, F_print_sequence_device_control_1_s_length); + const f_string_static_t f_print_sequence_device_control_2_s = macro_f_string_static_t_initialize2(F_print_sequence_device_control_2_s, 0, F_print_sequence_device_control_2_s_length); + const f_string_static_t f_print_sequence_device_control_3_s = macro_f_string_static_t_initialize2(F_print_sequence_device_control_3_s, 0, F_print_sequence_device_control_3_s_length); + const f_string_static_t f_print_sequence_device_control_4_s = macro_f_string_static_t_initialize2(F_print_sequence_device_control_4_s, 0, F_print_sequence_device_control_4_s_length); + const f_string_static_t f_print_sequence_end_of_medium_s = macro_f_string_static_t_initialize2(F_print_sequence_end_of_medium_s, 0, F_print_sequence_end_of_medium_s_length); + const f_string_static_t f_print_sequence_end_of_text_s = macro_f_string_static_t_initialize2(F_print_sequence_end_of_text_s, 0, F_print_sequence_end_of_text_s_length); + const f_string_static_t f_print_sequence_end_of_transmission_s = macro_f_string_static_t_initialize2(F_print_sequence_end_of_transmission_s, 0, F_print_sequence_end_of_transmission_s_length); + const f_string_static_t f_print_sequence_end_of_transmission_block_s = macro_f_string_static_t_initialize2(F_print_sequence_end_of_transmission_block_s, 0, F_print_sequence_end_of_transmission_block_s_length); + const f_string_static_t f_print_sequence_enquiry_s = macro_f_string_static_t_initialize2(F_print_sequence_enquiry_s, 0, F_print_sequence_enquiry_s_length); + const f_string_static_t f_print_sequence_escape_s = macro_f_string_static_t_initialize2(F_print_sequence_escape_s, 0, F_print_sequence_escape_s_length); + const f_string_static_t f_print_sequence_form_feed_s = macro_f_string_static_t_initialize2(F_print_sequence_form_feed_s, 0, F_print_sequence_form_feed_s_length); + const f_string_static_t f_print_sequence_line_feed_s = macro_f_string_static_t_initialize2(F_print_sequence_line_feed_s, 0, F_print_sequence_line_feed_s_length); + const f_string_static_t f_print_sequence_null_s = macro_f_string_static_t_initialize2(F_print_sequence_null_s, 0, F_print_sequence_null_s_length); + const f_string_static_t f_print_sequence_separator_file_s = macro_f_string_static_t_initialize2(F_print_sequence_separator_file_s, 0, F_print_sequence_separator_file_s_length); + const f_string_static_t f_print_sequence_separator_group_s = macro_f_string_static_t_initialize2(F_print_sequence_separator_group_s, 0, F_print_sequence_separator_group_s_length); + const f_string_static_t f_print_sequence_separator_record_s = macro_f_string_static_t_initialize2(F_print_sequence_separator_record_s, 0, F_print_sequence_separator_record_s_length); + const f_string_static_t f_print_sequence_separator_unit_s = macro_f_string_static_t_initialize2(F_print_sequence_separator_unit_s, 0, F_print_sequence_separator_unit_s_length); + const f_string_static_t f_print_sequence_shift_in_s = macro_f_string_static_t_initialize2(F_print_sequence_shift_in_s, 0, F_print_sequence_shift_in_s_length); + const f_string_static_t f_print_sequence_shift_out_s = macro_f_string_static_t_initialize2(F_print_sequence_shift_out_s, 0, F_print_sequence_shift_out_s_length); + const f_string_static_t f_print_sequence_start_of_header_s = macro_f_string_static_t_initialize2(F_print_sequence_start_of_header_s, 0, F_print_sequence_start_of_header_s_length); + const f_string_static_t f_print_sequence_start_of_text_s = macro_f_string_static_t_initialize2(F_print_sequence_start_of_text_s, 0, F_print_sequence_start_of_text_s_length); + const f_string_static_t f_print_sequence_substitute_s = macro_f_string_static_t_initialize2(F_print_sequence_substitute_s, 0, F_print_sequence_substitute_s_length); + const f_string_static_t f_print_sequence_synchronous_idle_s = macro_f_string_static_t_initialize2(F_print_sequence_synchronous_idle_s, 0, F_print_sequence_synchronous_idle_s_length); + const f_string_static_t f_print_sequence_tab_s = macro_f_string_static_t_initialize2(F_print_sequence_tab_s, 0, F_print_sequence_tab_s_length); + const f_string_static_t f_print_sequence_tab_vertical_s = macro_f_string_static_t_initialize2(F_print_sequence_tab_vertical_s, 0, F_print_sequence_tab_vertical_s_length); + const f_string_static_t f_print_sequence_unknown_s = macro_f_string_static_t_initialize2(F_print_sequence_unknown_s, 0, F_print_sequence_unknown_s_length); #endif // _di_f_print_sequences_ #ifndef _di_f_print_sequences_set_control_ - const char f_print_sequence_set_control_s[32][3] = { - F_print_sequence_null_s, - F_print_sequence_start_of_header_s, - F_print_sequence_start_of_text_s, - F_print_sequence_end_of_text_s, - F_print_sequence_end_of_transmission_s, - F_print_sequence_enquiry_s, - F_print_sequence_acknowledge_s, - F_print_sequence_bell_s, - F_print_sequence_backspace_s, - F_print_sequence_tab_s, - F_print_sequence_line_feed_s, - F_print_sequence_tab_vertical_s, - F_print_sequence_form_feed_s, - F_print_sequence_carriage_return_s, - F_print_sequence_shift_out_s, - F_print_sequence_shift_in_s, - F_print_sequence_data_link_escape_s, - F_print_sequence_device_control_1_s, - F_print_sequence_device_control_2_s, - F_print_sequence_device_control_3_s, - F_print_sequence_device_control_4_s, - F_print_sequence_acknowledge_negative_s, - F_print_sequence_synchronous_idle_s, - F_print_sequence_end_of_transmission_block_s, - F_print_sequence_cancel_s, - F_print_sequence_end_of_medium_s, - F_print_sequence_substitute_s, - F_print_sequence_escape_s, - F_print_sequence_separator_file_s, - F_print_sequence_separator_group_s, - F_print_sequence_separator_record_s, - F_print_sequence_separator_unit_s, + const f_string_static_t f_print_sequence_set_control_s[32] = { + f_print_sequence_null_s, + f_print_sequence_start_of_header_s, + f_print_sequence_start_of_text_s, + f_print_sequence_end_of_text_s, + f_print_sequence_end_of_transmission_s, + f_print_sequence_enquiry_s, + f_print_sequence_acknowledge_s, + f_print_sequence_bell_s, + f_print_sequence_backspace_s, + f_print_sequence_tab_s, + f_print_sequence_line_feed_s, + f_print_sequence_tab_vertical_s, + f_print_sequence_form_feed_s, + f_print_sequence_carriage_return_s, + f_print_sequence_shift_out_s, + f_print_sequence_shift_in_s, + f_print_sequence_data_link_escape_s, + f_print_sequence_device_control_1_s, + f_print_sequence_device_control_2_s, + f_print_sequence_device_control_3_s, + f_print_sequence_device_control_4_s, + f_print_sequence_acknowledge_negative_s, + f_print_sequence_synchronous_idle_s, + f_print_sequence_end_of_transmission_block_s, + f_print_sequence_cancel_s, + f_print_sequence_end_of_medium_s, + f_print_sequence_substitute_s, + f_print_sequence_escape_s, + f_print_sequence_separator_file_s, + f_print_sequence_separator_group_s, + f_print_sequence_separator_record_s, + f_print_sequence_separator_unit_s, }; #endif // _di_f_print_sequences_set_control_ diff --git a/level_0/f_print/c/print-common.h b/level_0/f_print/c/print-common.h index 0ff9eb9..ea60aef 100644 --- a/level_0/f_print/c/print-common.h +++ b/level_0/f_print/c/print-common.h @@ -71,40 +71,75 @@ extern "C" { #define F_print_sequence_tab_vertical_s "␋" #define F_print_sequence_unknown_s "�" - extern const f_string_t f_print_sequence_acknowledge_s; - extern const f_string_t f_print_sequence_acknowledge_negative_s; - extern const f_string_t f_print_sequence_backspace_s; - extern const f_string_t f_print_sequence_bell_s; - extern const f_string_t f_print_sequence_cancel_s; - extern const f_string_t f_print_sequence_carriage_return_s; - extern const f_string_t f_print_sequence_data_link_escape_s; - extern const f_string_t f_print_sequence_delete_s; - extern const f_string_t f_print_sequence_device_control_1_s; - extern const f_string_t f_print_sequence_device_control_2_s; - extern const f_string_t f_print_sequence_device_control_3_s; - extern const f_string_t f_print_sequence_device_control_4_s; - extern const f_string_t f_print_sequence_end_of_medium_s; - extern const f_string_t f_print_sequence_end_of_text_s; - extern const f_string_t f_print_sequence_end_of_transmission_s; - extern const f_string_t f_print_sequence_end_of_transmission_block_s; - extern const f_string_t f_print_sequence_escape_s; - extern const f_string_t f_print_sequence_equiry_s; - extern const f_string_t f_print_sequence_form_feed_s; - extern const f_string_t f_print_sequence_line_feed_s; - extern const f_string_t f_print_sequence_null_s; - extern const f_string_t f_print_sequence_separator_file_s; - extern const f_string_t f_print_sequence_separator_group_s; - extern const f_string_t f_print_sequence_separator_record_s; - extern const f_string_t f_print_sequence_separator_unit_s; - extern const f_string_t f_print_sequence_shift_in_s; - extern const f_string_t f_print_sequence_shift_out_s; - extern const f_string_t f_print_sequence_start_of_header_s; - extern const f_string_t f_print_sequence_start_of_text_s; - extern const f_string_t f_print_sequence_substitute_s; - extern const f_string_t f_print_sequence_synchronous_idle_s; - extern const f_string_t f_print_sequence_tab_s; - extern const f_string_t f_print_sequence_tab_vertical_s; - extern const f_string_t f_print_sequence_unknown_s; + #define F_print_sequence_acknowledge_s_length 3 + #define F_print_sequence_acknowledge_negative_s_length 3 + #define F_print_sequence_backspace_s_length 3 + #define F_print_sequence_bell_s_length 3 + #define F_print_sequence_cancel_s_length 3 + #define F_print_sequence_carriage_return_s_length 3 + #define F_print_sequence_data_link_escape_s_length 3 + #define F_print_sequence_delete_s_length 3 + #define F_print_sequence_device_control_1_s_length 3 + #define F_print_sequence_device_control_2_s_length 3 + #define F_print_sequence_device_control_3_s_length 3 + #define F_print_sequence_device_control_4_s_length 3 + #define F_print_sequence_end_of_medium_s_length 3 + #define F_print_sequence_end_of_text_s_length 3 + #define F_print_sequence_end_of_transmission_s_length 3 + #define F_print_sequence_end_of_transmission_block_s_length 3 + #define F_print_sequence_enquiry_s_length 3 + #define F_print_sequence_escape_s_length 3 + #define F_print_sequence_form_feed_s_length 3 + #define F_print_sequence_line_feed_s_length 3 + #define F_print_sequence_null_s_length 3 + #define F_print_sequence_separator_file_s_length 3 + #define F_print_sequence_separator_group_s_length 3 + #define F_print_sequence_separator_record_s_length 3 + #define F_print_sequence_separator_unit_s_length 3 + #define F_print_sequence_shift_in_s_length 3 + #define F_print_sequence_shift_out_s_length 3 + #define F_print_sequence_start_of_header_s_length 3 + #define F_print_sequence_start_of_text_s_length 3 + #define F_print_sequence_substitute_s_length 3 + #define F_print_sequence_synchronous_idle_s_length 3 + #define F_print_sequence_tab_s_length 3 + #define F_print_sequence_tab_vertical_s_length 3 + #define F_print_sequence_unknown_s_length 3 + + extern const f_string_static_t f_print_sequence_acknowledge_s; + extern const f_string_static_t f_print_sequence_acknowledge_negative_s; + extern const f_string_static_t f_print_sequence_backspace_s; + extern const f_string_static_t f_print_sequence_bell_s; + extern const f_string_static_t f_print_sequence_cancel_s; + extern const f_string_static_t f_print_sequence_carriage_return_s; + extern const f_string_static_t f_print_sequence_data_link_escape_s; + extern const f_string_static_t f_print_sequence_delete_s; + extern const f_string_static_t f_print_sequence_device_control_1_s; + extern const f_string_static_t f_print_sequence_device_control_2_s; + extern const f_string_static_t f_print_sequence_device_control_3_s; + extern const f_string_static_t f_print_sequence_device_control_4_s; + extern const f_string_static_t f_print_sequence_end_of_medium_s; + extern const f_string_static_t f_print_sequence_end_of_text_s; + extern const f_string_static_t f_print_sequence_end_of_transmission_s; + extern const f_string_static_t f_print_sequence_end_of_transmission_block_s; + extern const f_string_static_t f_print_sequence_escape_s; + extern const f_string_static_t f_print_sequence_equiry_s; + extern const f_string_static_t f_print_sequence_form_feed_s; + extern const f_string_static_t f_print_sequence_line_feed_s; + extern const f_string_static_t f_print_sequence_null_s; + extern const f_string_static_t f_print_sequence_separator_file_s; + extern const f_string_static_t f_print_sequence_separator_group_s; + extern const f_string_static_t f_print_sequence_separator_record_s; + extern const f_string_static_t f_print_sequence_separator_unit_s; + extern const f_string_static_t f_print_sequence_shift_in_s; + extern const f_string_static_t f_print_sequence_shift_out_s; + extern const f_string_static_t f_print_sequence_start_of_header_s; + extern const f_string_static_t f_print_sequence_start_of_text_s; + extern const f_string_static_t f_print_sequence_substitute_s; + extern const f_string_static_t f_print_sequence_synchronous_idle_s; + extern const f_string_static_t f_print_sequence_tab_s; + extern const f_string_static_t f_print_sequence_tab_vertical_s; + extern const f_string_static_t f_print_sequence_unknown_s; #endif // _di_f_print_sequences_ /** @@ -114,7 +149,7 @@ extern "C" { * With the exception being ASCII code 127, which is not present in this map. */ #ifndef _di_f_print_sequences_set_control_ - extern const char f_print_sequence_set_control_s[32][3]; + extern const f_string_static_t f_print_sequence_set_control_s[32]; #endif // _di_f_print_sequences_set_control_ /** diff --git a/level_0/f_print/c/print.c b/level_0/f_print/c/print.c index a015f02..94f776b 100644 --- a/level_0/f_print/c/print.c +++ b/level_0/f_print/c/print.c @@ -40,12 +40,12 @@ extern "C" { #endif // _di_level_0_parameter_checking_ if (character == 0x7f) { - if (fwrite_unlocked(f_print_sequence_delete_s, 1, 3, output) == 3) { + if (fwrite_unlocked(f_print_sequence_delete_s.string, 1, f_print_sequence_delete_s.used, output) == f_print_sequence_delete_s.used) { return F_none; } } else if (macro_f_utf_character_t_width_is(character) == 1) { - if (fwrite_unlocked(f_print_sequence_unknown_s, 1, 3, output) == 3) { + if (fwrite_unlocked(f_print_sequence_unknown_s.string, 1, f_print_sequence_unknown_s.used, output) == f_print_sequence_unknown_s.used) { return F_none; } } @@ -55,7 +55,7 @@ extern "C" { } } else { - if (fwrite_unlocked(f_print_sequence_set_control_s[character], 1, 3, output) == 3) { + if (fwrite_unlocked(f_print_sequence_set_control_s[character].string, 1, f_print_sequence_set_control_s[character].used, output) == f_print_sequence_set_control_s[character].used) { return F_none; } } @@ -65,7 +65,7 @@ extern "C" { #endif // _di_f_print_character_safely_ #ifndef _di_f_print_character_safely_get_ - f_string_t f_print_character_safely_get(const char character) { + const f_string_static_t f_print_character_safely_get(const char character) { return private_f_print_character_safely_get(character); } @@ -493,7 +493,8 @@ extern "C" { #endif // _di_f_print_safely_ #ifndef _di_f_print_safely_get_ - f_string_t f_print_safely_get(const f_string_t character, const f_array_length_t width_max) { + const f_string_static_t f_print_safely_get(const f_string_t character, const f_array_length_t width_max) { + return private_f_print_safely_get(character, width_max); } #endif // _di_f_print_safely_get_ @@ -511,13 +512,13 @@ extern "C" { f_array_length_t start = 0; f_array_length_t total = 0; - f_string_t safe = 0; + f_string_static_t safe = f_string_empty_s; uint8_t width = 0; for (register f_array_length_t i = 0; string[i]; ) { - safe = 0; + safe.used = 0; width = macro_f_utf_character_t_width(string[i]); if (width > 1) { @@ -526,25 +527,25 @@ extern "C" { if (string[i + 2]) { if (width > 3) { if (!string[i + 3]) { - safe = (f_string_t) f_print_sequence_unknown_s; + safe = f_print_sequence_unknown_s; } } } else { - safe = (f_string_t) f_print_sequence_unknown_s; + safe = f_print_sequence_unknown_s; } } } else { - safe = (f_string_t) f_print_sequence_unknown_s; + safe = f_print_sequence_unknown_s; } } - if (!safe) { + if (!safe.used) { safe = private_f_print_safely_get(string + i, width); } - if (safe) { + if (safe.used) { if (total) { if (fwrite_unlocked(string + start, 1, total, output) < total) { return F_status_set_error(F_output); @@ -553,7 +554,7 @@ extern "C" { total = 0; } - if (fwrite_unlocked(safe, 1, 3, output) < 3) { + if (fwrite_unlocked(safe.string, 1, safe.used, output) < safe.used) { return F_status_set_error(F_output); } @@ -573,6 +574,7 @@ extern "C" { i += width; start = i - 1; + continue; } diff --git a/level_0/f_print/c/print.h b/level_0/f_print/c/print.h index 666e803..5a8c438 100644 --- a/level_0/f_print/c/print.h +++ b/level_0/f_print/c/print.h @@ -124,9 +124,9 @@ extern "C" { * * Control characters are converted to the Unicode control character symbols, including NULL. * UTF-8 sequences with a width of 1 are converted to the unknown character '�'. - * For all other UTF-8 sequences, 0 is returned because it cannot be processed via a single 8-byte character. + * For all other UTF-8 sequences, an empty string is returned. * - * The returned string will either be NULL (for characters that are already safe) or a string representing the replacement. + * The returned string will either be an empty string (for characters that are already safe) or a string representing the replacement. * This can result in a 3-byte character being returned as a string of 3 1-bytes. * * This should only be called for the first 1-byte character of a multibyte character. @@ -135,13 +135,12 @@ extern "C" { * The character to verify as safe or not and then print. * * @return - * NULL is returned if the character is already safe or if the character has a UTF-8 width of 2 or greater. - * A non-NULL string is returned if the character needs safe replacement. - * The non-NULL strings returned are NULL terminated. - * The non-NULL strings returned are the 3-byte characters used as placeholder symbols. + * A string with used length of 0 (an empty string) is returned if the character is already safe or is a UTF-8 character whose width is greater than 1. + * A string with a non-zero used length is returned if the character needs safe replacement. + * A string with a non-zero used length is returned are NULL terminated (after the used length). */ #ifndef _di_f_print_character_safely_get_ - extern f_string_t f_print_character_safely_get(const char character); + extern const f_string_static_t f_print_character_safely_get(const char character); #endif // _di_f_print_character_safely_get_ /** @@ -1102,9 +1101,9 @@ extern "C" { * * Control characters are converted to the Unicode control character symbols, including NULL. * UTF-8 sequences with a width of 1 are converted to the unknown character '�'. - * For all other UTF-8 sequences, 0 is returned because it cannot be processed via a single 8-byte character. + * For all other UTF-8 sequences, an empty string is returned. * - * The returned string will either be NULL (for characters that are already safe) or a string representing the replacement. + * The returned string will either be an empty string (for characters that are already safe) or a string representing the replacement. * This can result in a 3-byte character being returned as a string of 3 1-bytes. * * This should only be called for the first 1-byte character of a multibyte character. @@ -1116,13 +1115,12 @@ extern "C" { * This is then updated to represent the max bytes used if enough space is available. * * @return - * NULL is returned if the character is already safe or if the character has a UTF-8 width of 2 or greater. - * A non-NULL string is returned if the character needs safe replacement. - * The non-NULL strings returned are NULL terminated. - * The non-NULL strings returned are the 3-byte characters used as placeholder symbols. + * A string with used length of 0 (an empty string) is returned if the character is already safe or is a UTF-8 character whose width is greater than 1. + * A string with a non-zero used length is returned if the character needs safe replacement. + * A string with a non-zero used length is returned are NULL terminated (after the used length). */ #ifndef _di_f_print_safely_get_ - extern f_string_t f_print_safely_get(const f_string_t character, const f_array_length_t width_max); + extern const f_string_static_t f_print_safely_get(const f_string_t character, const f_array_length_t width_max); #endif // _di_f_print_safely_get_ /** diff --git a/level_0/f_print/c/print_to.c b/level_0/f_print/c/print_to.c index e29f189..7341d48 100644 --- a/level_0/f_print/c/print_to.c +++ b/level_0/f_print/c/print_to.c @@ -509,13 +509,13 @@ static inline f_status_t private_inline_f_print_to_error() { f_array_length_t start = 0; f_array_length_t total = 0; - f_string_t safe = 0; + f_string_static_t safe = f_string_empty_s; uint8_t width = 0; for (register f_array_length_t i = 0; string[i]; ) { - safe = 0; + safe = f_string_empty_s; width = macro_f_utf_character_t_width(string[i]); if (width > 1) { @@ -524,25 +524,25 @@ static inline f_status_t private_inline_f_print_to_error() { if (string[i + 2]) { if (width > 3) { if (!string[i + 3]) { - safe = (f_string_t) f_print_sequence_unknown_s; + safe = f_print_sequence_unknown_s; } } } else { - safe = (f_string_t) f_print_sequence_unknown_s; + safe = f_print_sequence_unknown_s; } } } else { - safe = (f_string_t) f_print_sequence_unknown_s; + safe = f_print_sequence_unknown_s; } } - if (!safe) { + if (!safe.used) { safe = private_f_print_safely_get(string + i, width); } - if (safe) { + if (safe.used) { if (total) { if (write(id, string + start, total) == -1) { return private_inline_f_print_to_error(); @@ -551,12 +551,13 @@ static inline f_status_t private_inline_f_print_to_error() { total = 0; } - if (write(id, safe, 3) == -1) { + if (write(id, safe.string, safe.used) == -1) { return private_inline_f_print_to_error(); } i += width; start = i; + continue; } @@ -571,6 +572,7 @@ static inline f_status_t private_inline_f_print_to_error() { i += width; start = i - 1; + continue; } diff --git a/level_0/f_print/c/private-print.c b/level_0/f_print/c/private-print.c index 9a54a79..6e5353b 100644 --- a/level_0/f_print/c/private-print.c +++ b/level_0/f_print/c/private-print.c @@ -39,21 +39,21 @@ extern "C" { #endif // !defined(_di_f_print_) || !defined(_di_f_print_dynamic_) || !defined(_di_f_print_dynamic_partial_) #if !defined(_di_f_print_character_safely_get_) || !defined(_di_f_print_dynamic_partial_safely_) || !defined(_di_f_print_dynamic_safely_) || !defined(_di_f_print_except_dynamic_partial_safely_) || !defined(_di_f_print_except_dynamic_safely_) || !defined(_di_f_print_except_in_dynamic_safely_) || !defined(_di_f_print_except_in_dynamic_partial_safely_) || !defined(_di_f_print_except_in_safely_) || !defined(_di_f_print_except_safely_) || !defined(_di_f_print_safely_) || !defined(_di_f_print_safely_terminated_) || !defined(_di_f_print_to_dynamic_partial_safely_) || !defined(_di_f_print_to_dynamic_safely_) || !defined(_di_f_print_to_except_dynamic_partial_safely_) || !defined(_di_f_print_to_except_dynamic_safely_) || !defined(_di_f_print_to_except_in_dynamic_safely_) || !defined(_di_f_print_to_except_in_dynamic_partial_safely_) || !defined(_di_f_print_to_except_in_safely_) || !defined(_di_f_print_to_except_safely_) || !defined(_di_f_print_to_safely_) - f_string_t private_f_print_character_safely_get(const char character) { + const f_string_static_t private_f_print_character_safely_get(const char character) { if (character == 0x7f) { - return (f_string_t) f_print_sequence_delete_s; + return f_print_sequence_delete_s; } if (macro_f_utf_character_t_width_is(character) == 1) { - return (f_string_t) f_print_sequence_unknown_s; + return f_print_sequence_unknown_s; } if (macro_f_utf_character_t_width_is(character) > 1 || character > 0x1f) { - return 0; + return f_string_empty_s; } - return (f_string_t) f_print_sequence_set_control_s[character]; + return f_print_sequence_set_control_s[character]; } #endif // !defined(_di_f_print_character_safely_get_) || !defined(_di_f_print_dynamic_partial_safely_) || !defined(_di_f_print_dynamic_safely_) || !defined(_di_f_print_except_dynamic_partial_safely_) || !defined(_di_f_print_except_dynamic_safely_) || !defined(_di_f_print_except_in_dynamic_safely_) || !defined(_di_f_print_except_in_dynamic_partial_safely_) || !defined(_di_f_print_except_in_safely_) || !defined(_di_f_print_except_safely_) || !defined(_di_f_print_safely_) || !defined(_di_f_print_safely_terminated_) || !defined(_di_f_print_to_dynamic_partial_safely_) || !defined(_di_f_print_to_dynamic_safely_) || !defined(_di_f_print_to_except_dynamic_partial_safely_) || !defined(_di_f_print_to_except_dynamic_safely_) || !defined(_di_f_print_to_except_in_dynamic_safely_) || !defined(_di_f_print_to_except_in_dynamic_partial_safely_) || !defined(_di_f_print_to_except_in_safely_) || !defined(_di_f_print_to_except_safely_) || !defined(_di_f_print_to_safely_) @@ -265,7 +265,7 @@ extern "C" { f_array_length_t total = 0; f_status_t status = F_none; - f_string_t safe = 0; + f_string_static_t safe = f_string_static_t_initialize; uint8_t width = 0; @@ -329,7 +329,7 @@ extern "C" { continue; } - if (safe) { + if (safe.used) { if (total) { if (fwrite_unlocked(string + start, 1, total, output) < total) { return F_status_set_error(F_output); @@ -338,7 +338,7 @@ extern "C" { total = 0; } - if (fwrite_unlocked(safe, 1, 3, output) < 3) { + if (fwrite_unlocked(safe.string, 1, safe.used, output) < safe.used) { return F_status_set_error(F_output); } @@ -430,7 +430,7 @@ extern "C" { f_array_length_t total = 0; f_status_t status = F_none; - f_string_t safe = 0; + f_string_static_t safe = f_string_static_t_initialize; uint8_t width = 0; @@ -475,7 +475,7 @@ extern "C" { width = macro_f_utf_character_t_width(string[i]); - if (safe) { + if (safe.used) { if (total) { if (fwrite_unlocked(string + start, 1, total, output) < total) { return F_status_set_error(F_output); @@ -484,7 +484,7 @@ extern "C" { total = 0; } - if (fwrite_unlocked(safe, 1, 3, output) < 3) { + if (fwrite_unlocked(safe.string, 1, safe.used, output) < safe.used) { return F_status_set_error(F_output); } @@ -563,7 +563,7 @@ extern "C" { f_array_length_t start = 0; f_array_length_t total = 0; - f_string_t safe = 0; + f_string_static_t safe = f_string_static_t_initialize; uint8_t width = 0; @@ -588,7 +588,7 @@ extern "C" { continue; } - if (safe) { + if (safe.used) { if (total) { if (fwrite_unlocked(string + start, 1, total, output) < total) { return F_status_set_error(F_output); @@ -597,7 +597,7 @@ extern "C" { total = 0; } - if (!fwrite_unlocked(safe, 1, 3, output) < 3) { + if (!fwrite_unlocked(safe.string, 1, safe.used, output) < safe.used) { return F_status_set_error(F_output); } @@ -631,25 +631,25 @@ extern "C" { #endif // !defined(_di_f_print_safely_) || !defined(_di_f_print_safely_dynamic_) || !defined(_di_f_print_safely_dynamic_partial_) #if !defined(_di_f_print_character_safely_get_) || !defined(_di_f_print_dynamic_partial_safely_) || !defined(_di_f_print_dynamic_safely_) || !defined(_di_f_print_except_dynamic_partial_safely_) || !defined(_di_f_print_except_dynamic_safely_) || !defined(_di_f_print_except_in_dynamic_safely_) || !defined(_di_f_print_except_in_dynamic_partial_safely_) || !defined(_di_f_print_except_in_safely_) || !defined(_di_f_print_except_safely_) || !defined(_di_f_print_safely_) || !defined(_di_f_print_safely_terminated_) || !defined(_di_f_print_to_dynamic_partial_safely_) || !defined(_di_f_print_to_dynamic_safely_) || !defined(_di_f_print_to_except_dynamic_partial_safely_) || !defined(_di_f_print_to_except_dynamic_safely_) || !defined(_di_f_print_to_except_in_dynamic_safely_) || !defined(_di_f_print_to_except_in_dynamic_partial_safely_) || !defined(_di_f_print_to_except_in_safely_) || !defined(_di_f_print_to_except_safely_) || !defined(_di_f_print_to_safely_) - f_string_t private_f_print_safely_get(const f_string_t character, const f_array_length_t width_max) { + const f_string_static_t private_f_print_safely_get(const f_string_t character, const f_array_length_t width_max) { if (character[0] == 0x7f) { - return (f_string_t) f_print_sequence_delete_s; + return f_print_sequence_delete_s; } if (macro_f_utf_character_t_width_is(character[0])) { if (f_utf_is_valid(character, width_max) != F_true || f_utf_is_control(character, width_max)) { - return (f_string_t) f_print_sequence_unknown_s; + return f_print_sequence_unknown_s; } - return 0; + return f_string_empty_s; } if (character[0] > 0x1f) { - return 0; + return f_string_empty_s; } - return (f_string_t) f_print_sequence_set_control_s[character[0]]; + return f_print_sequence_set_control_s[character[0]]; } #endif // !defined(_di_f_print_character_safely_get_) || !defined(_di_f_print_dynamic_partial_safely_) || !defined(_di_f_print_dynamic_safely_) || !defined(_di_f_print_except_dynamic_partial_safely_) || !defined(_di_f_print_except_dynamic_safely_) || !defined(_di_f_print_except_in_dynamic_safely_) || !defined(_di_f_print_except_in_dynamic_partial_safely_) || !defined(_di_f_print_except_in_safely_) || !defined(_di_f_print_except_safely_) || !defined(_di_f_print_safely_) || !defined(_di_f_print_safely_terminated_) || !defined(_di_f_print_to_dynamic_partial_safely_) || !defined(_di_f_print_to_dynamic_safely_) || !defined(_di_f_print_to_except_dynamic_partial_safely_) || !defined(_di_f_print_to_except_dynamic_safely_) || !defined(_di_f_print_to_except_in_dynamic_safely_) || !defined(_di_f_print_to_except_in_dynamic_partial_safely_) || !defined(_di_f_print_to_except_in_safely_) || !defined(_di_f_print_to_except_safely_) || !defined(_di_f_print_to_safely_) diff --git a/level_0/f_print/c/private-print.h b/level_0/f_print/c/private-print.h index 40c4d62..2bbde88 100644 --- a/level_0/f_print/c/private-print.h +++ b/level_0/f_print/c/private-print.h @@ -115,7 +115,7 @@ extern "C" { * @see f_print_to_safely() */ #if !defined(_di_f_print_character_safely_get_) || !defined(_di_f_print_dynamic_partial_safely_) || !defined(_di_f_print_dynamic_safely_) || !defined(_di_f_print_except_dynamic_partial_safely_) || !defined(_di_f_print_except_dynamic_safely_) || !defined(_di_f_print_except_in_dynamic_safely_) || !defined(_di_f_print_except_in_dynamic_partial_safely_) || !defined(_di_f_print_except_in_safely_) || !defined(_di_f_print_except_safely_) || !defined(_di_f_print_safely_) || !defined(_di_f_print_safely_terminated_) || !defined(_di_f_print_to_dynamic_partial_safely_) || !defined(_di_f_print_to_dynamic_safely_) || !defined(_di_f_print_to_except_dynamic_partial_safely_) || !defined(_di_f_print_to_except_dynamic_safely_) || !defined(_di_f_print_to_except_in_dynamic_safely_) || !defined(_di_f_print_to_except_in_dynamic_partial_safely_) || !defined(_di_f_print_to_except_in_safely_) || !defined(_di_f_print_to_except_safely_) || !defined(_di_f_print_to_safely_) - extern f_string_t private_f_print_character_safely_get(const char character) F_attribute_visibility_internal_d; + extern const f_string_static_t private_f_print_character_safely_get(const char character) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_character_safely_get_) || !defined(_di_f_print_dynamic_partial_safely_) || !defined(_di_f_print_dynamic_safely_) || !defined(_di_f_print_except_dynamic_partial_safely_) || !defined(_di_f_print_except_dynamic_safely_) || !defined(_di_f_print_except_in_dynamic_safely_) || !defined(_di_f_print_except_in_dynamic_partial_safely_) || !defined(_di_f_print_except_in_safely_) || !defined(_di_f_print_except_safely_) || !defined(_di_f_print_safely_) || !defined(_di_f_print_safely_terminated_) || !defined(_di_f_print_to_dynamic_partial_safely_) || !defined(_di_f_print_to_dynamic_safely_) || !defined(_di_f_print_to_except_dynamic_partial_safely_) || !defined(_di_f_print_to_except_dynamic_safely_) || !defined(_di_f_print_to_except_in_dynamic_safely_) || !defined(_di_f_print_to_except_in_dynamic_partial_safely_) || !defined(_di_f_print_to_except_in_safely_) || !defined(_di_f_print_to_except_safely_) || !defined(_di_f_print_to_safely_) /** @@ -431,7 +431,7 @@ extern "C" { * @see f_print_to_safely() */ #if !defined(_di_f_print_character_safely_get_) || !defined(_di_f_print_dynamic_partial_safely_) || !defined(_di_f_print_dynamic_safely_) || !defined(_di_f_print_except_dynamic_partial_safely_) || !defined(_di_f_print_except_dynamic_safely_) || !defined(_di_f_print_except_in_dynamic_safely_) || !defined(_di_f_print_except_in_dynamic_partial_safely_) || !defined(_di_f_print_except_in_safely_) || !defined(_di_f_print_except_safely_) || !defined(_di_f_print_safely_) || !defined(_di_f_print_safely_terminated_) || !defined(_di_f_print_to_dynamic_partial_safely_) || !defined(_di_f_print_to_dynamic_safely_) || !defined(_di_f_print_to_except_dynamic_partial_safely_) || !defined(_di_f_print_to_except_dynamic_safely_) || !defined(_di_f_print_to_except_in_dynamic_safely_) || !defined(_di_f_print_to_except_in_dynamic_partial_safely_) || !defined(_di_f_print_to_except_in_safely_) || !defined(_di_f_print_to_except_safely_) || !defined(_di_f_print_to_safely_) - extern f_string_t private_f_print_safely_get(const f_string_t character, const f_array_length_t width_max) F_attribute_visibility_internal_d; + extern const f_string_static_t private_f_print_safely_get(const f_string_t character, const f_array_length_t width_max) F_attribute_visibility_internal_d; #endif // !defined(_di_f_print_character_safely_get_) || !defined(_di_f_print_dynamic_partial_safely_) || !defined(_di_f_print_dynamic_safely_) || !defined(_di_f_print_except_dynamic_partial_safely_) || !defined(_di_f_print_except_dynamic_safely_) || !defined(_di_f_print_except_in_dynamic_safely_) || !defined(_di_f_print_except_in_dynamic_partial_safely_) || !defined(_di_f_print_except_in_safely_) || !defined(_di_f_print_except_safely_) || !defined(_di_f_print_safely_) || !defined(_di_f_print_safely_terminated_) || !defined(_di_f_print_to_dynamic_partial_safely_) || !defined(_di_f_print_to_dynamic_safely_) || !defined(_di_f_print_to_except_dynamic_partial_safely_) || !defined(_di_f_print_to_except_dynamic_safely_) || !defined(_di_f_print_to_except_in_dynamic_safely_) || !defined(_di_f_print_to_except_in_dynamic_partial_safely_) || !defined(_di_f_print_to_except_in_safely_) || !defined(_di_f_print_to_except_safely_) || !defined(_di_f_print_to_safely_) /** diff --git a/level_0/f_print/c/private-print_to.c b/level_0/f_print/c/private-print_to.c index 124c068..7f8296c 100644 --- a/level_0/f_print/c/private-print_to.c +++ b/level_0/f_print/c/private-print_to.c @@ -68,12 +68,12 @@ static inline f_status_t private_inline_f_print_to_error() { f_status_t private_f_print_to_character_safely(const char character, const int id) { if (character == 0x7f) { - if (write(id, f_print_sequence_delete_s, 3) != -1) { + if (write(id, f_print_sequence_delete_s.string, f_print_sequence_delete_s.used) != -1) { return F_none; } } else if (macro_f_utf_character_t_width_is(character) == 1) { - if (write(id, f_print_sequence_unknown_s, 3) != -1) { + if (write(id, f_print_sequence_unknown_s.string, f_print_sequence_unknown_s.used) != -1) { return F_none; } } @@ -83,7 +83,7 @@ static inline f_status_t private_inline_f_print_to_error() { } } else { - if (write(id, f_print_sequence_set_control_s, 3) != -1) { + if (write(id, f_print_sequence_set_control_s[character].string, f_print_sequence_set_control_s[character].used) != -1) { return F_none; } } @@ -199,7 +199,7 @@ static inline f_status_t private_inline_f_print_to_error() { f_array_length_t total = 0; f_status_t status = F_none; - f_string_t safe = 0; + f_string_static_t safe = f_string_empty_s; uint8_t width = 0; @@ -234,7 +234,7 @@ static inline f_status_t private_inline_f_print_to_error() { continue; } - if (safe) { + if (safe.used) { if (total) { if (write(id, string + start, total) == -1) { return private_inline_f_print_to_error(); @@ -243,7 +243,7 @@ static inline f_status_t private_inline_f_print_to_error() { total = 0; } - if (write(id, safe, 3) == -1) { + if (write(id, safe.string, safe.used) == -1) { return private_inline_f_print_to_error(); } @@ -431,7 +431,7 @@ static inline f_status_t private_inline_f_print_to_error() { f_array_length_t total = 0; f_status_t status = F_none; - f_string_t safe = 0; + f_string_static_t safe = f_string_empty_s; uint8_t width = 0; @@ -495,7 +495,7 @@ static inline f_status_t private_inline_f_print_to_error() { continue; } - if (safe) { + if (safe.used) { if (total) { if (write(id, string + start, total) == -1) { return private_inline_f_print_to_error(); @@ -504,7 +504,7 @@ static inline f_status_t private_inline_f_print_to_error() { total = 0; } - if (write(id, safe, 3) == -1) { + if (write(id, safe.string, safe.used) == -1) { return private_inline_f_print_to_error(); } @@ -588,7 +588,7 @@ static inline f_status_t private_inline_f_print_to_error() { f_array_length_t start = 0; f_array_length_t total = 0; - f_string_t safe = 0; + f_string_static_t safe = f_string_empty_s; uint8_t width = 0; @@ -613,7 +613,7 @@ static inline f_status_t private_inline_f_print_to_error() { continue; } - if (safe) { + if (safe.used) { if (total) { if (write(id, string + start, total) == -1) { return private_inline_f_print_to_error(); @@ -622,7 +622,7 @@ static inline f_status_t private_inline_f_print_to_error() { total = 0; } - if (write(id, safe, 3) == -1) { + if (write(id, safe.string, safe.used) == -1) { return private_inline_f_print_to_error(); } diff --git a/level_0/f_serialize/c/private-serialize.c b/level_0/f_serialize/c/private-serialize.c index d755175..875334c 100644 --- a/level_0/f_serialize/c/private-serialize.c +++ b/level_0/f_serialize/c/private-serialize.c @@ -18,7 +18,7 @@ extern "C" { width = macro_f_utf_byte_width(serialize.string[i]); - if (serialize.string[i] == f_serialize_simple_splitter_s[0]) { + if (serialize.string[i] == f_serialize_simple_splitter_s.string[0]) { if (current == index) { if (start == i) { diff --git a/level_0/f_serialize/c/serialize-common.c b/level_0/f_serialize/c/serialize-common.c index 60759fc..df3fcf6 100644 --- a/level_0/f_serialize/c/serialize-common.c +++ b/level_0/f_serialize/c/serialize-common.c @@ -6,9 +6,9 @@ extern "C" { #endif #ifndef _di_f_serialize_splitter_s_ - const f_string_t f_serialize_simple_splitter_s = F_serialize_simple_splitter_s; - const f_string_t f_serialize_delimited_splitter_s = F_serialize_delimited_splitter_s; - const f_string_t f_serialize_delimited_delimiter_s = F_serialize_delimited_delimiter_s; + const f_string_static_t f_serialize_simple_splitter_s = macro_f_string_static_t_initialize2(F_serialize_simple_splitter_s, 0, F_serialize_simple_splitter_s_length); + const f_string_static_t f_serialize_delimited_splitter_s = macro_f_string_static_t_initialize2(F_serialize_delimited_splitter_s, 0, F_serialize_delimited_splitter_s_length); + const f_string_static_t f_serialize_delimited_delimiter_s = macro_f_string_static_t_initialize2(F_serialize_delimited_delimiter_s, 0, F_serialize_delimited_delimiter_s_length); #endif // _di_f_serialize_splitter_s_ #ifdef __cplusplus diff --git a/level_0/f_serialize/c/serialize-common.h b/level_0/f_serialize/c/serialize-common.h index da1a146..7686e37 100644 --- a/level_0/f_serialize/c/serialize-common.h +++ b/level_0/f_serialize/c/serialize-common.h @@ -21,9 +21,13 @@ extern "C" { #define F_serialize_delimited_splitter_s "'" #define F_serialize_delimited_delimiter_s "\\" - extern const f_string_t f_serialize_simple_splitter_s; - extern const f_string_t f_serialize_delimited_splitter_s; - extern const f_string_t f_serialize_delimited_delimiter_s; + #define F_serialize_simple_splitter_s_length 1 + #define F_serialize_delimited_splitter_s_length 1 + #define F_serialize_delimited_delimiter_s_length 1 + + extern const f_string_static_t f_serialize_simple_splitter_s; + extern const f_string_static_t f_serialize_delimited_splitter_s; + extern const f_string_static_t f_serialize_delimited_delimiter_s; #endif // _di_f_serialize_splitter_s_ #ifdef __cplusplus diff --git a/level_0/f_serialize/c/serialize.c b/level_0/f_serialize/c/serialize.c index b194202..dbfb7a6 100644 --- a/level_0/f_serialize/c/serialize.c +++ b/level_0/f_serialize/c/serialize.c @@ -23,8 +23,8 @@ extern "C" { serialize->used += value.used; } else { - memcpy(serialize->string + serialize->used, f_serialize_simple_splitter_s, 1); - memcpy(serialize->string + serialize->used + 1, value.string, value.used); + memcpy(serialize->string + serialize->used, f_serialize_simple_splitter_s.string, f_serialize_simple_splitter_s.used); + memcpy(serialize->string + serialize->used + f_serialize_simple_splitter_s.used, value.string, value.used); serialize->used += value.used + 1; } @@ -50,7 +50,7 @@ extern "C" { width = macro_f_utf_byte_width(serialize.string[i]); - if (serialize.string[i] == f_serialize_simple_splitter_s[0] || i + 1 >= serialize.used) { + if (serialize.string[i] == f_serialize_simple_splitter_s.string[0] || i + 1 >= serialize.used) { macro_f_memory_structure_increment(status, (*strings), 1, F_memory_default_allocation_small_d, macro_f_string_dynamics_t_resize, F_array_too_large); if (F_status_is_error(status)) return status; @@ -66,7 +66,7 @@ extern "C" { } else { - // subtract one from stop point to disclused the f_serialize_simple_splitter_s[0] character. + // subtract one from stop point to disclused the f_serialize_simple_splitter_s character. total = ((i - 1) - start) + 1; } @@ -119,7 +119,7 @@ extern "C" { width = macro_f_utf_byte_width(serialize.string[i]); - if (serialize.string[i] == f_serialize_simple_splitter_s[0] || i + 1 >= serialize.used) { + if (serialize.string[i] == f_serialize_simple_splitter_s.string[0] || i + 1 >= serialize.used) { macro_f_memory_structure_increment(status, (*locations), 1, F_memory_default_allocation_small_d, macro_f_string_ranges_t_resize, F_array_too_large); if (F_status_is_error(status)) return status; @@ -135,7 +135,7 @@ extern "C" { } else { - // subtract one from stop point to disclused the f_serialize_simple_splitter_s[0] character. + // subtract one from stop point to disclused the f_serialize_simple_splitter_s character. locations->array[locations->used].start = start; locations->array[locations->used].stop = i - 1; } diff --git a/level_0/f_status_string/c/status_string.c b/level_0/f_status_string/c/status_string.c index 036dd4e..14dc646 100644 --- a/level_0/f_status_string/c/status_string.c +++ b/level_0/f_status_string/c/status_string.c @@ -6,592 +6,592 @@ extern "C" { #ifndef _di_F_status_string_ #ifndef _di_F_status_boolean_ - const f_string_t f_status_false_s = F_status_false_s; - const f_string_t f_status_true_s = F_status_true_s; + const f_string_static_t f_status_false_s = macro_f_string_static_t_initialize2(F_status_false_s, 0, F_status_false_s_length); + const f_string_static_t f_status_true_s = macro_f_string_static_t_initialize2(F_status_true_s, 0, F_status_true_s_length); #endif // _di_F_status_boolean_ #ifndef _di_F_status_signal_ - const f_string_t f_status_signal_hangup_s = F_status_signal_hangup_s; - const f_string_t f_status_signal_interrupt_s = F_status_signal_interrupt_s; - const f_string_t f_status_signal_quit_s = F_status_signal_quit_s; - const f_string_t f_status_signal_illegal_s = F_status_signal_illegal_s; - const f_string_t f_status_signal_trap_s = F_status_signal_trap_s; - const f_string_t f_status_signal_abort_s = F_status_signal_abort_s; - const f_string_t f_status_signal_bus_error_s = F_status_signal_bus_error_s; - const f_string_t f_status_signal_floating_point_error_s = F_status_signal_floating_point_error_s; - const f_string_t f_status_signal_kill_s = F_status_signal_kill_s; - const f_string_t f_status_signal_user_1_s = F_status_signal_user_1_s; - const f_string_t f_status_signal_segmentation_fault_s = F_status_signal_segmentation_fault_s; - const f_string_t f_status_signal_user_2_s = F_status_signal_user_2_s; - const f_string_t f_status_signal_broken_pipe_s = F_status_signal_broken_pipe_s; - const f_string_t f_status_signal_alarm_clock_s = F_status_signal_alarm_clock_s; - const f_string_t f_status_signal_termination_s = F_status_signal_termination_s; - const f_string_t f_status_signal_stack_fault_s = F_status_signal_stack_fault_s; - const f_string_t f_status_signal_child_s = F_status_signal_child_s; - const f_string_t f_status_signal_continue_s = F_status_signal_continue_s; - const f_string_t f_status_signal_stop_s = F_status_signal_stop_s; - const f_string_t f_status_signal_keyboard_stop_s = F_status_signal_keyboard_stop_s; - const f_string_t f_status_signal_tty_in_s = F_status_signal_tty_in_s; - const f_string_t f_status_signal_tty_out_s = F_status_signal_tty_out_s; - const f_string_t f_status_signal_urgent_s = F_status_signal_urgent_s; - const f_string_t f_status_signal_cpu_limit_s = F_status_signal_cpu_limit_s; - const f_string_t f_status_signal_file_size_limit_s = F_status_signal_file_size_limit_s; - const f_string_t f_status_signal_virtual_alarm_clock_s = F_status_signal_virtual_alarm_clock_s; - const f_string_t f_status_signal_profile_alarm_clock_s = F_status_signal_profile_alarm_clock_s; - const f_string_t f_status_signal_window_size_change_s = F_status_signal_window_size_change_s; - const f_string_t f_status_signal_pollable_event_s = F_status_signal_pollable_event_s; - const f_string_t f_status_signal_power_failure_s = F_status_signal_power_failure_s; - const f_string_t f_status_signal_bad_system_call_s = F_status_signal_bad_system_call_s; - const f_string_t f_status_signal_reserved_32_s = F_status_signal_reserved_32_s; - const f_string_t f_status_signal_reserved_33_s = F_status_signal_reserved_33_s; - const f_string_t f_status_signal_reserved_34_s = F_status_signal_reserved_34_s; - const f_string_t f_status_signal_reserved_35_s = F_status_signal_reserved_35_s; - const f_string_t f_status_signal_reserved_36_s = F_status_signal_reserved_36_s; - const f_string_t f_status_signal_reserved_37_s = F_status_signal_reserved_37_s; - const f_string_t f_status_signal_reserved_38_s = F_status_signal_reserved_38_s; - const f_string_t f_status_signal_reserved_39_s = F_status_signal_reserved_39_s; - const f_string_t f_status_signal_reserved_40_s = F_status_signal_reserved_40_s; - const f_string_t f_status_signal_reserved_41_s = F_status_signal_reserved_41_s; - const f_string_t f_status_signal_reserved_42_s = F_status_signal_reserved_42_s; - const f_string_t f_status_signal_reserved_43_s = F_status_signal_reserved_43_s; - const f_string_t f_status_signal_reserved_44_s = F_status_signal_reserved_44_s; - const f_string_t f_status_signal_reserved_45_s = F_status_signal_reserved_45_s; - const f_string_t f_status_signal_reserved_46_s = F_status_signal_reserved_46_s; - const f_string_t f_status_signal_reserved_47_s = F_status_signal_reserved_47_s; - const f_string_t f_status_signal_reserved_48_s = F_status_signal_reserved_48_s; - const f_string_t f_status_signal_reserved_49_s = F_status_signal_reserved_49_s; - const f_string_t f_status_signal_reserved_50_s = F_status_signal_reserved_50_s; - const f_string_t f_status_signal_reserved_51_s = F_status_signal_reserved_51_s; - const f_string_t f_status_signal_reserved_52_s = F_status_signal_reserved_52_s; - const f_string_t f_status_signal_reserved_53_s = F_status_signal_reserved_53_s; - const f_string_t f_status_signal_reserved_54_s = F_status_signal_reserved_54_s; - const f_string_t f_status_signal_reserved_55_s = F_status_signal_reserved_55_s; - const f_string_t f_status_signal_reserved_56_s = F_status_signal_reserved_56_s; - const f_string_t f_status_signal_reserved_57_s = F_status_signal_reserved_57_s; - const f_string_t f_status_signal_reserved_58_s = F_status_signal_reserved_58_s; - const f_string_t f_status_signal_reserved_59_s = F_status_signal_reserved_59_s; - const f_string_t f_status_signal_reserved_60_s = F_status_signal_reserved_60_s; - const f_string_t f_status_signal_reserved_61_s = F_status_signal_reserved_61_s; - const f_string_t f_status_signal_reserved_62_s = F_status_signal_reserved_62_s; - const f_string_t f_status_signal_reserved_63_s = F_status_signal_reserved_63_s; - const f_string_t f_status_signal_reserved_64_s = F_status_signal_reserved_64_s; + const f_string_static_t f_status_signal_hangup_s = macro_f_string_static_t_initialize2(F_status_signal_hangup_s, 0, F_status_signal_hangup_s_length); + const f_string_static_t f_status_signal_interrupt_s = macro_f_string_static_t_initialize2(F_status_signal_interrupt_s, 0, F_status_signal_interrupt_s_length); + const f_string_static_t f_status_signal_quit_s = macro_f_string_static_t_initialize2(F_status_signal_quit_s, 0, F_status_signal_quit_s_length); + const f_string_static_t f_status_signal_illegal_s = macro_f_string_static_t_initialize2(F_status_signal_illegal_s, 0, F_status_signal_illegal_s_length); + const f_string_static_t f_status_signal_trap_s = macro_f_string_static_t_initialize2(F_status_signal_trap_s, 0, F_status_signal_trap_s_length); + const f_string_static_t f_status_signal_abort_s = macro_f_string_static_t_initialize2(F_status_signal_abort_s, 0, F_status_signal_abort_s_length); + const f_string_static_t f_status_signal_bus_error_s = macro_f_string_static_t_initialize2(F_status_signal_bus_error_s, 0, F_status_signal_bus_error_s_length); + const f_string_static_t f_status_signal_floating_point_error_s = macro_f_string_static_t_initialize2(F_status_signal_floating_point_error_s, 0, F_status_signal_floating_point_error_s_length); + const f_string_static_t f_status_signal_kill_s = macro_f_string_static_t_initialize2(F_status_signal_kill_s, 0, F_status_signal_kill_s_length); + const f_string_static_t f_status_signal_user_1_s = macro_f_string_static_t_initialize2(F_status_signal_user_1_s, 0, F_status_signal_user_1_s_length); + const f_string_static_t f_status_signal_segmentation_fault_s = macro_f_string_static_t_initialize2(F_status_signal_segmentation_fault_s, 0, F_status_signal_segmentation_fault_s_length); + const f_string_static_t f_status_signal_user_2_s = macro_f_string_static_t_initialize2(F_status_signal_user_2_s, 0, F_status_signal_user_2_s_length); + const f_string_static_t f_status_signal_broken_pipe_s = macro_f_string_static_t_initialize2(F_status_signal_broken_pipe_s, 0, F_status_signal_broken_pipe_s_length); + const f_string_static_t f_status_signal_alarm_clock_s = macro_f_string_static_t_initialize2(F_status_signal_alarm_clock_s, 0, F_status_signal_alarm_clock_s_length); + const f_string_static_t f_status_signal_termination_s = macro_f_string_static_t_initialize2(F_status_signal_termination_s, 0, F_status_signal_termination_s_length); + const f_string_static_t f_status_signal_stack_fault_s = macro_f_string_static_t_initialize2(F_status_signal_stack_fault_s, 0, F_status_signal_stack_fault_s_length); + const f_string_static_t f_status_signal_child_s = macro_f_string_static_t_initialize2(F_status_signal_child_s, 0, F_status_signal_child_s_length); + const f_string_static_t f_status_signal_continue_s = macro_f_string_static_t_initialize2(F_status_signal_continue_s, 0, F_status_signal_continue_s_length); + const f_string_static_t f_status_signal_stop_s = macro_f_string_static_t_initialize2(F_status_signal_stop_s, 0, F_status_signal_stop_s_length); + const f_string_static_t f_status_signal_keyboard_stop_s = macro_f_string_static_t_initialize2(F_status_signal_keyboard_stop_s, 0, F_status_signal_keyboard_stop_s_length); + const f_string_static_t f_status_signal_tty_in_s = macro_f_string_static_t_initialize2(F_status_signal_tty_in_s, 0, F_status_signal_tty_in_s_length); + const f_string_static_t f_status_signal_tty_out_s = macro_f_string_static_t_initialize2(F_status_signal_tty_out_s, 0, F_status_signal_tty_out_s_length); + const f_string_static_t f_status_signal_urgent_s = macro_f_string_static_t_initialize2(F_status_signal_urgent_s, 0, F_status_signal_urgent_s_length); + const f_string_static_t f_status_signal_cpu_limit_s = macro_f_string_static_t_initialize2(F_status_signal_cpu_limit_s, 0, F_status_signal_cpu_limit_s_length); + const f_string_static_t f_status_signal_file_size_limit_s = macro_f_string_static_t_initialize2(F_status_signal_file_size_limit_s, 0, F_status_signal_file_size_limit_s_length); + const f_string_static_t f_status_signal_virtual_alarm_clock_s = macro_f_string_static_t_initialize2(F_status_signal_virtual_alarm_clock_s, 0, F_status_signal_virtual_alarm_clock_s_length); + const f_string_static_t f_status_signal_profile_alarm_clock_s = macro_f_string_static_t_initialize2(F_status_signal_profile_alarm_clock_s, 0, F_status_signal_profile_alarm_clock_s_length); + const f_string_static_t f_status_signal_window_size_change_s = macro_f_string_static_t_initialize2(F_status_signal_window_size_change_s, 0, F_status_signal_window_size_change_s_length); + const f_string_static_t f_status_signal_pollable_event_s = macro_f_string_static_t_initialize2(F_status_signal_pollable_event_s, 0, F_status_signal_pollable_event_s_length); + const f_string_static_t f_status_signal_power_failure_s = macro_f_string_static_t_initialize2(F_status_signal_power_failure_s, 0, F_status_signal_power_failure_s_length); + const f_string_static_t f_status_signal_bad_system_call_s = macro_f_string_static_t_initialize2(F_status_signal_bad_system_call_s, 0, F_status_signal_bad_system_call_s_length); + const f_string_static_t f_status_signal_reserved_32_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_32_s, 0, F_status_signal_reserved_32_s_length); + const f_string_static_t f_status_signal_reserved_33_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_33_s, 0, F_status_signal_reserved_33_s_length); + const f_string_static_t f_status_signal_reserved_34_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_34_s, 0, F_status_signal_reserved_34_s_length); + const f_string_static_t f_status_signal_reserved_35_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_35_s, 0, F_status_signal_reserved_35_s_length); + const f_string_static_t f_status_signal_reserved_36_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_36_s, 0, F_status_signal_reserved_36_s_length); + const f_string_static_t f_status_signal_reserved_37_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_37_s, 0, F_status_signal_reserved_37_s_length); + const f_string_static_t f_status_signal_reserved_38_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_38_s, 0, F_status_signal_reserved_38_s_length); + const f_string_static_t f_status_signal_reserved_39_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_39_s, 0, F_status_signal_reserved_39_s_length); + const f_string_static_t f_status_signal_reserved_40_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_40_s, 0, F_status_signal_reserved_40_s_length); + const f_string_static_t f_status_signal_reserved_41_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_41_s, 0, F_status_signal_reserved_41_s_length); + const f_string_static_t f_status_signal_reserved_42_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_42_s, 0, F_status_signal_reserved_42_s_length); + const f_string_static_t f_status_signal_reserved_43_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_43_s, 0, F_status_signal_reserved_43_s_length); + const f_string_static_t f_status_signal_reserved_44_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_44_s, 0, F_status_signal_reserved_44_s_length); + const f_string_static_t f_status_signal_reserved_45_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_45_s, 0, F_status_signal_reserved_45_s_length); + const f_string_static_t f_status_signal_reserved_46_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_46_s, 0, F_status_signal_reserved_46_s_length); + const f_string_static_t f_status_signal_reserved_47_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_47_s, 0, F_status_signal_reserved_47_s_length); + const f_string_static_t f_status_signal_reserved_48_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_48_s, 0, F_status_signal_reserved_48_s_length); + const f_string_static_t f_status_signal_reserved_49_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_49_s, 0, F_status_signal_reserved_49_s_length); + const f_string_static_t f_status_signal_reserved_50_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_50_s, 0, F_status_signal_reserved_50_s_length); + const f_string_static_t f_status_signal_reserved_51_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_51_s, 0, F_status_signal_reserved_51_s_length); + const f_string_static_t f_status_signal_reserved_52_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_52_s, 0, F_status_signal_reserved_52_s_length); + const f_string_static_t f_status_signal_reserved_53_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_53_s, 0, F_status_signal_reserved_53_s_length); + const f_string_static_t f_status_signal_reserved_54_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_54_s, 0, F_status_signal_reserved_54_s_length); + const f_string_static_t f_status_signal_reserved_55_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_55_s, 0, F_status_signal_reserved_55_s_length); + const f_string_static_t f_status_signal_reserved_56_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_56_s, 0, F_status_signal_reserved_56_s_length); + const f_string_static_t f_status_signal_reserved_57_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_57_s, 0, F_status_signal_reserved_57_s_length); + const f_string_static_t f_status_signal_reserved_58_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_58_s, 0, F_status_signal_reserved_58_s_length); + const f_string_static_t f_status_signal_reserved_59_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_59_s, 0, F_status_signal_reserved_59_s_length); + const f_string_static_t f_status_signal_reserved_60_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_60_s, 0, F_status_signal_reserved_60_s_length); + const f_string_static_t f_status_signal_reserved_61_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_61_s, 0, F_status_signal_reserved_61_s_length); + const f_string_static_t f_status_signal_reserved_62_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_62_s, 0, F_status_signal_reserved_62_s_length); + const f_string_static_t f_status_signal_reserved_63_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_63_s, 0, F_status_signal_reserved_63_s_length); + const f_string_static_t f_status_signal_reserved_64_s = macro_f_string_static_t_initialize2(F_status_signal_reserved_64_s, 0, F_status_signal_reserved_64_s_length); #endif // _di_F_status_signal_ #ifndef _di_F_status_basic_ - const f_string_t f_status_none_s = F_status_none_s; - const f_string_t f_status_abort_s = F_status_abort_s; - const f_string_t f_status_abort_not_s = F_status_abort_not_s; - const f_string_t f_status_absolute_s = F_status_absolute_s; - const f_string_t f_status_absolute_not_s = F_status_absolute_not_s; - const f_string_t f_status_address_s = F_status_address_s; - const f_string_t f_status_address_not_s = F_status_address_not_s; - const f_string_t f_status_ascii_s = F_status_ascii_s; - const f_string_t f_status_ascii_not_s = F_status_ascii_not_s; - const f_string_t f_status_atomic_s = F_status_atomic_s; - const f_string_t f_status_atomic_not_s = F_status_atomic_not_s; - const f_string_t f_status_begin_s = F_status_begin_s; - const f_string_t f_status_begin_not_s = F_status_begin_not_s; - const f_string_t f_status_block_s = F_status_block_s; - const f_string_t f_status_block_not_s = F_status_block_not_s; - const f_string_t f_status_body_s = F_status_body_s; - const f_string_t f_status_body_not_s = F_status_body_not_s; - const f_string_t f_status_bound_s = F_status_bound_s; - const f_string_t f_status_bound_not_s = F_status_bound_not_s; - const f_string_t f_status_capability_s = F_status_capability_s; - const f_string_t f_status_capability_not_s = F_status_capability_not_s; - const f_string_t f_status_child_s = F_status_child_s; - const f_string_t f_status_child_not_s = F_status_child_not_s; - const f_string_t f_status_complete_s = F_status_complete_s; - const f_string_t f_status_complete_not_s = F_status_complete_not_s; - const f_string_t f_status_connect_s = F_status_connect_s; - const f_string_t f_status_connect_not_s = F_status_connect_not_s; - const f_string_t f_status_connect_refuse_s = F_status_connect_refuse_s; - const f_string_t f_status_connect_reset_s = F_status_connect_reset_s; - const f_string_t f_status_container_s = F_status_container_s; - const f_string_t f_status_container_not_s = F_status_container_not_s; - const f_string_t f_status_content_s = F_status_content_s; - const f_string_t f_status_content_not_s = F_status_content_not_s; - const f_string_t f_status_continue_s = F_status_continue_s; - const f_string_t f_status_continue_not_s = F_status_continue_not_s; - const f_string_t f_status_control_s = F_status_control_s; - const f_string_t f_status_control_not_s = F_status_control_not_s; - const f_string_t f_status_control_group_s = F_status_control_group_s; - const f_string_t f_status_control_group_not_s = F_status_control_group_not_s; - const f_string_t f_status_critical_s = F_status_critical_s; - const f_string_t f_status_critical_not_s = F_status_critical_not_s; - const f_string_t f_status_dead_s = F_status_dead_s; - const f_string_t f_status_dead_not_s = F_status_dead_not_s; - const f_string_t f_status_deadlock_s = F_status_deadlock_s; - const f_string_t f_status_deadlock_not_s = F_status_deadlock_not_s; - const f_string_t f_status_descriptor_s = F_status_descriptor_s; - const f_string_t f_status_descriptor_not_s = F_status_descriptor_not_s; - const f_string_t f_status_device_s = F_status_device_s; - const f_string_t f_status_device_not_s = F_status_device_not_s; - const f_string_t f_status_disable_s = F_status_disable_s; - const f_string_t f_status_disable_not_s = F_status_disable_not_s; - const f_string_t f_status_domain_s = F_status_domain_s; - const f_string_t f_status_domain_not_s = F_status_domain_not_s; - const f_string_t f_status_done_s = F_status_done_s; - const f_string_t f_status_done_not_s = F_status_done_not_s; - const f_string_t f_status_dummy_s = F_status_dummy_s; - const f_string_t f_status_dummy_not_s = F_status_dummy_not_s; - const f_string_t f_status_empty_s = F_status_empty_s; - const f_string_t f_status_empty_not_s = F_status_empty_not_s; - const f_string_t f_status_enable_s = F_status_enable_s; - const f_string_t f_status_enable_not_s = F_status_enable_not_s; - const f_string_t f_status_encoding_s = F_status_encoding_s; - const f_string_t f_status_encoding_not_s = F_status_encoding_not_s; - const f_string_t f_status_end_s = F_status_end_s; - const f_string_t f_status_end_not_s = F_status_end_not_s; - const f_string_t f_status_endian_s = F_status_endian_s; - const f_string_t f_status_endian_big_s = F_status_endian_big_s; - const f_string_t f_status_endian_little_s = F_status_endian_little_s; - const f_string_t f_status_endian_not_s = F_status_endian_not_s; - const f_string_t f_status_eoa_s = F_status_eoa_s; - const f_string_t f_status_eoa_not_s = F_status_eoa_not_s; - const f_string_t f_status_eof_s = F_status_eof_s; - const f_string_t f_status_eof_not_s = F_status_eof_not_s; - const f_string_t f_status_eol_s = F_status_eol_s; - const f_string_t f_status_eol_not_s = F_status_eol_not_s; - const f_string_t f_status_eos_s = F_status_eos_s; - const f_string_t f_status_eos_not_s = F_status_eos_not_s; - const f_string_t f_status_execute_s = F_status_execute_s; - const f_string_t f_status_execute_not_s = F_status_execute_not_s; - const f_string_t f_status_exist_s = F_status_exist_s; - const f_string_t f_status_exist_not_s = F_status_exist_not_s; - const f_string_t f_status_failure_s = F_status_failure_s; - const f_string_t f_status_failure_not_s = F_status_failure_not_s; - const f_string_t f_status_family_s = F_status_family_s; - const f_string_t f_status_family_not_s = F_status_family_not_s; - const f_string_t f_status_first_s = F_status_first_s; - const f_string_t f_status_first_not_s = F_status_first_not_s; - const f_string_t f_status_footer_s = F_status_footer_s; - const f_string_t f_status_footer_not_s = F_status_footer_not_s; - const f_string_t f_status_fork_s = F_status_fork_s; - const f_string_t f_status_fork_not_s = F_status_fork_not_s; - const f_string_t f_status_format_s = F_status_format_s; - const f_string_t f_status_format_not_s = F_status_format_not_s; - const f_string_t f_status_found_s = F_status_found_s; - const f_string_t f_status_found_not_s = F_status_found_not_s; - const f_string_t f_status_full_s = F_status_full_s; - const f_string_t f_status_full_not_s = F_status_full_not_s; - const f_string_t f_status_group_s = F_status_group_s; - const f_string_t f_status_group_not_s = F_status_group_not_s; - const f_string_t f_status_header_s = F_status_header_s; - const f_string_t f_status_header_not_s = F_status_header_not_s; - const f_string_t f_status_ignore_s = F_status_ignore_s; - const f_string_t f_status_ignore_not_s = F_status_ignore_not_s; - const f_string_t f_status_implemented_s = F_status_implemented_s; - const f_string_t f_status_implemented_not_s = F_status_implemented_not_s; - const f_string_t f_status_input_s = F_status_input_s; - const f_string_t f_status_input_not_s = F_status_input_not_s; - const f_string_t f_status_input_output_s = F_status_input_output_s; - const f_string_t f_status_interrupt_s = F_status_interrupt_s; - const f_string_t f_status_interrupt_not_s = F_status_interrupt_not_s; - const f_string_t f_status_known_s = F_status_known_s; - const f_string_t f_status_known_not_s = F_status_known_not_s; - const f_string_t f_status_last_s = F_status_last_s; - const f_string_t f_status_last_not_s = F_status_last_not_s; - const f_string_t f_status_limit_s = F_status_limit_s; - const f_string_t f_status_limit_not_s = F_status_limit_not_s; - const f_string_t f_status_link_s = F_status_link_s; - const f_string_t f_status_link_not_s = F_status_link_not_s; - const f_string_t f_status_live_s = F_status_live_s; - const f_string_t f_status_live_not_s = F_status_live_not_s; - const f_string_t f_status_lock_s = F_status_lock_s; - const f_string_t f_status_lock_not_s = F_status_lock_not_s; - const f_string_t f_status_loop_s = F_status_loop_s; - const f_string_t f_status_loop_not_s = F_status_loop_not_s; - const f_string_t f_status_maybe_s = F_status_maybe_s; - const f_string_t f_status_maybe_not_s = F_status_maybe_not_s; - const f_string_t f_status_memory_s = F_status_memory_s; - const f_string_t f_status_memory_not_s = F_status_memory_not_s; - const f_string_t f_status_message_s = F_status_message_s; - const f_string_t f_status_message_not_s = F_status_message_not_s; - const f_string_t f_status_minor_s = F_status_minor_s; - const f_string_t f_status_minor_not_s = F_status_minor_not_s; - const f_string_t f_status_moderate_s = F_status_moderate_s; - const f_string_t f_status_moderate_not_s = F_status_moderate_not_s; - const f_string_t f_status_mount_s = F_status_mount_s; - const f_string_t f_status_mount_not_s = F_status_mount_not_s; - const f_string_t f_status_name_s = F_status_name_s; - const f_string_t f_status_name_not_s = F_status_name_not_s; - const f_string_t f_status_next_s = F_status_next_s; - const f_string_t f_status_next_not_s = F_status_next_not_s; - const f_string_t f_status_nice_s = F_status_nice_s; - const f_string_t f_status_nice_not_s = F_status_nice_not_s; - const f_string_t f_status_object_s = F_status_object_s; - const f_string_t f_status_object_not_s = F_status_object_not_s; - const f_string_t f_status_option_s = F_status_option_s; - const f_string_t f_status_option_not_s = F_status_option_not_s; - const f_string_t f_status_output_s = F_status_output_s; - const f_string_t f_status_output_not_s = F_status_output_not_s; - const f_string_t f_status_packet_s = F_status_packet_s; - const f_string_t f_status_packet_not_s = F_status_packet_not_s; - const f_string_t f_status_parameter_s = F_status_parameter_s; - const f_string_t f_status_parameter_not_s = F_status_parameter_not_s; - const f_string_t f_status_parent_s = F_status_parent_s; - const f_string_t f_status_parent_not_s = F_status_parent_not_s; - const f_string_t f_status_payload_s = F_status_payload_s; - const f_string_t f_status_payload_not_s = F_status_payload_not_s; - const f_string_t f_status_pipe_s = F_status_pipe_s; - const f_string_t f_status_pipe_not_s = F_status_pipe_not_s; - const f_string_t f_status_port_s = F_status_port_s; - const f_string_t f_status_port_not_s = F_status_port_not_s; - const f_string_t f_status_previous_s = F_status_previous_s; - const f_string_t f_status_previous_not_s = F_status_previous_not_s; - const f_string_t f_status_processor_s = F_status_processor_s; - const f_string_t f_status_processor_not_s = F_status_processor_not_s; - const f_string_t f_status_progress_s = F_status_progress_s; - const f_string_t f_status_progress_not_s = F_status_progress_not_s; - const f_string_t f_status_prohibited_s = F_status_prohibited_s; - const f_string_t f_status_prohibited_not_s = F_status_prohibited_not_s; - const f_string_t f_status_property_s = F_status_property_s; - const f_string_t f_status_property_not_s = F_status_property_not_s; - const f_string_t f_status_protocol_s = F_status_protocol_s; - const f_string_t f_status_protocol_not_s = F_status_protocol_not_s; - const f_string_t f_status_range_s = F_status_range_s; - const f_string_t f_status_range_not_s = F_status_range_not_s; - const f_string_t f_status_read_s = F_status_read_s; - const f_string_t f_status_read_not_s = F_status_read_not_s; - const f_string_t f_status_read_only_s = F_status_read_only_s; - const f_string_t f_status_ready_s = F_status_ready_s; - const f_string_t f_status_ready_not_s = F_status_ready_not_s; - const f_string_t f_status_recover_s = F_status_recover_s; - const f_string_t f_status_recover_not_s = F_status_recover_not_s; - const f_string_t f_status_recurse_s = F_status_recurse_s; - const f_string_t f_status_recurse_not_s = F_status_recurse_not_s; - const f_string_t f_status_relative_s = F_status_relative_s; - const f_string_t f_status_relative_not_s = F_status_relative_not_s; - const f_string_t f_status_require_s = F_status_require_s; - const f_string_t f_status_require_not_s = F_status_require_not_s; - const f_string_t f_status_resource_s = F_status_resource_s; - const f_string_t f_status_resource_not_s = F_status_resource_not_s; - const f_string_t f_status_search_s = F_status_search_s; - const f_string_t f_status_search_not_s = F_status_search_not_s; - const f_string_t f_status_schedule_s = F_status_schedule_s; - const f_string_t f_status_schedule_not_s = F_status_schedule_not_s; - const f_string_t f_status_size_s = F_status_size_s; - const f_string_t f_status_size_not_s = F_status_size_not_s; - const f_string_t f_status_signal_s = F_status_signal_s; - const f_string_t f_status_signal_not_s = F_status_signal_not_s; - const f_string_t f_status_space_s = F_status_space_s; - const f_string_t f_status_space_not_s = F_status_space_not_s; - const f_string_t f_status_start_s = F_status_start_s; - const f_string_t f_status_start_not_s = F_status_start_not_s; - const f_string_t f_status_stop_s = F_status_stop_s; - const f_string_t f_status_stop_not_s = F_status_stop_not_s; - const f_string_t f_status_stream_s = F_status_stream_s; - const f_string_t f_status_stream_not_s = F_status_stream_not_s; - const f_string_t f_status_string_s = F_status_string_s; - const f_string_t f_status_string_not_s = F_status_string_not_s; - const f_string_t f_status_string_too_large_s = F_status_string_too_large_s; - const f_string_t f_status_string_too_small_s = F_status_string_too_small_s; - const f_string_t f_status_syntax_s = F_status_syntax_s; - const f_string_t f_status_syntax_not_s = F_status_syntax_not_s; - const f_string_t f_status_thread_s = F_status_thread_s; - const f_string_t f_status_thread_not_s = F_status_thread_not_s; - const f_string_t f_status_time_s = F_status_time_s; - const f_string_t f_status_time_not_s = F_status_time_not_s; - const f_string_t f_status_time_out_s = F_status_time_out_s; - const f_string_t f_status_too_large_s = F_status_too_large_s; - const f_string_t f_status_too_small_s = F_status_too_small_s; - const f_string_t f_status_type_s = F_status_type_s; - const f_string_t f_status_type_not_s = F_status_type_not_s; - const f_string_t f_status_success_s = F_status_success_s; - const f_string_t f_status_success_not_s = F_status_success_not_s; - const f_string_t f_status_supported_s = F_status_supported_s; - const f_string_t f_status_supported_not_s = F_status_supported_not_s; - const f_string_t f_status_user_s = F_status_user_s; - const f_string_t f_status_user_not_s = F_status_user_not_s; - const f_string_t f_status_utf_s = F_status_utf_s; - const f_string_t f_status_utf_fragment_s = F_status_utf_fragment_s; - const f_string_t f_status_utf_fragment_not_s = F_status_utf_fragment_not_s; - const f_string_t f_status_utf_not_s = F_status_utf_not_s; - const f_string_t f_status_valid_s = F_status_valid_s; - const f_string_t f_status_valid_not_s = F_status_valid_not_s; - const f_string_t f_status_value_s = F_status_value_s; - const f_string_t f_status_value_not_s = F_status_value_not_s; - const f_string_t f_status_wait_s = F_status_wait_s; - const f_string_t f_status_wait_not_s = F_status_wait_not_s; - const f_string_t f_status_warn_s = F_status_warn_s; - const f_string_t f_status_warn_not_s = F_status_warn_not_s; - const f_string_t f_status_world_s = F_status_world_s; - const f_string_t f_status_world_not_s = F_status_world_not_s; - const f_string_t f_status_write_s = F_status_write_s; - const f_string_t f_status_write_not_s = F_status_write_not_s; - const f_string_t f_status_write_only_s = F_status_write_only_s; + const f_string_static_t f_status_none_s = macro_f_string_static_t_initialize2(F_status_none_s, 0, F_status_none_s_length); + const f_string_static_t f_status_abort_s = macro_f_string_static_t_initialize2(F_status_abort_s, 0, F_status_abort_s_length); + const f_string_static_t f_status_abort_not_s = macro_f_string_static_t_initialize2(F_status_abort_not_s, 0, F_status_abort_not_s_length); + const f_string_static_t f_status_absolute_s = macro_f_string_static_t_initialize2(F_status_absolute_s, 0, F_status_absolute_s_length); + const f_string_static_t f_status_absolute_not_s = macro_f_string_static_t_initialize2(F_status_absolute_not_s, 0, F_status_absolute_not_s_length); + const f_string_static_t f_status_address_s = macro_f_string_static_t_initialize2(F_status_address_s, 0, F_status_address_s_length); + const f_string_static_t f_status_address_not_s = macro_f_string_static_t_initialize2(F_status_address_not_s, 0, F_status_address_not_s_length); + const f_string_static_t f_status_ascii_s = macro_f_string_static_t_initialize2(F_status_ascii_s, 0, F_status_ascii_s_length); + const f_string_static_t f_status_ascii_not_s = macro_f_string_static_t_initialize2(F_status_ascii_not_s, 0, F_status_ascii_not_s_length); + const f_string_static_t f_status_atomic_s = macro_f_string_static_t_initialize2(F_status_atomic_s, 0, F_status_atomic_s_length); + const f_string_static_t f_status_atomic_not_s = macro_f_string_static_t_initialize2(F_status_atomic_not_s, 0, F_status_atomic_not_s_length); + const f_string_static_t f_status_begin_s = macro_f_string_static_t_initialize2(F_status_begin_s, 0, F_status_begin_s_length); + const f_string_static_t f_status_begin_not_s = macro_f_string_static_t_initialize2(F_status_begin_not_s, 0, F_status_begin_not_s_length); + const f_string_static_t f_status_block_s = macro_f_string_static_t_initialize2(F_status_block_s, 0, F_status_block_s_length); + const f_string_static_t f_status_block_not_s = macro_f_string_static_t_initialize2(F_status_block_not_s, 0, F_status_block_not_s_length); + const f_string_static_t f_status_body_s = macro_f_string_static_t_initialize2(F_status_body_s, 0, F_status_body_s_length); + const f_string_static_t f_status_body_not_s = macro_f_string_static_t_initialize2(F_status_body_not_s, 0, F_status_body_not_s_length); + const f_string_static_t f_status_bound_s = macro_f_string_static_t_initialize2(F_status_bound_s, 0, F_status_bound_s_length); + const f_string_static_t f_status_bound_not_s = macro_f_string_static_t_initialize2(F_status_bound_not_s, 0, F_status_bound_not_s_length); + const f_string_static_t f_status_capability_s = macro_f_string_static_t_initialize2(F_status_capability_s, 0, F_status_capability_s_length); + const f_string_static_t f_status_capability_not_s = macro_f_string_static_t_initialize2(F_status_capability_not_s, 0, F_status_capability_not_s_length); + const f_string_static_t f_status_child_s = macro_f_string_static_t_initialize2(F_status_child_s, 0, F_status_child_s_length); + const f_string_static_t f_status_child_not_s = macro_f_string_static_t_initialize2(F_status_child_not_s, 0, F_status_child_not_s_length); + const f_string_static_t f_status_complete_s = macro_f_string_static_t_initialize2(F_status_complete_s, 0, F_status_complete_s_length); + const f_string_static_t f_status_complete_not_s = macro_f_string_static_t_initialize2(F_status_complete_not_s, 0, F_status_complete_not_s_length); + const f_string_static_t f_status_connect_s = macro_f_string_static_t_initialize2(F_status_connect_s, 0, F_status_connect_s_length); + const f_string_static_t f_status_connect_not_s = macro_f_string_static_t_initialize2(F_status_connect_not_s, 0, F_status_connect_not_s_length); + const f_string_static_t f_status_connect_refuse_s = macro_f_string_static_t_initialize2(F_status_connect_refuse_s, 0, F_status_connect_refuse_s_length); + const f_string_static_t f_status_connect_reset_s = macro_f_string_static_t_initialize2(F_status_connect_reset_s, 0, F_status_connect_reset_s_length); + const f_string_static_t f_status_container_s = macro_f_string_static_t_initialize2(F_status_container_s, 0, F_status_container_s_length); + const f_string_static_t f_status_container_not_s = macro_f_string_static_t_initialize2(F_status_container_not_s, 0, F_status_container_not_s_length); + const f_string_static_t f_status_content_s = macro_f_string_static_t_initialize2(F_status_content_s, 0, F_status_content_s_length); + const f_string_static_t f_status_content_not_s = macro_f_string_static_t_initialize2(F_status_content_not_s, 0, F_status_content_not_s_length); + const f_string_static_t f_status_continue_s = macro_f_string_static_t_initialize2(F_status_continue_s, 0, F_status_continue_s_length); + const f_string_static_t f_status_continue_not_s = macro_f_string_static_t_initialize2(F_status_continue_not_s, 0, F_status_continue_not_s_length); + const f_string_static_t f_status_control_s = macro_f_string_static_t_initialize2(F_status_control_s, 0, F_status_control_s_length); + const f_string_static_t f_status_control_not_s = macro_f_string_static_t_initialize2(F_status_control_not_s, 0, F_status_control_not_s_length); + const f_string_static_t f_status_control_group_s = macro_f_string_static_t_initialize2(F_status_control_group_s, 0, F_status_control_group_s_length); + const f_string_static_t f_status_control_group_not_s = macro_f_string_static_t_initialize2(F_status_control_group_not_s, 0, F_status_control_group_not_s_length); + const f_string_static_t f_status_critical_s = macro_f_string_static_t_initialize2(F_status_critical_s, 0, F_status_critical_s_length); + const f_string_static_t f_status_critical_not_s = macro_f_string_static_t_initialize2(F_status_critical_not_s, 0, F_status_critical_not_s_length); + const f_string_static_t f_status_dead_s = macro_f_string_static_t_initialize2(F_status_dead_s, 0, F_status_dead_s_length); + const f_string_static_t f_status_dead_not_s = macro_f_string_static_t_initialize2(F_status_dead_not_s, 0, F_status_dead_not_s_length); + const f_string_static_t f_status_deadlock_s = macro_f_string_static_t_initialize2(F_status_deadlock_s, 0, F_status_deadlock_s_length); + const f_string_static_t f_status_deadlock_not_s = macro_f_string_static_t_initialize2(F_status_deadlock_not_s, 0, F_status_deadlock_not_s_length); + const f_string_static_t f_status_descriptor_s = macro_f_string_static_t_initialize2(F_status_descriptor_s, 0, F_status_descriptor_s_length); + const f_string_static_t f_status_descriptor_not_s = macro_f_string_static_t_initialize2(F_status_descriptor_not_s, 0, F_status_descriptor_not_s_length); + const f_string_static_t f_status_device_s = macro_f_string_static_t_initialize2(F_status_device_s, 0, F_status_device_s_length); + const f_string_static_t f_status_device_not_s = macro_f_string_static_t_initialize2(F_status_device_not_s, 0, F_status_device_not_s_length); + const f_string_static_t f_status_disable_s = macro_f_string_static_t_initialize2(F_status_disable_s, 0, F_status_disable_s_length); + const f_string_static_t f_status_disable_not_s = macro_f_string_static_t_initialize2(F_status_disable_not_s, 0, F_status_disable_not_s_length); + const f_string_static_t f_status_domain_s = macro_f_string_static_t_initialize2(F_status_domain_s, 0, F_status_domain_s_length); + const f_string_static_t f_status_domain_not_s = macro_f_string_static_t_initialize2(F_status_domain_not_s, 0, F_status_domain_not_s_length); + const f_string_static_t f_status_done_s = macro_f_string_static_t_initialize2(F_status_done_s, 0, F_status_done_s_length); + const f_string_static_t f_status_done_not_s = macro_f_string_static_t_initialize2(F_status_done_not_s, 0, F_status_done_not_s_length); + const f_string_static_t f_status_dummy_s = macro_f_string_static_t_initialize2(F_status_dummy_s, 0, F_status_dummy_s_length); + const f_string_static_t f_status_dummy_not_s = macro_f_string_static_t_initialize2(F_status_dummy_not_s, 0, F_status_dummy_not_s_length); + const f_string_static_t f_status_empty_s = macro_f_string_static_t_initialize2(F_status_empty_s, 0, F_status_empty_s_length); + const f_string_static_t f_status_empty_not_s = macro_f_string_static_t_initialize2(F_status_empty_not_s, 0, F_status_empty_not_s_length); + const f_string_static_t f_status_enable_s = macro_f_string_static_t_initialize2(F_status_enable_s, 0, F_status_enable_s_length); + const f_string_static_t f_status_enable_not_s = macro_f_string_static_t_initialize2(F_status_enable_not_s, 0, F_status_enable_not_s_length); + const f_string_static_t f_status_encoding_s = macro_f_string_static_t_initialize2(F_status_encoding_s, 0, F_status_encoding_s_length); + const f_string_static_t f_status_encoding_not_s = macro_f_string_static_t_initialize2(F_status_encoding_not_s, 0, F_status_encoding_not_s_length); + const f_string_static_t f_status_end_s = macro_f_string_static_t_initialize2(F_status_end_s, 0, F_status_end_s_length); + const f_string_static_t f_status_end_not_s = macro_f_string_static_t_initialize2(F_status_end_not_s, 0, F_status_end_not_s_length); + const f_string_static_t f_status_endian_s = macro_f_string_static_t_initialize2(F_status_endian_s, 0, F_status_endian_s_length); + const f_string_static_t f_status_endian_big_s = macro_f_string_static_t_initialize2(F_status_endian_big_s, 0, F_status_endian_big_s_length); + const f_string_static_t f_status_endian_little_s = macro_f_string_static_t_initialize2(F_status_endian_little_s, 0, F_status_endian_little_s_length); + const f_string_static_t f_status_endian_not_s = macro_f_string_static_t_initialize2(F_status_endian_not_s, 0, F_status_endian_not_s_length); + const f_string_static_t f_status_eoa_s = macro_f_string_static_t_initialize2(F_status_eoa_s, 0, F_status_eoa_s_length); + const f_string_static_t f_status_eoa_not_s = macro_f_string_static_t_initialize2(F_status_eoa_not_s, 0, F_status_eoa_not_s_length); + const f_string_static_t f_status_eof_s = macro_f_string_static_t_initialize2(F_status_eof_s, 0, F_status_eof_s_length); + const f_string_static_t f_status_eof_not_s = macro_f_string_static_t_initialize2(F_status_eof_not_s, 0, F_status_eof_not_s_length); + const f_string_static_t f_status_eol_s = macro_f_string_static_t_initialize2(F_status_eol_s, 0, F_status_eol_s_length); + const f_string_static_t f_status_eol_not_s = macro_f_string_static_t_initialize2(F_status_eol_not_s, 0, F_status_eol_not_s_length); + const f_string_static_t f_status_eos_s = macro_f_string_static_t_initialize2(F_status_eos_s, 0, F_status_eos_s_length); + const f_string_static_t f_status_eos_not_s = macro_f_string_static_t_initialize2(F_status_eos_not_s, 0, F_status_eos_not_s_length); + const f_string_static_t f_status_execute_s = macro_f_string_static_t_initialize2(F_status_execute_s, 0, F_status_execute_s_length); + const f_string_static_t f_status_execute_not_s = macro_f_string_static_t_initialize2(F_status_execute_not_s, 0, F_status_execute_not_s_length); + const f_string_static_t f_status_exist_s = macro_f_string_static_t_initialize2(F_status_exist_s, 0, F_status_exist_s_length); + const f_string_static_t f_status_exist_not_s = macro_f_string_static_t_initialize2(F_status_exist_not_s, 0, F_status_exist_not_s_length); + const f_string_static_t f_status_failure_s = macro_f_string_static_t_initialize2(F_status_failure_s, 0, F_status_failure_s_length); + const f_string_static_t f_status_failure_not_s = macro_f_string_static_t_initialize2(F_status_failure_not_s, 0, F_status_failure_not_s_length); + const f_string_static_t f_status_family_s = macro_f_string_static_t_initialize2(F_status_family_s, 0, F_status_family_s_length); + const f_string_static_t f_status_family_not_s = macro_f_string_static_t_initialize2(F_status_family_not_s, 0, F_status_family_not_s_length); + const f_string_static_t f_status_first_s = macro_f_string_static_t_initialize2(F_status_first_s, 0, F_status_first_s_length); + const f_string_static_t f_status_first_not_s = macro_f_string_static_t_initialize2(F_status_first_not_s, 0, F_status_first_not_s_length); + const f_string_static_t f_status_footer_s = macro_f_string_static_t_initialize2(F_status_footer_s, 0, F_status_footer_s_length); + const f_string_static_t f_status_footer_not_s = macro_f_string_static_t_initialize2(F_status_footer_not_s, 0, F_status_footer_not_s_length); + const f_string_static_t f_status_fork_s = macro_f_string_static_t_initialize2(F_status_fork_s, 0, F_status_fork_s_length); + const f_string_static_t f_status_fork_not_s = macro_f_string_static_t_initialize2(F_status_fork_not_s, 0, F_status_fork_not_s_length); + const f_string_static_t f_status_format_s = macro_f_string_static_t_initialize2(F_status_format_s, 0, F_status_format_s_length); + const f_string_static_t f_status_format_not_s = macro_f_string_static_t_initialize2(F_status_format_not_s, 0, F_status_format_not_s_length); + const f_string_static_t f_status_found_s = macro_f_string_static_t_initialize2(F_status_found_s, 0, F_status_found_s_length); + const f_string_static_t f_status_found_not_s = macro_f_string_static_t_initialize2(F_status_found_not_s, 0, F_status_found_not_s_length); + const f_string_static_t f_status_full_s = macro_f_string_static_t_initialize2(F_status_full_s, 0, F_status_full_s_length); + const f_string_static_t f_status_full_not_s = macro_f_string_static_t_initialize2(F_status_full_not_s, 0, F_status_full_not_s_length); + const f_string_static_t f_status_group_s = macro_f_string_static_t_initialize2(F_status_group_s, 0, F_status_group_s_length); + const f_string_static_t f_status_group_not_s = macro_f_string_static_t_initialize2(F_status_group_not_s, 0, F_status_group_not_s_length); + const f_string_static_t f_status_header_s = macro_f_string_static_t_initialize2(F_status_header_s, 0, F_status_header_s_length); + const f_string_static_t f_status_header_not_s = macro_f_string_static_t_initialize2(F_status_header_not_s, 0, F_status_header_not_s_length); + const f_string_static_t f_status_ignore_s = macro_f_string_static_t_initialize2(F_status_ignore_s, 0, F_status_ignore_s_length); + const f_string_static_t f_status_ignore_not_s = macro_f_string_static_t_initialize2(F_status_ignore_not_s, 0, F_status_ignore_not_s_length); + const f_string_static_t f_status_implemented_s = macro_f_string_static_t_initialize2(F_status_implemented_s, 0, F_status_implemented_s_length); + const f_string_static_t f_status_implemented_not_s = macro_f_string_static_t_initialize2(F_status_implemented_not_s, 0, F_status_implemented_not_s_length); + const f_string_static_t f_status_input_s = macro_f_string_static_t_initialize2(F_status_input_s, 0, F_status_input_s_length); + const f_string_static_t f_status_input_not_s = macro_f_string_static_t_initialize2(F_status_input_not_s, 0, F_status_input_not_s_length); + const f_string_static_t f_status_input_output_s = macro_f_string_static_t_initialize2(F_status_input_output_s, 0, F_status_input_output_s_length); + const f_string_static_t f_status_interrupt_s = macro_f_string_static_t_initialize2(F_status_interrupt_s, 0, F_status_interrupt_s_length); + const f_string_static_t f_status_interrupt_not_s = macro_f_string_static_t_initialize2(F_status_interrupt_not_s, 0, F_status_interrupt_not_s_length); + const f_string_static_t f_status_known_s = macro_f_string_static_t_initialize2(F_status_known_s, 0, F_status_known_s_length); + const f_string_static_t f_status_known_not_s = macro_f_string_static_t_initialize2(F_status_known_not_s, 0, F_status_known_not_s_length); + const f_string_static_t f_status_last_s = macro_f_string_static_t_initialize2(F_status_last_s, 0, F_status_last_s_length); + const f_string_static_t f_status_last_not_s = macro_f_string_static_t_initialize2(F_status_last_not_s, 0, F_status_last_not_s_length); + const f_string_static_t f_status_limit_s = macro_f_string_static_t_initialize2(F_status_limit_s, 0, F_status_limit_s_length); + const f_string_static_t f_status_limit_not_s = macro_f_string_static_t_initialize2(F_status_limit_not_s, 0, F_status_limit_not_s_length); + const f_string_static_t f_status_link_s = macro_f_string_static_t_initialize2(F_status_link_s, 0, F_status_link_s_length); + const f_string_static_t f_status_link_not_s = macro_f_string_static_t_initialize2(F_status_link_not_s, 0, F_status_link_not_s_length); + const f_string_static_t f_status_live_s = macro_f_string_static_t_initialize2(F_status_live_s, 0, F_status_live_s_length); + const f_string_static_t f_status_live_not_s = macro_f_string_static_t_initialize2(F_status_live_not_s, 0, F_status_live_not_s_length); + const f_string_static_t f_status_lock_s = macro_f_string_static_t_initialize2(F_status_lock_s, 0, F_status_lock_s_length); + const f_string_static_t f_status_lock_not_s = macro_f_string_static_t_initialize2(F_status_lock_not_s, 0, F_status_lock_not_s_length); + const f_string_static_t f_status_loop_s = macro_f_string_static_t_initialize2(F_status_loop_s, 0, F_status_loop_s_length); + const f_string_static_t f_status_loop_not_s = macro_f_string_static_t_initialize2(F_status_loop_not_s, 0, F_status_loop_not_s_length); + const f_string_static_t f_status_maybe_s = macro_f_string_static_t_initialize2(F_status_maybe_s, 0, F_status_maybe_s_length); + const f_string_static_t f_status_maybe_not_s = macro_f_string_static_t_initialize2(F_status_maybe_not_s, 0, F_status_maybe_not_s_length); + const f_string_static_t f_status_memory_s = macro_f_string_static_t_initialize2(F_status_memory_s, 0, F_status_memory_s_length); + const f_string_static_t f_status_memory_not_s = macro_f_string_static_t_initialize2(F_status_memory_not_s, 0, F_status_memory_not_s_length); + const f_string_static_t f_status_message_s = macro_f_string_static_t_initialize2(F_status_message_s, 0, F_status_message_s_length); + const f_string_static_t f_status_message_not_s = macro_f_string_static_t_initialize2(F_status_message_not_s, 0, F_status_message_not_s_length); + const f_string_static_t f_status_minor_s = macro_f_string_static_t_initialize2(F_status_minor_s, 0, F_status_minor_s_length); + const f_string_static_t f_status_minor_not_s = macro_f_string_static_t_initialize2(F_status_minor_not_s, 0, F_status_minor_not_s_length); + const f_string_static_t f_status_moderate_s = macro_f_string_static_t_initialize2(F_status_moderate_s, 0, F_status_moderate_s_length); + const f_string_static_t f_status_moderate_not_s = macro_f_string_static_t_initialize2(F_status_moderate_not_s, 0, F_status_moderate_not_s_length); + const f_string_static_t f_status_mount_s = macro_f_string_static_t_initialize2(F_status_mount_s, 0, F_status_mount_s_length); + const f_string_static_t f_status_mount_not_s = macro_f_string_static_t_initialize2(F_status_mount_not_s, 0, F_status_mount_not_s_length); + const f_string_static_t f_status_name_s = macro_f_string_static_t_initialize2(F_status_name_s, 0, F_status_name_s_length); + const f_string_static_t f_status_name_not_s = macro_f_string_static_t_initialize2(F_status_name_not_s, 0, F_status_name_not_s_length); + const f_string_static_t f_status_next_s = macro_f_string_static_t_initialize2(F_status_next_s, 0, F_status_next_s_length); + const f_string_static_t f_status_next_not_s = macro_f_string_static_t_initialize2(F_status_next_not_s, 0, F_status_next_not_s_length); + const f_string_static_t f_status_nice_s = macro_f_string_static_t_initialize2(F_status_nice_s, 0, F_status_nice_s_length); + const f_string_static_t f_status_nice_not_s = macro_f_string_static_t_initialize2(F_status_nice_not_s, 0, F_status_nice_not_s_length); + const f_string_static_t f_status_object_s = macro_f_string_static_t_initialize2(F_status_object_s, 0, F_status_object_s_length); + const f_string_static_t f_status_object_not_s = macro_f_string_static_t_initialize2(F_status_object_not_s, 0, F_status_object_not_s_length); + const f_string_static_t f_status_option_s = macro_f_string_static_t_initialize2(F_status_option_s, 0, F_status_option_s_length); + const f_string_static_t f_status_option_not_s = macro_f_string_static_t_initialize2(F_status_option_not_s, 0, F_status_option_not_s_length); + const f_string_static_t f_status_output_s = macro_f_string_static_t_initialize2(F_status_output_s, 0, F_status_output_s_length); + const f_string_static_t f_status_output_not_s = macro_f_string_static_t_initialize2(F_status_output_not_s, 0, F_status_output_not_s_length); + const f_string_static_t f_status_packet_s = macro_f_string_static_t_initialize2(F_status_packet_s, 0, F_status_packet_s_length); + const f_string_static_t f_status_packet_not_s = macro_f_string_static_t_initialize2(F_status_packet_not_s, 0, F_status_packet_not_s_length); + const f_string_static_t f_status_parameter_s = macro_f_string_static_t_initialize2(F_status_parameter_s, 0, F_status_parameter_s_length); + const f_string_static_t f_status_parameter_not_s = macro_f_string_static_t_initialize2(F_status_parameter_not_s, 0, F_status_parameter_not_s_length); + const f_string_static_t f_status_parent_s = macro_f_string_static_t_initialize2(F_status_parent_s, 0, F_status_parent_s_length); + const f_string_static_t f_status_parent_not_s = macro_f_string_static_t_initialize2(F_status_parent_not_s, 0, F_status_parent_not_s_length); + const f_string_static_t f_status_payload_s = macro_f_string_static_t_initialize2(F_status_payload_s, 0, F_status_payload_s_length); + const f_string_static_t f_status_payload_not_s = macro_f_string_static_t_initialize2(F_status_payload_not_s, 0, F_status_payload_not_s_length); + const f_string_static_t f_status_pipe_s = macro_f_string_static_t_initialize2(F_status_pipe_s, 0, F_status_pipe_s_length); + const f_string_static_t f_status_pipe_not_s = macro_f_string_static_t_initialize2(F_status_pipe_not_s, 0, F_status_pipe_not_s_length); + const f_string_static_t f_status_port_s = macro_f_string_static_t_initialize2(F_status_port_s, 0, F_status_port_s_length); + const f_string_static_t f_status_port_not_s = macro_f_string_static_t_initialize2(F_status_port_not_s, 0, F_status_port_not_s_length); + const f_string_static_t f_status_previous_s = macro_f_string_static_t_initialize2(F_status_previous_s, 0, F_status_previous_s_length); + const f_string_static_t f_status_previous_not_s = macro_f_string_static_t_initialize2(F_status_previous_not_s, 0, F_status_previous_not_s_length); + const f_string_static_t f_status_processor_s = macro_f_string_static_t_initialize2(F_status_processor_s, 0, F_status_processor_s_length); + const f_string_static_t f_status_processor_not_s = macro_f_string_static_t_initialize2(F_status_processor_not_s, 0, F_status_processor_not_s_length); + const f_string_static_t f_status_progress_s = macro_f_string_static_t_initialize2(F_status_progress_s, 0, F_status_progress_s_length); + const f_string_static_t f_status_progress_not_s = macro_f_string_static_t_initialize2(F_status_progress_not_s, 0, F_status_progress_not_s_length); + const f_string_static_t f_status_prohibited_s = macro_f_string_static_t_initialize2(F_status_prohibited_s, 0, F_status_prohibited_s_length); + const f_string_static_t f_status_prohibited_not_s = macro_f_string_static_t_initialize2(F_status_prohibited_not_s, 0, F_status_prohibited_not_s_length); + const f_string_static_t f_status_property_s = macro_f_string_static_t_initialize2(F_status_property_s, 0, F_status_property_s_length); + const f_string_static_t f_status_property_not_s = macro_f_string_static_t_initialize2(F_status_property_not_s, 0, F_status_property_not_s_length); + const f_string_static_t f_status_protocol_s = macro_f_string_static_t_initialize2(F_status_protocol_s, 0, F_status_protocol_s_length); + const f_string_static_t f_status_protocol_not_s = macro_f_string_static_t_initialize2(F_status_protocol_not_s, 0, F_status_protocol_not_s_length); + const f_string_static_t f_status_range_s = macro_f_string_static_t_initialize2(F_status_range_s, 0, F_status_range_s_length); + const f_string_static_t f_status_range_not_s = macro_f_string_static_t_initialize2(F_status_range_not_s, 0, F_status_range_not_s_length); + const f_string_static_t f_status_read_s = macro_f_string_static_t_initialize2(F_status_read_s, 0, F_status_read_s_length); + const f_string_static_t f_status_read_not_s = macro_f_string_static_t_initialize2(F_status_read_not_s, 0, F_status_read_not_s_length); + const f_string_static_t f_status_read_only_s = macro_f_string_static_t_initialize2(F_status_read_only_s, 0, F_status_read_only_s_length); + const f_string_static_t f_status_ready_s = macro_f_string_static_t_initialize2(F_status_ready_s, 0, F_status_ready_s_length); + const f_string_static_t f_status_ready_not_s = macro_f_string_static_t_initialize2(F_status_ready_not_s, 0, F_status_ready_not_s_length); + const f_string_static_t f_status_recover_s = macro_f_string_static_t_initialize2(F_status_recover_s, 0, F_status_recover_s_length); + const f_string_static_t f_status_recover_not_s = macro_f_string_static_t_initialize2(F_status_recover_not_s, 0, F_status_recover_not_s_length); + const f_string_static_t f_status_recurse_s = macro_f_string_static_t_initialize2(F_status_recurse_s, 0, F_status_recurse_s_length); + const f_string_static_t f_status_recurse_not_s = macro_f_string_static_t_initialize2(F_status_recurse_not_s, 0, F_status_recurse_not_s_length); + const f_string_static_t f_status_relative_s = macro_f_string_static_t_initialize2(F_status_relative_s, 0, F_status_relative_s_length); + const f_string_static_t f_status_relative_not_s = macro_f_string_static_t_initialize2(F_status_relative_not_s, 0, F_status_relative_not_s_length); + const f_string_static_t f_status_require_s = macro_f_string_static_t_initialize2(F_status_require_s, 0, F_status_require_s_length); + const f_string_static_t f_status_require_not_s = macro_f_string_static_t_initialize2(F_status_require_not_s, 0, F_status_require_not_s_length); + const f_string_static_t f_status_resource_s = macro_f_string_static_t_initialize2(F_status_resource_s, 0, F_status_resource_s_length); + const f_string_static_t f_status_resource_not_s = macro_f_string_static_t_initialize2(F_status_resource_not_s, 0, F_status_resource_not_s_length); + const f_string_static_t f_status_search_s = macro_f_string_static_t_initialize2(F_status_search_s, 0, F_status_search_s_length); + const f_string_static_t f_status_search_not_s = macro_f_string_static_t_initialize2(F_status_search_not_s, 0, F_status_search_not_s_length); + const f_string_static_t f_status_schedule_s = macro_f_string_static_t_initialize2(F_status_schedule_s, 0, F_status_schedule_s_length); + const f_string_static_t f_status_schedule_not_s = macro_f_string_static_t_initialize2(F_status_schedule_not_s, 0, F_status_schedule_not_s_length); + const f_string_static_t f_status_size_s = macro_f_string_static_t_initialize2(F_status_size_s, 0, F_status_size_s_length); + const f_string_static_t f_status_size_not_s = macro_f_string_static_t_initialize2(F_status_size_not_s, 0, F_status_size_not_s_length); + const f_string_static_t f_status_signal_s = macro_f_string_static_t_initialize2(F_status_signal_s, 0, F_status_signal_s_length); + const f_string_static_t f_status_signal_not_s = macro_f_string_static_t_initialize2(F_status_signal_not_s, 0, F_status_signal_not_s_length); + const f_string_static_t f_status_space_s = macro_f_string_static_t_initialize2(F_status_space_s, 0, F_status_space_s_length); + const f_string_static_t f_status_space_not_s = macro_f_string_static_t_initialize2(F_status_space_not_s, 0, F_status_space_not_s_length); + const f_string_static_t f_status_start_s = macro_f_string_static_t_initialize2(F_status_start_s, 0, F_status_start_s_length); + const f_string_static_t f_status_start_not_s = macro_f_string_static_t_initialize2(F_status_start_not_s, 0, F_status_start_not_s_length); + const f_string_static_t f_status_stop_s = macro_f_string_static_t_initialize2(F_status_stop_s, 0, F_status_stop_s_length); + const f_string_static_t f_status_stop_not_s = macro_f_string_static_t_initialize2(F_status_stop_not_s, 0, F_status_stop_not_s_length); + const f_string_static_t f_status_stream_s = macro_f_string_static_t_initialize2(F_status_stream_s, 0, F_status_stream_s_length); + const f_string_static_t f_status_stream_not_s = macro_f_string_static_t_initialize2(F_status_stream_not_s, 0, F_status_stream_not_s_length); + const f_string_static_t f_status_string_s = macro_f_string_static_t_initialize2(F_status_string_s, 0, F_status_string_s_length); + const f_string_static_t f_status_string_not_s = macro_f_string_static_t_initialize2(F_status_string_not_s, 0, F_status_string_not_s_length); + const f_string_static_t f_status_string_too_large_s = macro_f_string_static_t_initialize2(F_status_string_too_large_s, 0, F_status_string_too_large_s_length); + const f_string_static_t f_status_string_too_small_s = macro_f_string_static_t_initialize2(F_status_string_too_small_s, 0, F_status_string_too_small_s_length); + const f_string_static_t f_status_syntax_s = macro_f_string_static_t_initialize2(F_status_syntax_s, 0, F_status_syntax_s_length); + const f_string_static_t f_status_syntax_not_s = macro_f_string_static_t_initialize2(F_status_syntax_not_s, 0, F_status_syntax_not_s_length); + const f_string_static_t f_status_thread_s = macro_f_string_static_t_initialize2(F_status_thread_s, 0, F_status_thread_s_length); + const f_string_static_t f_status_thread_not_s = macro_f_string_static_t_initialize2(F_status_thread_not_s, 0, F_status_thread_not_s_length); + const f_string_static_t f_status_time_s = macro_f_string_static_t_initialize2(F_status_time_s, 0, F_status_time_s_length); + const f_string_static_t f_status_time_not_s = macro_f_string_static_t_initialize2(F_status_time_not_s, 0, F_status_time_not_s_length); + const f_string_static_t f_status_time_out_s = macro_f_string_static_t_initialize2(F_status_time_out_s, 0, F_status_time_out_s_length); + const f_string_static_t f_status_too_large_s = macro_f_string_static_t_initialize2(F_status_too_large_s, 0, F_status_too_large_s_length); + const f_string_static_t f_status_too_small_s = macro_f_string_static_t_initialize2(F_status_too_small_s, 0, F_status_too_small_s_length); + const f_string_static_t f_status_type_s = macro_f_string_static_t_initialize2(F_status_type_s, 0, F_status_type_s_length); + const f_string_static_t f_status_type_not_s = macro_f_string_static_t_initialize2(F_status_type_not_s, 0, F_status_type_not_s_length); + const f_string_static_t f_status_success_s = macro_f_string_static_t_initialize2(F_status_success_s, 0, F_status_success_s_length); + const f_string_static_t f_status_success_not_s = macro_f_string_static_t_initialize2(F_status_success_not_s, 0, F_status_success_not_s_length); + const f_string_static_t f_status_supported_s = macro_f_string_static_t_initialize2(F_status_supported_s, 0, F_status_supported_s_length); + const f_string_static_t f_status_supported_not_s = macro_f_string_static_t_initialize2(F_status_supported_not_s, 0, F_status_supported_not_s_length); + const f_string_static_t f_status_user_s = macro_f_string_static_t_initialize2(F_status_user_s, 0, F_status_user_s_length); + const f_string_static_t f_status_user_not_s = macro_f_string_static_t_initialize2(F_status_user_not_s, 0, F_status_user_not_s_length); + const f_string_static_t f_status_utf_s = macro_f_string_static_t_initialize2(F_status_utf_s, 0, F_status_utf_s_length); + const f_string_static_t f_status_utf_fragment_s = macro_f_string_static_t_initialize2(F_status_utf_fragment_s, 0, F_status_utf_fragment_s_length); + const f_string_static_t f_status_utf_fragment_not_s = macro_f_string_static_t_initialize2(F_status_utf_fragment_not_s, 0, F_status_utf_fragment_not_s_length); + const f_string_static_t f_status_utf_not_s = macro_f_string_static_t_initialize2(F_status_utf_not_s, 0, F_status_utf_not_s_length); + const f_string_static_t f_status_valid_s = macro_f_string_static_t_initialize2(F_status_valid_s, 0, F_status_valid_s_length); + const f_string_static_t f_status_valid_not_s = macro_f_string_static_t_initialize2(F_status_valid_not_s, 0, F_status_valid_not_s_length); + const f_string_static_t f_status_value_s = macro_f_string_static_t_initialize2(F_status_value_s, 0, F_status_value_s_length); + const f_string_static_t f_status_value_not_s = macro_f_string_static_t_initialize2(F_status_value_not_s, 0, F_status_value_not_s_length); + const f_string_static_t f_status_wait_s = macro_f_string_static_t_initialize2(F_status_wait_s, 0, F_status_wait_s_length); + const f_string_static_t f_status_wait_not_s = macro_f_string_static_t_initialize2(F_status_wait_not_s, 0, F_status_wait_not_s_length); + const f_string_static_t f_status_warn_s = macro_f_string_static_t_initialize2(F_status_warn_s, 0, F_status_warn_s_length); + const f_string_static_t f_status_warn_not_s = macro_f_string_static_t_initialize2(F_status_warn_not_s, 0, F_status_warn_not_s_length); + const f_string_static_t f_status_world_s = macro_f_string_static_t_initialize2(F_status_world_s, 0, F_status_world_s_length); + const f_string_static_t f_status_world_not_s = macro_f_string_static_t_initialize2(F_status_world_not_s, 0, F_status_world_not_s_length); + const f_string_static_t f_status_write_s = macro_f_string_static_t_initialize2(F_status_write_s, 0, F_status_write_s_length); + const f_string_static_t f_status_write_not_s = macro_f_string_static_t_initialize2(F_status_write_not_s, 0, F_status_write_not_s_length); + const f_string_static_t f_status_write_only_s = macro_f_string_static_t_initialize2(F_status_write_only_s, 0, F_status_write_only_s_length); #endif // _di_F_status_basic_ #ifndef _di_F_status_array_ - const f_string_t f_status_array_s = F_status_array_s; - const f_string_t f_status_array_not_s = F_status_array_not_s; - const f_string_t f_status_array_too_large_s = F_status_array_too_large_s; - const f_string_t f_status_array_too_small_s = F_status_array_too_small_s; + const f_string_static_t f_status_array_s = macro_f_string_static_t_initialize2(F_status_array_s, 0, F_status_array_s_length); + const f_string_static_t f_status_array_not_s = macro_f_string_static_t_initialize2(F_status_array_not_s, 0, F_status_array_not_s_length); + const f_string_static_t f_status_array_too_large_s = macro_f_string_static_t_initialize2(F_status_array_too_large_s, 0, F_status_array_too_large_s_length); + const f_string_static_t f_status_array_too_small_s = macro_f_string_static_t_initialize2(F_status_array_too_small_s, 0, F_status_array_too_small_s_length); #endif // _di_F_status_array_ #ifndef _di_F_status_available_ - const f_string_t f_status_available_s = F_status_available_s; - const f_string_t f_status_available_not_s = F_status_available_not_s; - const f_string_t f_status_available_not_address_s = F_status_available_not_address_s; - const f_string_t f_status_available_not_buffer_s = F_status_available_not_buffer_s; - const f_string_t f_status_available_not_device_s = F_status_available_not_device_s; - const f_string_t f_status_available_not_pipe_s = F_status_available_not_pipe_s; - const f_string_t f_status_available_not_port_s = F_status_available_not_port_s; - const f_string_t f_status_available_not_process_s = F_status_available_not_process_s; - const f_string_t f_status_available_not_socket_s = F_status_available_not_socket_s; + const f_string_static_t f_status_available_s = macro_f_string_static_t_initialize2(F_status_available_s, 0, F_status_available_s_length); + const f_string_static_t f_status_available_not_s = macro_f_string_static_t_initialize2(F_status_available_not_s, 0, F_status_available_not_s_length); + const f_string_static_t f_status_available_not_address_s = macro_f_string_static_t_initialize2(F_status_available_not_address_s, 0, F_status_available_not_address_s_length); + const f_string_static_t f_status_available_not_buffer_s = macro_f_string_static_t_initialize2(F_status_available_not_buffer_s, 0, F_status_available_not_buffer_s_length); + const f_string_static_t f_status_available_not_device_s = macro_f_string_static_t_initialize2(F_status_available_not_device_s, 0, F_status_available_not_device_s_length); + const f_string_static_t f_status_available_not_pipe_s = macro_f_string_static_t_initialize2(F_status_available_not_pipe_s, 0, F_status_available_not_pipe_s_length); + const f_string_static_t f_status_available_not_port_s = macro_f_string_static_t_initialize2(F_status_available_not_port_s, 0, F_status_available_not_port_s_length); + const f_string_static_t f_status_available_not_process_s = macro_f_string_static_t_initialize2(F_status_available_not_process_s, 0, F_status_available_not_process_s_length); + const f_string_static_t f_status_available_not_socket_s = macro_f_string_static_t_initialize2(F_status_available_not_socket_s, 0, F_status_available_not_socket_s_length); #endif // _di_F_status_available_ #ifndef _di_F_status_busy_ - const f_string_t f_status_busy_s = F_status_busy_s; - const f_string_t f_status_busy_address_s = F_status_busy_address_s; - const f_string_t f_status_busy_buffer_s = F_status_busy_buffer_s; - const f_string_t f_status_busy_device_s = F_status_busy_device_s; - const f_string_t f_status_busy_not_s = F_status_busy_not_s; - const f_string_t f_status_busy_pipe_s = F_status_busy_pipe_s; - const f_string_t f_status_busy_port_s = F_status_busy_port_s; - const f_string_t f_status_busy_process_s = F_status_busy_process_s; - const f_string_t f_status_busy_socket_s = F_status_busy_socket_s; + const f_string_static_t f_status_busy_s = macro_f_string_static_t_initialize2(F_status_busy_s, 0, F_status_busy_s_length); + const f_string_static_t f_status_busy_address_s = macro_f_string_static_t_initialize2(F_status_busy_address_s, 0, F_status_busy_address_s_length); + const f_string_static_t f_status_busy_buffer_s = macro_f_string_static_t_initialize2(F_status_busy_buffer_s, 0, F_status_busy_buffer_s_length); + const f_string_static_t f_status_busy_device_s = macro_f_string_static_t_initialize2(F_status_busy_device_s, 0, F_status_busy_device_s_length); + const f_string_static_t f_status_busy_not_s = macro_f_string_static_t_initialize2(F_status_busy_not_s, 0, F_status_busy_not_s_length); + const f_string_static_t f_status_busy_pipe_s = macro_f_string_static_t_initialize2(F_status_busy_pipe_s, 0, F_status_busy_pipe_s_length); + const f_string_static_t f_status_busy_port_s = macro_f_string_static_t_initialize2(F_status_busy_port_s, 0, F_status_busy_port_s_length); + const f_string_static_t f_status_busy_process_s = macro_f_string_static_t_initialize2(F_status_busy_process_s, 0, F_status_busy_process_s_length); + const f_string_static_t f_status_busy_socket_s = macro_f_string_static_t_initialize2(F_status_busy_socket_s, 0, F_status_busy_socket_s_length); #endif // _di_F_status_busy_ #ifndef _di_F_status_network_ - const f_string_t f_status_network_s = F_status_network_s; - const f_string_t f_status_network_busy_s = F_status_network_busy_s; - const f_string_t f_status_network_busy_not_s = F_status_network_busy_not_s; - const f_string_t f_status_network_client_s = F_status_network_client_s; - const f_string_t f_status_network_client_not_s = F_status_network_client_not_s; - const f_string_t f_status_network_device_s = F_status_network_device_s; - const f_string_t f_status_network_device_not_s = F_status_network_device_not_s; - const f_string_t f_status_network_found_s = F_status_network_found_s; - const f_string_t f_status_network_found_not_s = F_status_network_found_not_s; - const f_string_t f_status_network_lost_s = F_status_network_lost_s; - const f_string_t f_status_network_lost_not_s = F_status_network_lost_not_s; - const f_string_t f_status_network_not_s = F_status_network_not_s; - const f_string_t f_status_network_reach_s = F_status_network_reach_s; - const f_string_t f_status_network_reach_client_s = F_status_network_reach_client_s; - const f_string_t f_status_network_reach_client_not_s = F_status_network_reach_client_not_s; - const f_string_t f_status_network_reach_not_s = F_status_network_reach_not_s; - const f_string_t f_status_network_reach_server_s = F_status_network_reach_server_s; - const f_string_t f_status_network_reach_server_not_s = F_status_network_reach_server_not_s; - const f_string_t f_status_network_server_s = F_status_network_server_s; - const f_string_t f_status_network_server_not_s = F_status_network_server_not_s; - const f_string_t f_status_network_time_s = F_status_network_time_s; - const f_string_t f_status_network_time_not_s = F_status_network_time_not_s; + const f_string_static_t f_status_network_s = macro_f_string_static_t_initialize2(F_status_network_s, 0, F_status_network_s_length); + const f_string_static_t f_status_network_busy_s = macro_f_string_static_t_initialize2(F_status_network_busy_s, 0, F_status_network_busy_s_length); + const f_string_static_t f_status_network_busy_not_s = macro_f_string_static_t_initialize2(F_status_network_busy_not_s, 0, F_status_network_busy_not_s_length); + const f_string_static_t f_status_network_client_s = macro_f_string_static_t_initialize2(F_status_network_client_s, 0, F_status_network_client_s_length); + const f_string_static_t f_status_network_client_not_s = macro_f_string_static_t_initialize2(F_status_network_client_not_s, 0, F_status_network_client_not_s_length); + const f_string_static_t f_status_network_device_s = macro_f_string_static_t_initialize2(F_status_network_device_s, 0, F_status_network_device_s_length); + const f_string_static_t f_status_network_device_not_s = macro_f_string_static_t_initialize2(F_status_network_device_not_s, 0, F_status_network_device_not_s_length); + const f_string_static_t f_status_network_found_s = macro_f_string_static_t_initialize2(F_status_network_found_s, 0, F_status_network_found_s_length); + const f_string_static_t f_status_network_found_not_s = macro_f_string_static_t_initialize2(F_status_network_found_not_s, 0, F_status_network_found_not_s_length); + const f_string_static_t f_status_network_lost_s = macro_f_string_static_t_initialize2(F_status_network_lost_s, 0, F_status_network_lost_s_length); + const f_string_static_t f_status_network_lost_not_s = macro_f_string_static_t_initialize2(F_status_network_lost_not_s, 0, F_status_network_lost_not_s_length); + const f_string_static_t f_status_network_not_s = macro_f_string_static_t_initialize2(F_status_network_not_s, 0, F_status_network_not_s_length); + const f_string_static_t f_status_network_reach_s = macro_f_string_static_t_initialize2(F_status_network_reach_s, 0, F_status_network_reach_s_length); + const f_string_static_t f_status_network_reach_client_s = macro_f_string_static_t_initialize2(F_status_network_reach_client_s, 0, F_status_network_reach_client_s_length); + const f_string_static_t f_status_network_reach_client_not_s = macro_f_string_static_t_initialize2(F_status_network_reach_client_not_s, 0, F_status_network_reach_client_not_s_length); + const f_string_static_t f_status_network_reach_not_s = macro_f_string_static_t_initialize2(F_status_network_reach_not_s, 0, F_status_network_reach_not_s_length); + const f_string_static_t f_status_network_reach_server_s = macro_f_string_static_t_initialize2(F_status_network_reach_server_s, 0, F_status_network_reach_server_s_length); + const f_string_static_t f_status_network_reach_server_not_s = macro_f_string_static_t_initialize2(F_status_network_reach_server_not_s, 0, F_status_network_reach_server_not_s_length); + const f_string_static_t f_status_network_server_s = macro_f_string_static_t_initialize2(F_status_network_server_s, 0, F_status_network_server_s_length); + const f_string_static_t f_status_network_server_not_s = macro_f_string_static_t_initialize2(F_status_network_server_not_s, 0, F_status_network_server_not_s_length); + const f_string_static_t f_status_network_time_s = macro_f_string_static_t_initialize2(F_status_network_time_s, 0, F_status_network_time_s_length); + const f_string_static_t f_status_network_time_not_s = macro_f_string_static_t_initialize2(F_status_network_time_not_s, 0, F_status_network_time_not_s_length); #endif // _di_F_status_network_ #ifndef _di_F_status_number_ - const f_string_t f_status_number_s = F_status_number_s; - const f_string_t f_status_number_decimal_s = F_status_number_decimal_s; - const f_string_t f_status_number_decimal_not_s = F_status_number_decimal_not_s; - const f_string_t f_status_number_divide_by_zero_s = F_status_number_divide_by_zero_s; - const f_string_t f_status_number_negative_s = F_status_number_negative_s; - const f_string_t f_status_number_negative_not_s = F_status_number_negative_not_s; - const f_string_t f_status_number_not_s = F_status_number_not_s; - const f_string_t f_status_number_overflow_s = F_status_number_overflow_s; - const f_string_t f_status_number_positive_s = F_status_number_positive_s; - const f_string_t f_status_number_positive_not_s = F_status_number_positive_not_s; - const f_string_t f_status_number_too_large_s = F_status_number_too_large_s; - const f_string_t f_status_number_too_small_s = F_status_number_too_small_s; - const f_string_t f_status_number_underflow_s = F_status_number_underflow_s; - const f_string_t f_status_number_whole_s = F_status_number_whole_s; - const f_string_t f_status_number_whole_not_s = F_status_number_whole_not_s; - const f_string_t f_status_number_zero_s = F_status_number_zero_s; - const f_string_t f_status_number_zero_not_s = F_status_number_zero_not_s; + const f_string_static_t f_status_number_s = macro_f_string_static_t_initialize2(F_status_number_s, 0, F_status_number_s_length); + const f_string_static_t f_status_number_decimal_s = macro_f_string_static_t_initialize2(F_status_number_decimal_s, 0, F_status_number_decimal_s_length); + const f_string_static_t f_status_number_decimal_not_s = macro_f_string_static_t_initialize2(F_status_number_decimal_not_s, 0, F_status_number_decimal_not_s_length); + const f_string_static_t f_status_number_divide_by_zero_s = macro_f_string_static_t_initialize2(F_status_number_divide_by_zero_s, 0, F_status_number_divide_by_zero_s_length); + const f_string_static_t f_status_number_negative_s = macro_f_string_static_t_initialize2(F_status_number_negative_s, 0, F_status_number_negative_s_length); + const f_string_static_t f_status_number_negative_not_s = macro_f_string_static_t_initialize2(F_status_number_negative_not_s, 0, F_status_number_negative_not_s_length); + const f_string_static_t f_status_number_not_s = macro_f_string_static_t_initialize2(F_status_number_not_s, 0, F_status_number_not_s_length); + const f_string_static_t f_status_number_overflow_s = macro_f_string_static_t_initialize2(F_status_number_overflow_s, 0, F_status_number_overflow_s_length); + const f_string_static_t f_status_number_positive_s = macro_f_string_static_t_initialize2(F_status_number_positive_s, 0, F_status_number_positive_s_length); + const f_string_static_t f_status_number_positive_not_s = macro_f_string_static_t_initialize2(F_status_number_positive_not_s, 0, F_status_number_positive_not_s_length); + const f_string_static_t f_status_number_too_large_s = macro_f_string_static_t_initialize2(F_status_number_too_large_s, 0, F_status_number_too_large_s_length); + const f_string_static_t f_status_number_too_small_s = macro_f_string_static_t_initialize2(F_status_number_too_small_s, 0, F_status_number_too_small_s_length); + const f_string_static_t f_status_number_underflow_s = macro_f_string_static_t_initialize2(F_status_number_underflow_s, 0, F_status_number_underflow_s_length); + const f_string_static_t f_status_number_whole_s = macro_f_string_static_t_initialize2(F_status_number_whole_s, 0, F_status_number_whole_s_length); + const f_string_static_t f_status_number_whole_not_s = macro_f_string_static_t_initialize2(F_status_number_whole_not_s, 0, F_status_number_whole_not_s_length); + const f_string_static_t f_status_number_zero_s = macro_f_string_static_t_initialize2(F_status_number_zero_s, 0, F_status_number_zero_s_length); + const f_string_static_t f_status_number_zero_not_s = macro_f_string_static_t_initialize2(F_status_number_zero_not_s, 0, F_status_number_zero_not_s_length); #endif // _di_F_status_number_ #ifndef _di_F_status_buffer_ - const f_string_t f_status_buffer_s = F_status_buffer_s; - const f_string_t f_status_buffer_not_s = F_status_buffer_not_s; - const f_string_t f_status_buffer_too_large_s = F_status_buffer_too_large_s; - const f_string_t f_status_buffer_too_small_s = F_status_buffer_too_small_s; - const f_string_t f_status_complete_not_utf_s = F_status_complete_not_utf_s; - const f_string_t f_status_complete_not_utf_block_s = F_status_complete_not_utf_block_s; - const f_string_t f_status_complete_not_utf_eoa_s = F_status_complete_not_utf_eoa_s; - const f_string_t f_status_complete_not_utf_eof_s = F_status_complete_not_utf_eof_s; - const f_string_t f_status_complete_not_utf_eol_s = F_status_complete_not_utf_eol_s; - const f_string_t f_status_complete_not_utf_eos_s = F_status_complete_not_utf_eos_s; - const f_string_t f_status_complete_not_utf_stop_s = F_status_complete_not_utf_stop_s; - const f_string_t f_status_none_block_s = F_status_none_block_s; - const f_string_t f_status_none_eoa_s = F_status_none_eoa_s; - const f_string_t f_status_none_eof_s = F_status_none_eof_s; - const f_string_t f_status_none_eol_s = F_status_none_eol_s; - const f_string_t f_status_none_eos_s = F_status_none_eos_s; - const f_string_t f_status_none_not_s = F_status_none_not_s; - const f_string_t f_status_none_stop_s = F_status_none_stop_s; - const f_string_t f_status_data_s = F_status_data_s; - const f_string_t f_status_data_not_s = F_status_data_not_s; - const f_string_t f_status_data_not_block_s = F_status_data_not_block_s; - const f_string_t f_status_data_not_eoa_s = F_status_data_not_eoa_s; - const f_string_t f_status_data_not_eof_s = F_status_data_not_eof_s; - const f_string_t f_status_data_not_eol_s = F_status_data_not_eol_s; - const f_string_t f_status_data_not_eos_s = F_status_data_not_eos_s; - const f_string_t f_status_data_not_stop_s = F_status_data_not_stop_s; - const f_string_t f_status_terminated_s = F_status_terminated_s; - const f_string_t f_status_terminated_not_s = F_status_terminated_not_s; - const f_string_t f_status_terminated_not_block_s = F_status_terminated_not_block_s; - const f_string_t f_status_terminated_not_eoa_s = F_status_terminated_not_eoa_s; - const f_string_t f_status_terminated_not_eof_s = F_status_terminated_not_eof_s; - const f_string_t f_status_terminated_not_eol_s = F_status_terminated_not_eol_s; - const f_string_t f_status_terminated_not_eos_s = F_status_terminated_not_eos_s; - const f_string_t f_status_terminated_not_stop_s = F_status_terminated_not_stop_s; - const f_string_t f_status_terminated_not_group_s = F_status_terminated_not_group_s; - const f_string_t f_status_terminated_not_group_block_s = F_status_terminated_not_group_block_s; - const f_string_t f_status_terminated_not_group_eoa_s = F_status_terminated_not_group_eoa_s; - const f_string_t f_status_terminated_not_group_eof_s = F_status_terminated_not_group_eof_s; - const f_string_t f_status_terminated_not_group_eol_s = F_status_terminated_not_group_eol_s; - const f_string_t f_status_terminated_not_group_eos_s = F_status_terminated_not_group_eos_s; - const f_string_t f_status_terminated_not_group_stop_s = F_status_terminated_not_group_stop_s; - const f_string_t f_status_terminated_not_nest_s = F_status_terminated_not_nest_s; - const f_string_t f_status_terminated_not_nest_block_s = F_status_terminated_not_nest_block_s; - const f_string_t f_status_terminated_not_nest_eoa_s = F_status_terminated_not_nest_eoa_s; - const f_string_t f_status_terminated_not_nest_eof_s = F_status_terminated_not_nest_eof_s; - const f_string_t f_status_terminated_not_nest_eol_s = F_status_terminated_not_nest_eol_s; - const f_string_t f_status_terminated_not_nest_eos_s = F_status_terminated_not_nest_eos_s; - const f_string_t f_status_terminated_not_nest_stop_s = F_status_terminated_not_nest_stop_s; + const f_string_static_t f_status_buffer_s = macro_f_string_static_t_initialize2(F_status_buffer_s, 0, F_status_buffer_s_length); + const f_string_static_t f_status_buffer_not_s = macro_f_string_static_t_initialize2(F_status_buffer_not_s, 0, F_status_buffer_not_s_length); + const f_string_static_t f_status_buffer_too_large_s = macro_f_string_static_t_initialize2(F_status_buffer_too_large_s, 0, F_status_buffer_too_large_s_length); + const f_string_static_t f_status_buffer_too_small_s = macro_f_string_static_t_initialize2(F_status_buffer_too_small_s, 0, F_status_buffer_too_small_s_length); + const f_string_static_t f_status_complete_not_utf_s = macro_f_string_static_t_initialize2(F_status_complete_not_utf_s, 0, F_status_complete_not_utf_s_length); + const f_string_static_t f_status_complete_not_utf_block_s = macro_f_string_static_t_initialize2(F_status_complete_not_utf_block_s, 0, F_status_complete_not_utf_block_s_length); + const f_string_static_t f_status_complete_not_utf_eoa_s = macro_f_string_static_t_initialize2(F_status_complete_not_utf_eoa_s, 0, F_status_complete_not_utf_eoa_s_length); + const f_string_static_t f_status_complete_not_utf_eof_s = macro_f_string_static_t_initialize2(F_status_complete_not_utf_eof_s, 0, F_status_complete_not_utf_eof_s_length); + const f_string_static_t f_status_complete_not_utf_eol_s = macro_f_string_static_t_initialize2(F_status_complete_not_utf_eol_s, 0, F_status_complete_not_utf_eol_s_length); + const f_string_static_t f_status_complete_not_utf_eos_s = macro_f_string_static_t_initialize2(F_status_complete_not_utf_eos_s, 0, F_status_complete_not_utf_eos_s_length); + const f_string_static_t f_status_complete_not_utf_stop_s = macro_f_string_static_t_initialize2(F_status_complete_not_utf_stop_s, 0, F_status_complete_not_utf_stop_s_length); + const f_string_static_t f_status_none_block_s = macro_f_string_static_t_initialize2(F_status_none_block_s, 0, F_status_none_block_s_length); + const f_string_static_t f_status_none_eoa_s = macro_f_string_static_t_initialize2(F_status_none_eoa_s, 0, F_status_none_eoa_s_length); + const f_string_static_t f_status_none_eof_s = macro_f_string_static_t_initialize2(F_status_none_eof_s, 0, F_status_none_eof_s_length); + const f_string_static_t f_status_none_eol_s = macro_f_string_static_t_initialize2(F_status_none_eol_s, 0, F_status_none_eol_s_length); + const f_string_static_t f_status_none_eos_s = macro_f_string_static_t_initialize2(F_status_none_eos_s, 0, F_status_none_eos_s_length); + const f_string_static_t f_status_none_not_s = macro_f_string_static_t_initialize2(F_status_none_not_s, 0, F_status_none_not_s_length); + const f_string_static_t f_status_none_stop_s = macro_f_string_static_t_initialize2(F_status_none_stop_s, 0, F_status_none_stop_s_length); + const f_string_static_t f_status_data_s = macro_f_string_static_t_initialize2(F_status_data_s, 0, F_status_data_s_length); + const f_string_static_t f_status_data_not_s = macro_f_string_static_t_initialize2(F_status_data_not_s, 0, F_status_data_not_s_length); + const f_string_static_t f_status_data_not_block_s = macro_f_string_static_t_initialize2(F_status_data_not_block_s, 0, F_status_data_not_block_s_length); + const f_string_static_t f_status_data_not_eoa_s = macro_f_string_static_t_initialize2(F_status_data_not_eoa_s, 0, F_status_data_not_eoa_s_length); + const f_string_static_t f_status_data_not_eof_s = macro_f_string_static_t_initialize2(F_status_data_not_eof_s, 0, F_status_data_not_eof_s_length); + const f_string_static_t f_status_data_not_eol_s = macro_f_string_static_t_initialize2(F_status_data_not_eol_s, 0, F_status_data_not_eol_s_length); + const f_string_static_t f_status_data_not_eos_s = macro_f_string_static_t_initialize2(F_status_data_not_eos_s, 0, F_status_data_not_eos_s_length); + const f_string_static_t f_status_data_not_stop_s = macro_f_string_static_t_initialize2(F_status_data_not_stop_s, 0, F_status_data_not_stop_s_length); + const f_string_static_t f_status_terminated_s = macro_f_string_static_t_initialize2(F_status_terminated_s, 0, F_status_terminated_s_length); + const f_string_static_t f_status_terminated_not_s = macro_f_string_static_t_initialize2(F_status_terminated_not_s, 0, F_status_terminated_not_s_length); + const f_string_static_t f_status_terminated_not_block_s = macro_f_string_static_t_initialize2(F_status_terminated_not_block_s, 0, F_status_terminated_not_block_s_length); + const f_string_static_t f_status_terminated_not_eoa_s = macro_f_string_static_t_initialize2(F_status_terminated_not_eoa_s, 0, F_status_terminated_not_eoa_s_length); + const f_string_static_t f_status_terminated_not_eof_s = macro_f_string_static_t_initialize2(F_status_terminated_not_eof_s, 0, F_status_terminated_not_eof_s_length); + const f_string_static_t f_status_terminated_not_eol_s = macro_f_string_static_t_initialize2(F_status_terminated_not_eol_s, 0, F_status_terminated_not_eol_s_length); + const f_string_static_t f_status_terminated_not_eos_s = macro_f_string_static_t_initialize2(F_status_terminated_not_eos_s, 0, F_status_terminated_not_eos_s_length); + const f_string_static_t f_status_terminated_not_stop_s = macro_f_string_static_t_initialize2(F_status_terminated_not_stop_s, 0, F_status_terminated_not_stop_s_length); + const f_string_static_t f_status_terminated_not_group_s = macro_f_string_static_t_initialize2(F_status_terminated_not_group_s, 0, F_status_terminated_not_group_s_length); + const f_string_static_t f_status_terminated_not_group_block_s = macro_f_string_static_t_initialize2(F_status_terminated_not_group_block_s, 0, F_status_terminated_not_group_block_s_length); + const f_string_static_t f_status_terminated_not_group_eoa_s = macro_f_string_static_t_initialize2(F_status_terminated_not_group_eoa_s, 0, F_status_terminated_not_group_eoa_s_length); + const f_string_static_t f_status_terminated_not_group_eof_s = macro_f_string_static_t_initialize2(F_status_terminated_not_group_eof_s, 0, F_status_terminated_not_group_eof_s_length); + const f_string_static_t f_status_terminated_not_group_eol_s = macro_f_string_static_t_initialize2(F_status_terminated_not_group_eol_s, 0, F_status_terminated_not_group_eol_s_length); + const f_string_static_t f_status_terminated_not_group_eos_s = macro_f_string_static_t_initialize2(F_status_terminated_not_group_eos_s, 0, F_status_terminated_not_group_eos_s_length); + const f_string_static_t f_status_terminated_not_group_stop_s = macro_f_string_static_t_initialize2(F_status_terminated_not_group_stop_s, 0, F_status_terminated_not_group_stop_s_length); + const f_string_static_t f_status_terminated_not_nest_s = macro_f_string_static_t_initialize2(F_status_terminated_not_nest_s, 0, F_status_terminated_not_nest_s_length); + const f_string_static_t f_status_terminated_not_nest_block_s = macro_f_string_static_t_initialize2(F_status_terminated_not_nest_block_s, 0, F_status_terminated_not_nest_block_s_length); + const f_string_static_t f_status_terminated_not_nest_eoa_s = macro_f_string_static_t_initialize2(F_status_terminated_not_nest_eoa_s, 0, F_status_terminated_not_nest_eoa_s_length); + const f_string_static_t f_status_terminated_not_nest_eof_s = macro_f_string_static_t_initialize2(F_status_terminated_not_nest_eof_s, 0, F_status_terminated_not_nest_eof_s_length); + const f_string_static_t f_status_terminated_not_nest_eol_s = macro_f_string_static_t_initialize2(F_status_terminated_not_nest_eol_s, 0, F_status_terminated_not_nest_eol_s_length); + const f_string_static_t f_status_terminated_not_nest_eos_s = macro_f_string_static_t_initialize2(F_status_terminated_not_nest_eos_s, 0, F_status_terminated_not_nest_eos_s_length); + const f_string_static_t f_status_terminated_not_nest_stop_s = macro_f_string_static_t_initialize2(F_status_terminated_not_nest_stop_s, 0, F_status_terminated_not_nest_stop_s_length); #endif // _di_F_status_buffer_ #ifndef _di_F_status_process_ - const f_string_t f_status_process_s = F_status_process_s; - const f_string_t f_status_process_not_s = F_status_process_not_s; - const f_string_t f_status_process_too_many_s = F_status_process_too_many_s; + const f_string_static_t f_status_process_s = macro_f_string_static_t_initialize2(F_status_process_s, 0, F_status_process_s_length); + const f_string_static_t f_status_process_not_s = macro_f_string_static_t_initialize2(F_status_process_not_s, 0, F_status_process_not_s_length); + const f_string_static_t f_status_process_too_many_s = macro_f_string_static_t_initialize2(F_status_process_too_many_s, 0, F_status_process_too_many_s_length); #endif // _di_F_status_process_ #ifndef _di_F_status_file_ - const f_string_t f_status_file_s = F_status_file_s; - const f_string_t f_status_file_close_s = F_status_file_close_s; - const f_string_t f_status_file_closed_s = F_status_file_closed_s; - const f_string_t f_status_file_descriptor_s = F_status_file_descriptor_s; - const f_string_t f_status_file_descriptor_max_s = F_status_file_descriptor_max_s; - const f_string_t f_status_file_descriptor_not_s = F_status_file_descriptor_not_s; - const f_string_t f_status_file_empty_s = F_status_file_empty_s; - const f_string_t f_status_file_flush_s = F_status_file_flush_s; - const f_string_t f_status_file_found_s = F_status_file_found_s; - const f_string_t f_status_file_found_not_s = F_status_file_found_not_s; - const f_string_t f_status_file_not_s = F_status_file_not_s; - const f_string_t f_status_file_open_s = F_status_file_open_s; - const f_string_t f_status_file_open_max_s = F_status_file_open_max_s; - const f_string_t f_status_file_opened_s = F_status_file_opened_s; - const f_string_t f_status_file_overflow_s = F_status_file_overflow_s; - const f_string_t f_status_file_purge_s = F_status_file_purge_s; - const f_string_t f_status_file_read_s = F_status_file_read_s; - const f_string_t f_status_file_reallocation_s = F_status_file_reallocation_s; - const f_string_t f_status_file_seek_s = F_status_file_seek_s; - const f_string_t f_status_file_stat_s = F_status_file_stat_s; - const f_string_t f_status_file_synchronize_s = F_status_file_synchronize_s; - const f_string_t f_status_file_type_block_s = F_status_file_type_block_s; - const f_string_t f_status_file_type_character_s = F_status_file_type_character_s; - const f_string_t f_status_file_type_directory_s = F_status_file_type_directory_s; - const f_string_t f_status_file_type_fifo_s = F_status_file_type_fifo_s; - const f_string_t f_status_file_type_link_s = F_status_file_type_link_s; - const f_string_t f_status_file_type_not_block_s = F_status_file_type_not_block_s; - const f_string_t f_status_file_type_not_character_s = F_status_file_type_not_character_s; - const f_string_t f_status_file_type_not_directory_s = F_status_file_type_not_directory_s; - const f_string_t f_status_file_type_not_fifo_s = F_status_file_type_not_fifo_s; - const f_string_t f_status_file_type_not_link_s = F_status_file_type_not_link_s; - const f_string_t f_status_file_type_not_pipe_s = F_status_file_type_not_pipe_s; - const f_string_t f_status_file_type_not_regular_s = F_status_file_type_not_regular_s; - const f_string_t f_status_file_type_not_socket_s = F_status_file_type_not_socket_s; - const f_string_t f_status_file_type_not_unknown_s = F_status_file_type_not_unknown_s; - const f_string_t f_status_file_type_pipe_s = F_status_file_type_pipe_s; - const f_string_t f_status_file_type_regular_s = F_status_file_type_regular_s; - const f_string_t f_status_file_type_socket_s = F_status_file_type_socket_s; - const f_string_t f_status_file_type_unknown_s = F_status_file_type_unknown_s; - const f_string_t f_status_file_underflow_s = F_status_file_underflow_s; - const f_string_t f_status_file_utf_s = F_status_file_utf_s; - const f_string_t f_status_file_utf_not_s = F_status_file_utf_not_s; - const f_string_t f_status_file_write_s = F_status_file_write_s; + const f_string_static_t f_status_file_s = macro_f_string_static_t_initialize2(F_status_file_s, 0, F_status_file_s_length); + const f_string_static_t f_status_file_close_s = macro_f_string_static_t_initialize2(F_status_file_close_s, 0, F_status_file_close_s_length); + const f_string_static_t f_status_file_closed_s = macro_f_string_static_t_initialize2(F_status_file_closed_s, 0, F_status_file_closed_s_length); + const f_string_static_t f_status_file_descriptor_s = macro_f_string_static_t_initialize2(F_status_file_descriptor_s, 0, F_status_file_descriptor_s_length); + const f_string_static_t f_status_file_descriptor_max_s = macro_f_string_static_t_initialize2(F_status_file_descriptor_max_s, 0, F_status_file_descriptor_max_s_length); + const f_string_static_t f_status_file_descriptor_not_s = macro_f_string_static_t_initialize2(F_status_file_descriptor_not_s, 0, F_status_file_descriptor_not_s_length); + const f_string_static_t f_status_file_empty_s = macro_f_string_static_t_initialize2(F_status_file_empty_s, 0, F_status_file_empty_s_length); + const f_string_static_t f_status_file_flush_s = macro_f_string_static_t_initialize2(F_status_file_flush_s, 0, F_status_file_flush_s_length); + const f_string_static_t f_status_file_found_s = macro_f_string_static_t_initialize2(F_status_file_found_s, 0, F_status_file_found_s_length); + const f_string_static_t f_status_file_found_not_s = macro_f_string_static_t_initialize2(F_status_file_found_not_s, 0, F_status_file_found_not_s_length); + const f_string_static_t f_status_file_not_s = macro_f_string_static_t_initialize2(F_status_file_not_s, 0, F_status_file_not_s_length); + const f_string_static_t f_status_file_open_s = macro_f_string_static_t_initialize2(F_status_file_open_s, 0, F_status_file_open_s_length); + const f_string_static_t f_status_file_open_max_s = macro_f_string_static_t_initialize2(F_status_file_open_max_s, 0, F_status_file_open_max_s_length); + const f_string_static_t f_status_file_opened_s = macro_f_string_static_t_initialize2(F_status_file_opened_s, 0, F_status_file_opened_s_length); + const f_string_static_t f_status_file_overflow_s = macro_f_string_static_t_initialize2(F_status_file_overflow_s, 0, F_status_file_overflow_s_length); + const f_string_static_t f_status_file_purge_s = macro_f_string_static_t_initialize2(F_status_file_purge_s, 0, F_status_file_purge_s_length); + const f_string_static_t f_status_file_read_s = macro_f_string_static_t_initialize2(F_status_file_read_s, 0, F_status_file_read_s_length); + const f_string_static_t f_status_file_reallocation_s = macro_f_string_static_t_initialize2(F_status_file_reallocation_s, 0, F_status_file_reallocation_s_length); + const f_string_static_t f_status_file_seek_s = macro_f_string_static_t_initialize2(F_status_file_seek_s, 0, F_status_file_seek_s_length); + const f_string_static_t f_status_file_stat_s = macro_f_string_static_t_initialize2(F_status_file_stat_s, 0, F_status_file_stat_s_length); + const f_string_static_t f_status_file_synchronize_s = macro_f_string_static_t_initialize2(F_status_file_synchronize_s, 0, F_status_file_synchronize_s_length); + const f_string_static_t f_status_file_type_block_s = macro_f_string_static_t_initialize2(F_status_file_type_block_s, 0, F_status_file_type_block_s_length); + const f_string_static_t f_status_file_type_character_s = macro_f_string_static_t_initialize2(F_status_file_type_character_s, 0, F_status_file_type_character_s_length); + const f_string_static_t f_status_file_type_directory_s = macro_f_string_static_t_initialize2(F_status_file_type_directory_s, 0, F_status_file_type_directory_s_length); + const f_string_static_t f_status_file_type_fifo_s = macro_f_string_static_t_initialize2(F_status_file_type_fifo_s, 0, F_status_file_type_fifo_s_length); + const f_string_static_t f_status_file_type_link_s = macro_f_string_static_t_initialize2(F_status_file_type_link_s, 0, F_status_file_type_link_s_length); + const f_string_static_t f_status_file_type_not_block_s = macro_f_string_static_t_initialize2(F_status_file_type_not_block_s, 0, F_status_file_type_not_block_s_length); + const f_string_static_t f_status_file_type_not_character_s = macro_f_string_static_t_initialize2(F_status_file_type_not_character_s, 0, F_status_file_type_not_character_s_length); + const f_string_static_t f_status_file_type_not_directory_s = macro_f_string_static_t_initialize2(F_status_file_type_not_directory_s, 0, F_status_file_type_not_directory_s_length); + const f_string_static_t f_status_file_type_not_fifo_s = macro_f_string_static_t_initialize2(F_status_file_type_not_fifo_s, 0, F_status_file_type_not_fifo_s_length); + const f_string_static_t f_status_file_type_not_link_s = macro_f_string_static_t_initialize2(F_status_file_type_not_link_s, 0, F_status_file_type_not_link_s_length); + const f_string_static_t f_status_file_type_not_pipe_s = macro_f_string_static_t_initialize2(F_status_file_type_not_pipe_s, 0, F_status_file_type_not_pipe_s_length); + const f_string_static_t f_status_file_type_not_regular_s = macro_f_string_static_t_initialize2(F_status_file_type_not_regular_s, 0, F_status_file_type_not_regular_s_length); + const f_string_static_t f_status_file_type_not_socket_s = macro_f_string_static_t_initialize2(F_status_file_type_not_socket_s, 0, F_status_file_type_not_socket_s_length); + const f_string_static_t f_status_file_type_not_unknown_s = macro_f_string_static_t_initialize2(F_status_file_type_not_unknown_s, 0, F_status_file_type_not_unknown_s_length); + const f_string_static_t f_status_file_type_pipe_s = macro_f_string_static_t_initialize2(F_status_file_type_pipe_s, 0, F_status_file_type_pipe_s_length); + const f_string_static_t f_status_file_type_regular_s = macro_f_string_static_t_initialize2(F_status_file_type_regular_s, 0, F_status_file_type_regular_s_length); + const f_string_static_t f_status_file_type_socket_s = macro_f_string_static_t_initialize2(F_status_file_type_socket_s, 0, F_status_file_type_socket_s_length); + const f_string_static_t f_status_file_type_unknown_s = macro_f_string_static_t_initialize2(F_status_file_type_unknown_s, 0, F_status_file_type_unknown_s_length); + const f_string_static_t f_status_file_underflow_s = macro_f_string_static_t_initialize2(F_status_file_underflow_s, 0, F_status_file_underflow_s_length); + const f_string_static_t f_status_file_utf_s = macro_f_string_static_t_initialize2(F_status_file_utf_s, 0, F_status_file_utf_s_length); + const f_string_static_t f_status_file_utf_not_s = macro_f_string_static_t_initialize2(F_status_file_utf_not_s, 0, F_status_file_utf_not_s_length); + const f_string_static_t f_status_file_write_s = macro_f_string_static_t_initialize2(F_status_file_write_s, 0, F_status_file_write_s_length); #endif // _di_F_status_file_ #ifndef _di_F_status_filesystem_ - const f_string_t f_status_filesystem_s = F_status_filesystem_s; - const f_string_t f_status_filesystem_not_s = F_status_filesystem_not_s; - const f_string_t f_status_filesystem_quota_block_s = F_status_filesystem_quota_block_s; - const f_string_t f_status_filesystem_quota_reached_s = F_status_filesystem_quota_reached_s; + const f_string_static_t f_status_filesystem_s = macro_f_string_static_t_initialize2(F_status_filesystem_s, 0, F_status_filesystem_s_length); + const f_string_static_t f_status_filesystem_not_s = macro_f_string_static_t_initialize2(F_status_filesystem_not_s, 0, F_status_filesystem_not_s_length); + const f_string_static_t f_status_filesystem_quota_block_s = macro_f_string_static_t_initialize2(F_status_filesystem_quota_block_s, 0, F_status_filesystem_quota_block_s_length); + const f_string_static_t f_status_filesystem_quota_reached_s = macro_f_string_static_t_initialize2(F_status_filesystem_quota_reached_s, 0, F_status_filesystem_quota_reached_s_length); #endif // _di_F_status_filesystem_ #ifndef _di_F_status_directory_ - const f_string_t f_status_directory_s = F_status_directory_s; - const f_string_t f_status_directory_close_s = F_status_directory_close_s; - const f_string_t f_status_directory_closed_s = F_status_directory_closed_s; - const f_string_t f_status_directory_descriptor_s = F_status_directory_descriptor_s; - const f_string_t f_status_directory_empty_s = F_status_directory_empty_s; - const f_string_t f_status_directory_empty_not_s = F_status_directory_empty_not_s; - const f_string_t f_status_directory_found_s = F_status_directory_found_s; - const f_string_t f_status_directory_found_not_s = F_status_directory_found_not_s; - const f_string_t f_status_directory_flush_s = F_status_directory_flush_s; - const f_string_t f_status_directory_link_max_s = F_status_directory_link_max_s; - const f_string_t f_status_directory_not_s = F_status_directory_not_s; - const f_string_t f_status_directory_open_s = F_status_directory_open_s; - const f_string_t f_status_directory_purge_s = F_status_directory_purge_s; - const f_string_t f_status_directory_read_s = F_status_directory_read_s; - const f_string_t f_status_directory_stream_s = F_status_directory_stream_s; - const f_string_t f_status_directory_supported_not_s = F_status_directory_supported_not_s; - const f_string_t f_status_directory_synchronize_s = F_status_directory_synchronize_s; - const f_string_t f_status_directory_utf_s = F_status_directory_utf_s; - const f_string_t f_status_directory_utf_not_s = F_status_directory_utf_not_s; - const f_string_t f_status_directory_write_s = F_status_directory_write_s; + const f_string_static_t f_status_directory_s = macro_f_string_static_t_initialize2(F_status_directory_s, 0, F_status_directory_s_length); + const f_string_static_t f_status_directory_close_s = macro_f_string_static_t_initialize2(F_status_directory_close_s, 0, F_status_directory_close_s_length); + const f_string_static_t f_status_directory_closed_s = macro_f_string_static_t_initialize2(F_status_directory_closed_s, 0, F_status_directory_closed_s_length); + const f_string_static_t f_status_directory_descriptor_s = macro_f_string_static_t_initialize2(F_status_directory_descriptor_s, 0, F_status_directory_descriptor_s_length); + const f_string_static_t f_status_directory_empty_s = macro_f_string_static_t_initialize2(F_status_directory_empty_s, 0, F_status_directory_empty_s_length); + const f_string_static_t f_status_directory_empty_not_s = macro_f_string_static_t_initialize2(F_status_directory_empty_not_s, 0, F_status_directory_empty_not_s_length); + const f_string_static_t f_status_directory_found_s = macro_f_string_static_t_initialize2(F_status_directory_found_s, 0, F_status_directory_found_s_length); + const f_string_static_t f_status_directory_found_not_s = macro_f_string_static_t_initialize2(F_status_directory_found_not_s, 0, F_status_directory_found_not_s_length); + const f_string_static_t f_status_directory_flush_s = macro_f_string_static_t_initialize2(F_status_directory_flush_s, 0, F_status_directory_flush_s_length); + const f_string_static_t f_status_directory_link_max_s = macro_f_string_static_t_initialize2(F_status_directory_link_max_s, 0, F_status_directory_link_max_s_length); + const f_string_static_t f_status_directory_not_s = macro_f_string_static_t_initialize2(F_status_directory_not_s, 0, F_status_directory_not_s_length); + const f_string_static_t f_status_directory_open_s = macro_f_string_static_t_initialize2(F_status_directory_open_s, 0, F_status_directory_open_s_length); + const f_string_static_t f_status_directory_purge_s = macro_f_string_static_t_initialize2(F_status_directory_purge_s, 0, F_status_directory_purge_s_length); + const f_string_static_t f_status_directory_read_s = macro_f_string_static_t_initialize2(F_status_directory_read_s, 0, F_status_directory_read_s_length); + const f_string_static_t f_status_directory_stream_s = macro_f_string_static_t_initialize2(F_status_directory_stream_s, 0, F_status_directory_stream_s_length); + const f_string_static_t f_status_directory_supported_not_s = macro_f_string_static_t_initialize2(F_status_directory_supported_not_s, 0, F_status_directory_supported_not_s_length); + const f_string_static_t f_status_directory_synchronize_s = macro_f_string_static_t_initialize2(F_status_directory_synchronize_s, 0, F_status_directory_synchronize_s_length); + const f_string_static_t f_status_directory_utf_s = macro_f_string_static_t_initialize2(F_status_directory_utf_s, 0, F_status_directory_utf_s_length); + const f_string_static_t f_status_directory_utf_not_s = macro_f_string_static_t_initialize2(F_status_directory_utf_not_s, 0, F_status_directory_utf_not_s_length); + const f_string_static_t f_status_directory_write_s = macro_f_string_static_t_initialize2(F_status_directory_write_s, 0, F_status_directory_write_s_length); #endif // _di_F_status_directory_ #ifndef _di_F_status_socket_ - const f_string_t f_status_socket_s = F_status_socket_s; - const f_string_t f_status_socket_client_s = F_status_socket_client_s; - const f_string_t f_status_socket_not_s = F_status_socket_not_s; - const f_string_t f_status_socket_receive_s = F_status_socket_receive_s; - const f_string_t f_status_socket_send_s = F_status_socket_send_s; - const f_string_t f_status_socket_target_s = F_status_socket_target_s; + const f_string_static_t f_status_socket_s = macro_f_string_static_t_initialize2(F_status_socket_s, 0, F_status_socket_s_length); + const f_string_static_t f_status_socket_client_s = macro_f_string_static_t_initialize2(F_status_socket_client_s, 0, F_status_socket_client_s_length); + const f_string_static_t f_status_socket_not_s = macro_f_string_static_t_initialize2(F_status_socket_not_s, 0, F_status_socket_not_s_length); + const f_string_static_t f_status_socket_receive_s = macro_f_string_static_t_initialize2(F_status_socket_receive_s, 0, F_status_socket_receive_s_length); + const f_string_static_t f_status_socket_send_s = macro_f_string_static_t_initialize2(F_status_socket_send_s, 0, F_status_socket_send_s_length); + const f_string_static_t f_status_socket_target_s = macro_f_string_static_t_initialize2(F_status_socket_target_s, 0, F_status_socket_target_s_length); #endif // _di_F_status_socket_ #ifndef _di_F_status_compare_ - const f_string_t f_status_equal_to_s = F_status_equal_to_s; - const f_string_t f_status_equal_to_not_s = F_status_equal_to_not_s; - const f_string_t f_status_than_greater_s = F_status_than_greater_s; - const f_string_t f_status_than_less_s = F_status_than_less_s; + const f_string_static_t f_status_equal_to_s = macro_f_string_static_t_initialize2(F_status_equal_to_s, 0, F_status_equal_to_s_length); + const f_string_static_t f_status_equal_to_not_s = macro_f_string_static_t_initialize2(F_status_equal_to_not_s, 0, F_status_equal_to_not_s_length); + const f_string_static_t f_status_than_greater_s = macro_f_string_static_t_initialize2(F_status_than_greater_s, 0, F_status_than_greater_s_length); + const f_string_static_t f_status_than_less_s = macro_f_string_static_t_initialize2(F_status_than_less_s, 0, F_status_than_less_s_length); #endif // _di_F_status_compare_ #ifndef _di_F_status_access_ - const f_string_t f_status_access_s = F_status_access_s; - const f_string_t f_status_access_denied_s = F_status_access_denied_s; - const f_string_t f_status_access_denied_user_s = F_status_access_denied_user_s; - const f_string_t f_status_access_denied_group_s = F_status_access_denied_group_s; - const f_string_t f_status_access_denied_world_s = F_status_access_denied_world_s; - const f_string_t f_status_access_denied_read_s = F_status_access_denied_read_s; - const f_string_t f_status_access_denied_write_s = F_status_access_denied_write_s; - const f_string_t f_status_access_denied_execute_s = F_status_access_denied_execute_s; - const f_string_t f_status_access_denied_super_s = F_status_access_denied_super_s; - const f_string_t f_status_access_granted_s = F_status_access_granted_s; - const f_string_t f_status_access_granted_user_s = F_status_access_granted_user_s; - const f_string_t f_status_access_granted_group_s = F_status_access_granted_group_s; - const f_string_t f_status_access_granted_world_s = F_status_access_granted_world_s; - const f_string_t f_status_access_granted_read_s = F_status_access_granted_read_s; - const f_string_t f_status_access_granted_write_s = F_status_access_granted_write_s; - const f_string_t f_status_access_granted_execute_s = F_status_access_granted_execute_s; - const f_string_t f_status_access_granted_super_s = F_status_access_granted_super_s; - const f_string_t f_status_access_group_s = F_status_access_group_s; - const f_string_t f_status_access_mode_s = F_status_access_mode_s; - const f_string_t f_status_access_not_s = F_status_access_not_s; - const f_string_t f_status_access_owner_s = F_status_access_owner_s; + const f_string_static_t f_status_access_s = macro_f_string_static_t_initialize2(F_status_access_s, 0, F_status_access_s_length); + const f_string_static_t f_status_access_denied_s = macro_f_string_static_t_initialize2(F_status_access_denied_s, 0, F_status_access_denied_s_length); + const f_string_static_t f_status_access_denied_user_s = macro_f_string_static_t_initialize2(F_status_access_denied_user_s, 0, F_status_access_denied_user_s_length); + const f_string_static_t f_status_access_denied_group_s = macro_f_string_static_t_initialize2(F_status_access_denied_group_s, 0, F_status_access_denied_group_s_length); + const f_string_static_t f_status_access_denied_world_s = macro_f_string_static_t_initialize2(F_status_access_denied_world_s, 0, F_status_access_denied_world_s_length); + const f_string_static_t f_status_access_denied_read_s = macro_f_string_static_t_initialize2(F_status_access_denied_read_s, 0, F_status_access_denied_read_s_length); + const f_string_static_t f_status_access_denied_write_s = macro_f_string_static_t_initialize2(F_status_access_denied_write_s, 0, F_status_access_denied_write_s_length); + const f_string_static_t f_status_access_denied_execute_s = macro_f_string_static_t_initialize2(F_status_access_denied_execute_s, 0, F_status_access_denied_execute_s_length); + const f_string_static_t f_status_access_denied_super_s = macro_f_string_static_t_initialize2(F_status_access_denied_super_s, 0, F_status_access_denied_super_s_length); + const f_string_static_t f_status_access_granted_s = macro_f_string_static_t_initialize2(F_status_access_granted_s, 0, F_status_access_granted_s_length); + const f_string_static_t f_status_access_granted_user_s = macro_f_string_static_t_initialize2(F_status_access_granted_user_s, 0, F_status_access_granted_user_s_length); + const f_string_static_t f_status_access_granted_group_s = macro_f_string_static_t_initialize2(F_status_access_granted_group_s, 0, F_status_access_granted_group_s_length); + const f_string_static_t f_status_access_granted_world_s = macro_f_string_static_t_initialize2(F_status_access_granted_world_s, 0, F_status_access_granted_world_s_length); + const f_string_static_t f_status_access_granted_read_s = macro_f_string_static_t_initialize2(F_status_access_granted_read_s, 0, F_status_access_granted_read_s_length); + const f_string_static_t f_status_access_granted_write_s = macro_f_string_static_t_initialize2(F_status_access_granted_write_s, 0, F_status_access_granted_write_s_length); + const f_string_static_t f_status_access_granted_execute_s = macro_f_string_static_t_initialize2(F_status_access_granted_execute_s, 0, F_status_access_granted_execute_s_length); + const f_string_static_t f_status_access_granted_super_s = macro_f_string_static_t_initialize2(F_status_access_granted_super_s, 0, F_status_access_granted_super_s_length); + const f_string_static_t f_status_access_group_s = macro_f_string_static_t_initialize2(F_status_access_group_s, 0, F_status_access_group_s_length); + const f_string_static_t f_status_access_mode_s = macro_f_string_static_t_initialize2(F_status_access_mode_s, 0, F_status_access_mode_s_length); + const f_string_static_t f_status_access_not_s = macro_f_string_static_t_initialize2(F_status_access_not_s, 0, F_status_access_not_s_length); + const f_string_static_t f_status_access_owner_s = macro_f_string_static_t_initialize2(F_status_access_owner_s, 0, F_status_access_owner_s_length); #endif // _di_F_status_access_ #ifndef _di_F_status_terminal_ - const f_string_t f_status_terminal_s = F_status_terminal_s; - const f_string_t f_status_terminal_access_s = F_status_terminal_access_s; - const f_string_t f_status_terminal_known_s = F_status_terminal_known_s; - const f_string_t f_status_terminal_known_not_s = F_status_terminal_known_not_s; - const f_string_t f_status_terminal_not_s = F_status_terminal_not_s; - const f_string_t f_status_terminal_prohibited_s = F_status_terminal_prohibited_s; - const f_string_t f_status_terminal_read_s = F_status_terminal_read_s; - const f_string_t f_status_terminal_valid_s = F_status_terminal_valid_s; - const f_string_t f_status_terminal_valid_not_s = F_status_terminal_valid_not_s; - const f_string_t f_status_terminal_write_s = F_status_terminal_write_s; + const f_string_static_t f_status_terminal_s = macro_f_string_static_t_initialize2(F_status_terminal_s, 0, F_status_terminal_s_length); + const f_string_static_t f_status_terminal_access_s = macro_f_string_static_t_initialize2(F_status_terminal_access_s, 0, F_status_terminal_access_s_length); + const f_string_static_t f_status_terminal_known_s = macro_f_string_static_t_initialize2(F_status_terminal_known_s, 0, F_status_terminal_known_s_length); + const f_string_static_t f_status_terminal_known_not_s = macro_f_string_static_t_initialize2(F_status_terminal_known_not_s, 0, F_status_terminal_known_not_s_length); + const f_string_static_t f_status_terminal_not_s = macro_f_string_static_t_initialize2(F_status_terminal_not_s, 0, F_status_terminal_not_s_length); + const f_string_static_t f_status_terminal_prohibited_s = macro_f_string_static_t_initialize2(F_status_terminal_prohibited_s, 0, F_status_terminal_prohibited_s_length); + const f_string_static_t f_status_terminal_read_s = macro_f_string_static_t_initialize2(F_status_terminal_read_s, 0, F_status_terminal_read_s_length); + const f_string_static_t f_status_terminal_valid_s = macro_f_string_static_t_initialize2(F_status_terminal_valid_s, 0, F_status_terminal_valid_s_length); + const f_string_static_t f_status_terminal_valid_not_s = macro_f_string_static_t_initialize2(F_status_terminal_valid_not_s, 0, F_status_terminal_valid_not_s_length); + const f_string_static_t f_status_terminal_write_s = macro_f_string_static_t_initialize2(F_status_terminal_write_s, 0, F_status_terminal_write_s_length); #endif // _di_F_status_terminal_ - const f_string_t f_status_status_code_last_s = F_status_status_code_last_s; + const f_string_static_t f_status_status_code_last_s = macro_f_string_static_t_initialize2(F_status_status_code_last_s, 0, F_status_status_code_last_s_length); #endif // _di_F_status_string_ #ifndef _di_f_status_string_to_ - f_status_t f_status_string_to(const f_status_t code, f_string_t *string) { + f_status_t f_status_string_to(const f_status_t code, f_string_static_t *name) { #ifndef _di_level_0_parameter_checking_ - if (!string) return F_status_set_error(F_parameter); + if (!name) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ f_status_t unmasked_code = F_status_set_fine(code); @@ -599,11 +599,11 @@ extern "C" { switch (unmasked_code) { #ifndef _di_F_status_boolean_ case F_false: - *string = f_status_false_s; + *name = f_status_false_s; break; case F_true: - *string = f_status_true_s; + *name = f_status_true_s; break; #endif // _di_F_status_boolean_ @@ -611,2134 +611,2134 @@ extern "C" { // F_signal_hangup is not used because it has the same code as F_true. case F_signal_interrupt: - *string = f_status_signal_interrupt_s; + *name = f_status_signal_interrupt_s; break; case F_signal_quit: - *string = f_status_signal_quit_s; + *name = f_status_signal_quit_s; break; case F_signal_illegal: - *string = f_status_signal_illegal_s; + *name = f_status_signal_illegal_s; break; case F_signal_trap: - *string = f_status_signal_trap_s; + *name = f_status_signal_trap_s; break; case F_signal_abort: - *string = f_status_signal_abort_s; + *name = f_status_signal_abort_s; break; case F_signal_bus_error: - *string = f_status_signal_bus_error_s; + *name = f_status_signal_bus_error_s; break; case F_signal_floating_point_error: - *string = f_status_signal_floating_point_error_s; + *name = f_status_signal_floating_point_error_s; break; case F_signal_kill: - *string = f_status_signal_kill_s; + *name = f_status_signal_kill_s; break; case F_signal_user_1: - *string = f_status_signal_user_1_s; + *name = f_status_signal_user_1_s; break; case F_signal_segmentation_fault: - *string = f_status_signal_segmentation_fault_s; + *name = f_status_signal_segmentation_fault_s; break; case F_signal_user_2: - *string = f_status_signal_user_2_s; + *name = f_status_signal_user_2_s; break; case F_signal_broken_pipe: - *string = f_status_signal_broken_pipe_s; + *name = f_status_signal_broken_pipe_s; break; case F_signal_alarm_clock: - *string = f_status_signal_alarm_clock_s; + *name = f_status_signal_alarm_clock_s; break; case F_signal_termination: - *string = f_status_signal_termination_s; + *name = f_status_signal_termination_s; break; case F_signal_stack_fault: - *string = f_status_signal_stack_fault_s; + *name = f_status_signal_stack_fault_s; break; case F_signal_child: - *string = f_status_signal_child_s; + *name = f_status_signal_child_s; break; case F_signal_continue: - *string = f_status_signal_continue_s; + *name = f_status_signal_continue_s; break; case F_signal_stop: - *string = f_status_signal_stop_s; + *name = f_status_signal_stop_s; break; case F_signal_keyboard_stop: - *string = f_status_signal_keyboard_stop_s; + *name = f_status_signal_keyboard_stop_s; break; case F_signal_tty_in: - *string = f_status_signal_tty_in_s; + *name = f_status_signal_tty_in_s; break; case F_signal_tty_out: - *string = f_status_signal_tty_out_s; + *name = f_status_signal_tty_out_s; break; case F_signal_urgent: - *string = f_status_signal_urgent_s; + *name = f_status_signal_urgent_s; break; case F_signal_cpu_limit: - *string = f_status_signal_cpu_limit_s; + *name = f_status_signal_cpu_limit_s; break; case F_signal_file_size_limit: - *string = f_status_signal_file_size_limit_s; + *name = f_status_signal_file_size_limit_s; break; case F_signal_virtual_alarm_clock: - *string = f_status_signal_virtual_alarm_clock_s; + *name = f_status_signal_virtual_alarm_clock_s; break; case F_signal_profile_alarm_clock: - *string = f_status_signal_profile_alarm_clock_s; + *name = f_status_signal_profile_alarm_clock_s; break; case F_signal_window_size_change: - *string = f_status_signal_window_size_change_s; + *name = f_status_signal_window_size_change_s; break; case F_signal_pollable_event: - *string = f_status_signal_pollable_event_s; + *name = f_status_signal_pollable_event_s; break; case F_signal_power_failure: - *string = f_status_signal_power_failure_s; + *name = f_status_signal_power_failure_s; break; case F_signal_bad_system_call: - *string = f_status_signal_bad_system_call_s; + *name = f_status_signal_bad_system_call_s; break; case F_signal_reserved_32: - *string = f_status_signal_reserved_32_s; + *name = f_status_signal_reserved_32_s; break; case F_signal_reserved_33: - *string = f_status_signal_reserved_33_s; + *name = f_status_signal_reserved_33_s; break; case F_signal_reserved_34: - *string = f_status_signal_reserved_34_s; + *name = f_status_signal_reserved_34_s; break; case F_signal_reserved_35: - *string = f_status_signal_reserved_35_s; + *name = f_status_signal_reserved_35_s; break; case F_signal_reserved_36: - *string = f_status_signal_reserved_36_s; + *name = f_status_signal_reserved_36_s; break; case F_signal_reserved_37: - *string = f_status_signal_reserved_37_s; + *name = f_status_signal_reserved_37_s; break; case F_signal_reserved_38: - *string = f_status_signal_reserved_38_s; + *name = f_status_signal_reserved_38_s; break; case F_signal_reserved_39: - *string = f_status_signal_reserved_39_s; + *name = f_status_signal_reserved_39_s; break; case F_signal_reserved_40: - *string = f_status_signal_reserved_40_s; + *name = f_status_signal_reserved_40_s; break; case F_signal_reserved_41: - *string = f_status_signal_reserved_41_s; + *name = f_status_signal_reserved_41_s; break; case F_signal_reserved_42: - *string = f_status_signal_reserved_42_s; + *name = f_status_signal_reserved_42_s; break; case F_signal_reserved_43: - *string = f_status_signal_reserved_43_s; + *name = f_status_signal_reserved_43_s; break; case F_signal_reserved_44: - *string = f_status_signal_reserved_44_s; + *name = f_status_signal_reserved_44_s; break; case F_signal_reserved_45: - *string = f_status_signal_reserved_45_s; + *name = f_status_signal_reserved_45_s; break; case F_signal_reserved_46: - *string = f_status_signal_reserved_46_s; + *name = f_status_signal_reserved_46_s; break; case F_signal_reserved_47: - *string = f_status_signal_reserved_47_s; + *name = f_status_signal_reserved_47_s; break; case F_signal_reserved_48: - *string = f_status_signal_reserved_48_s; + *name = f_status_signal_reserved_48_s; break; case F_signal_reserved_49: - *string = f_status_signal_reserved_49_s; + *name = f_status_signal_reserved_49_s; break; case F_signal_reserved_50: - *string = f_status_signal_reserved_50_s; + *name = f_status_signal_reserved_50_s; break; case F_signal_reserved_51: - *string = f_status_signal_reserved_51_s; + *name = f_status_signal_reserved_51_s; break; case F_signal_reserved_52: - *string = f_status_signal_reserved_52_s; + *name = f_status_signal_reserved_52_s; break; case F_signal_reserved_53: - *string = f_status_signal_reserved_53_s; + *name = f_status_signal_reserved_53_s; break; case F_signal_reserved_54: - *string = f_status_signal_reserved_54_s; + *name = f_status_signal_reserved_54_s; break; case F_signal_reserved_55: - *string = f_status_signal_reserved_55_s; + *name = f_status_signal_reserved_55_s; break; case F_signal_reserved_56: - *string = f_status_signal_reserved_56_s; + *name = f_status_signal_reserved_56_s; break; case F_signal_reserved_57: - *string = f_status_signal_reserved_57_s; + *name = f_status_signal_reserved_57_s; break; case F_signal_reserved_58: - *string = f_status_signal_reserved_58_s; + *name = f_status_signal_reserved_58_s; break; case F_signal_reserved_59: - *string = f_status_signal_reserved_59_s; + *name = f_status_signal_reserved_59_s; break; case F_signal_reserved_60: - *string = f_status_signal_reserved_60_s; + *name = f_status_signal_reserved_60_s; break; case F_signal_reserved_61: - *string = f_status_signal_reserved_61_s; + *name = f_status_signal_reserved_61_s; break; case F_signal_reserved_62: - *string = f_status_signal_reserved_62_s; + *name = f_status_signal_reserved_62_s; break; case F_signal_reserved_63: - *string = f_status_signal_reserved_63_s; + *name = f_status_signal_reserved_63_s; break; case F_signal_reserved_64: - *string = f_status_signal_reserved_64_s; + *name = f_status_signal_reserved_64_s; break; #endif // _di_F_status_signal_ #ifndef _di_F_status_basic_ case F_none: - *string = f_status_none_s; + *name = f_status_none_s; break; case F_abort: - *string = f_status_abort_s; + *name = f_status_abort_s; break; case F_abort_not: - *string = f_status_abort_not_s; + *name = f_status_abort_not_s; break; case F_absolute: - *string = f_status_absolute_s; + *name = f_status_absolute_s; break; case F_absolute_not: - *string = f_status_absolute_not_s; + *name = f_status_absolute_not_s; break; case F_address: - *string = f_status_address_s; + *name = f_status_address_s; break; case F_address_not: - *string = f_status_address_not_s; + *name = f_status_address_not_s; break; case F_ascii: - *string = f_status_ascii_s; + *name = f_status_ascii_s; break; case F_ascii_not: - *string = f_status_ascii_not_s; + *name = f_status_ascii_not_s; break; case F_atomic: - *string = f_status_atomic_s; + *name = f_status_atomic_s; break; case F_atomic_not: - *string = f_status_atomic_not_s; + *name = f_status_atomic_not_s; break; case F_begin: - *string = f_status_begin_s; + *name = f_status_begin_s; break; case F_begin_not: - *string = f_status_begin_not_s; + *name = f_status_begin_not_s; break; case F_block: - *string = f_status_block_s; + *name = f_status_block_s; break; case F_block_not: - *string = f_status_block_not_s; + *name = f_status_block_not_s; break; case F_body: - *string = f_status_body_s; + *name = f_status_body_s; break; case F_body_not: - *string = f_status_body_not_s; + *name = f_status_body_not_s; break; case F_bound: - *string = f_status_bound_s; + *name = f_status_bound_s; break; case F_bound_not: - *string = f_status_bound_not_s; + *name = f_status_bound_not_s; break; case F_capability: - *string = f_status_capability_s; + *name = f_status_capability_s; break; case F_capability_not: - *string = f_status_capability_not_s; + *name = f_status_capability_not_s; break; case F_child: - *string = f_status_child_s; + *name = f_status_child_s; break; case F_child_not: - *string = f_status_child_not_s; + *name = f_status_child_not_s; break; case F_complete: - *string = f_status_complete_s; + *name = f_status_complete_s; break; case F_complete_not: - *string = f_status_complete_not_s; + *name = f_status_complete_not_s; break; case F_connect: - *string = f_status_connect_s; + *name = f_status_connect_s; break; case F_connect_not: - *string = f_status_connect_not_s; + *name = f_status_connect_not_s; break; case F_connect_refuse: - *string = f_status_connect_refuse_s; + *name = f_status_connect_refuse_s; break; case F_connect_reset: - *string = f_status_connect_reset_s; + *name = f_status_connect_reset_s; break; case F_content: - *string = f_status_content_s; + *name = f_status_content_s; break; case F_content_not: - *string = f_status_content_not_s; + *name = f_status_content_not_s; break; case F_continue: - *string = f_status_continue_s; + *name = f_status_continue_s; break; case F_continue_not: - *string = f_status_continue_not_s; + *name = f_status_continue_not_s; break; case F_container: - *string = f_status_container_s; + *name = f_status_container_s; break; case F_container_not: - *string = f_status_container_not_s; + *name = f_status_container_not_s; break; case F_control: - *string = f_status_control_s; + *name = f_status_control_s; break; case F_control_not: - *string = f_status_control_not_s; + *name = f_status_control_not_s; break; case F_control_group: - *string = f_status_control_group_s; + *name = f_status_control_group_s; break; case F_control_group_not: - *string = f_status_control_group_not_s; + *name = f_status_control_group_not_s; break; case F_critical: - *string = f_status_critical_s; + *name = f_status_critical_s; break; case F_critical_not: - *string = f_status_critical_not_s; + *name = f_status_critical_not_s; break; case F_dead: - *string = f_status_dead_s; + *name = f_status_dead_s; break; case F_dead_not: - *string = f_status_dead_not_s; + *name = f_status_dead_not_s; break; case F_deadlock: - *string = f_status_deadlock_s; + *name = f_status_deadlock_s; break; case F_deadlock_not: - *string = f_status_deadlock_not_s; + *name = f_status_deadlock_not_s; break; case F_descriptor: - *string = f_status_descriptor_s; + *name = f_status_descriptor_s; break; case F_descriptor_not: - *string = f_status_descriptor_not_s; + *name = f_status_descriptor_not_s; break; case F_device: - *string = f_status_device_s; + *name = f_status_device_s; break; case F_device_not: - *string = f_status_device_not_s; + *name = f_status_device_not_s; break; case F_disable: - *string = f_status_disable_s; + *name = f_status_disable_s; break; case F_disable_not: - *string = f_status_disable_not_s; + *name = f_status_disable_not_s; break; case F_domain: - *string = f_status_domain_s; + *name = f_status_domain_s; break; case F_domain_not: - *string = f_status_domain_not_s; + *name = f_status_domain_not_s; break; case F_done: - *string = f_status_done_s; + *name = f_status_done_s; break; case F_done_not: - *string = f_status_done_not_s; + *name = f_status_done_not_s; break; case F_dummy: - *string = f_status_dummy_s; + *name = f_status_dummy_s; break; case F_dummy_not: - *string = f_status_dummy_not_s; + *name = f_status_dummy_not_s; break; case F_empty: - *string = f_status_empty_s; + *name = f_status_empty_s; break; case F_empty_not: - *string = f_status_empty_not_s; + *name = f_status_empty_not_s; break; case F_enable: - *string = f_status_enable_s; + *name = f_status_enable_s; break; case F_enable_not: - *string = f_status_enable_not_s; + *name = f_status_enable_not_s; break; case F_encoding: - *string = f_status_encoding_s; + *name = f_status_encoding_s; break; case F_encoding_not: - *string = f_status_encoding_not_s; + *name = f_status_encoding_not_s; break; case F_end: - *string = f_status_end_s; + *name = f_status_end_s; break; case F_end_not: - *string = f_status_end_not_s; + *name = f_status_end_not_s; break; case F_endian: - *string = f_status_endian_s; + *name = f_status_endian_s; break; case F_endian_big: - *string = f_status_endian_big_s; + *name = f_status_endian_big_s; break; case F_endian_little: - *string = f_status_endian_little_s; + *name = f_status_endian_little_s; break; case F_endian_not: - *string = f_status_endian_not_s; + *name = f_status_endian_not_s; break; case F_eoa: - *string = f_status_eoa_s; + *name = f_status_eoa_s; break; case F_eoa_not: - *string = f_status_eoa_not_s; + *name = f_status_eoa_not_s; break; case F_eof: - *string = f_status_eof_s; + *name = f_status_eof_s; break; case F_eof_not: - *string = f_status_eof_not_s; + *name = f_status_eof_not_s; break; case F_eol: - *string = f_status_eol_s; + *name = f_status_eol_s; break; case F_eol_not: - *string = f_status_eol_not_s; + *name = f_status_eol_not_s; break; case F_eos: - *string = f_status_eos_s; + *name = f_status_eos_s; break; case F_eos_not: - *string = f_status_eos_not_s; + *name = f_status_eos_not_s; break; case F_execute: - *string = f_status_execute_s; + *name = f_status_execute_s; break; case F_execute_not: - *string = f_status_execute_not_s; + *name = f_status_execute_not_s; break; case F_exist: - *string = f_status_exist_s; + *name = f_status_exist_s; break; case F_exist_not: - *string = f_status_exist_not_s; + *name = f_status_exist_not_s; break; case F_failure: - *string = f_status_failure_s; + *name = f_status_failure_s; break; case F_failure_not: - *string = f_status_failure_not_s; + *name = f_status_failure_not_s; break; case F_family: - *string = f_status_family_s; + *name = f_status_family_s; break; case F_family_not: - *string = f_status_family_not_s; + *name = f_status_family_not_s; break; case F_first: - *string = f_status_first_s; + *name = f_status_first_s; break; case F_first_not: - *string = f_status_first_not_s; + *name = f_status_first_not_s; break; case F_footer: - *string = f_status_footer_s; + *name = f_status_footer_s; break; case F_footer_not: - *string = f_status_footer_not_s; + *name = f_status_footer_not_s; break; case F_fork: - *string = f_status_fork_s; + *name = f_status_fork_s; break; case F_fork_not: - *string = f_status_fork_not_s; + *name = f_status_fork_not_s; break; case F_format: - *string = f_status_format_s; + *name = f_status_format_s; break; case F_format_not: - *string = f_status_format_not_s; + *name = f_status_format_not_s; break; case F_found: - *string = f_status_found_s; + *name = f_status_found_s; break; case F_found_not: - *string = f_status_found_not_s; + *name = f_status_found_not_s; break; case F_full: - *string = f_status_full_s; + *name = f_status_full_s; break; case F_full_not: - *string = f_status_full_not_s; + *name = f_status_full_not_s; break; case F_group: - *string = f_status_group_s; + *name = f_status_group_s; break; case F_group_not: - *string = f_status_group_not_s; + *name = f_status_group_not_s; break; case F_header: - *string = f_status_header_s; + *name = f_status_header_s; break; case F_header_not: - *string = f_status_header_not_s; + *name = f_status_header_not_s; break; case F_ignore: - *string = f_status_ignore_s; + *name = f_status_ignore_s; break; case F_ignore_not: - *string = f_status_ignore_not_s; + *name = f_status_ignore_not_s; break; case F_implemented: - *string = f_status_implemented_s; + *name = f_status_implemented_s; break; case F_implemented_not: - *string = f_status_implemented_not_s; + *name = f_status_implemented_not_s; break; case F_input: - *string = f_status_input_s; + *name = f_status_input_s; break; case F_input_not: - *string = f_status_input_not_s; + *name = f_status_input_not_s; break; case F_input_output: - *string = f_status_input_output_s; + *name = f_status_input_output_s; break; case F_interrupt: - *string = f_status_interrupt_s; + *name = f_status_interrupt_s; break; case F_interrupt_not: - *string = f_status_interrupt_not_s; + *name = f_status_interrupt_not_s; break; case F_last: - *string = f_status_last_s; + *name = f_status_last_s; break; case F_last_not: - *string = f_status_last_not_s; + *name = f_status_last_not_s; break; case F_limit: - *string = f_status_limit_s; + *name = f_status_limit_s; break; case F_limit_not: - *string = f_status_limit_not_s; + *name = f_status_limit_not_s; break; case F_link: - *string = f_status_link_s; + *name = f_status_link_s; break; case F_link_not: - *string = f_status_link_not_s; + *name = f_status_link_not_s; break; case F_live: - *string = f_status_live_s; + *name = f_status_live_s; break; case F_live_not: - *string = f_status_live_not_s; + *name = f_status_live_not_s; break; case F_lock: - *string = f_status_lock_s; + *name = f_status_lock_s; break; case F_lock_not: - *string = f_status_lock_not_s; + *name = f_status_lock_not_s; break; case F_loop: - *string = f_status_loop_s; + *name = f_status_loop_s; break; case F_loop_not: - *string = f_status_loop_not_s; + *name = f_status_loop_not_s; break; case F_maybe: - *string = f_status_maybe_s; + *name = f_status_maybe_s; break; case F_maybe_not: - *string = f_status_maybe_not_s; + *name = f_status_maybe_not_s; break; case F_memory: - *string = f_status_memory_s; + *name = f_status_memory_s; break; case F_memory_not: - *string = f_status_memory_not_s; + *name = f_status_memory_not_s; break; case F_message: - *string = f_status_message_s; + *name = f_status_message_s; break; case F_message_not: - *string = f_status_message_not_s; + *name = f_status_message_not_s; break; case F_minor: - *string = f_status_minor_s; + *name = f_status_minor_s; break; case F_minor_not: - *string = f_status_minor_not_s; + *name = f_status_minor_not_s; break; case F_moderate: - *string = f_status_moderate_s; + *name = f_status_moderate_s; break; case F_moderate_not: - *string = f_status_moderate_not_s; + *name = f_status_moderate_not_s; break; case F_mount: - *string = f_status_mount_s; + *name = f_status_mount_s; break; case F_mount_not: - *string = f_status_mount_not_s; + *name = f_status_mount_not_s; break; case F_name: - *string = f_status_name_s; + *name = f_status_name_s; break; case F_name_not: - *string = f_status_name_not_s; + *name = f_status_name_not_s; break; case F_next: - *string = f_status_next_s; + *name = f_status_next_s; break; case F_next_not: - *string = f_status_next_not_s; + *name = f_status_next_not_s; break; case F_nice: - *string = f_status_nice_s; + *name = f_status_nice_s; break; case F_nice_not: - *string = f_status_nice_not_s; + *name = f_status_nice_not_s; break; case F_object: - *string = f_status_object_s; + *name = f_status_object_s; break; case F_object_not: - *string = f_status_object_not_s; + *name = f_status_object_not_s; break; case F_option: - *string = f_status_option_s; + *name = f_status_option_s; break; case F_option_not: - *string = f_status_option_not_s; + *name = f_status_option_not_s; break; case F_output: - *string = f_status_output_s; + *name = f_status_output_s; break; case F_output_not: - *string = f_status_output_not_s; + *name = f_status_output_not_s; break; case F_packet: - *string = f_status_packet_s; + *name = f_status_packet_s; break; case F_packet_not: - *string = f_status_packet_not_s; + *name = f_status_packet_not_s; break; case F_parameter: - *string = f_status_parameter_s; + *name = f_status_parameter_s; break; case F_parameter_not: - *string = f_status_parameter_not_s; + *name = f_status_parameter_not_s; break; case F_parent: - *string = f_status_parent_s; + *name = f_status_parent_s; break; case F_parent_not: - *string = f_status_parent_not_s; + *name = f_status_parent_not_s; break; case F_payload: - *string = f_status_payload_s; + *name = f_status_payload_s; break; case F_payload_not: - *string = f_status_payload_not_s; + *name = f_status_payload_not_s; break; case F_pipe: - *string = f_status_pipe_s; + *name = f_status_pipe_s; break; case F_pipe_not: - *string = f_status_pipe_not_s; + *name = f_status_pipe_not_s; break; case F_port: - *string = f_status_port_s; + *name = f_status_port_s; break; case F_port_not: - *string = f_status_port_not_s; + *name = f_status_port_not_s; break; case F_previous: - *string = f_status_previous_s; + *name = f_status_previous_s; break; case F_previous_not: - *string = f_status_previous_not_s; + *name = f_status_previous_not_s; break; case F_processor: - *string = f_status_processor_s; + *name = f_status_processor_s; break; case F_processor_not: - *string = f_status_processor_not_s; + *name = f_status_processor_not_s; break; case F_progress: - *string = f_status_progress_s; + *name = f_status_progress_s; break; case F_progress_not: - *string = f_status_progress_not_s; + *name = f_status_progress_not_s; break; case F_prohibited: - *string = f_status_prohibited_s; + *name = f_status_prohibited_s; break; case F_prohibited_not: - *string = f_status_prohibited_not_s; + *name = f_status_prohibited_not_s; break; case F_property: - *string = f_status_property_s; + *name = f_status_property_s; break; case F_property_not: - *string = f_status_property_not_s; + *name = f_status_property_not_s; break; case F_protocol: - *string = f_status_protocol_s; + *name = f_status_protocol_s; break; case F_protocol_not: - *string = f_status_protocol_not_s; + *name = f_status_protocol_not_s; break; case F_range: - *string = f_status_range_s; + *name = f_status_range_s; break; case F_range_not: - *string = f_status_range_not_s; + *name = f_status_range_not_s; break; case F_read: - *string = f_status_read_s; + *name = f_status_read_s; break; case F_read_not: - *string = f_status_read_not_s; + *name = f_status_read_not_s; break; case F_read_only: - *string = f_status_read_only_s; + *name = f_status_read_only_s; break; case F_ready: - *string = f_status_ready_s; + *name = f_status_ready_s; break; case F_ready_not: - *string = f_status_ready_not_s; + *name = f_status_ready_not_s; break; case F_recover: - *string = f_status_recover_s; + *name = f_status_recover_s; break; case F_recover_not: - *string = f_status_recover_not_s; + *name = f_status_recover_not_s; break; case F_recurse: - *string = f_status_recurse_s; + *name = f_status_recurse_s; break; case F_recurse_not: - *string = f_status_recurse_not_s; + *name = f_status_recurse_not_s; break; case F_relative: - *string = f_status_relative_s; + *name = f_status_relative_s; break; case F_relative_not: - *string = f_status_relative_not_s; + *name = f_status_relative_not_s; break; case F_require: - *string = f_status_require_s; + *name = f_status_require_s; break; case F_require_not: - *string = f_status_require_not_s; + *name = f_status_require_not_s; break; case F_resource: - *string = f_status_resource_s; + *name = f_status_resource_s; break; case F_resource_not: - *string = f_status_resource_not_s; + *name = f_status_resource_not_s; break; case F_search: - *string = f_status_search_s; + *name = f_status_search_s; break; case F_search_not: - *string = f_status_search_not_s; + *name = f_status_search_not_s; break; case F_schedule: - *string = f_status_schedule_s; + *name = f_status_schedule_s; break; case F_schedule_not: - *string = f_status_schedule_not_s; + *name = f_status_schedule_not_s; break; case F_size: - *string = f_status_size_s; + *name = f_status_size_s; break; case F_size_not: - *string = f_status_size_not_s; + *name = f_status_size_not_s; break; case F_signal: - *string = f_status_signal_s; + *name = f_status_signal_s; break; case F_signal_not: - *string = f_status_signal_not_s; + *name = f_status_signal_not_s; break; case F_space: - *string = f_status_space_s; + *name = f_status_space_s; break; case F_space_not: - *string = f_status_space_not_s; + *name = f_status_space_not_s; break; case F_start: - *string = f_status_start_s; + *name = f_status_start_s; break; case F_start_not: - *string = f_status_start_not_s; + *name = f_status_start_not_s; break; case F_stop: - *string = f_status_stop_s; + *name = f_status_stop_s; break; case F_stop_not: - *string = f_status_stop_not_s; + *name = f_status_stop_not_s; break; case F_stream: - *string = f_status_stream_s; + *name = f_status_stream_s; break; case F_stream_not: - *string = f_status_stream_not_s; + *name = f_status_stream_not_s; break; case F_string: - *string = f_status_string_s; + *name = f_status_string_s; break; case F_string_not: - *string = f_status_string_not_s; + *name = f_status_string_not_s; break; case F_string_too_large: - *string = f_status_too_large_s; + *name = f_status_too_large_s; break; case F_string_too_small: - *string = f_status_too_small_s; + *name = f_status_too_small_s; break; case F_syntax: - *string = f_status_syntax_s; + *name = f_status_syntax_s; break; case F_syntax_not: - *string = f_status_syntax_not_s; + *name = f_status_syntax_not_s; break; case F_thread: - *string = f_status_thread_s; + *name = f_status_thread_s; break; case F_thread_not: - *string = f_status_thread_not_s; + *name = f_status_thread_not_s; break; case F_time: - *string = f_status_time_s; + *name = f_status_time_s; break; case F_time_not: - *string = f_status_time_not_s; + *name = f_status_time_not_s; break; case F_time_out: - *string = f_status_time_out_s; + *name = f_status_time_out_s; break; case F_too_large: - *string = f_status_too_large_s; + *name = f_status_too_large_s; break; case F_too_small: - *string = f_status_too_small_s; + *name = f_status_too_small_s; break; case F_type: - *string = f_status_type_s; + *name = f_status_type_s; break; case F_type_not: - *string = f_status_type_not_s; + *name = f_status_type_not_s; break; case F_known: - *string = f_status_known_s; + *name = f_status_known_s; break; case F_known_not: - *string = f_status_known_not_s; + *name = f_status_known_not_s; break; case F_success: - *string = f_status_success_s; + *name = f_status_success_s; break; case F_success_not: - *string = f_status_success_not_s; + *name = f_status_success_not_s; break; case F_supported: - *string = f_status_supported_s; + *name = f_status_supported_s; break; case F_supported_not: - *string = f_status_supported_not_s; + *name = f_status_supported_not_s; break; case F_user: - *string = f_status_user_s; + *name = f_status_user_s; break; case F_user_not: - *string = f_status_user_not_s; + *name = f_status_user_not_s; break; case F_utf: - *string = f_status_utf_s; + *name = f_status_utf_s; break; case F_utf_fragment: - *string = f_status_utf_fragment_s; + *name = f_status_utf_fragment_s; break; case F_utf_fragment_not: - *string = f_status_utf_fragment_not_s; + *name = f_status_utf_fragment_not_s; break; case F_utf_not: - *string = f_status_utf_not_s; + *name = f_status_utf_not_s; break; case F_valid: - *string = f_status_valid_s; + *name = f_status_valid_s; break; case F_valid_not: - *string = f_status_valid_not_s; + *name = f_status_valid_not_s; break; case F_value: - *string = f_status_value_s; + *name = f_status_value_s; break; case F_value_not: - *string = f_status_value_not_s; + *name = f_status_value_not_s; break; case F_wait: - *string = f_status_wait_s; + *name = f_status_wait_s; break; case F_wait_not: - *string = f_status_wait_not_s; + *name = f_status_wait_not_s; break; case F_warn: - *string = f_status_warn_s; + *name = f_status_warn_s; break; case F_warn_not: - *string = f_status_warn_not_s; + *name = f_status_warn_not_s; break; case F_world: - *string = f_status_world_s; + *name = f_status_world_s; break; case F_world_not: - *string = f_status_world_not_s; + *name = f_status_world_not_s; break; case F_write: - *string = f_status_write_s; + *name = f_status_write_s; break; case F_write_not: - *string = f_status_write_not_s; + *name = f_status_write_not_s; break; case F_write_only: - *string = f_status_write_only_s; + *name = f_status_write_only_s; break; #endif // _di_F_status_basic_ #ifndef _di_F_status_array_ case F_array: - *string = f_status_array_s; + *name = f_status_array_s; break; case F_array_not: - *string = f_status_array_not_s; + *name = f_status_array_not_s; break; case F_array_too_large: - *string = f_status_array_too_large_s; + *name = f_status_array_too_large_s; break; case F_array_too_small: - *string = f_status_array_too_small_s; + *name = f_status_array_too_small_s; break; #endif // _di_F_status_array_ #ifndef _di_F_status_available_ case F_available: - *string = f_status_available_s; + *name = f_status_available_s; break; case F_available_not: - *string = f_status_available_not_s; + *name = f_status_available_not_s; break; case F_available_not_address: - *string = f_status_available_not_address_s; + *name = f_status_available_not_address_s; break; case F_available_not_buffer: - *string = f_status_available_not_buffer_s; + *name = f_status_available_not_buffer_s; break; case F_available_not_device: - *string = f_status_available_not_device_s; + *name = f_status_available_not_device_s; break; case F_available_not_pipe: - *string = f_status_available_not_pipe_s; + *name = f_status_available_not_pipe_s; break; case F_available_not_port: - *string = f_status_available_not_port_s; + *name = f_status_available_not_port_s; break; case F_available_not_process: - *string = f_status_available_not_process_s; + *name = f_status_available_not_process_s; break; case F_available_not_socket: - *string = f_status_available_not_socket_s; + *name = f_status_available_not_socket_s; break; #endif // _di_F_status_available_ #ifndef _di_F_status_busy_ case F_busy: - *string = f_status_busy_s; + *name = f_status_busy_s; break; case F_busy_address: - *string = f_status_busy_address_s; + *name = f_status_busy_address_s; break; case F_busy_buffer: - *string = f_status_busy_buffer_s; + *name = f_status_busy_buffer_s; break; case F_busy_device: - *string = f_status_busy_device_s; + *name = f_status_busy_device_s; break; case F_busy_not: - *string = f_status_busy_not_s; + *name = f_status_busy_not_s; break; case F_busy_pipe: - *string = f_status_busy_pipe_s; + *name = f_status_busy_pipe_s; break; case F_busy_port: - *string = f_status_busy_port_s; + *name = f_status_busy_port_s; break; case F_busy_process: - *string = f_status_busy_process_s; + *name = f_status_busy_process_s; break; case F_busy_socket: - *string = f_status_busy_socket_s; + *name = f_status_busy_socket_s; break; #endif // _di_F_status_busy_ #ifndef _di_F_status_network_ case F_network: - *string = f_status_network_s; + *name = f_status_network_s; break; case F_network_busy: - *string = f_status_network_busy_s; + *name = f_status_network_busy_s; break; case F_network_busy_not: - *string = f_status_network_busy_not_s; + *name = f_status_network_busy_not_s; break; case F_network_client: - *string = f_status_network_client_s; + *name = f_status_network_client_s; break; case F_network_client_not: - *string = f_status_network_client_not_s; + *name = f_status_network_client_not_s; break; case F_network_device: - *string = f_status_network_device_s; + *name = f_status_network_device_s; break; case F_network_device_not: - *string = f_status_network_device_not_s; + *name = f_status_network_device_not_s; break; case F_network_found: - *string = f_status_network_found_s; + *name = f_status_network_found_s; break; case F_network_found_not: - *string = f_status_network_found_not_s; + *name = f_status_network_found_not_s; break; case F_network_lost: - *string = f_status_network_lost_s; + *name = f_status_network_lost_s; break; case F_network_lost_not: - *string = f_status_network_lost_not_s; + *name = f_status_network_lost_not_s; break; case F_network_not: - *string = f_status_network_not_s; + *name = f_status_network_not_s; break; case F_network_reach: - *string = f_status_network_reach_s; + *name = f_status_network_reach_s; break; case F_network_reach_client: - *string = f_status_network_reach_client_s; + *name = f_status_network_reach_client_s; break; case F_network_reach_client_not: - *string = f_status_network_reach_client_not_s; + *name = f_status_network_reach_client_not_s; break; case F_network_reach_not: - *string = f_status_network_reach_not_s; + *name = f_status_network_reach_not_s; break; case F_network_reach_server: - *string = f_status_network_reach_server_s; + *name = f_status_network_reach_server_s; break; case F_network_reach_server_not: - *string = f_status_network_reach_server_not_s; + *name = f_status_network_reach_server_not_s; break; case F_network_server: - *string = f_status_network_server_s; + *name = f_status_network_server_s; break; case F_network_server_not: - *string = f_status_network_server_not_s; + *name = f_status_network_server_not_s; break; case F_network_time: - *string = f_status_network_time_s; + *name = f_status_network_time_s; break; case F_network_time_not: - *string = f_status_network_time_not_s; + *name = f_status_network_time_not_s; break; #endif // _di_F_status_network_ #ifndef _di_F_status_number_ case F_number: - *string = f_status_number_s; + *name = f_status_number_s; break; case F_number_decimal: - *string = f_status_number_decimal_s; + *name = f_status_number_decimal_s; break; case F_number_decimal_not: - *string = f_status_number_decimal_not_s; + *name = f_status_number_decimal_not_s; break; case F_number_divide_by_zero: - *string = f_status_number_divide_by_zero_s; + *name = f_status_number_divide_by_zero_s; break; case F_number_negative: - *string = f_status_number_negative_s; + *name = f_status_number_negative_s; break; case F_number_negative_not: - *string = f_status_number_negative_not_s; + *name = f_status_number_negative_not_s; break; case F_number_not: - *string = f_status_number_not_s; + *name = f_status_number_not_s; break; case F_number_overflow: - *string = f_status_number_overflow_s; + *name = f_status_number_overflow_s; break; case F_number_positive: - *string = f_status_number_positive_s; + *name = f_status_number_positive_s; break; case F_number_positive_not: - *string = f_status_number_positive_not_s; + *name = f_status_number_positive_not_s; break; case F_number_too_large: - *string = f_status_number_too_large_s; + *name = f_status_number_too_large_s; break; case F_number_too_small: - *string = f_status_number_too_small_s; + *name = f_status_number_too_small_s; break; case F_number_underflow: - *string = f_status_number_underflow_s; + *name = f_status_number_underflow_s; break; case F_number_whole: - *string = f_status_number_whole_s; + *name = f_status_number_whole_s; break; case F_number_whole_not: - *string = f_status_number_whole_not_s; + *name = f_status_number_whole_not_s; break; case F_number_zero: - *string = f_status_number_zero_s; + *name = f_status_number_zero_s; break; case F_number_zero_not: - *string = f_status_number_zero_not_s; + *name = f_status_number_zero_not_s; break; #endif // _di_F_status_number_ #ifndef _di_F_status_buffers_ case F_buffer: - *string = f_status_buffer_s; + *name = f_status_buffer_s; break; case F_buffer_not: - *string = f_status_buffer_not_s; + *name = f_status_buffer_not_s; break; case F_buffer_too_large: - *string = f_status_buffer_too_large_s; + *name = f_status_buffer_too_large_s; break; case F_buffer_too_small: - *string = f_status_buffer_too_small_s; + *name = f_status_buffer_too_small_s; break; case F_complete_not_utf_block: - *string = f_status_complete_not_utf_block_s; + *name = f_status_complete_not_utf_block_s; break; case F_complete_not_utf_eoa: - *string = f_status_complete_not_utf_eoa_s; + *name = f_status_complete_not_utf_eoa_s; break; case F_complete_not_utf_eof: - *string = f_status_complete_not_utf_eof_s; + *name = f_status_complete_not_utf_eof_s; break; case F_complete_not_utf_eol: - *string = f_status_complete_not_utf_eol_s; + *name = f_status_complete_not_utf_eol_s; break; case F_complete_not_utf_eos: - *string = f_status_complete_not_utf_eos_s; + *name = f_status_complete_not_utf_eos_s; break; case F_complete_not_utf_stop: - *string = f_status_complete_not_utf_stop_s; + *name = f_status_complete_not_utf_stop_s; break; case F_none_block: - *string = f_status_none_block_s; + *name = f_status_none_block_s; break; case F_none_eoa: - *string = f_status_none_eoa_s; + *name = f_status_none_eoa_s; break; case F_none_eof: - *string = f_status_none_eof_s; + *name = f_status_none_eof_s; break; case F_none_eol: - *string = f_status_none_eol_s; + *name = f_status_none_eol_s; break; case F_none_eos: - *string = f_status_none_eos_s; + *name = f_status_none_eos_s; break; case F_none_stop: - *string = f_status_none_stop_s; + *name = f_status_none_stop_s; break; case F_data: - *string = f_status_data_s; + *name = f_status_data_s; break; case F_data_not: - *string = f_status_data_not_s; + *name = f_status_data_not_s; break; case F_data_not_block: - *string = f_status_data_not_block_s; + *name = f_status_data_not_block_s; break; case F_data_not_eoa: - *string = f_status_data_not_eoa_s; + *name = f_status_data_not_eoa_s; break; case F_data_not_eof: - *string = f_status_data_not_eof_s; + *name = f_status_data_not_eof_s; break; case F_data_not_eol: - *string = f_status_data_not_eol_s; + *name = f_status_data_not_eol_s; break; case F_data_not_eos: - *string = f_status_data_not_eos_s; + *name = f_status_data_not_eos_s; break; case F_data_not_stop: - *string = f_status_data_not_stop_s; + *name = f_status_data_not_stop_s; break; case F_terminated: - *string = f_status_terminated_s; + *name = f_status_terminated_s; break; case F_terminated_not: - *string = f_status_terminated_not_s; + *name = f_status_terminated_not_s; break; case F_terminated_not_block: - *string = f_status_terminated_not_block_s; + *name = f_status_terminated_not_block_s; break; case F_terminated_not_eoa: - *string = f_status_terminated_not_eoa_s; + *name = f_status_terminated_not_eoa_s; break; case F_terminated_not_eof: - *string = f_status_terminated_not_eof_s; + *name = f_status_terminated_not_eof_s; break; case F_terminated_not_eol: - *string = f_status_terminated_not_eol_s; + *name = f_status_terminated_not_eol_s; break; case F_terminated_not_eos: - *string = f_status_terminated_not_eos_s; + *name = f_status_terminated_not_eos_s; break; case F_terminated_not_group: - *string = f_status_terminated_not_group_s; + *name = f_status_terminated_not_group_s; break; case F_terminated_not_group_block: - *string = f_status_terminated_not_group_block_s; + *name = f_status_terminated_not_group_block_s; break; case F_terminated_not_group_eoa: - *string = f_status_terminated_not_group_eoa_s; + *name = f_status_terminated_not_group_eoa_s; break; case F_terminated_not_group_eof: - *string = f_status_terminated_not_group_eof_s; + *name = f_status_terminated_not_group_eof_s; break; case F_terminated_not_group_eol: - *string = f_status_terminated_not_group_eol_s; + *name = f_status_terminated_not_group_eol_s; break; case F_terminated_not_group_eos: - *string = f_status_terminated_not_group_eos_s; + *name = f_status_terminated_not_group_eos_s; break; case F_terminated_not_group_stop: - *string = f_status_terminated_not_group_stop_s; + *name = f_status_terminated_not_group_stop_s; break; case F_terminated_not_nest: - *string = f_status_terminated_not_nest_s; + *name = f_status_terminated_not_nest_s; break; case F_terminated_not_nest_block: - *string = f_status_terminated_not_nest_block_s; + *name = f_status_terminated_not_nest_block_s; break; case F_terminated_not_nest_eoa: - *string = f_status_terminated_not_nest_eoa_s; + *name = f_status_terminated_not_nest_eoa_s; break; case F_terminated_not_nest_eof: - *string = f_status_terminated_not_nest_eof_s; + *name = f_status_terminated_not_nest_eof_s; break; case F_terminated_not_nest_eol: - *string = f_status_terminated_not_nest_eol_s; + *name = f_status_terminated_not_nest_eol_s; break; case F_terminated_not_nest_eos: - *string = f_status_terminated_not_nest_eos_s; + *name = f_status_terminated_not_nest_eos_s; break; case F_terminated_not_nest_stop: - *string = f_status_terminated_not_nest_stop_s; + *name = f_status_terminated_not_nest_stop_s; break; case F_terminated_not_stop: - *string = f_status_terminated_not_stop_s; + *name = f_status_terminated_not_stop_s; break; #endif // _di_F_status_buffers_ #ifndef _di_F_status_process_ case F_process: - *string = f_status_process_s; + *name = f_status_process_s; break; case F_process_not: - *string = f_status_process_not_s; + *name = f_status_process_not_s; break; case F_process_too_many: - *string = f_status_process_too_many_s; + *name = f_status_process_too_many_s; break; #endif // _di_F_status_process_ #ifndef _di_F_status_file_ case F_file: - *string = f_status_file_s; + *name = f_status_file_s; break; case F_file_close: - *string = f_status_file_close_s; + *name = f_status_file_close_s; break; case F_file_closed: - *string = f_status_file_closed_s; + *name = f_status_file_closed_s; break; case F_file_descriptor: - *string = f_status_file_descriptor_s; + *name = f_status_file_descriptor_s; break; case F_file_descriptor_max: - *string = f_status_file_descriptor_max_s; + *name = f_status_file_descriptor_max_s; break; case F_file_descriptor_not: - *string = f_status_file_descriptor_not_s; + *name = f_status_file_descriptor_not_s; break; case F_file_empty: - *string = f_status_file_empty_s; + *name = f_status_file_empty_s; break; case F_file_flush: - *string = f_status_file_flush_s; + *name = f_status_file_flush_s; break; case F_file_found: - *string = f_status_file_found_s; + *name = f_status_file_found_s; break; case F_file_found_not: - *string = f_status_file_found_not_s; + *name = f_status_file_found_not_s; break; case F_file_not: - *string = f_status_file_not_s; + *name = f_status_file_not_s; break; case F_file_open: - *string = f_status_file_open_s; + *name = f_status_file_open_s; break; case F_file_open_max: - *string = f_status_file_open_max_s; + *name = f_status_file_open_max_s; break; case F_file_opened: - *string = f_status_file_opened_s; + *name = f_status_file_opened_s; break; case F_file_overflow: - *string = f_status_file_overflow_s; + *name = f_status_file_overflow_s; break; case F_file_purge: - *string = f_status_file_purge_s; + *name = f_status_file_purge_s; break; case F_file_read: - *string = f_status_file_read_s; + *name = f_status_file_read_s; break; case F_file_reallocation: - *string = f_status_file_reallocation_s; + *name = f_status_file_reallocation_s; break; case F_file_seek: - *string = f_status_file_seek_s; + *name = f_status_file_seek_s; break; case F_file_stat: - *string = f_status_file_stat_s; + *name = f_status_file_stat_s; break; case F_file_synchronize: - *string = f_status_file_synchronize_s; + *name = f_status_file_synchronize_s; break; case F_file_type_block: - *string = f_status_file_type_block_s; + *name = f_status_file_type_block_s; break; case F_file_type_character: - *string = f_status_file_type_character_s; + *name = f_status_file_type_character_s; break; case F_file_type_directory: - *string = f_status_file_type_directory_s; + *name = f_status_file_type_directory_s; break; case F_file_type_fifo: - *string = f_status_file_type_fifo_s; + *name = f_status_file_type_fifo_s; break; case F_file_type_link: - *string = f_status_file_type_link_s; + *name = f_status_file_type_link_s; break; case F_file_type_not_character: - *string = f_status_file_type_not_character_s; + *name = f_status_file_type_not_character_s; break; case F_file_type_not_directory: - *string = f_status_file_type_not_directory_s; + *name = f_status_file_type_not_directory_s; break; case F_file_type_not_fifo: - *string = f_status_file_type_not_fifo_s; + *name = f_status_file_type_not_fifo_s; break; case F_file_type_not_link: - *string = f_status_file_type_not_link_s; + *name = f_status_file_type_not_link_s; break; case F_file_type_not_pipe: - *string = f_status_file_type_not_pipe_s; + *name = f_status_file_type_not_pipe_s; break; case F_file_type_not_regular: - *string = f_status_file_type_not_regular_s; + *name = f_status_file_type_not_regular_s; break; case F_file_type_not_socket: - *string = f_status_file_type_not_socket_s; + *name = f_status_file_type_not_socket_s; break; case F_file_type_not_unknown: - *string = f_status_file_type_not_unknown_s; + *name = f_status_file_type_not_unknown_s; break; case F_file_type_pipe: - *string = f_status_file_type_pipe_s; + *name = f_status_file_type_pipe_s; break; case F_file_type_regular: - *string = f_status_file_type_regular_s; + *name = f_status_file_type_regular_s; break; case F_file_type_socket: - *string = f_status_file_type_socket_s; + *name = f_status_file_type_socket_s; break; case F_file_type_unknown: - *string = f_status_file_type_unknown_s; + *name = f_status_file_type_unknown_s; break; case F_file_underflow: - *string = f_status_file_underflow_s; + *name = f_status_file_underflow_s; break; case F_file_utf: - *string = f_status_file_utf_s; + *name = f_status_file_utf_s; break; case F_file_utf_not: - *string = f_status_file_utf_not_s; + *name = f_status_file_utf_not_s; break; case F_file_write: - *string = f_status_file_write_s; + *name = f_status_file_write_s; break; #endif // _di_F_status_file_ #ifndef _di_F_status_filesystem_ case F_filesystem: - *string = f_status_filesystem_s; + *name = f_status_filesystem_s; break; case F_filesystem_not: - *string = f_status_filesystem_not_s; + *name = f_status_filesystem_not_s; break; case F_filesystem_quota_block: - *string = f_status_filesystem_quota_block_s; + *name = f_status_filesystem_quota_block_s; break; case F_filesystem_quota_reached: - *string = f_status_filesystem_quota_reached_s; + *name = f_status_filesystem_quota_reached_s; break; #endif // _di_F_status_filesystem_ #ifndef _di_F_status_directory_ case F_directory: - *string = f_status_directory_s; + *name = f_status_directory_s; break; case F_directory_close: - *string = f_status_directory_close_s; + *name = f_status_directory_close_s; break; case F_directory_closed: - *string = f_status_directory_closed_s; + *name = f_status_directory_closed_s; break; case F_directory_descriptor: - *string = f_status_directory_descriptor_s; + *name = f_status_directory_descriptor_s; break; case F_directory_empty: - *string = f_status_directory_empty_s; + *name = f_status_directory_empty_s; break; case F_directory_empty_not: - *string = f_status_directory_empty_not_s; + *name = f_status_directory_empty_not_s; break; case F_directory_found: - *string = f_status_directory_found_s; + *name = f_status_directory_found_s; break; case F_directory_found_not: - *string = f_status_directory_found_not_s; + *name = f_status_directory_found_not_s; break; case F_directory_flush: - *string = f_status_directory_flush_s; + *name = f_status_directory_flush_s; break; case F_directory_link_max: - *string = f_status_directory_link_max_s; + *name = f_status_directory_link_max_s; break; case F_directory_not: - *string = f_status_directory_not_s; + *name = f_status_directory_not_s; break; case F_directory_open: - *string = f_status_directory_open_s; + *name = f_status_directory_open_s; break; case F_directory_purge: - *string = f_status_directory_purge_s; + *name = f_status_directory_purge_s; break; case F_directory_read: - *string = f_status_directory_read_s; + *name = f_status_directory_read_s; break; case F_directory_stream: - *string = f_status_directory_stream_s; + *name = f_status_directory_stream_s; break; case F_directory_synchronize: - *string = f_status_directory_synchronize_s; + *name = f_status_directory_synchronize_s; break; case F_directory_supported_not: - *string = f_status_directory_supported_not_s; + *name = f_status_directory_supported_not_s; break; case F_directory_utf: - *string = f_status_directory_utf_s; + *name = f_status_directory_utf_s; break; case F_directory_utf_not: - *string = f_status_directory_utf_not_s; + *name = f_status_directory_utf_not_s; break; case F_directory_write: - *string = f_status_directory_utf_not_s; + *name = f_status_directory_utf_not_s; break; #endif // _di_F_status_directory_ #ifndef _di_F_status_socket_ case F_socket: - *string = f_status_socket_s; + *name = f_status_socket_s; break; case F_socket_client: - *string = f_status_socket_client_s; + *name = f_status_socket_client_s; break; case F_socket_not: - *string = f_status_socket_not_s; + *name = f_status_socket_not_s; break; case F_socket_receive: - *string = f_status_socket_receive_s; + *name = f_status_socket_receive_s; break; case F_socket_send: - *string = f_status_socket_send_s; + *name = f_status_socket_send_s; break; case F_socket_target: - *string = f_status_socket_target_s; + *name = f_status_socket_target_s; break; #endif // _di_F_status_socket_ #ifndef _di_F_error_compare_ case F_equal_to: - *string = f_status_equal_to_s; + *name = f_status_equal_to_s; break; case F_equal_to_not: - *string = f_status_equal_to_not_s; + *name = f_status_equal_to_not_s; break; case F_than_greater: - *string = f_status_than_greater_s; + *name = f_status_than_greater_s; break; case F_than_less: - *string = f_status_than_less_s; + *name = f_status_than_less_s; break; #endif // _di_F_status_compare_ #ifndef _di_F_status_access_ case F_access: - *string = f_status_access_s; + *name = f_status_access_s; break; case F_access_denied: - *string = f_status_access_denied_s; + *name = f_status_access_denied_s; break; case F_access_denied_user: - *string = f_status_access_denied_user_s; + *name = f_status_access_denied_user_s; break; case F_access_denied_group: - *string = f_status_access_denied_group_s; + *name = f_status_access_denied_group_s; break; case F_access_denied_world: - *string = f_status_access_denied_world_s; + *name = f_status_access_denied_world_s; break; case F_access_denied_read: - *string = f_status_access_denied_read_s; + *name = f_status_access_denied_read_s; break; case F_access_denied_write: - *string = f_status_access_denied_write_s; + *name = f_status_access_denied_write_s; break; case F_access_denied_execute: - *string = f_status_access_denied_execute_s; + *name = f_status_access_denied_execute_s; break; case F_access_denied_super: - *string = f_status_access_denied_super_s; + *name = f_status_access_denied_super_s; break; case F_access_granted: - *string = f_status_access_granted_s; + *name = f_status_access_granted_s; break; case F_access_granted_user: - *string = f_status_access_granted_user_s; + *name = f_status_access_granted_user_s; break; case F_access_granted_group: - *string = f_status_access_granted_group_s; + *name = f_status_access_granted_group_s; break; case F_access_granted_world: - *string = f_status_access_granted_world_s; + *name = f_status_access_granted_world_s; break; case F_access_granted_read: - *string = f_status_access_granted_read_s; + *name = f_status_access_granted_read_s; break; case F_access_granted_write: - *string = f_status_access_granted_write_s; + *name = f_status_access_granted_write_s; break; case F_access_granted_execute: - *string = f_status_access_granted_execute_s; + *name = f_status_access_granted_execute_s; break; case F_access_granted_super: - *string = f_status_access_granted_super_s; + *name = f_status_access_granted_super_s; break; case F_access_group: - *string = f_status_access_group_s; + *name = f_status_access_group_s; break; case F_access_mode: - *string = f_status_access_mode_s; + *name = f_status_access_mode_s; break; case F_access_not: - *string = f_status_access_not_s; + *name = f_status_access_not_s; break; case F_access_owner: - *string = f_status_access_owner_s; + *name = f_status_access_owner_s; break; #endif // _di_F_status_access_ #ifndef _di_F_status_terminal_ case F_terminal: - *string = f_status_terminal_s; + *name = f_status_terminal_s; break; case F_terminal_access: - *string = f_status_terminal_access_s; + *name = f_status_terminal_access_s; break; case F_terminal_known: - *string = f_status_terminal_known_s; + *name = f_status_terminal_known_s; break; case F_terminal_known_not: - *string = f_status_terminal_known_not_s; + *name = f_status_terminal_known_not_s; break; case F_terminal_not: - *string = f_status_terminal_not_s; + *name = f_status_terminal_not_s; break; case F_terminal_prohibited: - *string = f_status_terminal_prohibited_s; + *name = f_status_terminal_prohibited_s; break; case F_terminal_read: - *string = f_status_terminal_read_s; + *name = f_status_terminal_read_s; break; case F_terminal_valid: - *string = f_status_terminal_valid_s; + *name = f_status_terminal_valid_s; break; case F_terminal_valid_not: - *string = f_status_terminal_valid_not_s; + *name = f_status_terminal_valid_not_s; break; case F_terminal_write: - *string = f_status_terminal_write_s; + *name = f_status_terminal_write_s; break; #endif // _di_F_status_terminal_ case F_status_code_last: - *string = f_status_status_code_last_s; + *name = f_status_status_code_last_s; break; default: - *string = 0; + *name = f_string_empty_s; return F_status_set_error(F_data); } diff --git a/level_0/f_status_string/c/status_string.h b/level_0/f_status_string/c/status_string.h index af65301..a1bede0 100644 --- a/level_0/f_status_string/c/status_string.h +++ b/level_0/f_status_string/c/status_string.h @@ -29,8 +29,8 @@ extern "C" { #define F_status_false_s_length 7 #define F_status_true_s_length 6 - extern const f_string_t f_status_false_s; - extern const f_string_t f_status_true_s; + extern const f_string_static_t f_status_false_s; + extern const f_string_static_t f_status_true_s; #endif // _di_F_status_boolean_ #ifndef _di_F_status_signal_ @@ -164,70 +164,70 @@ extern "C" { #define F_status_signal_reserved_63_s_length 20 #define F_status_signal_reserved_64_s_length 20 - extern const f_string_t f_status_signal_hangup_s; - extern const f_string_t f_status_signal_interrupt_s; - extern const f_string_t f_status_signal_quit_s; - extern const f_string_t f_status_signal_illegal_s; - extern const f_string_t f_status_signal_trap_s; - extern const f_string_t f_status_signal_abort_s; - extern const f_string_t f_status_signal_bus_error_s; - extern const f_string_t f_status_signal_floating_point_error_s; - extern const f_string_t f_status_signal_kill_s; - extern const f_string_t f_status_signal_user_1_s; - extern const f_string_t f_status_signal_segmentation_fault_s; - extern const f_string_t f_status_signal_user_2_s; - extern const f_string_t f_status_signal_broken_pipe_s; - extern const f_string_t f_status_signal_alarm_clock_s; - extern const f_string_t f_status_signal_termination_s; - extern const f_string_t f_status_signal_stack_fault_s; - extern const f_string_t f_status_signal_child_s; - extern const f_string_t f_status_signal_continue_s; - extern const f_string_t f_status_signal_stop_s; - extern const f_string_t f_status_signal_keyboard_stop_s; - extern const f_string_t f_status_signal_tty_in_s; - extern const f_string_t f_status_signal_tty_out_s; - extern const f_string_t f_status_signal_urgent_s; - extern const f_string_t f_status_signal_cpu_limit_s; - extern const f_string_t f_status_signal_file_size_limit_s; - extern const f_string_t f_status_signal_virtual_alarm_clock_s; - extern const f_string_t f_status_signal_profile_alarm_clock_s; - extern const f_string_t f_status_signal_window_size_change_s; - extern const f_string_t f_status_signal_pollable_event_s; - extern const f_string_t f_status_signal_power_failure_s; - extern const f_string_t f_status_signal_bad_system_call_s; - extern const f_string_t f_status_signal_reserved_32_s; - extern const f_string_t f_status_signal_reserved_33_s; - extern const f_string_t f_status_signal_reserved_34_s; - extern const f_string_t f_status_signal_reserved_35_s; - extern const f_string_t f_status_signal_reserved_36_s; - extern const f_string_t f_status_signal_reserved_37_s; - extern const f_string_t f_status_signal_reserved_38_s; - extern const f_string_t f_status_signal_reserved_39_s; - extern const f_string_t f_status_signal_reserved_40_s; - extern const f_string_t f_status_signal_reserved_41_s; - extern const f_string_t f_status_signal_reserved_42_s; - extern const f_string_t f_status_signal_reserved_43_s; - extern const f_string_t f_status_signal_reserved_44_s; - extern const f_string_t f_status_signal_reserved_45_s; - extern const f_string_t f_status_signal_reserved_46_s; - extern const f_string_t f_status_signal_reserved_47_s; - extern const f_string_t f_status_signal_reserved_48_s; - extern const f_string_t f_status_signal_reserved_49_s; - extern const f_string_t f_status_signal_reserved_50_s; - extern const f_string_t f_status_signal_reserved_51_s; - extern const f_string_t f_status_signal_reserved_52_s; - extern const f_string_t f_status_signal_reserved_53_s; - extern const f_string_t f_status_signal_reserved_54_s; - extern const f_string_t f_status_signal_reserved_55_s; - extern const f_string_t f_status_signal_reserved_56_s; - extern const f_string_t f_status_signal_reserved_57_s; - extern const f_string_t f_status_signal_reserved_58_s; - extern const f_string_t f_status_signal_reserved_59_s; - extern const f_string_t f_status_signal_reserved_60_s; - extern const f_string_t f_status_signal_reserved_61_s; - extern const f_string_t f_status_signal_reserved_62_s; - extern const f_string_t f_status_signal_reserved_63_s; - extern const f_string_t f_status_signal_reserved_64_s; + extern const f_string_static_t f_status_signal_hangup_s; + extern const f_string_static_t f_status_signal_interrupt_s; + extern const f_string_static_t f_status_signal_quit_s; + extern const f_string_static_t f_status_signal_illegal_s; + extern const f_string_static_t f_status_signal_trap_s; + extern const f_string_static_t f_status_signal_abort_s; + extern const f_string_static_t f_status_signal_bus_error_s; + extern const f_string_static_t f_status_signal_floating_point_error_s; + extern const f_string_static_t f_status_signal_kill_s; + extern const f_string_static_t f_status_signal_user_1_s; + extern const f_string_static_t f_status_signal_segmentation_fault_s; + extern const f_string_static_t f_status_signal_user_2_s; + extern const f_string_static_t f_status_signal_broken_pipe_s; + extern const f_string_static_t f_status_signal_alarm_clock_s; + extern const f_string_static_t f_status_signal_termination_s; + extern const f_string_static_t f_status_signal_stack_fault_s; + extern const f_string_static_t f_status_signal_child_s; + extern const f_string_static_t f_status_signal_continue_s; + extern const f_string_static_t f_status_signal_stop_s; + extern const f_string_static_t f_status_signal_keyboard_stop_s; + extern const f_string_static_t f_status_signal_tty_in_s; + extern const f_string_static_t f_status_signal_tty_out_s; + extern const f_string_static_t f_status_signal_urgent_s; + extern const f_string_static_t f_status_signal_cpu_limit_s; + extern const f_string_static_t f_status_signal_file_size_limit_s; + extern const f_string_static_t f_status_signal_virtual_alarm_clock_s; + extern const f_string_static_t f_status_signal_profile_alarm_clock_s; + extern const f_string_static_t f_status_signal_window_size_change_s; + extern const f_string_static_t f_status_signal_pollable_event_s; + extern const f_string_static_t f_status_signal_power_failure_s; + extern const f_string_static_t f_status_signal_bad_system_call_s; + extern const f_string_static_t f_status_signal_reserved_32_s; + extern const f_string_static_t f_status_signal_reserved_33_s; + extern const f_string_static_t f_status_signal_reserved_34_s; + extern const f_string_static_t f_status_signal_reserved_35_s; + extern const f_string_static_t f_status_signal_reserved_36_s; + extern const f_string_static_t f_status_signal_reserved_37_s; + extern const f_string_static_t f_status_signal_reserved_38_s; + extern const f_string_static_t f_status_signal_reserved_39_s; + extern const f_string_static_t f_status_signal_reserved_40_s; + extern const f_string_static_t f_status_signal_reserved_41_s; + extern const f_string_static_t f_status_signal_reserved_42_s; + extern const f_string_static_t f_status_signal_reserved_43_s; + extern const f_string_static_t f_status_signal_reserved_44_s; + extern const f_string_static_t f_status_signal_reserved_45_s; + extern const f_string_static_t f_status_signal_reserved_46_s; + extern const f_string_static_t f_status_signal_reserved_47_s; + extern const f_string_static_t f_status_signal_reserved_48_s; + extern const f_string_static_t f_status_signal_reserved_49_s; + extern const f_string_static_t f_status_signal_reserved_50_s; + extern const f_string_static_t f_status_signal_reserved_51_s; + extern const f_string_static_t f_status_signal_reserved_52_s; + extern const f_string_static_t f_status_signal_reserved_53_s; + extern const f_string_static_t f_status_signal_reserved_54_s; + extern const f_string_static_t f_status_signal_reserved_55_s; + extern const f_string_static_t f_status_signal_reserved_56_s; + extern const f_string_static_t f_status_signal_reserved_57_s; + extern const f_string_static_t f_status_signal_reserved_58_s; + extern const f_string_static_t f_status_signal_reserved_59_s; + extern const f_string_static_t f_status_signal_reserved_60_s; + extern const f_string_static_t f_status_signal_reserved_61_s; + extern const f_string_static_t f_status_signal_reserved_62_s; + extern const f_string_static_t f_status_signal_reserved_63_s; + extern const f_string_static_t f_status_signal_reserved_64_s; #endif // _di_F_status_signal_ #ifndef _di_F_status_basic_ @@ -719,249 +719,249 @@ extern "C" { #define F_status_write_not_s_length 11 #define F_status_write_only_s_length 12 - extern const f_string_t f_status_none_s; - extern const f_string_t f_status_abort_s; - extern const f_string_t f_status_abort_not_s; - extern const f_string_t f_status_absolute_s; - extern const f_string_t f_status_absolute_not_s; - extern const f_string_t f_status_address_s; - extern const f_string_t f_status_address_not_s; - extern const f_string_t f_status_ascii_s; - extern const f_string_t f_status_ascii_not_s; - extern const f_string_t f_status_atomic_s; - extern const f_string_t f_status_atomic_not_s; - extern const f_string_t f_status_begin_s; - extern const f_string_t f_status_begin_not_s; - extern const f_string_t f_status_block_s; - extern const f_string_t f_status_block_not_s; - extern const f_string_t f_status_body_s; - extern const f_string_t f_status_body_not_s; - extern const f_string_t f_status_bound_s; - extern const f_string_t f_status_bound_not_s; - extern const f_string_t f_status_capability_s; - extern const f_string_t f_status_capability_not_s; - extern const f_string_t f_status_child_s; - extern const f_string_t f_status_child_not_s; - extern const f_string_t f_status_complete_s; - extern const f_string_t f_status_complete_not_s; - extern const f_string_t f_status_connect_s; - extern const f_string_t f_status_connect_not_s; - extern const f_string_t f_status_connect_refuse_s; - extern const f_string_t f_status_connect_reset_s; - extern const f_string_t f_status_container_s; - extern const f_string_t f_status_container_not_s; - extern const f_string_t f_status_content_s; - extern const f_string_t f_status_content_not_s; - extern const f_string_t f_status_continue_s; - extern const f_string_t f_status_continue_not_s; - extern const f_string_t f_status_control_s; - extern const f_string_t f_status_control_not_s; - extern const f_string_t f_status_control_group_s; - extern const f_string_t f_status_control_group_not_s; - extern const f_string_t f_status_critical_s; - extern const f_string_t f_status_critical_not_s; - extern const f_string_t f_status_dead_s; - extern const f_string_t f_status_dead_not_s; - extern const f_string_t f_status_deadlock_s; - extern const f_string_t f_status_deadlock_not_s; - extern const f_string_t f_status_descriptor_s; - extern const f_string_t f_status_descriptor_not_s; - extern const f_string_t f_status_device_s; - extern const f_string_t f_status_device_not_s; - extern const f_string_t f_status_disable_s; - extern const f_string_t f_status_disable_not_s; - extern const f_string_t f_status_domain_s; - extern const f_string_t f_status_domain_not_s; - extern const f_string_t f_status_done_s; - extern const f_string_t f_status_done_not_s; - extern const f_string_t f_status_dummy_s; - extern const f_string_t f_status_dummy_not_s; - extern const f_string_t f_status_empty_s; - extern const f_string_t f_status_empty_not_s; - extern const f_string_t f_status_enable_s; - extern const f_string_t f_status_enable_not_s; - extern const f_string_t f_status_encoding_s; - extern const f_string_t f_status_encoding_not_s; - extern const f_string_t f_status_end_s; - extern const f_string_t f_status_end_not_s; - extern const f_string_t f_status_endian_s; - extern const f_string_t f_status_endian_big_s; - extern const f_string_t f_status_endian_little_s; - extern const f_string_t f_status_endian_not_s; - extern const f_string_t f_status_eoa_s; - extern const f_string_t f_status_eoa_not_s; - extern const f_string_t f_status_eof_s; - extern const f_string_t f_status_eof_not_s; - extern const f_string_t f_status_eol_s; - extern const f_string_t f_status_eol_not_s; - extern const f_string_t f_status_eos_s; - extern const f_string_t f_status_eos_not_s; - extern const f_string_t f_status_execute_s; - extern const f_string_t f_status_execute_not_s; - extern const f_string_t f_status_exist_s; - extern const f_string_t f_status_exist_not_s; - extern const f_string_t f_status_failure_s; - extern const f_string_t f_status_failure_not_s; - extern const f_string_t f_status_family_s; - extern const f_string_t f_status_family_not_s; - extern const f_string_t f_status_first_s; - extern const f_string_t f_status_first_not_s; - extern const f_string_t f_status_footer_s; - extern const f_string_t f_status_footer_not_s; - extern const f_string_t f_status_fork_s; - extern const f_string_t f_status_fork_not_s; - extern const f_string_t f_status_format_s; - extern const f_string_t f_status_format_not_s; - extern const f_string_t f_status_found_s; - extern const f_string_t f_status_found_not_s; - extern const f_string_t f_status_full_s; - extern const f_string_t f_status_full_not_s; - extern const f_string_t f_status_group_s; - extern const f_string_t f_status_group_not_s; - extern const f_string_t f_status_header_s; - extern const f_string_t f_status_header_not_s; - extern const f_string_t f_status_ignore_s; - extern const f_string_t f_status_ignore_not_s; - extern const f_string_t f_status_implemented_s; - extern const f_string_t f_status_implemented_not_s; - extern const f_string_t f_status_input_s; - extern const f_string_t f_status_input_not_s; - extern const f_string_t f_status_input_output_s; - extern const f_string_t f_status_interrupt_s; - extern const f_string_t f_status_interrupt_not_s; - extern const f_string_t f_status_known_s; - extern const f_string_t f_status_known_not_s; - extern const f_string_t f_status_last_s; - extern const f_string_t f_status_last_not_s; - extern const f_string_t f_status_limit_s; - extern const f_string_t f_status_limit_not_s; - extern const f_string_t f_status_link_s; - extern const f_string_t f_status_link_not_s; - extern const f_string_t f_status_live_s; - extern const f_string_t f_status_live_not_s; - extern const f_string_t f_status_lock_s; - extern const f_string_t f_status_lock_not_s; - extern const f_string_t f_status_loop_s; - extern const f_string_t f_status_loop_not_s; - extern const f_string_t f_status_maybe_s; - extern const f_string_t f_status_maybe_not_s; - extern const f_string_t f_status_memory_s; - extern const f_string_t f_status_memory_not_s; - extern const f_string_t f_status_message_s; - extern const f_string_t f_status_message_not_s; - extern const f_string_t f_status_minor_s; - extern const f_string_t f_status_minor_not_s; - extern const f_string_t f_status_moderate_s; - extern const f_string_t f_status_moderate_not_s; - extern const f_string_t f_status_mount_s; - extern const f_string_t f_status_mount_not_s; - extern const f_string_t f_status_name_s; - extern const f_string_t f_status_name_not_s; - extern const f_string_t f_status_next_s; - extern const f_string_t f_status_next_not_s; - extern const f_string_t f_status_nice_s; - extern const f_string_t f_status_nice_not_s; - extern const f_string_t f_status_object_s; - extern const f_string_t f_status_object_not_s; - extern const f_string_t f_status_option_s; - extern const f_string_t f_status_option_not_s; - extern const f_string_t f_status_output_s; - extern const f_string_t f_status_output_not_s; - extern const f_string_t f_status_packet_s; - extern const f_string_t f_status_packet_not_s; - extern const f_string_t f_status_parameter_s; - extern const f_string_t f_status_parameter_not_s; - extern const f_string_t f_status_parent_s; - extern const f_string_t f_status_parent_not_s; - extern const f_string_t f_status_payload_s; - extern const f_string_t f_status_payload_not_s; - extern const f_string_t f_status_previous_s; - extern const f_string_t f_status_previous_not_s; - extern const f_string_t f_status_pipe_s; - extern const f_string_t f_status_pipe_not_s; - extern const f_string_t f_status_port_s; - extern const f_string_t f_status_port_not_s; - extern const f_string_t f_status_processor_s; - extern const f_string_t f_status_processor_not_s; - extern const f_string_t f_status_progress_s; - extern const f_string_t f_status_progress_not_s; - extern const f_string_t f_status_prohibited_s; - extern const f_string_t f_status_prohibited_not_s; - extern const f_string_t f_status_property_s; - extern const f_string_t f_status_property_not_s; - extern const f_string_t f_status_protocol_s; - extern const f_string_t f_status_protocol_not_s; - extern const f_string_t f_status_range_s; - extern const f_string_t f_status_range_not_s; - extern const f_string_t f_status_read_s; - extern const f_string_t f_status_read_not_s; - extern const f_string_t f_status_read_only_s; - extern const f_string_t f_status_ready_s; - extern const f_string_t f_status_ready_not_s; - extern const f_string_t f_status_recover_s; - extern const f_string_t f_status_recover_not_s; - extern const f_string_t f_status_recurse_s; - extern const f_string_t f_status_recurse_not_s; - extern const f_string_t f_status_relative_s; - extern const f_string_t f_status_relative_not_s; - extern const f_string_t f_status_require_s; - extern const f_string_t f_status_require_not_s; - extern const f_string_t f_status_resource_s; - extern const f_string_t f_status_resource_not_s; - extern const f_string_t f_status_search_s; - extern const f_string_t f_status_search_not_s; - extern const f_string_t f_status_schedule_s; - extern const f_string_t f_status_schedule_not_s; - extern const f_string_t f_status_size_s; - extern const f_string_t f_status_size_not_s; - extern const f_string_t f_status_signal_s; - extern const f_string_t f_status_signal_not_s; - extern const f_string_t f_status_space_s; - extern const f_string_t f_status_space_not_s; - extern const f_string_t f_status_start_s; - extern const f_string_t f_status_start_not_s; - extern const f_string_t f_status_stop_s; - extern const f_string_t f_status_stop_not_s; - extern const f_string_t f_status_stream_s; - extern const f_string_t f_status_stream_not_s; - extern const f_string_t f_status_string_s; - extern const f_string_t f_status_string_not_s; - extern const f_string_t f_status_string_too_large_s; - extern const f_string_t f_status_string_too_small_s; - extern const f_string_t f_status_syntax_s; - extern const f_string_t f_status_syntax_not_s; - extern const f_string_t f_status_thread_s; - extern const f_string_t f_status_thread_not_s; - extern const f_string_t f_status_time_s; - extern const f_string_t f_status_time_not_s; - extern const f_string_t f_status_time_out_s; - extern const f_string_t f_status_too_large_s; - extern const f_string_t f_status_too_small_s; - extern const f_string_t f_status_type_s; - extern const f_string_t f_status_type_not_s; - extern const f_string_t f_status_success_s; - extern const f_string_t f_status_success_not_s; - extern const f_string_t f_status_supported_s; - extern const f_string_t f_status_supported_not_s; - extern const f_string_t f_status_user_s; - extern const f_string_t f_status_user_not_s; - extern const f_string_t f_status_utf_s; - extern const f_string_t f_status_utf_fragment_s; - extern const f_string_t f_status_utf_fragment_not_s; - extern const f_string_t f_status_utf_not_s; - extern const f_string_t f_status_valid_s; - extern const f_string_t f_status_valid_not_s; - extern const f_string_t f_status_value_s; - extern const f_string_t f_status_value_not_s; - extern const f_string_t f_status_wait_s; - extern const f_string_t f_status_wait_not_s; - extern const f_string_t f_status_warn_s; - extern const f_string_t f_status_warn_not_s; - extern const f_string_t f_status_world_s; - extern const f_string_t f_status_world_not_s; - extern const f_string_t f_status_write_s; - extern const f_string_t f_status_write_not_s; - extern const f_string_t f_status_write_only_s; + extern const f_string_static_t f_status_none_s; + extern const f_string_static_t f_status_abort_s; + extern const f_string_static_t f_status_abort_not_s; + extern const f_string_static_t f_status_absolute_s; + extern const f_string_static_t f_status_absolute_not_s; + extern const f_string_static_t f_status_address_s; + extern const f_string_static_t f_status_address_not_s; + extern const f_string_static_t f_status_ascii_s; + extern const f_string_static_t f_status_ascii_not_s; + extern const f_string_static_t f_status_atomic_s; + extern const f_string_static_t f_status_atomic_not_s; + extern const f_string_static_t f_status_begin_s; + extern const f_string_static_t f_status_begin_not_s; + extern const f_string_static_t f_status_block_s; + extern const f_string_static_t f_status_block_not_s; + extern const f_string_static_t f_status_body_s; + extern const f_string_static_t f_status_body_not_s; + extern const f_string_static_t f_status_bound_s; + extern const f_string_static_t f_status_bound_not_s; + extern const f_string_static_t f_status_capability_s; + extern const f_string_static_t f_status_capability_not_s; + extern const f_string_static_t f_status_child_s; + extern const f_string_static_t f_status_child_not_s; + extern const f_string_static_t f_status_complete_s; + extern const f_string_static_t f_status_complete_not_s; + extern const f_string_static_t f_status_connect_s; + extern const f_string_static_t f_status_connect_not_s; + extern const f_string_static_t f_status_connect_refuse_s; + extern const f_string_static_t f_status_connect_reset_s; + extern const f_string_static_t f_status_container_s; + extern const f_string_static_t f_status_container_not_s; + extern const f_string_static_t f_status_content_s; + extern const f_string_static_t f_status_content_not_s; + extern const f_string_static_t f_status_continue_s; + extern const f_string_static_t f_status_continue_not_s; + extern const f_string_static_t f_status_control_s; + extern const f_string_static_t f_status_control_not_s; + extern const f_string_static_t f_status_control_group_s; + extern const f_string_static_t f_status_control_group_not_s; + extern const f_string_static_t f_status_critical_s; + extern const f_string_static_t f_status_critical_not_s; + extern const f_string_static_t f_status_dead_s; + extern const f_string_static_t f_status_dead_not_s; + extern const f_string_static_t f_status_deadlock_s; + extern const f_string_static_t f_status_deadlock_not_s; + extern const f_string_static_t f_status_descriptor_s; + extern const f_string_static_t f_status_descriptor_not_s; + extern const f_string_static_t f_status_device_s; + extern const f_string_static_t f_status_device_not_s; + extern const f_string_static_t f_status_disable_s; + extern const f_string_static_t f_status_disable_not_s; + extern const f_string_static_t f_status_domain_s; + extern const f_string_static_t f_status_domain_not_s; + extern const f_string_static_t f_status_done_s; + extern const f_string_static_t f_status_done_not_s; + extern const f_string_static_t f_status_dummy_s; + extern const f_string_static_t f_status_dummy_not_s; + extern const f_string_static_t f_status_empty_s; + extern const f_string_static_t f_status_empty_not_s; + extern const f_string_static_t f_status_enable_s; + extern const f_string_static_t f_status_enable_not_s; + extern const f_string_static_t f_status_encoding_s; + extern const f_string_static_t f_status_encoding_not_s; + extern const f_string_static_t f_status_end_s; + extern const f_string_static_t f_status_end_not_s; + extern const f_string_static_t f_status_endian_s; + extern const f_string_static_t f_status_endian_big_s; + extern const f_string_static_t f_status_endian_little_s; + extern const f_string_static_t f_status_endian_not_s; + extern const f_string_static_t f_status_eoa_s; + extern const f_string_static_t f_status_eoa_not_s; + extern const f_string_static_t f_status_eof_s; + extern const f_string_static_t f_status_eof_not_s; + extern const f_string_static_t f_status_eol_s; + extern const f_string_static_t f_status_eol_not_s; + extern const f_string_static_t f_status_eos_s; + extern const f_string_static_t f_status_eos_not_s; + extern const f_string_static_t f_status_execute_s; + extern const f_string_static_t f_status_execute_not_s; + extern const f_string_static_t f_status_exist_s; + extern const f_string_static_t f_status_exist_not_s; + extern const f_string_static_t f_status_failure_s; + extern const f_string_static_t f_status_failure_not_s; + extern const f_string_static_t f_status_family_s; + extern const f_string_static_t f_status_family_not_s; + extern const f_string_static_t f_status_first_s; + extern const f_string_static_t f_status_first_not_s; + extern const f_string_static_t f_status_footer_s; + extern const f_string_static_t f_status_footer_not_s; + extern const f_string_static_t f_status_fork_s; + extern const f_string_static_t f_status_fork_not_s; + extern const f_string_static_t f_status_format_s; + extern const f_string_static_t f_status_format_not_s; + extern const f_string_static_t f_status_found_s; + extern const f_string_static_t f_status_found_not_s; + extern const f_string_static_t f_status_full_s; + extern const f_string_static_t f_status_full_not_s; + extern const f_string_static_t f_status_group_s; + extern const f_string_static_t f_status_group_not_s; + extern const f_string_static_t f_status_header_s; + extern const f_string_static_t f_status_header_not_s; + extern const f_string_static_t f_status_ignore_s; + extern const f_string_static_t f_status_ignore_not_s; + extern const f_string_static_t f_status_implemented_s; + extern const f_string_static_t f_status_implemented_not_s; + extern const f_string_static_t f_status_input_s; + extern const f_string_static_t f_status_input_not_s; + extern const f_string_static_t f_status_input_output_s; + extern const f_string_static_t f_status_interrupt_s; + extern const f_string_static_t f_status_interrupt_not_s; + extern const f_string_static_t f_status_known_s; + extern const f_string_static_t f_status_known_not_s; + extern const f_string_static_t f_status_last_s; + extern const f_string_static_t f_status_last_not_s; + extern const f_string_static_t f_status_limit_s; + extern const f_string_static_t f_status_limit_not_s; + extern const f_string_static_t f_status_link_s; + extern const f_string_static_t f_status_link_not_s; + extern const f_string_static_t f_status_live_s; + extern const f_string_static_t f_status_live_not_s; + extern const f_string_static_t f_status_lock_s; + extern const f_string_static_t f_status_lock_not_s; + extern const f_string_static_t f_status_loop_s; + extern const f_string_static_t f_status_loop_not_s; + extern const f_string_static_t f_status_maybe_s; + extern const f_string_static_t f_status_maybe_not_s; + extern const f_string_static_t f_status_memory_s; + extern const f_string_static_t f_status_memory_not_s; + extern const f_string_static_t f_status_message_s; + extern const f_string_static_t f_status_message_not_s; + extern const f_string_static_t f_status_minor_s; + extern const f_string_static_t f_status_minor_not_s; + extern const f_string_static_t f_status_moderate_s; + extern const f_string_static_t f_status_moderate_not_s; + extern const f_string_static_t f_status_mount_s; + extern const f_string_static_t f_status_mount_not_s; + extern const f_string_static_t f_status_name_s; + extern const f_string_static_t f_status_name_not_s; + extern const f_string_static_t f_status_next_s; + extern const f_string_static_t f_status_next_not_s; + extern const f_string_static_t f_status_nice_s; + extern const f_string_static_t f_status_nice_not_s; + extern const f_string_static_t f_status_object_s; + extern const f_string_static_t f_status_object_not_s; + extern const f_string_static_t f_status_option_s; + extern const f_string_static_t f_status_option_not_s; + extern const f_string_static_t f_status_output_s; + extern const f_string_static_t f_status_output_not_s; + extern const f_string_static_t f_status_packet_s; + extern const f_string_static_t f_status_packet_not_s; + extern const f_string_static_t f_status_parameter_s; + extern const f_string_static_t f_status_parameter_not_s; + extern const f_string_static_t f_status_parent_s; + extern const f_string_static_t f_status_parent_not_s; + extern const f_string_static_t f_status_payload_s; + extern const f_string_static_t f_status_payload_not_s; + extern const f_string_static_t f_status_previous_s; + extern const f_string_static_t f_status_previous_not_s; + extern const f_string_static_t f_status_pipe_s; + extern const f_string_static_t f_status_pipe_not_s; + extern const f_string_static_t f_status_port_s; + extern const f_string_static_t f_status_port_not_s; + extern const f_string_static_t f_status_processor_s; + extern const f_string_static_t f_status_processor_not_s; + extern const f_string_static_t f_status_progress_s; + extern const f_string_static_t f_status_progress_not_s; + extern const f_string_static_t f_status_prohibited_s; + extern const f_string_static_t f_status_prohibited_not_s; + extern const f_string_static_t f_status_property_s; + extern const f_string_static_t f_status_property_not_s; + extern const f_string_static_t f_status_protocol_s; + extern const f_string_static_t f_status_protocol_not_s; + extern const f_string_static_t f_status_range_s; + extern const f_string_static_t f_status_range_not_s; + extern const f_string_static_t f_status_read_s; + extern const f_string_static_t f_status_read_not_s; + extern const f_string_static_t f_status_read_only_s; + extern const f_string_static_t f_status_ready_s; + extern const f_string_static_t f_status_ready_not_s; + extern const f_string_static_t f_status_recover_s; + extern const f_string_static_t f_status_recover_not_s; + extern const f_string_static_t f_status_recurse_s; + extern const f_string_static_t f_status_recurse_not_s; + extern const f_string_static_t f_status_relative_s; + extern const f_string_static_t f_status_relative_not_s; + extern const f_string_static_t f_status_require_s; + extern const f_string_static_t f_status_require_not_s; + extern const f_string_static_t f_status_resource_s; + extern const f_string_static_t f_status_resource_not_s; + extern const f_string_static_t f_status_search_s; + extern const f_string_static_t f_status_search_not_s; + extern const f_string_static_t f_status_schedule_s; + extern const f_string_static_t f_status_schedule_not_s; + extern const f_string_static_t f_status_size_s; + extern const f_string_static_t f_status_size_not_s; + extern const f_string_static_t f_status_signal_s; + extern const f_string_static_t f_status_signal_not_s; + extern const f_string_static_t f_status_space_s; + extern const f_string_static_t f_status_space_not_s; + extern const f_string_static_t f_status_start_s; + extern const f_string_static_t f_status_start_not_s; + extern const f_string_static_t f_status_stop_s; + extern const f_string_static_t f_status_stop_not_s; + extern const f_string_static_t f_status_stream_s; + extern const f_string_static_t f_status_stream_not_s; + extern const f_string_static_t f_status_string_s; + extern const f_string_static_t f_status_string_not_s; + extern const f_string_static_t f_status_string_too_large_s; + extern const f_string_static_t f_status_string_too_small_s; + extern const f_string_static_t f_status_syntax_s; + extern const f_string_static_t f_status_syntax_not_s; + extern const f_string_static_t f_status_thread_s; + extern const f_string_static_t f_status_thread_not_s; + extern const f_string_static_t f_status_time_s; + extern const f_string_static_t f_status_time_not_s; + extern const f_string_static_t f_status_time_out_s; + extern const f_string_static_t f_status_too_large_s; + extern const f_string_static_t f_status_too_small_s; + extern const f_string_static_t f_status_type_s; + extern const f_string_static_t f_status_type_not_s; + extern const f_string_static_t f_status_success_s; + extern const f_string_static_t f_status_success_not_s; + extern const f_string_static_t f_status_supported_s; + extern const f_string_static_t f_status_supported_not_s; + extern const f_string_static_t f_status_user_s; + extern const f_string_static_t f_status_user_not_s; + extern const f_string_static_t f_status_utf_s; + extern const f_string_static_t f_status_utf_fragment_s; + extern const f_string_static_t f_status_utf_fragment_not_s; + extern const f_string_static_t f_status_utf_not_s; + extern const f_string_static_t f_status_valid_s; + extern const f_string_static_t f_status_valid_not_s; + extern const f_string_static_t f_status_value_s; + extern const f_string_static_t f_status_value_not_s; + extern const f_string_static_t f_status_wait_s; + extern const f_string_static_t f_status_wait_not_s; + extern const f_string_static_t f_status_warn_s; + extern const f_string_static_t f_status_warn_not_s; + extern const f_string_static_t f_status_world_s; + extern const f_string_static_t f_status_world_not_s; + extern const f_string_static_t f_status_write_s; + extern const f_string_static_t f_status_write_not_s; + extern const f_string_static_t f_status_write_only_s; #endif // _di_F_status_basic_ #ifndef _di_F_status_array_ @@ -975,10 +975,10 @@ extern "C" { #define F_status_array_too_large_s_length 17 #define F_status_array_too_small_s_length 17 - extern const f_string_t f_status_array_s; - extern const f_string_t f_status_array_not_s; - extern const f_string_t f_status_array_too_large_s; - extern const f_string_t f_status_array_too_small_s; + extern const f_string_static_t f_status_array_s; + extern const f_string_static_t f_status_array_not_s; + extern const f_string_static_t f_status_array_too_large_s; + extern const f_string_static_t f_status_array_too_small_s; #endif // _di_F_status_array_ #ifndef _di_F_status_available_ @@ -1002,15 +1002,15 @@ extern "C" { #define F_status_available_not_process_s_length 23 #define F_status_available_not_socket_s_length 22 - extern const f_string_t f_status_available_s; - extern const f_string_t f_status_available_not_s; - extern const f_string_t f_status_available_not_address_s; - extern const f_string_t f_status_available_not_buffer_s; - extern const f_string_t f_status_available_not_device_s; - extern const f_string_t f_status_available_not_pipe_s; - extern const f_string_t f_status_available_not_port_s; - extern const f_string_t f_status_available_not_process_s; - extern const f_string_t f_status_available_not_socket_s; + extern const f_string_static_t f_status_available_s; + extern const f_string_static_t f_status_available_not_s; + extern const f_string_static_t f_status_available_not_address_s; + extern const f_string_static_t f_status_available_not_buffer_s; + extern const f_string_static_t f_status_available_not_device_s; + extern const f_string_static_t f_status_available_not_pipe_s; + extern const f_string_static_t f_status_available_not_port_s; + extern const f_string_static_t f_status_available_not_process_s; + extern const f_string_static_t f_status_available_not_socket_s; #endif // _di_F_status_available_ #ifndef _di_F_status_busy_ @@ -1034,15 +1034,15 @@ extern "C" { #define F_status_busy_process_s_length 14 #define F_status_busy_socket_s_length 13 - extern const f_string_t f_status_busy_s; - extern const f_string_t f_status_busy_address_s; - extern const f_string_t f_status_busy_buffer_s; - extern const f_string_t f_status_busy_device_s; - extern const f_string_t f_status_busy_not_s; - extern const f_string_t f_status_busy_pipe_s; - extern const f_string_t f_status_busy_port_s; - extern const f_string_t f_status_busy_process_s; - extern const f_string_t f_status_busy_socket_s; + extern const f_string_static_t f_status_busy_s; + extern const f_string_static_t f_status_busy_address_s; + extern const f_string_static_t f_status_busy_buffer_s; + extern const f_string_static_t f_status_busy_device_s; + extern const f_string_static_t f_status_busy_not_s; + extern const f_string_static_t f_status_busy_pipe_s; + extern const f_string_static_t f_status_busy_port_s; + extern const f_string_static_t f_status_busy_process_s; + extern const f_string_static_t f_status_busy_socket_s; #endif // _di_F_status_busy_ #ifndef _di_F_status_network_ @@ -1092,28 +1092,28 @@ extern "C" { #define F_status_network_time_s_length 14 #define F_status_network_time_not_s_length 18 - extern const f_string_t f_status_network_s; - extern const f_string_t f_status_network_busy_s; - extern const f_string_t f_status_network_busy_not_s; - extern const f_string_t f_status_network_client_s; - extern const f_string_t f_status_network_client_not_s; - extern const f_string_t f_status_network_device_s; - extern const f_string_t f_status_network_device_not_s; - extern const f_string_t f_status_network_found_s; - extern const f_string_t f_status_network_found_not_s; - extern const f_string_t f_status_network_lost_s; - extern const f_string_t f_status_network_lost_not_s; - extern const f_string_t f_status_network_not_s; - extern const f_string_t f_status_network_reach_s; - extern const f_string_t f_status_network_reach_client_s; - extern const f_string_t f_status_network_reach_client_not_s; - extern const f_string_t f_status_network_reach_not_s; - extern const f_string_t f_status_network_reach_server_s; - extern const f_string_t f_status_network_reach_server_not_s; - extern const f_string_t f_status_network_server_s; - extern const f_string_t f_status_network_server_not_s; - extern const f_string_t f_status_network_time_s; - extern const f_string_t f_status_network_time_not_s; + extern const f_string_static_t f_status_network_s; + extern const f_string_static_t f_status_network_busy_s; + extern const f_string_static_t f_status_network_busy_not_s; + extern const f_string_static_t f_status_network_client_s; + extern const f_string_static_t f_status_network_client_not_s; + extern const f_string_static_t f_status_network_device_s; + extern const f_string_static_t f_status_network_device_not_s; + extern const f_string_static_t f_status_network_found_s; + extern const f_string_static_t f_status_network_found_not_s; + extern const f_string_static_t f_status_network_lost_s; + extern const f_string_static_t f_status_network_lost_not_s; + extern const f_string_static_t f_status_network_not_s; + extern const f_string_static_t f_status_network_reach_s; + extern const f_string_static_t f_status_network_reach_client_s; + extern const f_string_static_t f_status_network_reach_client_not_s; + extern const f_string_static_t f_status_network_reach_not_s; + extern const f_string_static_t f_status_network_reach_server_s; + extern const f_string_static_t f_status_network_reach_server_not_s; + extern const f_string_static_t f_status_network_server_s; + extern const f_string_static_t f_status_network_server_not_s; + extern const f_string_static_t f_status_network_time_s; + extern const f_string_static_t f_status_network_time_not_s; #endif // _di_F_status_network_ #ifndef _di_F_status_number_ @@ -1153,23 +1153,23 @@ extern "C" { #define F_status_number_zero_s_length 13 #define F_status_number_zero_not_s_length 17 - extern const f_string_t f_status_number_s; - extern const f_string_t f_status_number_decimal_s; - extern const f_string_t f_status_number_decimal_not_s; - extern const f_string_t f_status_number_divide_by_zero_s; - extern const f_string_t f_status_number_negative_s; - extern const f_string_t f_status_number_negative_not_s; - extern const f_string_t f_status_number_not_s; - extern const f_string_t f_status_number_overflow_s; - extern const f_string_t f_status_number_positive_s; - extern const f_string_t f_status_number_positive_not_s; - extern const f_string_t f_status_number_too_large_s; - extern const f_string_t f_status_number_too_small_s; - extern const f_string_t f_status_number_underflow_s; - extern const f_string_t f_status_number_whole_s; - extern const f_string_t f_status_number_whole_not_s; - extern const f_string_t f_status_number_zero_s; - extern const f_string_t f_status_number_zero_not_s; + extern const f_string_static_t f_status_number_s; + extern const f_string_static_t f_status_number_decimal_s; + extern const f_string_static_t f_status_number_decimal_not_s; + extern const f_string_static_t f_status_number_divide_by_zero_s; + extern const f_string_static_t f_status_number_negative_s; + extern const f_string_static_t f_status_number_negative_not_s; + extern const f_string_static_t f_status_number_not_s; + extern const f_string_static_t f_status_number_overflow_s; + extern const f_string_static_t f_status_number_positive_s; + extern const f_string_static_t f_status_number_positive_not_s; + extern const f_string_static_t f_status_number_too_large_s; + extern const f_string_static_t f_status_number_too_small_s; + extern const f_string_static_t f_status_number_underflow_s; + extern const f_string_static_t f_status_number_whole_s; + extern const f_string_static_t f_status_number_whole_not_s; + extern const f_string_static_t f_status_number_zero_s; + extern const f_string_static_t f_status_number_zero_not_s; #endif // _di_F_status_number_ #ifndef _di_F_status_buffer_ @@ -1238,6 +1238,7 @@ extern "C" { #define F_status_none_eof_s_length 10 #define F_status_none_eol_s_length 10 #define F_status_none_eos_s_length 10 + #define F_status_none_not_s_length 10 #define F_status_none_stop_s_length 11 #define F_status_data_s_length 6 #define F_status_data_not_s_length 10 @@ -1270,54 +1271,54 @@ extern "C" { #define F_status_terminated_not_nest_eos_s_length 25 #define F_status_terminated_not_nest_stop_s_length 26 - extern const f_string_t f_status_buffer_s; - extern const f_string_t f_status_buffer_not_s; - extern const f_string_t f_status_buffer_too_large_s; - extern const f_string_t f_status_buffer_too_small_s; - extern const f_string_t f_status_complete_not_utf_s; - extern const f_string_t f_status_complete_not_utf_block_s; - extern const f_string_t f_status_complete_not_utf_eoa_s; - extern const f_string_t f_status_complete_not_utf_eof_s; - extern const f_string_t f_status_complete_not_utf_eol_s; - extern const f_string_t f_status_complete_not_utf_eos_s; - extern const f_string_t f_status_complete_not_utf_stop_s; - extern const f_string_t f_status_none_block_s; - extern const f_string_t f_status_none_eoa_s; - extern const f_string_t f_status_none_eof_s; - extern const f_string_t f_status_none_eol_s; - extern const f_string_t f_status_none_eos_s; - extern const f_string_t f_status_none_not_s; - extern const f_string_t f_status_none_stop_s; - extern const f_string_t f_status_data_s; - extern const f_string_t f_status_data_not_s; - extern const f_string_t f_status_data_not_block_s; - extern const f_string_t f_status_data_not_eoa_s; - extern const f_string_t f_status_data_not_eof_s; - extern const f_string_t f_status_data_not_eol_s; - extern const f_string_t f_status_data_not_eos_s; - extern const f_string_t f_status_data_not_stop_s; - extern const f_string_t f_status_terminated_s; - extern const f_string_t f_status_terminated_not_s; - extern const f_string_t f_status_terminated_not_block_s; - extern const f_string_t f_status_terminated_not_eoa_s; - extern const f_string_t f_status_terminated_not_eof_s; - extern const f_string_t f_status_terminated_not_eol_s; - extern const f_string_t f_status_terminated_not_eos_s; - extern const f_string_t f_status_terminated_not_stop_s; - extern const f_string_t f_status_terminated_not_group_s; - extern const f_string_t f_status_terminated_not_group_block_s; - extern const f_string_t f_status_terminated_not_group_eoa_s; - extern const f_string_t f_status_terminated_not_group_eof_s; - extern const f_string_t f_status_terminated_not_group_eol_s; - extern const f_string_t f_status_terminated_not_group_eos_s; - extern const f_string_t f_status_terminated_not_group_stop_s; - extern const f_string_t f_status_terminated_not_nest_s; - extern const f_string_t f_status_terminated_not_nest_block_s; - extern const f_string_t f_status_terminated_not_nest_eoa_s; - extern const f_string_t f_status_terminated_not_nest_eof_s; - extern const f_string_t f_status_terminated_not_nest_eol_s; - extern const f_string_t f_status_terminated_not_nest_eos_s; - extern const f_string_t f_status_terminated_not_nest_stop_s; + extern const f_string_static_t f_status_buffer_s; + extern const f_string_static_t f_status_buffer_not_s; + extern const f_string_static_t f_status_buffer_too_large_s; + extern const f_string_static_t f_status_buffer_too_small_s; + extern const f_string_static_t f_status_complete_not_utf_s; + extern const f_string_static_t f_status_complete_not_utf_block_s; + extern const f_string_static_t f_status_complete_not_utf_eoa_s; + extern const f_string_static_t f_status_complete_not_utf_eof_s; + extern const f_string_static_t f_status_complete_not_utf_eol_s; + extern const f_string_static_t f_status_complete_not_utf_eos_s; + extern const f_string_static_t f_status_complete_not_utf_stop_s; + extern const f_string_static_t f_status_none_block_s; + extern const f_string_static_t f_status_none_eoa_s; + extern const f_string_static_t f_status_none_eof_s; + extern const f_string_static_t f_status_none_eol_s; + extern const f_string_static_t f_status_none_eos_s; + extern const f_string_static_t f_status_none_not_s; + extern const f_string_static_t f_status_none_stop_s; + extern const f_string_static_t f_status_data_s; + extern const f_string_static_t f_status_data_not_s; + extern const f_string_static_t f_status_data_not_block_s; + extern const f_string_static_t f_status_data_not_eoa_s; + extern const f_string_static_t f_status_data_not_eof_s; + extern const f_string_static_t f_status_data_not_eol_s; + extern const f_string_static_t f_status_data_not_eos_s; + extern const f_string_static_t f_status_data_not_stop_s; + extern const f_string_static_t f_status_terminated_s; + extern const f_string_static_t f_status_terminated_not_s; + extern const f_string_static_t f_status_terminated_not_block_s; + extern const f_string_static_t f_status_terminated_not_eoa_s; + extern const f_string_static_t f_status_terminated_not_eof_s; + extern const f_string_static_t f_status_terminated_not_eol_s; + extern const f_string_static_t f_status_terminated_not_eos_s; + extern const f_string_static_t f_status_terminated_not_stop_s; + extern const f_string_static_t f_status_terminated_not_group_s; + extern const f_string_static_t f_status_terminated_not_group_block_s; + extern const f_string_static_t f_status_terminated_not_group_eoa_s; + extern const f_string_static_t f_status_terminated_not_group_eof_s; + extern const f_string_static_t f_status_terminated_not_group_eol_s; + extern const f_string_static_t f_status_terminated_not_group_eos_s; + extern const f_string_static_t f_status_terminated_not_group_stop_s; + extern const f_string_static_t f_status_terminated_not_nest_s; + extern const f_string_static_t f_status_terminated_not_nest_block_s; + extern const f_string_static_t f_status_terminated_not_nest_eoa_s; + extern const f_string_static_t f_status_terminated_not_nest_eof_s; + extern const f_string_static_t f_status_terminated_not_nest_eol_s; + extern const f_string_static_t f_status_terminated_not_nest_eos_s; + extern const f_string_static_t f_status_terminated_not_nest_stop_s; #endif // _di_F_status_buffer_ #ifndef _di_F_status_process_ @@ -1329,9 +1330,9 @@ extern "C" { #define F_status_process_not_s_length 13 #define F_status_process_too_many_s_length 18 - extern const f_string_t f_status_process_s; - extern const f_string_t f_status_process_not_s; - extern const f_string_t f_status_process_too_many_s; + extern const f_string_static_t f_status_process_s; + extern const f_string_static_t f_status_process_not_s; + extern const f_string_static_t f_status_process_too_many_s; #endif // _di_F_status_process_ #ifndef _di_F_status_file_ @@ -1423,49 +1424,49 @@ extern "C" { #define F_status_file_utf_not_s_length 14 #define F_status_file_write_s_length 12 - extern const f_string_t f_status_file_s; - extern const f_string_t f_status_file_close_s; - extern const f_string_t f_status_file_closed_s; - extern const f_string_t f_status_file_descriptor_s; - extern const f_string_t f_status_file_descriptor_max_s; - extern const f_string_t f_status_file_descriptor_not_s; - extern const f_string_t f_status_file_empty_s; - extern const f_string_t f_status_file_flush_s; - extern const f_string_t f_status_file_found_s; - extern const f_string_t f_status_file_found_not_s; - extern const f_string_t f_status_file_not_s; - extern const f_string_t f_status_file_open_s; - extern const f_string_t f_status_file_open_max_s; - extern const f_string_t f_status_file_opened_s; - extern const f_string_t f_status_file_overflow_s; - extern const f_string_t f_status_file_purge_s; - extern const f_string_t f_status_file_read_s; - extern const f_string_t f_status_file_reallocation_s; - extern const f_string_t f_status_file_seek_s; - extern const f_string_t f_status_file_stat_s; - extern const f_string_t f_status_file_synchronize_s; - extern const f_string_t f_status_file_type_block_s; - extern const f_string_t f_status_file_type_character_s; - extern const f_string_t f_status_file_type_directory_s; - extern const f_string_t f_status_file_type_fifo_s; - extern const f_string_t f_status_file_type_link_s; - extern const f_string_t f_status_file_type_not_block_s; - extern const f_string_t f_status_file_type_not_character_s; - extern const f_string_t f_status_file_type_not_directory_s; - extern const f_string_t f_status_file_type_not_fifo_s; - extern const f_string_t f_status_file_type_not_link_s; - extern const f_string_t f_status_file_type_not_pipe_s; - extern const f_string_t f_status_file_type_not_regular_s; - extern const f_string_t f_status_file_type_not_socket_s; - extern const f_string_t f_status_file_type_not_unknown_s; - extern const f_string_t f_status_file_type_pipe_s; - extern const f_string_t f_status_file_type_regular_s; - extern const f_string_t f_status_file_type_socket_s; - extern const f_string_t f_status_file_type_unknown_s; - extern const f_string_t f_status_file_underflow_s; - extern const f_string_t f_status_file_utf_s; - extern const f_string_t f_status_file_utf_not_s; - extern const f_string_t f_status_file_write_s; + extern const f_string_static_t f_status_file_s; + extern const f_string_static_t f_status_file_close_s; + extern const f_string_static_t f_status_file_closed_s; + extern const f_string_static_t f_status_file_descriptor_s; + extern const f_string_static_t f_status_file_descriptor_max_s; + extern const f_string_static_t f_status_file_descriptor_not_s; + extern const f_string_static_t f_status_file_empty_s; + extern const f_string_static_t f_status_file_flush_s; + extern const f_string_static_t f_status_file_found_s; + extern const f_string_static_t f_status_file_found_not_s; + extern const f_string_static_t f_status_file_not_s; + extern const f_string_static_t f_status_file_open_s; + extern const f_string_static_t f_status_file_open_max_s; + extern const f_string_static_t f_status_file_opened_s; + extern const f_string_static_t f_status_file_overflow_s; + extern const f_string_static_t f_status_file_purge_s; + extern const f_string_static_t f_status_file_read_s; + extern const f_string_static_t f_status_file_reallocation_s; + extern const f_string_static_t f_status_file_seek_s; + extern const f_string_static_t f_status_file_stat_s; + extern const f_string_static_t f_status_file_synchronize_s; + extern const f_string_static_t f_status_file_type_block_s; + extern const f_string_static_t f_status_file_type_character_s; + extern const f_string_static_t f_status_file_type_directory_s; + extern const f_string_static_t f_status_file_type_fifo_s; + extern const f_string_static_t f_status_file_type_link_s; + extern const f_string_static_t f_status_file_type_not_block_s; + extern const f_string_static_t f_status_file_type_not_character_s; + extern const f_string_static_t f_status_file_type_not_directory_s; + extern const f_string_static_t f_status_file_type_not_fifo_s; + extern const f_string_static_t f_status_file_type_not_link_s; + extern const f_string_static_t f_status_file_type_not_pipe_s; + extern const f_string_static_t f_status_file_type_not_regular_s; + extern const f_string_static_t f_status_file_type_not_socket_s; + extern const f_string_static_t f_status_file_type_not_unknown_s; + extern const f_string_static_t f_status_file_type_pipe_s; + extern const f_string_static_t f_status_file_type_regular_s; + extern const f_string_static_t f_status_file_type_socket_s; + extern const f_string_static_t f_status_file_type_unknown_s; + extern const f_string_static_t f_status_file_underflow_s; + extern const f_string_static_t f_status_file_utf_s; + extern const f_string_static_t f_status_file_utf_not_s; + extern const f_string_static_t f_status_file_write_s; #endif // _di_F_status_file_ #ifndef _di_F_status_filesystem_ @@ -1479,10 +1480,10 @@ extern "C" { #define F_status_filesystem_quota_block_s_length 24 #define F_status_filesystem_quota_reached_s_length 26 - extern const f_string_t f_status_filesystem_s; - extern const f_string_t f_status_filesystem_not_s; - extern const f_string_t f_status_filesystem_quota_block_s; - extern const f_string_t f_status_filesystem_quota_reached_s; + extern const f_string_static_t f_status_filesystem_s; + extern const f_string_static_t f_status_filesystem_not_s; + extern const f_string_static_t f_status_filesystem_quota_block_s; + extern const f_string_static_t f_status_filesystem_quota_reached_s; #endif // _di_F_status_filesystem_ #ifndef _di_F_status_directory_ @@ -1528,26 +1529,26 @@ extern "C" { #define F_status_directory_utf_not_s_length 19 #define F_status_directory_write_s_length 17 - extern const f_string_t f_status_directory_s; - extern const f_string_t f_status_directory_close_s; - extern const f_string_t f_status_directory_closed_s; - extern const f_string_t f_status_directory_descriptor_s; - extern const f_string_t f_status_directory_empty_s; - extern const f_string_t f_status_directory_empty_not_s; - extern const f_string_t f_status_directory_found_s; - extern const f_string_t f_status_directory_found_not_s; - extern const f_string_t f_status_directory_flush_s; - extern const f_string_t f_status_directory_link_max_s; - extern const f_string_t f_status_directory_not_s; - extern const f_string_t f_status_directory_open_s; - extern const f_string_t f_status_directory_purge_s; - extern const f_string_t f_status_directory_read_s; - extern const f_string_t f_status_directory_stream_s; - extern const f_string_t f_status_directory_supported_not_s; - extern const f_string_t f_status_directory_synchronize_s; - extern const f_string_t f_status_directory_utf_s; - extern const f_string_t f_status_directory_utf_not_s; - extern const f_string_t f_status_directory_write_s; + extern const f_string_static_t f_status_directory_s; + extern const f_string_static_t f_status_directory_close_s; + extern const f_string_static_t f_status_directory_closed_s; + extern const f_string_static_t f_status_directory_descriptor_s; + extern const f_string_static_t f_status_directory_empty_s; + extern const f_string_static_t f_status_directory_empty_not_s; + extern const f_string_static_t f_status_directory_found_s; + extern const f_string_static_t f_status_directory_found_not_s; + extern const f_string_static_t f_status_directory_flush_s; + extern const f_string_static_t f_status_directory_link_max_s; + extern const f_string_static_t f_status_directory_not_s; + extern const f_string_static_t f_status_directory_open_s; + extern const f_string_static_t f_status_directory_purge_s; + extern const f_string_static_t f_status_directory_read_s; + extern const f_string_static_t f_status_directory_stream_s; + extern const f_string_static_t f_status_directory_supported_not_s; + extern const f_string_static_t f_status_directory_synchronize_s; + extern const f_string_static_t f_status_directory_utf_s; + extern const f_string_static_t f_status_directory_utf_not_s; + extern const f_string_static_t f_status_directory_write_s; #endif // _di_F_status_directory_ #ifndef _di_F_status_socket_ @@ -1565,12 +1566,12 @@ extern "C" { #define F_status_socket_send_s_length 13 #define F_status_socket_target_s_length 15 - extern const f_string_t f_status_socket_s; - extern const f_string_t f_status_socket_client_s; - extern const f_string_t f_status_socket_not_s; - extern const f_string_t f_status_socket_receive_s; - extern const f_string_t f_status_socket_send_s; - extern const f_string_t f_status_socket_target_s; + extern const f_string_static_t f_status_socket_s; + extern const f_string_static_t f_status_socket_client_s; + extern const f_string_static_t f_status_socket_not_s; + extern const f_string_static_t f_status_socket_receive_s; + extern const f_string_static_t f_status_socket_send_s; + extern const f_string_static_t f_status_socket_target_s; #endif // _di_F_status_socket_ #ifndef _di_F_status_compare_ @@ -1584,10 +1585,10 @@ extern "C" { #define F_status_than_greater_s_length 14 #define F_status_than_less_s_length 11 - extern const f_string_t f_status_equal_to_s; - extern const f_string_t f_status_equal_to_not_s; - extern const f_string_t f_status_than_greater_s; - extern const f_string_t f_status_than_less_s; + extern const f_string_static_t f_status_equal_to_s; + extern const f_string_static_t f_status_equal_to_not_s; + extern const f_string_static_t f_status_than_greater_s; + extern const f_string_static_t f_status_than_less_s; #endif // _di_F_status_compare_ #ifndef _di_F_status_access_ @@ -1635,27 +1636,27 @@ extern "C" { #define F_status_access_not_s_length 12 #define F_status_access_owner_s_length 14 - extern const f_string_t f_status_access_s; - extern const f_string_t f_status_access_denied_s; - extern const f_string_t f_status_access_denied_user_s; - extern const f_string_t f_status_access_denied_group_s; - extern const f_string_t f_status_access_denied_world_s; - extern const f_string_t f_status_access_denied_read_s; - extern const f_string_t f_status_access_denied_write_s; - extern const f_string_t f_status_access_denied_execute_s; - extern const f_string_t f_status_access_denied_super_s; - extern const f_string_t f_status_access_granted_s; - extern const f_string_t f_status_access_granted_user_s; - extern const f_string_t f_status_access_granted_group_s; - extern const f_string_t f_status_access_granted_world_s; - extern const f_string_t f_status_access_granted_read_s; - extern const f_string_t f_status_access_granted_write_s; - extern const f_string_t f_status_access_granted_execute_s; - extern const f_string_t f_status_access_granted_super_s; - extern const f_string_t f_status_access_group_s; - extern const f_string_t f_status_access_mode_s; - extern const f_string_t f_status_access_not_s; - extern const f_string_t f_status_access_owner_s; + extern const f_string_static_t f_status_access_s; + extern const f_string_static_t f_status_access_denied_s; + extern const f_string_static_t f_status_access_denied_user_s; + extern const f_string_static_t f_status_access_denied_group_s; + extern const f_string_static_t f_status_access_denied_world_s; + extern const f_string_static_t f_status_access_denied_read_s; + extern const f_string_static_t f_status_access_denied_write_s; + extern const f_string_static_t f_status_access_denied_execute_s; + extern const f_string_static_t f_status_access_denied_super_s; + extern const f_string_static_t f_status_access_granted_s; + extern const f_string_static_t f_status_access_granted_user_s; + extern const f_string_static_t f_status_access_granted_group_s; + extern const f_string_static_t f_status_access_granted_world_s; + extern const f_string_static_t f_status_access_granted_read_s; + extern const f_string_static_t f_status_access_granted_write_s; + extern const f_string_static_t f_status_access_granted_execute_s; + extern const f_string_static_t f_status_access_granted_super_s; + extern const f_string_static_t f_status_access_group_s; + extern const f_string_static_t f_status_access_mode_s; + extern const f_string_static_t f_status_access_not_s; + extern const f_string_static_t f_status_access_owner_s; #endif // _di_F_status_access_ #ifndef _di_F_status_terminal_ @@ -1681,23 +1682,22 @@ extern "C" { #define F_status_terminal_valid_not_s_length 20 #define F_status_terminal_write_s_length 16 - extern const f_string_t f_status_terminal_s; - extern const f_string_t f_status_terminal_access_s; - extern const f_string_t f_status_terminal_known_s; - extern const f_string_t f_status_terminal_known_not_s; - extern const f_string_t f_status_terminal_not_s; - extern const f_string_t f_status_terminal_prohibited_s; - extern const f_string_t f_status_terminal_read_s; - extern const f_string_t f_status_terminal_valid_s; - extern const f_string_t f_status_terminal_valid_not_s; - extern const f_string_t f_status_terminal_write_s; + extern const f_string_static_t f_status_terminal_s; + extern const f_string_static_t f_status_terminal_access_s; + extern const f_string_static_t f_status_terminal_known_s; + extern const f_string_static_t f_status_terminal_known_not_s; + extern const f_string_static_t f_status_terminal_not_s; + extern const f_string_static_t f_status_terminal_prohibited_s; + extern const f_string_static_t f_status_terminal_read_s; + extern const f_string_static_t f_status_terminal_valid_s; + extern const f_string_static_t f_status_terminal_valid_not_s; + extern const f_string_static_t f_status_terminal_write_s; #endif // _di_F_status_terminal_ #define F_status_status_code_last_s "F_status_code_last" - - extern const f_string_t f_status_status_code_last_s; - #define F_status_status_code_last_s_length 18 + + extern const f_string_static_t f_status_status_code_last_s; #endif // _di_F_status_string_ /** @@ -1706,9 +1706,9 @@ extern "C" { * The error, warning, and signal bits are ignored. * * @param code - * The status code to process. - * @param string - * The processed code code. + * The status number to process. + * @param name + * The processed code name. * * @return * F_none on success. @@ -1717,7 +1717,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_status_string_to_ - extern f_status_t f_status_string_to(const f_status_t code, f_string_t *string); + extern f_status_t f_status_string_to(const f_status_t code, f_string_static_t *name); #endif // _di_f_status_string_to_ #ifdef __cplusplus diff --git a/level_0/f_string/c/string-common.c b/level_0/f_string/c/string-common.c index 95eec4a..f1f1b2e 100644 --- a/level_0/f_string/c/string-common.c +++ b/level_0/f_string/c/string-common.c @@ -5,162 +5,6 @@ extern "C" { #endif -#ifndef _di_f_string_empty_s_ - const f_string_t f_string_empty_s = ""; -#endif // _di_f_string_empty_s_ - -#ifndef _di_string_format_s_ - const f_string_t f_string_format_string_s = F_string_format_string_s; - const f_string_t f_string_format_character_s = F_string_format_character_s; - const f_string_t f_string_format_wide_string_s = F_string_format_wide_string_s; - const f_string_t f_string_format_wide_character_s = F_string_format_wide_character_s; - const f_string_t f_string_format_integer_s = F_string_format_integer_s; - const f_string_t f_string_format_unsigned_s = F_string_format_unsigned_s; - const f_string_t f_string_format_digit_s = F_string_format_digit_s; - const f_string_t f_string_format_float_s = F_string_format_float_s; - const f_string_t f_string_format_short_integer_s = F_string_format_short_integer_s; - const f_string_t f_string_format_short_unsigned_s = F_string_format_short_unsigned_s; - const f_string_t f_string_format_long_integer_s = F_string_format_long_integer_s; - const f_string_t f_string_format_long_unsigned_s = F_string_format_long_unsigned_s; - const f_string_t f_string_format_long_double_s = F_string_format_long_double_s; - const f_string_t f_string_format_long_long_integer_s = F_string_format_long_long_integer_s; - const f_string_t f_string_format_long_long_unsigned_s = F_string_format_long_long_unsigned_s; -#endif // _di_string_format_s_ - -#ifndef _di_string_ascii_s_ - const f_string_t f_string_ascii_0_s = F_string_ascii_0_s; - const f_string_t f_string_ascii_1_s = F_string_ascii_1_s; - const f_string_t f_string_ascii_2_s = F_string_ascii_2_s; - const f_string_t f_string_ascii_3_s = F_string_ascii_3_s; - const f_string_t f_string_ascii_4_s = F_string_ascii_4_s; - const f_string_t f_string_ascii_5_s = F_string_ascii_5_s; - const f_string_t f_string_ascii_6_s = F_string_ascii_6_s; - const f_string_t f_string_ascii_7_s = F_string_ascii_7_s; - const f_string_t f_string_ascii_8_s = F_string_ascii_8_s; - const f_string_t f_string_ascii_9_s = F_string_ascii_9_s; - - const f_string_t f_string_ascii_a_s = F_string_ascii_a_s; - const f_string_t f_string_ascii_b_s = F_string_ascii_b_s; - const f_string_t f_string_ascii_c_s = F_string_ascii_c_s; - const f_string_t f_string_ascii_d_s = F_string_ascii_d_s; - const f_string_t f_string_ascii_e_s = F_string_ascii_e_s; - const f_string_t f_string_ascii_f_s = F_string_ascii_f_s; - const f_string_t f_string_ascii_g_s = F_string_ascii_g_s; - const f_string_t f_string_ascii_h_s = F_string_ascii_h_s; - const f_string_t f_string_ascii_i_s = F_string_ascii_i_s; - const f_string_t f_string_ascii_j_s = F_string_ascii_j_s; - const f_string_t f_string_ascii_k_s = F_string_ascii_k_s; - const f_string_t f_string_ascii_l_s = F_string_ascii_l_s; - const f_string_t f_string_ascii_m_s = F_string_ascii_m_s; - const f_string_t f_string_ascii_n_s = F_string_ascii_n_s; - const f_string_t f_string_ascii_o_s = F_string_ascii_o_s; - const f_string_t f_string_ascii_p_s = F_string_ascii_p_s; - const f_string_t f_string_ascii_q_s = F_string_ascii_q_s; - const f_string_t f_string_ascii_r_s = F_string_ascii_r_s; - const f_string_t f_string_ascii_s_s = F_string_ascii_s_s; - const f_string_t f_string_ascii_t_s = F_string_ascii_t_s; - const f_string_t f_string_ascii_u_s = F_string_ascii_u_s; - const f_string_t f_string_ascii_v_s = F_string_ascii_v_s; - const f_string_t f_string_ascii_w_s = F_string_ascii_w_s; - const f_string_t f_string_ascii_x_s = F_string_ascii_x_s; - const f_string_t f_string_ascii_y_s = F_string_ascii_y_s; - const f_string_t f_string_ascii_z_s = F_string_ascii_z_s; - - const f_string_t f_string_ascii_A_s = F_string_ascii_A_s; - const f_string_t f_string_ascii_B_s = F_string_ascii_B_s; - const f_string_t f_string_ascii_C_s = F_string_ascii_C_s; - const f_string_t f_string_ascii_D_s = F_string_ascii_D_s; - const f_string_t f_string_ascii_E_s = F_string_ascii_E_s; - const f_string_t f_string_ascii_F_s = F_string_ascii_F_s; - const f_string_t f_string_ascii_G_s = F_string_ascii_G_s; - const f_string_t f_string_ascii_H_s = F_string_ascii_H_s; - const f_string_t f_string_ascii_I_s = F_string_ascii_I_s; - const f_string_t f_string_ascii_J_s = F_string_ascii_J_s; - const f_string_t f_string_ascii_K_s = F_string_ascii_K_s; - const f_string_t f_string_ascii_L_s = F_string_ascii_L_s; - const f_string_t f_string_ascii_M_s = F_string_ascii_M_s; - const f_string_t f_string_ascii_N_s = F_string_ascii_N_s; - const f_string_t f_string_ascii_O_s = F_string_ascii_O_s; - const f_string_t f_string_ascii_P_s = F_string_ascii_P_s; - const f_string_t f_string_ascii_Q_s = F_string_ascii_Q_s; - const f_string_t f_string_ascii_R_s = F_string_ascii_R_s; - const f_string_t f_string_ascii_S_s = F_string_ascii_S_s; - const f_string_t f_string_ascii_T_s = F_string_ascii_T_s; - const f_string_t f_string_ascii_U_s = F_string_ascii_U_s; - const f_string_t f_string_ascii_V_s = F_string_ascii_V_s; - const f_string_t f_string_ascii_W_s = F_string_ascii_W_s; - const f_string_t f_string_ascii_X_s = F_string_ascii_X_s; - const f_string_t f_string_ascii_Y_s = F_string_ascii_Y_s; - const f_string_t f_string_ascii_Z_s = F_string_ascii_Z_s; - - const f_string_t f_string_ascii_ampersand_s = F_string_ascii_ampersand_s; - const f_string_t f_string_ascii_asterisk_s = F_string_ascii_asterisk_s; - const f_string_t f_string_ascii_brace_close_s = F_string_ascii_brace_close_s; - const f_string_t f_string_ascii_brace_open_s = F_string_ascii_brace_open_s; - const f_string_t f_string_ascii_bracket_close_s = F_string_ascii_bracket_close_s; - const f_string_t f_string_ascii_bracket_open_s = F_string_ascii_bracket_open_s; - const f_string_t f_string_ascii_caret_s = F_string_ascii_caret_s; - const f_string_t f_string_ascii_comma_s = F_string_ascii_comma_s; - const f_string_t f_string_ascii_colon_s = F_string_ascii_colon_s; - const f_string_t f_string_ascii_colon_semi_s = F_string_ascii_colon_semi_s; - const f_string_t f_string_ascii_dollar_s = F_string_ascii_dollar_s; - const f_string_t f_string_ascii_equal_s = F_string_ascii_equal_s; - const f_string_t f_string_ascii_exclamation_s = F_string_ascii_exclamation_s; - const f_string_t f_string_ascii_grave_s = F_string_ascii_grave_s; - const f_string_t f_string_ascii_mark_question_s = F_string_ascii_mark_question_s; - const f_string_t f_string_ascii_minus_s = F_string_ascii_minus_s; - const f_string_t f_string_ascii_parenthesis_open_s = F_string_ascii_parenthesis_open_s; - const f_string_t f_string_ascii_parenthesis_close_s = F_string_ascii_parenthesis_close_s; - const f_string_t f_string_ascii_percent_s = F_string_ascii_percent_s; - const f_string_t f_string_ascii_period_s = F_string_ascii_period_s; - const f_string_t f_string_ascii_pipe_s = F_string_ascii_pipe_s; - const f_string_t f_string_ascii_plus_s = F_string_ascii_plus_s; - const f_string_t f_string_ascii_pound_s = F_string_ascii_pound_s; - const f_string_t f_string_ascii_quote_double_s = F_string_ascii_quote_double_s; - const f_string_t f_string_ascii_quote_single_s = F_string_ascii_quote_single_s; - const f_string_t f_string_ascii_sign_at_s = F_string_ascii_sign_at_s; - const f_string_t f_string_ascii_sign_greater_than_s = F_string_ascii_sign_greater_than_s; - const f_string_t f_string_ascii_sign_less_than_s = F_string_ascii_sign_less_than_s; - const f_string_t f_string_ascii_slash_forward_s = F_string_ascii_slash_forward_s; - const f_string_t f_string_ascii_slash_backward_s = F_string_ascii_slash_backward_s; - const f_string_t f_string_ascii_tilde_s = F_string_ascii_tilde_s; - const f_string_t f_string_ascii_underscore_s = F_string_ascii_underscore_s; - - const f_string_t f_string_ascii_acknowledge_s = F_string_ascii_acknowledge_s; - const f_string_t f_string_ascii_acknowledge_negative_s = F_string_ascii_acknowledge_negative_s; - const f_string_t f_string_ascii_bell_s = F_string_ascii_bell_s; - const f_string_t f_string_ascii_cancel_s = F_string_ascii_cancel_s; - const f_string_t f_string_ascii_data_link_escape_s = F_string_ascii_data_link_escape_s; - const f_string_t f_string_ascii_device_control_one_s = F_string_ascii_device_control_one_s; - const f_string_t f_string_ascii_device_control_two_s = F_string_ascii_device_control_two_s; - const f_string_t f_string_ascii_device_control_three_s = F_string_ascii_device_control_three_s; - const f_string_t f_string_ascii_device_control_four_s = F_string_ascii_device_control_four_s; - const f_string_t f_string_ascii_enquiry_s = F_string_ascii_enquiry_s; - const f_string_t f_string_ascii_escape_s = F_string_ascii_escape_s; - const f_string_t f_string_ascii_feed_form_s = F_string_ascii_feed_form_s; - const f_string_t f_string_ascii_feed_line_s = F_string_ascii_feed_line_s; - const f_string_t f_string_ascii_header_start_s = F_string_ascii_header_start_s; - const f_string_t f_string_ascii_medium_stop_s = F_string_ascii_medium_stop_s; - const f_string_t f_string_ascii_null_s = F_string_ascii_null_s; - const f_string_t f_string_ascii_return_carriage_s = F_string_ascii_return_carriage_s; - const f_string_t f_string_ascii_separator_file_s = F_string_ascii_separator_file_s; - const f_string_t f_string_ascii_separator_group_s = F_string_ascii_separator_group_s; - const f_string_t f_string_ascii_separator_record_s = F_string_ascii_separator_record_s; - const f_string_t f_string_ascii_separator_unit_s = F_string_ascii_separator_unit_s; - const f_string_t f_string_ascii_shift_in_s = F_string_ascii_shift_in_s; - const f_string_t f_string_ascii_shift_out_s = F_string_ascii_shift_out_s; - const f_string_t f_string_ascii_space_s = F_string_ascii_space_s; - const f_string_t f_string_ascii_space_back_s = F_string_ascii_space_back_s; - const f_string_t f_string_ascii_substitute_s = F_string_ascii_substitute_s; - const f_string_t f_string_ascii_synchronous_idle_s = F_string_ascii_synchronous_idle_s; - const f_string_t f_string_ascii_tab_horizontal_s = F_string_ascii_tab_horizontal_s; - const f_string_t f_string_ascii_tab_vertical_s = F_string_ascii_tab_vertical_s; - const f_string_t f_string_ascii_text_start_s = F_string_ascii_text_start_s; - const f_string_t f_string_ascii_text_stop_s = F_string_ascii_text_stop_s; - const f_string_t f_string_ascii_transmission_stop_s = F_string_ascii_transmission_stop_s; - const f_string_t f_string_ascii_transmission_block_end_s = F_string_ascii_transmission_block_end_s; -#endif // _di_string_ascii_s_ - #ifdef __cplusplus } // extern "C" #endif diff --git a/level_0/f_string/c/string-common.h b/level_0/f_string/c/string-common.h index 5fef2fe..ea5efcd 100644 --- a/level_0/f_string/c/string-common.h +++ b/level_0/f_string/c/string-common.h @@ -60,8 +60,8 @@ extern "C" { * * GCC errors such as: "warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]" can be avoided using this. * - * Do not confuse this with "const f_string_t". - * When "const f_string_t * xxx" is passed to a function, then "xxx" cannot be changed. + * Do not confuse this with "const f_string_static_t". + * When "const f_string_static_t * xxx" is passed to a function, then "xxx" cannot be changed. * When "f_string_constant_t * xxx" is passed to a function, then "xxx" can be changed. */ #ifndef _di_f_string_constant_t_ @@ -72,505 +72,6 @@ extern "C" { #define macro_f_string_constant_t_clear(string) string = 0; #endif // _di_f_string_t_ -/** - * Define the end of line character. - * FLL forbids '\r' and '\r\n' as end of line characters, \r will be silently ignored. - */ -#ifndef _di_f_string_eol_s_ - #define f_string_eol_s f_string_ascii_feed_line_s - #define F_string_eol_s F_string_ascii_feed_line_s - - #define F_string_eol_s_length 1 -#endif // _di_f_string_eol_s_ - -#ifndef _di_f_string_empty_s_ - const extern f_string_t f_string_empty_s; -#endif // _di_f_string_empty_s_ - -#ifndef _di_f_string_placeholder_s_ - #define f_string_placeholder_s f_string_empty_s - #define F_string_placeholder_s F_string_empty_s - - #define F_string_placeholder_s_length 1 -#endif // _di_f_string_placeholder_s_ - -#ifndef _di_f_string_space_s_ - #define f_string_space_s f_string_ascii_space_s - #define F_string_space_s F_string_ascii_space_s - - #define F_string_space_s_length 1 -#endif // _di_f_string_space_s_ - -#ifndef _di_string_format_s_ - #define F_string_format_string_s "%s" - #define F_string_format_character_s "%c" - #define F_string_format_wide_string_s "%ls" - #define F_string_format_wide_character_s "%lc" - #define F_string_format_integer_s "%i" - #define F_string_format_unsigned_s "%u" - #define F_string_format_digit_s "%d" - #define F_string_format_float_s "%f" - #define F_string_format_short_integer_s "%hi" - #define F_string_format_short_unsigned_s "%hu" - #define F_string_format_long_integer_s "%li" - #define F_string_format_long_unsigned_s "%lu" - #define F_string_format_long_double_s "%ld" - #define F_string_format_long_long_integer_s "%lli" - #define F_string_format_long_long_unsigned_s "%llu" - - #define F_string_format_string_s_length 2 - #define F_string_format_character_s_length 2 - #define F_string_format_wide_string_s_length 3 - #define F_string_format_wide_character_s_length 3 - #define F_string_format_integer_s_length 2 - #define F_string_format_unsigned_s_length 2 - #define F_string_format_digit_s_length 2 - #define F_string_format_float_s_length 2 - #define F_string_format_short_integer_s_length 3 - #define F_string_format_short_unsigned_s_length 3 - #define F_string_format_long_integer_s_length 3 - #define F_string_format_long_unsigned_s_length 3 - #define F_string_format_long_double_s_length 3 - #define F_string_format_long_long_integer_s_length 4 - #define F_string_format_long_long_unsigned_s_length 4 - - extern const f_string_t f_string_format_string_s; - extern const f_string_t f_string_format_character_s; - extern const f_string_t f_string_format_wide_string_s; - extern const f_string_t f_string_format_wide_character_s; - extern const f_string_t f_string_format_integer_s; - extern const f_string_t f_string_format_unsigned_s; - extern const f_string_t f_string_format_digit_s; - extern const f_string_t f_string_format_float_s; - extern const f_string_t f_string_format_short_integer_s; - extern const f_string_t f_string_format_short_unsigned_s; - extern const f_string_t f_string_format_long_integer_s; - extern const f_string_t f_string_format_long_unsigned_s; - extern const f_string_t f_string_format_long_double_s; - extern const f_string_t f_string_format_long_long_integer_s; - extern const f_string_t f_string_format_long_long_unsigned_s; -#endif // _di_string_format_s_ - -#ifndef _di_f_array_length_printf_ - #define F_array_length_printf_s F_string_format_integer_s - #define F_array_length_short_printf_s F_string_format_short_integer_s - #define F_array_length_long_printf_s F_string_format_long_integer_s - - #define F_array_length_printf_s_length F_string_format_integer_s_length - #define F_array_length_short_printf_s_length F_string_format_short_integer_s_length - #define F_array_length_long_printf_s_length F_string_format_long_integer_s_length -#endif // _di_f_array_length_printf_ - -/** - * Provide a set of ASCII strings. - * - * This is not intended to be exhaustive or language-specific. - * Instead, this is for very common uses such as converting a hex-digit string into a number. - * These are standardized not be the language, per-say, but instead by the specific standard (such as hexidecimal). - * - * The NULL ASCII string can be represented by the integer 0; however, given that these are all NULL-terminated strings the NULL character is represented with a NULL termination as well. - * The NULL ASCII string therefore has two NULLs, first the NULL represents the NULL and the second represents the NULL termination. - * - * @todo provide extended ASCII-characters. - */ -#ifndef _di_string_ascii_s_ - #define F_string_ascii_0_s "0" - #define F_string_ascii_1_s "1" - #define F_string_ascii_2_s "2" - #define F_string_ascii_3_s "3" - #define F_string_ascii_4_s "4" - #define F_string_ascii_5_s "5" - #define F_string_ascii_6_s "6" - #define F_string_ascii_7_s "7" - #define F_string_ascii_8_s "8" - #define F_string_ascii_9_s "9" - - #define F_string_ascii_a_s "a" - #define F_string_ascii_b_s "b" - #define F_string_ascii_c_s "c" - #define F_string_ascii_d_s "d" - #define F_string_ascii_e_s "e" - #define F_string_ascii_f_s "f" - #define F_string_ascii_g_s "g" - #define F_string_ascii_h_s "h" - #define F_string_ascii_i_s "i" - #define F_string_ascii_j_s "j" - #define F_string_ascii_k_s "k" - #define F_string_ascii_l_s "l" - #define F_string_ascii_m_s "m" - #define F_string_ascii_n_s "n" - #define F_string_ascii_o_s "o" - #define F_string_ascii_p_s "p" - #define F_string_ascii_q_s "q" - #define F_string_ascii_r_s "r" - #define F_string_ascii_s_s "s" - #define F_string_ascii_t_s "t" - #define F_string_ascii_u_s "u" - #define F_string_ascii_v_s "v" - #define F_string_ascii_w_s "w" - #define F_string_ascii_x_s "x" - #define F_string_ascii_y_s "y" - #define F_string_ascii_z_s "z" - - #define F_string_ascii_A_s "A" - #define F_string_ascii_B_s "B" - #define F_string_ascii_C_s "C" - #define F_string_ascii_D_s "D" - #define F_string_ascii_E_s "E" - #define F_string_ascii_F_s "F" - #define F_string_ascii_G_s "G" - #define F_string_ascii_H_s "H" - #define F_string_ascii_I_s "I" - #define F_string_ascii_J_s "J" - #define F_string_ascii_K_s "K" - #define F_string_ascii_L_s "L" - #define F_string_ascii_M_s "M" - #define F_string_ascii_N_s "N" - #define F_string_ascii_O_s "O" - #define F_string_ascii_P_s "P" - #define F_string_ascii_Q_s "Q" - #define F_string_ascii_R_s "R" - #define F_string_ascii_S_s "S" - #define F_string_ascii_T_s "T" - #define F_string_ascii_U_s "U" - #define F_string_ascii_V_s "V" - #define F_string_ascii_W_s "W" - #define F_string_ascii_X_s "X" - #define F_string_ascii_Y_s "Y" - #define F_string_ascii_Z_s "Z" - - #define F_string_ascii_ampersand_s "&" - #define F_string_ascii_asterisk_s "*" - #define F_string_ascii_brace_close_s "}" - #define F_string_ascii_brace_open_s "{" - #define F_string_ascii_bracket_close_s "]" - #define F_string_ascii_bracket_open_s "[" - #define F_string_ascii_caret_s "^" - #define F_string_ascii_comma_s "," - #define F_string_ascii_colon_s ":" - #define F_string_ascii_colon_semi_s ";" - #define F_string_ascii_dollar_s "$" - #define F_string_ascii_equal_s "=" - #define F_string_ascii_exclamation_s "!" - #define F_string_ascii_grave_s "`" - #define F_string_ascii_mark_question_s "?" - #define F_string_ascii_minus_s "-" - #define F_string_ascii_parenthesis_open_s "(" - #define F_string_ascii_parenthesis_close_s ")" - #define F_string_ascii_percent_s "%" - #define F_string_ascii_period_s "." - #define F_string_ascii_pipe_s "|" - #define F_string_ascii_plus_s "+" - #define F_string_ascii_pound_s "#" - #define F_string_ascii_quote_double_s "\"" - #define F_string_ascii_quote_single_s "'" - #define F_string_ascii_sign_at_s "@" - #define F_string_ascii_sign_greater_than_s ">" - #define F_string_ascii_sign_less_than_s "<" - #define F_string_ascii_slash_forward_s "/" - #define F_string_ascii_slash_backward_s "\\" - #define F_string_ascii_tilde_s "~" - #define F_string_ascii_underscore_s "_" - - #define F_string_ascii_acknowledge_s "" - #define F_string_ascii_acknowledge_negative_s "" - #define F_string_ascii_bell_s "" - #define F_string_ascii_cancel_s "" - #define F_string_ascii_data_link_escape_s "" - #define F_string_ascii_device_control_one_s "" - #define F_string_ascii_device_control_two_s "" - #define F_string_ascii_device_control_three_s "" - #define F_string_ascii_device_control_four_s "" - #define F_string_ascii_enquiry_s "" - #define F_string_ascii_escape_s "" - #define F_string_ascii_feed_form_s "\f" - #define F_string_ascii_feed_line_s "\n" - #define F_string_ascii_header_start_s "" - #define F_string_ascii_medium_stop_s "" - #define F_string_ascii_null_s "\0" - #define F_string_ascii_return_carriage_s "\r" - #define F_string_ascii_separator_file_s "" - #define F_string_ascii_separator_group_s "" - #define F_string_ascii_separator_record_s "" - #define F_string_ascii_separator_unit_s "" - #define F_string_ascii_shift_in_s "" - #define F_string_ascii_shift_out_s "" - #define F_string_ascii_space_s " " - #define F_string_ascii_space_back_s "" - #define F_string_ascii_substitute_s "" - #define F_string_ascii_synchronous_idle_s "" - #define F_string_ascii_tab_horizontal_s "\t" - #define F_string_ascii_tab_vertical_s "\v" - #define F_string_ascii_text_start_s "" - #define F_string_ascii_text_stop_s "" - #define F_string_ascii_transmission_stop_s "" - #define F_string_ascii_transmission_block_end_s "" - - #define F_string_ascii_0_s_length 1 - #define F_string_ascii_1_s_length 1 - #define F_string_ascii_2_s_length 1 - #define F_string_ascii_3_s_length 1 - #define F_string_ascii_4_s_length 1 - #define F_string_ascii_5_s_length 1 - #define F_string_ascii_6_s_length 1 - #define F_string_ascii_7_s_length 1 - #define F_string_ascii_8_s_length 1 - #define F_string_ascii_9_s_length 1 - - #define F_string_ascii_a_s_length 1 - #define F_string_ascii_b_s_length 1 - #define F_string_ascii_c_s_length 1 - #define F_string_ascii_d_s_length 1 - #define F_string_ascii_e_s_length 1 - #define F_string_ascii_f_s_length 1 - #define F_string_ascii_g_s_length 1 - #define F_string_ascii_h_s_length 1 - #define F_string_ascii_i_s_length 1 - #define F_string_ascii_j_s_length 1 - #define F_string_ascii_k_s_length 1 - #define F_string_ascii_l_s_length 1 - #define F_string_ascii_m_s_length 1 - #define F_string_ascii_n_s_length 1 - #define F_string_ascii_o_s_length 1 - #define F_string_ascii_p_s_length 1 - #define F_string_ascii_q_s_length 1 - #define F_string_ascii_r_s_length 1 - #define F_string_ascii_s_s_length 1 - #define F_string_ascii_t_s_length 1 - #define F_string_ascii_u_s_length 1 - #define F_string_ascii_v_s_length 1 - #define F_string_ascii_w_s_length 1 - #define F_string_ascii_x_s_length 1 - #define F_string_ascii_y_s_length 1 - #define F_string_ascii_z_s_length 1 - - #define F_string_ascii_A_s_length 1 - #define F_string_ascii_B_s_length 1 - #define F_string_ascii_C_s_length 1 - #define F_string_ascii_D_s_length 1 - #define F_string_ascii_E_s_length 1 - #define F_string_ascii_F_s_length 1 - #define F_string_ascii_G_s_length 1 - #define F_string_ascii_H_s_length 1 - #define F_string_ascii_I_s_length 1 - #define F_string_ascii_J_s_length 1 - #define F_string_ascii_K_s_length 1 - #define F_string_ascii_L_s_length 1 - #define F_string_ascii_M_s_length 1 - #define F_string_ascii_N_s_length 1 - #define F_string_ascii_O_s_length 1 - #define F_string_ascii_P_s_length 1 - #define F_string_ascii_Q_s_length 1 - #define F_string_ascii_R_s_length 1 - #define F_string_ascii_S_s_length 1 - #define F_string_ascii_T_s_length 1 - #define F_string_ascii_U_s_length 1 - #define F_string_ascii_V_s_length 1 - #define F_string_ascii_W_s_length 1 - #define F_string_ascii_X_s_length 1 - #define F_string_ascii_Y_s_length 1 - #define F_string_ascii_Z_s_length 1 - - #define F_string_ascii_ampersand_s_length 1 - #define F_string_ascii_asterisk_s_length 1 - #define F_string_ascii_brace_close_s_length 1 - #define F_string_ascii_brace_open_s_length 1 - #define F_string_ascii_bracket_close_s_length 1 - #define F_string_ascii_bracket_open_s_length 1 - #define F_string_ascii_caret_s_length 1 - #define F_string_ascii_comma_s_length 1 - #define F_string_ascii_colon_s_length 1 - #define F_string_ascii_colon_semi_s_length 1 - #define F_string_ascii_dollar_s_length 1 - #define F_string_ascii_equal_s_length 1 - #define F_string_ascii_exclamation_s_length 1 - #define F_string_ascii_grave_s_length 1 - #define F_string_ascii_mark_question_s_length 1 - #define F_string_ascii_minus_s_length 1 - #define F_string_ascii_parenthesis_open_s_length 1 - #define F_string_ascii_parenthesis_close_s_length 1 - #define F_string_ascii_percent_s_length 1 - #define F_string_ascii_period_s_length 1 - #define F_string_ascii_pipe_s_length 1 - #define F_string_ascii_plus_s_length 1 - #define F_string_ascii_pound_s_length 1 - #define F_string_ascii_quote_double_s_length 1 - #define F_string_ascii_quote_single_s_length 1 - #define F_string_ascii_sign_at_s_length 1 - #define F_string_ascii_sign_greater_than_s_length 1 - #define F_string_ascii_sign_less_than_s_length 1 - #define F_string_ascii_slash_forward_s_length 1 - #define F_string_ascii_slash_backward_s_length 1 - #define F_string_ascii_tilde_s_length 1 - #define F_string_ascii_underscore_s_length 1 - - #define F_string_ascii_acknowledge_s_length 1 - #define F_string_ascii_acknowledge_negative_s_length 1 - #define F_string_ascii_bell_s_length 1 - #define F_string_ascii_cancel_s_length 1 - #define F_string_ascii_data_link_escape_s_length 1 - #define F_string_ascii_device_control_one_s_length 1 - #define F_string_ascii_device_control_two_s_length 1 - #define F_string_ascii_device_control_three_s_length 1 - #define F_string_ascii_device_control_four_s_length 1 - #define F_string_ascii_enquiry_s_length 1 - #define F_string_ascii_escape_s_length 1 - #define F_string_ascii_feed_form_s_length 1 - #define F_string_ascii_feed_line_s_length 1 - #define F_string_ascii_header_start_s_length 1 - #define F_string_ascii_medium_stop_s_length 1 - #define F_string_ascii_null_s_length 1 - #define F_string_ascii_return_carriage_s_length 1 - #define F_string_ascii_separator_file_s_length 1 - #define F_string_ascii_separator_group_s_length 1 - #define F_string_ascii_separator_record_s_length 1 - #define F_string_ascii_separator_unit_s_length 1 - #define F_string_ascii_shift_in_s_length 1 - #define F_string_ascii_shift_out_s_length 1 - #define F_string_ascii_space_s_length 1 - #define F_string_ascii_space_back_s_length 1 - #define F_string_ascii_substitute_s_length 1 - #define F_string_ascii_synchronous_idle_s_length 1 - #define F_string_ascii_tab_horizontal_s_length 1 - #define F_string_ascii_tab_vertical_s_length 1 - #define F_string_ascii_text_start_s_length 1 - #define F_string_ascii_text_stop_s_length 1 - #define F_string_ascii_transmission_stop_s_length 1 - #define F_string_ascii_transmission_block_end_s_length 1 - - extern const f_string_t f_string_ascii_0_s; - extern const f_string_t f_string_ascii_1_s; - extern const f_string_t f_string_ascii_2_s; - extern const f_string_t f_string_ascii_3_s; - extern const f_string_t f_string_ascii_4_s; - extern const f_string_t f_string_ascii_5_s; - extern const f_string_t f_string_ascii_6_s; - extern const f_string_t f_string_ascii_7_s; - extern const f_string_t f_string_ascii_8_s; - extern const f_string_t f_string_ascii_9_s; - - extern const f_string_t f_string_ascii_a_s; - extern const f_string_t f_string_ascii_b_s; - extern const f_string_t f_string_ascii_c_s; - extern const f_string_t f_string_ascii_d_s; - extern const f_string_t f_string_ascii_e_s; - extern const f_string_t f_string_ascii_f_s; - extern const f_string_t f_string_ascii_g_s; - extern const f_string_t f_string_ascii_h_s; - extern const f_string_t f_string_ascii_i_s; - extern const f_string_t f_string_ascii_j_s; - extern const f_string_t f_string_ascii_k_s; - extern const f_string_t f_string_ascii_l_s; - extern const f_string_t f_string_ascii_m_s; - extern const f_string_t f_string_ascii_n_s; - extern const f_string_t f_string_ascii_o_s; - extern const f_string_t f_string_ascii_p_s; - extern const f_string_t f_string_ascii_q_s; - extern const f_string_t f_string_ascii_r_s; - extern const f_string_t f_string_ascii_s_s; - extern const f_string_t f_string_ascii_t_s; - extern const f_string_t f_string_ascii_u_s; - extern const f_string_t f_string_ascii_v_s; - extern const f_string_t f_string_ascii_w_s; - extern const f_string_t f_string_ascii_x_s; - extern const f_string_t f_string_ascii_y_s; - extern const f_string_t f_string_ascii_z_s; - - extern const f_string_t f_string_ascii_A_s; - extern const f_string_t f_string_ascii_B_s; - extern const f_string_t f_string_ascii_C_s; - extern const f_string_t f_string_ascii_D_s; - extern const f_string_t f_string_ascii_E_s; - extern const f_string_t f_string_ascii_F_s; - extern const f_string_t f_string_ascii_G_s; - extern const f_string_t f_string_ascii_H_s; - extern const f_string_t f_string_ascii_I_s; - extern const f_string_t f_string_ascii_J_s; - extern const f_string_t f_string_ascii_K_s; - extern const f_string_t f_string_ascii_L_s; - extern const f_string_t f_string_ascii_M_s; - extern const f_string_t f_string_ascii_N_s; - extern const f_string_t f_string_ascii_O_s; - extern const f_string_t f_string_ascii_P_s; - extern const f_string_t f_string_ascii_Q_s; - extern const f_string_t f_string_ascii_R_s; - extern const f_string_t f_string_ascii_S_s; - extern const f_string_t f_string_ascii_T_s; - extern const f_string_t f_string_ascii_U_s; - extern const f_string_t f_string_ascii_V_s; - extern const f_string_t f_string_ascii_W_s; - extern const f_string_t f_string_ascii_X_s; - extern const f_string_t f_string_ascii_Y_s; - extern const f_string_t f_string_ascii_Z_s; - - extern const f_string_t f_string_ascii_ampersand_s; - extern const f_string_t f_string_ascii_asterisk_s; - extern const f_string_t f_string_ascii_brace_close_s; - extern const f_string_t f_string_ascii_brace_open_s; - extern const f_string_t f_string_ascii_bracket_close_s; - extern const f_string_t f_string_ascii_bracket_open_s; - extern const f_string_t f_string_ascii_caret_s; - extern const f_string_t f_string_ascii_comma_s; - extern const f_string_t f_string_ascii_colon_s; - extern const f_string_t f_string_ascii_colon_semi_s; - extern const f_string_t f_string_ascii_dollar_s; - extern const f_string_t f_string_ascii_equal_s; - extern const f_string_t f_string_ascii_exclamation_s; - extern const f_string_t f_string_ascii_grave_s; - extern const f_string_t f_string_ascii_mark_question_s; - extern const f_string_t f_string_ascii_minus_s; - extern const f_string_t f_string_ascii_parenthesis_open_s; - extern const f_string_t f_string_ascii_parenthesis_close_s; - extern const f_string_t f_string_ascii_percent_s; - extern const f_string_t f_string_ascii_period_s; - extern const f_string_t f_string_ascii_pipe_s; - extern const f_string_t f_string_ascii_plus_s; - extern const f_string_t f_string_ascii_pound_s; - extern const f_string_t f_string_ascii_quote_double_s; - extern const f_string_t f_string_ascii_quote_single_s; - extern const f_string_t f_string_ascii_sign_at_s; - extern const f_string_t f_string_ascii_sign_greater_than_s; - extern const f_string_t f_string_ascii_sign_less_than_s; - extern const f_string_t f_string_ascii_slash_forward_s; - extern const f_string_t f_string_ascii_slash_backward_s; - extern const f_string_t f_string_ascii_tilde_s; - extern const f_string_t f_string_ascii_underscore_s; - - extern const f_string_t f_string_ascii_acknowledge_s; - extern const f_string_t f_string_ascii_acknowledge_negative_s; - extern const f_string_t f_string_ascii_bell_s; - extern const f_string_t f_string_ascii_cancel_s; - extern const f_string_t f_string_ascii_data_link_escape_s; - extern const f_string_t f_string_ascii_device_control_one_s; - extern const f_string_t f_string_ascii_device_control_two_s; - extern const f_string_t f_string_ascii_device_control_three_s; - extern const f_string_t f_string_ascii_device_control_four_s; - extern const f_string_t f_string_ascii_enquiry_s; - extern const f_string_t f_string_ascii_escape_s; - extern const f_string_t f_string_ascii_feed_form_s; - extern const f_string_t f_string_ascii_feed_line_s; - extern const f_string_t f_string_ascii_header_start_s; - extern const f_string_t f_string_ascii_medium_stop_s; - extern const f_string_t f_string_ascii_null_s; - extern const f_string_t f_string_ascii_return_carriage_s; - extern const f_string_t f_string_ascii_separator_file_s; - extern const f_string_t f_string_ascii_separator_group_s; - extern const f_string_t f_string_ascii_separator_record_s; - extern const f_string_t f_string_ascii_separator_unit_s; - extern const f_string_t f_string_ascii_shift_in_s; - extern const f_string_t f_string_ascii_shift_out_s; - extern const f_string_t f_string_ascii_space_s; - extern const f_string_t f_string_ascii_space_back_s; - extern const f_string_t f_string_ascii_substitute_s; - extern const f_string_t f_string_ascii_synchronous_idle_s; - extern const f_string_t f_string_ascii_tab_horizontal_s; - extern const f_string_t f_string_ascii_tab_vertical_s; - extern const f_string_t f_string_ascii_text_start_s; - extern const f_string_t f_string_ascii_text_stop_s; - extern const f_string_t f_string_ascii_transmission_stop_s; - extern const f_string_t f_string_ascii_transmission_block_end_s; -#endif // _di_string_ascii_s_ - #ifdef __cplusplus } // extern "C" #endif diff --git a/level_0/f_string/c/string.c b/level_0/f_string/c/string.c index 744480b..b707135 100644 --- a/level_0/f_string/c/string.c +++ b/level_0/f_string/c/string.c @@ -319,7 +319,7 @@ extern "C" { return F_data_not_stop; } - while (string[range->start] != f_string_eol_s[0]) { + while (string[range->start] != f_string_eol_s.string[0]) { ++range->start; @@ -344,7 +344,7 @@ extern "C" { while (string[range->start] != seek_to) { - if (string[range->start] == f_string_eol_s[0]) { + if (string[range->start] == f_string_eol_s.string[0]) { return F_none_eol; } diff --git a/level_0/f_string/c/string_dynamic.c b/level_0/f_string/c/string_dynamic.c index 401de12..73f9193 100644 --- a/level_0/f_string/c/string_dynamic.c +++ b/level_0/f_string/c/string_dynamic.c @@ -5,9 +5,147 @@ extern "C" { #endif -#ifndef _di_f_string_static_empty_s_ - const f_string_static_t f_string_static_empty_s = macro_f_string_static_t_initialize("", 0); -#endif // _di_f_string_static_empty_s_ +#ifndef _di_f_string_empty_s_ + const f_string_static_t f_string_empty_s = macro_f_string_static_t_initialize2(F_string_empty_s, 0, F_string_empty_s_length); +#endif // _di_f_string_empty_s_ + +#ifndef _di_f_string_null_s_ + const f_string_static_t f_string_null_s = macro_f_string_static_t_initialize2(F_string_null_s, 0, F_string_null_s_length); +#endif // _di_f_string_null_s_ + +#ifndef _di_string_ascii_s_ + const f_string_static_t f_string_ascii_0_s = macro_f_string_static_t_initialize2(F_string_ascii_0_s, 0, F_string_ascii_0_s_length); + const f_string_static_t f_string_ascii_1_s = macro_f_string_static_t_initialize2(F_string_ascii_1_s, 0, F_string_ascii_1_s_length); + const f_string_static_t f_string_ascii_2_s = macro_f_string_static_t_initialize2(F_string_ascii_2_s, 0, F_string_ascii_2_s_length); + const f_string_static_t f_string_ascii_3_s = macro_f_string_static_t_initialize2(F_string_ascii_3_s, 0, F_string_ascii_3_s_length); + const f_string_static_t f_string_ascii_4_s = macro_f_string_static_t_initialize2(F_string_ascii_4_s, 0, F_string_ascii_4_s_length); + const f_string_static_t f_string_ascii_5_s = macro_f_string_static_t_initialize2(F_string_ascii_5_s, 0, F_string_ascii_5_s_length); + const f_string_static_t f_string_ascii_6_s = macro_f_string_static_t_initialize2(F_string_ascii_6_s, 0, F_string_ascii_6_s_length); + const f_string_static_t f_string_ascii_7_s = macro_f_string_static_t_initialize2(F_string_ascii_7_s, 0, F_string_ascii_7_s_length); + const f_string_static_t f_string_ascii_8_s = macro_f_string_static_t_initialize2(F_string_ascii_8_s, 0, F_string_ascii_8_s_length); + const f_string_static_t f_string_ascii_9_s = macro_f_string_static_t_initialize2(F_string_ascii_9_s, 0, F_string_ascii_9_s_length); + + const f_string_static_t f_string_ascii_a_s = macro_f_string_static_t_initialize2(F_string_ascii_a_s, 0, F_string_ascii_a_s_length); + const f_string_static_t f_string_ascii_b_s = macro_f_string_static_t_initialize2(F_string_ascii_b_s, 0, F_string_ascii_b_s_length); + const f_string_static_t f_string_ascii_c_s = macro_f_string_static_t_initialize2(F_string_ascii_c_s, 0, F_string_ascii_c_s_length); + const f_string_static_t f_string_ascii_d_s = macro_f_string_static_t_initialize2(F_string_ascii_d_s, 0, F_string_ascii_d_s_length); + const f_string_static_t f_string_ascii_e_s = macro_f_string_static_t_initialize2(F_string_ascii_e_s, 0, F_string_ascii_e_s_length); + const f_string_static_t f_string_ascii_f_s = macro_f_string_static_t_initialize2(F_string_ascii_f_s, 0, F_string_ascii_f_s_length); + const f_string_static_t f_string_ascii_g_s = macro_f_string_static_t_initialize2(F_string_ascii_g_s, 0, F_string_ascii_g_s_length); + const f_string_static_t f_string_ascii_h_s = macro_f_string_static_t_initialize2(F_string_ascii_h_s, 0, F_string_ascii_h_s_length); + const f_string_static_t f_string_ascii_i_s = macro_f_string_static_t_initialize2(F_string_ascii_i_s, 0, F_string_ascii_i_s_length); + const f_string_static_t f_string_ascii_j_s = macro_f_string_static_t_initialize2(F_string_ascii_j_s, 0, F_string_ascii_j_s_length); + const f_string_static_t f_string_ascii_k_s = macro_f_string_static_t_initialize2(F_string_ascii_k_s, 0, F_string_ascii_k_s_length); + const f_string_static_t f_string_ascii_l_s = macro_f_string_static_t_initialize2(F_string_ascii_l_s, 0, F_string_ascii_l_s_length); + const f_string_static_t f_string_ascii_m_s = macro_f_string_static_t_initialize2(F_string_ascii_m_s, 0, F_string_ascii_m_s_length); + const f_string_static_t f_string_ascii_n_s = macro_f_string_static_t_initialize2(F_string_ascii_n_s, 0, F_string_ascii_n_s_length); + const f_string_static_t f_string_ascii_o_s = macro_f_string_static_t_initialize2(F_string_ascii_o_s, 0, F_string_ascii_o_s_length); + const f_string_static_t f_string_ascii_p_s = macro_f_string_static_t_initialize2(F_string_ascii_p_s, 0, F_string_ascii_p_s_length); + const f_string_static_t f_string_ascii_q_s = macro_f_string_static_t_initialize2(F_string_ascii_q_s, 0, F_string_ascii_q_s_length); + const f_string_static_t f_string_ascii_r_s = macro_f_string_static_t_initialize2(F_string_ascii_r_s, 0, F_string_ascii_r_s_length); + const f_string_static_t f_string_ascii_s_s = macro_f_string_static_t_initialize2(F_string_ascii_s_s, 0, F_string_ascii_s_s_length); + const f_string_static_t f_string_ascii_t_s = macro_f_string_static_t_initialize2(F_string_ascii_t_s, 0, F_string_ascii_t_s_length); + const f_string_static_t f_string_ascii_u_s = macro_f_string_static_t_initialize2(F_string_ascii_u_s, 0, F_string_ascii_u_s_length); + const f_string_static_t f_string_ascii_v_s = macro_f_string_static_t_initialize2(F_string_ascii_v_s, 0, F_string_ascii_v_s_length); + const f_string_static_t f_string_ascii_w_s = macro_f_string_static_t_initialize2(F_string_ascii_w_s, 0, F_string_ascii_w_s_length); + const f_string_static_t f_string_ascii_x_s = macro_f_string_static_t_initialize2(F_string_ascii_x_s, 0, F_string_ascii_x_s_length); + const f_string_static_t f_string_ascii_y_s = macro_f_string_static_t_initialize2(F_string_ascii_y_s, 0, F_string_ascii_y_s_length); + const f_string_static_t f_string_ascii_z_s = macro_f_string_static_t_initialize2(F_string_ascii_z_s, 0, F_string_ascii_z_s_length); + + const f_string_static_t f_string_ascii_A_s = macro_f_string_static_t_initialize2(F_string_ascii_A_s, 0, F_string_ascii_A_s_length); + const f_string_static_t f_string_ascii_B_s = macro_f_string_static_t_initialize2(F_string_ascii_B_s, 0, F_string_ascii_B_s_length); + const f_string_static_t f_string_ascii_C_s = macro_f_string_static_t_initialize2(F_string_ascii_C_s, 0, F_string_ascii_C_s_length); + const f_string_static_t f_string_ascii_D_s = macro_f_string_static_t_initialize2(F_string_ascii_D_s, 0, F_string_ascii_D_s_length); + const f_string_static_t f_string_ascii_E_s = macro_f_string_static_t_initialize2(F_string_ascii_E_s, 0, F_string_ascii_E_s_length); + const f_string_static_t f_string_ascii_F_s = macro_f_string_static_t_initialize2(F_string_ascii_F_s, 0, F_string_ascii_F_s_length); + const f_string_static_t f_string_ascii_G_s = macro_f_string_static_t_initialize2(F_string_ascii_G_s, 0, F_string_ascii_G_s_length); + const f_string_static_t f_string_ascii_H_s = macro_f_string_static_t_initialize2(F_string_ascii_H_s, 0, F_string_ascii_H_s_length); + const f_string_static_t f_string_ascii_I_s = macro_f_string_static_t_initialize2(F_string_ascii_I_s, 0, F_string_ascii_I_s_length); + const f_string_static_t f_string_ascii_J_s = macro_f_string_static_t_initialize2(F_string_ascii_J_s, 0, F_string_ascii_J_s_length); + const f_string_static_t f_string_ascii_K_s = macro_f_string_static_t_initialize2(F_string_ascii_K_s, 0, F_string_ascii_K_s_length); + const f_string_static_t f_string_ascii_L_s = macro_f_string_static_t_initialize2(F_string_ascii_L_s, 0, F_string_ascii_L_s_length); + const f_string_static_t f_string_ascii_M_s = macro_f_string_static_t_initialize2(F_string_ascii_M_s, 0, F_string_ascii_M_s_length); + const f_string_static_t f_string_ascii_N_s = macro_f_string_static_t_initialize2(F_string_ascii_N_s, 0, F_string_ascii_N_s_length); + const f_string_static_t f_string_ascii_O_s = macro_f_string_static_t_initialize2(F_string_ascii_O_s, 0, F_string_ascii_O_s_length); + const f_string_static_t f_string_ascii_P_s = macro_f_string_static_t_initialize2(F_string_ascii_P_s, 0, F_string_ascii_P_s_length); + const f_string_static_t f_string_ascii_Q_s = macro_f_string_static_t_initialize2(F_string_ascii_Q_s, 0, F_string_ascii_Q_s_length); + const f_string_static_t f_string_ascii_R_s = macro_f_string_static_t_initialize2(F_string_ascii_R_s, 0, F_string_ascii_R_s_length); + const f_string_static_t f_string_ascii_S_s = macro_f_string_static_t_initialize2(F_string_ascii_S_s, 0, F_string_ascii_S_s_length); + const f_string_static_t f_string_ascii_T_s = macro_f_string_static_t_initialize2(F_string_ascii_T_s, 0, F_string_ascii_T_s_length); + const f_string_static_t f_string_ascii_U_s = macro_f_string_static_t_initialize2(F_string_ascii_U_s, 0, F_string_ascii_U_s_length); + const f_string_static_t f_string_ascii_V_s = macro_f_string_static_t_initialize2(F_string_ascii_V_s, 0, F_string_ascii_V_s_length); + const f_string_static_t f_string_ascii_W_s = macro_f_string_static_t_initialize2(F_string_ascii_W_s, 0, F_string_ascii_W_s_length); + const f_string_static_t f_string_ascii_X_s = macro_f_string_static_t_initialize2(F_string_ascii_X_s, 0, F_string_ascii_X_s_length); + const f_string_static_t f_string_ascii_Y_s = macro_f_string_static_t_initialize2(F_string_ascii_Y_s, 0, F_string_ascii_Y_s_length); + const f_string_static_t f_string_ascii_Z_s = macro_f_string_static_t_initialize2(F_string_ascii_Z_s, 0, F_string_ascii_Z_s_length); + + const f_string_static_t f_string_ascii_ampersand_s = macro_f_string_static_t_initialize2(F_string_ascii_ampersand_s, 0, F_string_ascii_ampersand_s_length); + const f_string_static_t f_string_ascii_asterisk_s = macro_f_string_static_t_initialize2(F_string_ascii_asterisk_s, 0, F_string_ascii_asterisk_s_length); + const f_string_static_t f_string_ascii_brace_close_s = macro_f_string_static_t_initialize2(F_string_ascii_brace_close_s, 0, F_string_ascii_brace_close_s_length); + const f_string_static_t f_string_ascii_brace_open_s = macro_f_string_static_t_initialize2(F_string_ascii_brace_open_s, 0, F_string_ascii_brace_open_s_length); + const f_string_static_t f_string_ascii_bracket_close_s = macro_f_string_static_t_initialize2(F_string_ascii_bracket_close_s, 0, F_string_ascii_bracket_close_s_length); + const f_string_static_t f_string_ascii_bracket_open_s = macro_f_string_static_t_initialize2(F_string_ascii_bracket_open_s, 0, F_string_ascii_bracket_open_s_length); + const f_string_static_t f_string_ascii_caret_s = macro_f_string_static_t_initialize2(F_string_ascii_caret_s, 0, F_string_ascii_caret_s_length); + const f_string_static_t f_string_ascii_comma_s = macro_f_string_static_t_initialize2(F_string_ascii_comma_s, 0, F_string_ascii_comma_s_length); + const f_string_static_t f_string_ascii_colon_s = macro_f_string_static_t_initialize2(F_string_ascii_colon_s, 0, F_string_ascii_colon_s_length); + const f_string_static_t f_string_ascii_colon_semi_s = macro_f_string_static_t_initialize2(F_string_ascii_colon_semi_s, 0, F_string_ascii_colon_semi_s_length); + const f_string_static_t f_string_ascii_dollar_s = macro_f_string_static_t_initialize2(F_string_ascii_dollar_s, 0, F_string_ascii_dollar_s_length); + const f_string_static_t f_string_ascii_equal_s = macro_f_string_static_t_initialize2(F_string_ascii_equal_s, 0, F_string_ascii_equal_s_length); + const f_string_static_t f_string_ascii_exclamation_s = macro_f_string_static_t_initialize2(F_string_ascii_exclamation_s, 0, F_string_ascii_exclamation_s_length); + const f_string_static_t f_string_ascii_grave_s = macro_f_string_static_t_initialize2(F_string_ascii_grave_s, 0, F_string_ascii_grave_s_length); + const f_string_static_t f_string_ascii_mark_question_s = macro_f_string_static_t_initialize2(F_string_ascii_mark_question_s, 0, F_string_ascii_mark_question_s_length); + const f_string_static_t f_string_ascii_minus_s = macro_f_string_static_t_initialize2(F_string_ascii_minus_s, 0, F_string_ascii_minus_s_length); + const f_string_static_t f_string_ascii_parenthesis_open_s = macro_f_string_static_t_initialize2(F_string_ascii_parenthesis_open_s, 0, F_string_ascii_parenthesis_open_s_length); + const f_string_static_t f_string_ascii_parenthesis_close_s = macro_f_string_static_t_initialize2(F_string_ascii_parenthesis_close_s, 0, F_string_ascii_parenthesis_close_s_length); + const f_string_static_t f_string_ascii_percent_s = macro_f_string_static_t_initialize2(F_string_ascii_percent_s, 0, F_string_ascii_percent_s_length); + const f_string_static_t f_string_ascii_period_s = macro_f_string_static_t_initialize2(F_string_ascii_period_s, 0, F_string_ascii_period_s_length); + const f_string_static_t f_string_ascii_pipe_s = macro_f_string_static_t_initialize2(F_string_ascii_pipe_s, 0, F_string_ascii_pipe_s_length); + const f_string_static_t f_string_ascii_plus_s = macro_f_string_static_t_initialize2(F_string_ascii_plus_s, 0, F_string_ascii_plus_s_length); + const f_string_static_t f_string_ascii_pound_s = macro_f_string_static_t_initialize2(F_string_ascii_pound_s, 0, F_string_ascii_pound_s_length); + const f_string_static_t f_string_ascii_quote_double_s = macro_f_string_static_t_initialize2(F_string_ascii_quote_double_s, 0, F_string_ascii_quote_double_s_length); + const f_string_static_t f_string_ascii_quote_single_s = macro_f_string_static_t_initialize2(F_string_ascii_quote_single_s, 0, F_string_ascii_quote_single_s_length); + const f_string_static_t f_string_ascii_sign_at_s = macro_f_string_static_t_initialize2(F_string_ascii_sign_at_s, 0, F_string_ascii_sign_at_s_length); + const f_string_static_t f_string_ascii_sign_greater_than_s = macro_f_string_static_t_initialize2(F_string_ascii_sign_greater_than_s, 0, F_string_ascii_sign_greater_than_s_length); + const f_string_static_t f_string_ascii_sign_less_than_s = macro_f_string_static_t_initialize2(F_string_ascii_sign_less_than_s, 0, F_string_ascii_sign_less_than_s_length); + const f_string_static_t f_string_ascii_slash_forward_s = macro_f_string_static_t_initialize2(F_string_ascii_slash_forward_s, 0, F_string_ascii_slash_forward_s_length); + const f_string_static_t f_string_ascii_slash_backward_s = macro_f_string_static_t_initialize2(F_string_ascii_slash_backward_s, 0, F_string_ascii_slash_backward_s_length); + const f_string_static_t f_string_ascii_tilde_s = macro_f_string_static_t_initialize2(F_string_ascii_tilde_s, 0, F_string_ascii_tilde_s_length); + const f_string_static_t f_string_ascii_underscore_s = macro_f_string_static_t_initialize2(F_string_ascii_underscore_s, 0, F_string_ascii_underscore_s_length); + + const f_string_static_t f_string_ascii_acknowledge_s = macro_f_string_static_t_initialize2(F_string_ascii_acknowledge_s, 0, F_string_ascii_acknowledge_s_length); + const f_string_static_t f_string_ascii_acknowledge_negative_s = macro_f_string_static_t_initialize2(F_string_ascii_acknowledge_negative_s, 0, F_string_ascii_acknowledge_negative_s_length); + const f_string_static_t f_string_ascii_bell_s = macro_f_string_static_t_initialize2(F_string_ascii_bell_s, 0, F_string_ascii_bell_s_length); + const f_string_static_t f_string_ascii_cancel_s = macro_f_string_static_t_initialize2(F_string_ascii_cancel_s, 0, F_string_ascii_cancel_s_length); + const f_string_static_t f_string_ascii_data_link_escape_s = macro_f_string_static_t_initialize2(F_string_ascii_data_link_escape_s, 0, F_string_ascii_data_link_escape_s_length); + const f_string_static_t f_string_ascii_device_control_one_s = macro_f_string_static_t_initialize2(F_string_ascii_device_control_one_s, 0, F_string_ascii_device_control_one_s_length); + const f_string_static_t f_string_ascii_device_control_two_s = macro_f_string_static_t_initialize2(F_string_ascii_device_control_two_s, 0, F_string_ascii_device_control_two_s_length); + const f_string_static_t f_string_ascii_device_control_three_s = macro_f_string_static_t_initialize2(F_string_ascii_device_control_three_s, 0, F_string_ascii_device_control_three_s_length); + const f_string_static_t f_string_ascii_device_control_four_s = macro_f_string_static_t_initialize2(F_string_ascii_device_control_four_s, 0, F_string_ascii_device_control_four_s_length); + const f_string_static_t f_string_ascii_enquiry_s = macro_f_string_static_t_initialize2(F_string_ascii_enquiry_s, 0, F_string_ascii_enquiry_s_length); + const f_string_static_t f_string_ascii_escape_s = macro_f_string_static_t_initialize2(F_string_ascii_escape_s, 0, F_string_ascii_escape_s_length); + const f_string_static_t f_string_ascii_feed_form_s = macro_f_string_static_t_initialize2(F_string_ascii_feed_form_s, 0, F_string_ascii_feed_form_s_length); + const f_string_static_t f_string_ascii_feed_line_s = macro_f_string_static_t_initialize2(F_string_ascii_feed_line_s, 0, F_string_ascii_feed_line_s_length); + const f_string_static_t f_string_ascii_header_start_s = macro_f_string_static_t_initialize2(F_string_ascii_header_start_s, 0, F_string_ascii_header_start_s_length); + const f_string_static_t f_string_ascii_medium_stop_s = macro_f_string_static_t_initialize2(F_string_ascii_medium_stop_s, 0, F_string_ascii_medium_stop_s_length); + const f_string_static_t f_string_ascii_null_s = macro_f_string_static_t_initialize2(F_string_ascii_null_s, 0, F_string_ascii_null_s_length); + const f_string_static_t f_string_ascii_return_carriage_s = macro_f_string_static_t_initialize2(F_string_ascii_return_carriage_s, 0, F_string_ascii_return_carriage_s_length); + const f_string_static_t f_string_ascii_separator_file_s = macro_f_string_static_t_initialize2(F_string_ascii_separator_file_s, 0, F_string_ascii_separator_file_s_length); + const f_string_static_t f_string_ascii_separator_group_s = macro_f_string_static_t_initialize2(F_string_ascii_separator_group_s, 0, F_string_ascii_separator_group_s_length); + const f_string_static_t f_string_ascii_separator_record_s = macro_f_string_static_t_initialize2(F_string_ascii_separator_record_s, 0, F_string_ascii_separator_record_s_length); + const f_string_static_t f_string_ascii_separator_unit_s = macro_f_string_static_t_initialize2(F_string_ascii_separator_unit_s, 0, F_string_ascii_separator_unit_s_length); + const f_string_static_t f_string_ascii_shift_in_s = macro_f_string_static_t_initialize2(F_string_ascii_shift_in_s, 0, F_string_ascii_shift_in_s_length); + const f_string_static_t f_string_ascii_shift_out_s = macro_f_string_static_t_initialize2(F_string_ascii_shift_out_s, 0, F_string_ascii_shift_out_s_length); + const f_string_static_t f_string_ascii_space_s = macro_f_string_static_t_initialize2(F_string_ascii_space_s, 0, F_string_ascii_space_s_length); + const f_string_static_t f_string_ascii_space_back_s = macro_f_string_static_t_initialize2(F_string_ascii_space_back_s, 0, F_string_ascii_space_back_s_length); + const f_string_static_t f_string_ascii_substitute_s = macro_f_string_static_t_initialize2(F_string_ascii_substitute_s, 0, F_string_ascii_substitute_s_length); + const f_string_static_t f_string_ascii_synchronous_idle_s = macro_f_string_static_t_initialize2(F_string_ascii_synchronous_idle_s, 0, F_string_ascii_synchronous_idle_s_length); + const f_string_static_t f_string_ascii_tab_horizontal_s = macro_f_string_static_t_initialize2(F_string_ascii_tab_horizontal_s, 0, F_string_ascii_tab_horizontal_s_length); + const f_string_static_t f_string_ascii_tab_vertical_s = macro_f_string_static_t_initialize2(F_string_ascii_tab_vertical_s, 0, F_string_ascii_tab_vertical_s_length); + const f_string_static_t f_string_ascii_text_start_s = macro_f_string_static_t_initialize2(F_string_ascii_text_start_s, 0, F_string_ascii_text_start_s_length); + const f_string_static_t f_string_ascii_text_stop_s = macro_f_string_static_t_initialize2(F_string_ascii_text_stop_s, 0, F_string_ascii_text_stop_s_length); + const f_string_static_t f_string_ascii_transmission_stop_s = macro_f_string_static_t_initialize2(F_string_ascii_transmission_stop_s, 0, F_string_ascii_transmission_stop_s_length); + const f_string_static_t f_string_ascii_transmission_block_end_s = macro_f_string_static_t_initialize2(F_string_ascii_transmission_block_end_s, 0, F_string_ascii_transmission_block_end_s_length); +#endif // _di_string_ascii_s_ #ifndef _di_f_string_dynamic_adjust_ f_status_t f_string_dynamic_adjust(const f_array_length_t length, f_string_dynamic_t *dynamic) { @@ -199,7 +337,7 @@ extern "C" { #endif // _di_f_string_dynamic_increase_by_ #ifndef _di_f_string_dynamic_mash_ - f_status_t f_string_dynamic_mash(const f_string_t glue, const f_array_length_t glue_length, const f_string_static_t source, f_string_dynamic_t *destination) { + f_status_t f_string_dynamic_mash(const f_string_static_t glue, const f_string_static_t source, f_string_dynamic_t *destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -208,8 +346,8 @@ extern "C" { return F_data_not_eos; } - if (glue_length && destination->used) { - const f_status_t status = private_f_string_append(glue, glue_length, destination); + if (glue.used && destination->used) { + const f_status_t status = private_f_string_append(glue.string, glue.used, destination); if (F_status_is_error(status)) return status; } @@ -218,7 +356,7 @@ extern "C" { #endif // _di_f_string_dynamic_mash_ #ifndef _di_f_string_dynamic_mash_nulless_ - f_status_t f_string_dynamic_mash_nulless(const f_string_t glue, const f_array_length_t glue_length, const f_string_static_t source, f_string_dynamic_t *destination) { + f_status_t f_string_dynamic_mash_nulless(const f_string_static_t glue, const f_string_static_t source, f_string_dynamic_t *destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -227,8 +365,8 @@ extern "C" { return F_data_not_eos; } - if (glue_length && destination->used) { - const f_status_t status = private_f_string_append_nulless(glue, glue_length, destination); + if (glue.used && destination->used) { + const f_status_t status = private_f_string_append_nulless(glue.string, glue.used, destination); if (F_status_is_error(status)) return status; } @@ -237,7 +375,7 @@ extern "C" { #endif // _di_f_string_dynamic_mash_nulless_ #ifndef _di_f_string_dynamic_mish_ - f_status_t f_string_dynamic_mish(const f_string_t glue, const f_array_length_t glue_length, const f_string_static_t source, f_string_dynamic_t *destination) { + f_status_t f_string_dynamic_mish(const f_string_static_t glue, const f_string_static_t source, f_string_dynamic_t *destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -246,8 +384,8 @@ extern "C" { return F_data_not_eos; } - if (glue_length && destination->used) { - const f_status_t status = private_f_string_prepend(glue, glue_length, destination); + if (glue.used && destination->used) { + const f_status_t status = private_f_string_prepend(glue.string, glue.used, destination); if (F_status_is_error(status)) return status; } @@ -256,7 +394,7 @@ extern "C" { #endif // _di_f_string_dynamic_mish_ #ifndef _di_f_string_dynamic_mish_nulless_ - f_status_t f_string_dynamic_mish_nulless(const f_string_t glue, const f_array_length_t glue_length, const f_string_static_t source, f_string_dynamic_t *destination) { + f_status_t f_string_dynamic_mish_nulless(const f_string_static_t glue, const f_string_static_t source, f_string_dynamic_t *destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -265,8 +403,8 @@ extern "C" { return F_data_not_eos; } - if (glue_length && destination->used) { - const f_status_t status = private_f_string_prepend_nulless(glue, glue_length, destination); + if (glue.used && destination->used) { + const f_status_t status = private_f_string_prepend_nulless(glue.string, glue.used, destination); if (F_status_is_error(status)) return status; } @@ -413,7 +551,7 @@ extern "C" { #endif // _di_f_string_dynamic_partial_append_nulless_ #ifndef _di_f_string_dynamic_partial_mash_ - f_status_t f_string_dynamic_partial_mash(const f_string_t glue, const f_array_length_t glue_length, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { + f_status_t f_string_dynamic_partial_mash(const f_string_static_t glue, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { #ifndef _di_level_0_parameter_checking_ if (source.used <= range.stop) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -427,8 +565,8 @@ extern "C" { return F_data_not_stop; } - if (glue_length && destination->used) { - f_status_t status = private_f_string_append(glue, glue_length, destination); + if (glue.used && destination->used) { + f_status_t status = private_f_string_append(glue.string, glue.used, destination); if (F_status_is_error(status)) return status; } @@ -437,7 +575,7 @@ extern "C" { #endif // _di_f_string_dynamic_partial_mash_ #ifndef _di_f_string_dynamic_partial_mash_nulless_ - f_status_t f_string_dynamic_partial_mash_nulless(const f_string_t glue, const f_array_length_t glue_length, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { + f_status_t f_string_dynamic_partial_mash_nulless(const f_string_static_t glue, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { #ifndef _di_level_0_parameter_checking_ if (source.used <= range.stop) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -451,8 +589,8 @@ extern "C" { return F_data_not_stop; } - if (glue_length && destination->used) { - f_status_t status = private_f_string_append_nulless(glue, glue_length, destination); + if (glue.used && destination->used) { + f_status_t status = private_f_string_append_nulless(glue.string, glue.used, destination); if (F_status_is_error(status)) return status; } @@ -461,7 +599,7 @@ extern "C" { #endif // _di_f_string_dynamic_partial_mash_nulless_ #ifndef _di_f_string_dynamic_partial_mish_ - f_status_t f_string_partial_dynamic_mish(const f_string_t glue, const f_array_length_t glue_length, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { + f_status_t f_string_partial_dynamic_mish(const f_string_static_t glue, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { #ifndef _di_level_0_parameter_checking_ if (source.used <= range.stop) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -475,8 +613,8 @@ extern "C" { return F_data_not_stop; } - if (glue_length && destination->used) { - f_status_t status = private_f_string_prepend(glue, glue_length, destination); + if (glue.used && destination->used) { + f_status_t status = private_f_string_prepend(glue.string, glue.used, destination); if (F_status_is_error(status)) return status; } @@ -485,7 +623,7 @@ extern "C" { #endif // _di_f_string_dynamic_partial_mish_ #ifndef _di_f_string_dynamic_partial_mish_nulless_ - f_status_t f_string_dynamic_partial_mish_nulless(const f_string_t glue, const f_array_length_t glue_length, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { + f_status_t f_string_dynamic_partial_mish_nulless(const f_string_static_t glue, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { #ifndef _di_level_0_parameter_checking_ if (source.used <= range.stop) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -499,8 +637,8 @@ extern "C" { return F_data_not_stop; } - if (glue_length && destination->used) { - f_status_t status = private_f_string_prepend_nulless(glue, glue_length, destination); + if (glue.used && destination->used) { + f_status_t status = private_f_string_prepend_nulless(glue.string, glue.used, destination); if (F_status_is_error(status)) return status; } @@ -777,7 +915,7 @@ extern "C" { if (!buffer.used) return F_data_not_eos; if (range->start > range->stop) return F_data_not_stop; - while (buffer.string[range->start] != f_string_eol_s[0]) { + while (buffer.string[range->start] != f_string_eol_s.string[0]) { ++range->start; @@ -800,7 +938,7 @@ extern "C" { while (buffer.string[range->start] != seek_to_this) { - if (buffer.string[range->start] == f_string_eol_s[0]) return F_none_eol; + if (buffer.string[range->start] == f_string_eol_s.string[0]) return F_none_eol; ++range->start; diff --git a/level_0/f_string/c/string_dynamic.h b/level_0/f_string/c/string_dynamic.h index db5ea51..d0543dc 100644 --- a/level_0/f_string/c/string_dynamic.h +++ b/level_0/f_string/c/string_dynamic.h @@ -130,9 +130,474 @@ extern "C" { #define macro_f_string_dynamics_t_decimate_by(status, dynamics, amount) status = f_string_dynamics_decimate_by(amount, &dynamics); #endif // _di_f_string_dynamics_t_ -#ifndef _di_f_string_static_empty_s_ - const extern f_string_static_t f_string_static_empty_s; -#endif // _di_f_string_static_empty_s_ +/** + * Provide a static empty string. + * + * This is intended to represent an empty string. + */ +#ifndef _di_f_string_empty_s_ + #define F_string_empty_s "" + #define F_string_empty_s_length 0 + + extern const f_string_static_t f_string_empty_s; +#endif // _di_f_string_empty_s_ + +/** + * Provide a static string focusing on the NULL character. + * + * This is different from f_string_empty_s in that it's used is set to 1 to represent the NULL character. + */ +#ifndef _di_f_string_null_s_ + #define F_string_null_s "" + #define F_string_null_s_length 1 + + extern const f_string_static_t f_string_null_s; +#endif // _di_f_string_null_s_ + +/** + * Provide a character to use as a placeholder within some string. + * + * This is generally the NULL character and should be effectively the same as f_string_null_s. + */ +#ifndef _di_f_string_placeholder_s_ + #define F_string_placeholder_s F_string_null_s + #define F_string_placeholder_s_length F_string_null_s_length + + #define f_string_placeholder_s f_string_null_s +#endif // _di_f_string_placeholder_s_ + +/** + * Provide a set of ASCII strings. + * + * This is not intended to be exhaustive or language-specific. + * Instead, this is for very common uses such as converting a hex-digit string into a number. + * These are standardized not be the language, per-say, but instead by the specific standard (such as hexidecimal). + * + * The NULL ASCII string can be represented by the integer 0; however, given that these are all NULL-terminated strings the NULL character is represented with a NULL termination as well. + * The NULL ASCII string therefore has two NULLs, first the NULL represents the NULL and the second represents the NULL termination. + * + * @todo provide extended ASCII-characters. + */ +#ifndef _di_string_ascii_s_ + #define F_string_ascii_0_s "0" + #define F_string_ascii_1_s "1" + #define F_string_ascii_2_s "2" + #define F_string_ascii_3_s "3" + #define F_string_ascii_4_s "4" + #define F_string_ascii_5_s "5" + #define F_string_ascii_6_s "6" + #define F_string_ascii_7_s "7" + #define F_string_ascii_8_s "8" + #define F_string_ascii_9_s "9" + + #define F_string_ascii_a_s "a" + #define F_string_ascii_b_s "b" + #define F_string_ascii_c_s "c" + #define F_string_ascii_d_s "d" + #define F_string_ascii_e_s "e" + #define F_string_ascii_f_s "f" + #define F_string_ascii_g_s "g" + #define F_string_ascii_h_s "h" + #define F_string_ascii_i_s "i" + #define F_string_ascii_j_s "j" + #define F_string_ascii_k_s "k" + #define F_string_ascii_l_s "l" + #define F_string_ascii_m_s "m" + #define F_string_ascii_n_s "n" + #define F_string_ascii_o_s "o" + #define F_string_ascii_p_s "p" + #define F_string_ascii_q_s "q" + #define F_string_ascii_r_s "r" + #define F_string_ascii_s_s "s" + #define F_string_ascii_t_s "t" + #define F_string_ascii_u_s "u" + #define F_string_ascii_v_s "v" + #define F_string_ascii_w_s "w" + #define F_string_ascii_x_s "x" + #define F_string_ascii_y_s "y" + #define F_string_ascii_z_s "z" + + #define F_string_ascii_A_s "A" + #define F_string_ascii_B_s "B" + #define F_string_ascii_C_s "C" + #define F_string_ascii_D_s "D" + #define F_string_ascii_E_s "E" + #define F_string_ascii_F_s "F" + #define F_string_ascii_G_s "G" + #define F_string_ascii_H_s "H" + #define F_string_ascii_I_s "I" + #define F_string_ascii_J_s "J" + #define F_string_ascii_K_s "K" + #define F_string_ascii_L_s "L" + #define F_string_ascii_M_s "M" + #define F_string_ascii_N_s "N" + #define F_string_ascii_O_s "O" + #define F_string_ascii_P_s "P" + #define F_string_ascii_Q_s "Q" + #define F_string_ascii_R_s "R" + #define F_string_ascii_S_s "S" + #define F_string_ascii_T_s "T" + #define F_string_ascii_U_s "U" + #define F_string_ascii_V_s "V" + #define F_string_ascii_W_s "W" + #define F_string_ascii_X_s "X" + #define F_string_ascii_Y_s "Y" + #define F_string_ascii_Z_s "Z" + + #define F_string_ascii_ampersand_s "&" + #define F_string_ascii_asterisk_s "*" + #define F_string_ascii_brace_close_s "}" + #define F_string_ascii_brace_open_s "{" + #define F_string_ascii_bracket_close_s "]" + #define F_string_ascii_bracket_open_s "[" + #define F_string_ascii_caret_s "^" + #define F_string_ascii_comma_s "," + #define F_string_ascii_colon_s ":" + #define F_string_ascii_colon_semi_s ";" + #define F_string_ascii_dollar_s "$" + #define F_string_ascii_equal_s "=" + #define F_string_ascii_exclamation_s "!" + #define F_string_ascii_grave_s "`" + #define F_string_ascii_mark_question_s "?" + #define F_string_ascii_minus_s "-" + #define F_string_ascii_parenthesis_open_s "(" + #define F_string_ascii_parenthesis_close_s ")" + #define F_string_ascii_percent_s "%" + #define F_string_ascii_period_s "." + #define F_string_ascii_pipe_s "|" + #define F_string_ascii_plus_s "+" + #define F_string_ascii_pound_s "#" + #define F_string_ascii_quote_double_s "\"" + #define F_string_ascii_quote_single_s "'" + #define F_string_ascii_sign_at_s "@" + #define F_string_ascii_sign_greater_than_s ">" + #define F_string_ascii_sign_less_than_s "<" + #define F_string_ascii_slash_forward_s "/" + #define F_string_ascii_slash_backward_s "\\" + #define F_string_ascii_tilde_s "~" + #define F_string_ascii_underscore_s "_" + + #define F_string_ascii_acknowledge_s "" + #define F_string_ascii_acknowledge_negative_s "" + #define F_string_ascii_bell_s "" + #define F_string_ascii_cancel_s "" + #define F_string_ascii_data_link_escape_s "" + #define F_string_ascii_device_control_one_s "" + #define F_string_ascii_device_control_two_s "" + #define F_string_ascii_device_control_three_s "" + #define F_string_ascii_device_control_four_s "" + #define F_string_ascii_enquiry_s "" + #define F_string_ascii_escape_s "" + #define F_string_ascii_feed_form_s "\f" + #define F_string_ascii_feed_line_s "\n" + #define F_string_ascii_header_start_s "" + #define F_string_ascii_medium_stop_s "" + #define F_string_ascii_null_s "\0" + #define F_string_ascii_return_carriage_s "\r" + #define F_string_ascii_separator_file_s "" + #define F_string_ascii_separator_group_s "" + #define F_string_ascii_separator_record_s "" + #define F_string_ascii_separator_unit_s "" + #define F_string_ascii_shift_in_s "" + #define F_string_ascii_shift_out_s "" + #define F_string_ascii_space_s " " + #define F_string_ascii_space_back_s "" + #define F_string_ascii_substitute_s "" + #define F_string_ascii_synchronous_idle_s "" + #define F_string_ascii_tab_horizontal_s "\t" + #define F_string_ascii_tab_vertical_s "\v" + #define F_string_ascii_text_start_s "" + #define F_string_ascii_text_stop_s "" + #define F_string_ascii_transmission_stop_s "" + #define F_string_ascii_transmission_block_end_s "" + + #define F_string_ascii_0_s_length 1 + #define F_string_ascii_1_s_length 1 + #define F_string_ascii_2_s_length 1 + #define F_string_ascii_3_s_length 1 + #define F_string_ascii_4_s_length 1 + #define F_string_ascii_5_s_length 1 + #define F_string_ascii_6_s_length 1 + #define F_string_ascii_7_s_length 1 + #define F_string_ascii_8_s_length 1 + #define F_string_ascii_9_s_length 1 + + #define F_string_ascii_a_s_length 1 + #define F_string_ascii_b_s_length 1 + #define F_string_ascii_c_s_length 1 + #define F_string_ascii_d_s_length 1 + #define F_string_ascii_e_s_length 1 + #define F_string_ascii_f_s_length 1 + #define F_string_ascii_g_s_length 1 + #define F_string_ascii_h_s_length 1 + #define F_string_ascii_i_s_length 1 + #define F_string_ascii_j_s_length 1 + #define F_string_ascii_k_s_length 1 + #define F_string_ascii_l_s_length 1 + #define F_string_ascii_m_s_length 1 + #define F_string_ascii_n_s_length 1 + #define F_string_ascii_o_s_length 1 + #define F_string_ascii_p_s_length 1 + #define F_string_ascii_q_s_length 1 + #define F_string_ascii_r_s_length 1 + #define F_string_ascii_s_s_length 1 + #define F_string_ascii_t_s_length 1 + #define F_string_ascii_u_s_length 1 + #define F_string_ascii_v_s_length 1 + #define F_string_ascii_w_s_length 1 + #define F_string_ascii_x_s_length 1 + #define F_string_ascii_y_s_length 1 + #define F_string_ascii_z_s_length 1 + + #define F_string_ascii_A_s_length 1 + #define F_string_ascii_B_s_length 1 + #define F_string_ascii_C_s_length 1 + #define F_string_ascii_D_s_length 1 + #define F_string_ascii_E_s_length 1 + #define F_string_ascii_F_s_length 1 + #define F_string_ascii_G_s_length 1 + #define F_string_ascii_H_s_length 1 + #define F_string_ascii_I_s_length 1 + #define F_string_ascii_J_s_length 1 + #define F_string_ascii_K_s_length 1 + #define F_string_ascii_L_s_length 1 + #define F_string_ascii_M_s_length 1 + #define F_string_ascii_N_s_length 1 + #define F_string_ascii_O_s_length 1 + #define F_string_ascii_P_s_length 1 + #define F_string_ascii_Q_s_length 1 + #define F_string_ascii_R_s_length 1 + #define F_string_ascii_S_s_length 1 + #define F_string_ascii_T_s_length 1 + #define F_string_ascii_U_s_length 1 + #define F_string_ascii_V_s_length 1 + #define F_string_ascii_W_s_length 1 + #define F_string_ascii_X_s_length 1 + #define F_string_ascii_Y_s_length 1 + #define F_string_ascii_Z_s_length 1 + + #define F_string_ascii_ampersand_s_length 1 + #define F_string_ascii_asterisk_s_length 1 + #define F_string_ascii_brace_close_s_length 1 + #define F_string_ascii_brace_open_s_length 1 + #define F_string_ascii_bracket_close_s_length 1 + #define F_string_ascii_bracket_open_s_length 1 + #define F_string_ascii_caret_s_length 1 + #define F_string_ascii_comma_s_length 1 + #define F_string_ascii_colon_s_length 1 + #define F_string_ascii_colon_semi_s_length 1 + #define F_string_ascii_dollar_s_length 1 + #define F_string_ascii_equal_s_length 1 + #define F_string_ascii_exclamation_s_length 1 + #define F_string_ascii_grave_s_length 1 + #define F_string_ascii_mark_question_s_length 1 + #define F_string_ascii_minus_s_length 1 + #define F_string_ascii_parenthesis_open_s_length 1 + #define F_string_ascii_parenthesis_close_s_length 1 + #define F_string_ascii_percent_s_length 1 + #define F_string_ascii_period_s_length 1 + #define F_string_ascii_pipe_s_length 1 + #define F_string_ascii_plus_s_length 1 + #define F_string_ascii_pound_s_length 1 + #define F_string_ascii_quote_double_s_length 1 + #define F_string_ascii_quote_single_s_length 1 + #define F_string_ascii_sign_at_s_length 1 + #define F_string_ascii_sign_greater_than_s_length 1 + #define F_string_ascii_sign_less_than_s_length 1 + #define F_string_ascii_slash_forward_s_length 1 + #define F_string_ascii_slash_backward_s_length 1 + #define F_string_ascii_tilde_s_length 1 + #define F_string_ascii_underscore_s_length 1 + + #define F_string_ascii_acknowledge_s_length 1 + #define F_string_ascii_acknowledge_negative_s_length 1 + #define F_string_ascii_bell_s_length 1 + #define F_string_ascii_cancel_s_length 1 + #define F_string_ascii_data_link_escape_s_length 1 + #define F_string_ascii_device_control_one_s_length 1 + #define F_string_ascii_device_control_two_s_length 1 + #define F_string_ascii_device_control_three_s_length 1 + #define F_string_ascii_device_control_four_s_length 1 + #define F_string_ascii_enquiry_s_length 1 + #define F_string_ascii_escape_s_length 1 + #define F_string_ascii_feed_form_s_length 1 + #define F_string_ascii_feed_line_s_length 1 + #define F_string_ascii_header_start_s_length 1 + #define F_string_ascii_medium_stop_s_length 1 + #define F_string_ascii_null_s_length 1 + #define F_string_ascii_return_carriage_s_length 1 + #define F_string_ascii_separator_file_s_length 1 + #define F_string_ascii_separator_group_s_length 1 + #define F_string_ascii_separator_record_s_length 1 + #define F_string_ascii_separator_unit_s_length 1 + #define F_string_ascii_shift_in_s_length 1 + #define F_string_ascii_shift_out_s_length 1 + #define F_string_ascii_space_s_length 1 + #define F_string_ascii_space_back_s_length 1 + #define F_string_ascii_substitute_s_length 1 + #define F_string_ascii_synchronous_idle_s_length 1 + #define F_string_ascii_tab_horizontal_s_length 1 + #define F_string_ascii_tab_vertical_s_length 1 + #define F_string_ascii_text_start_s_length 1 + #define F_string_ascii_text_stop_s_length 1 + #define F_string_ascii_transmission_stop_s_length 1 + #define F_string_ascii_transmission_block_end_s_length 1 + + extern const f_string_static_t f_string_ascii_0_s; + extern const f_string_static_t f_string_ascii_1_s; + extern const f_string_static_t f_string_ascii_2_s; + extern const f_string_static_t f_string_ascii_3_s; + extern const f_string_static_t f_string_ascii_4_s; + extern const f_string_static_t f_string_ascii_5_s; + extern const f_string_static_t f_string_ascii_6_s; + extern const f_string_static_t f_string_ascii_7_s; + extern const f_string_static_t f_string_ascii_8_s; + extern const f_string_static_t f_string_ascii_9_s; + + extern const f_string_static_t f_string_ascii_a_s; + extern const f_string_static_t f_string_ascii_b_s; + extern const f_string_static_t f_string_ascii_c_s; + extern const f_string_static_t f_string_ascii_d_s; + extern const f_string_static_t f_string_ascii_e_s; + extern const f_string_static_t f_string_ascii_f_s; + extern const f_string_static_t f_string_ascii_g_s; + extern const f_string_static_t f_string_ascii_h_s; + extern const f_string_static_t f_string_ascii_i_s; + extern const f_string_static_t f_string_ascii_j_s; + extern const f_string_static_t f_string_ascii_k_s; + extern const f_string_static_t f_string_ascii_l_s; + extern const f_string_static_t f_string_ascii_m_s; + extern const f_string_static_t f_string_ascii_n_s; + extern const f_string_static_t f_string_ascii_o_s; + extern const f_string_static_t f_string_ascii_p_s; + extern const f_string_static_t f_string_ascii_q_s; + extern const f_string_static_t f_string_ascii_r_s; + extern const f_string_static_t f_string_ascii_s_s; + extern const f_string_static_t f_string_ascii_t_s; + extern const f_string_static_t f_string_ascii_u_s; + extern const f_string_static_t f_string_ascii_v_s; + extern const f_string_static_t f_string_ascii_w_s; + extern const f_string_static_t f_string_ascii_x_s; + extern const f_string_static_t f_string_ascii_y_s; + extern const f_string_static_t f_string_ascii_z_s; + + extern const f_string_static_t f_string_ascii_A_s; + extern const f_string_static_t f_string_ascii_B_s; + extern const f_string_static_t f_string_ascii_C_s; + extern const f_string_static_t f_string_ascii_D_s; + extern const f_string_static_t f_string_ascii_E_s; + extern const f_string_static_t f_string_ascii_F_s; + extern const f_string_static_t f_string_ascii_G_s; + extern const f_string_static_t f_string_ascii_H_s; + extern const f_string_static_t f_string_ascii_I_s; + extern const f_string_static_t f_string_ascii_J_s; + extern const f_string_static_t f_string_ascii_K_s; + extern const f_string_static_t f_string_ascii_L_s; + extern const f_string_static_t f_string_ascii_M_s; + extern const f_string_static_t f_string_ascii_N_s; + extern const f_string_static_t f_string_ascii_O_s; + extern const f_string_static_t f_string_ascii_P_s; + extern const f_string_static_t f_string_ascii_Q_s; + extern const f_string_static_t f_string_ascii_R_s; + extern const f_string_static_t f_string_ascii_S_s; + extern const f_string_static_t f_string_ascii_T_s; + extern const f_string_static_t f_string_ascii_U_s; + extern const f_string_static_t f_string_ascii_V_s; + extern const f_string_static_t f_string_ascii_W_s; + extern const f_string_static_t f_string_ascii_X_s; + extern const f_string_static_t f_string_ascii_Y_s; + extern const f_string_static_t f_string_ascii_Z_s; + + extern const f_string_static_t f_string_ascii_ampersand_s; + extern const f_string_static_t f_string_ascii_asterisk_s; + extern const f_string_static_t f_string_ascii_brace_close_s; + extern const f_string_static_t f_string_ascii_brace_open_s; + extern const f_string_static_t f_string_ascii_bracket_close_s; + extern const f_string_static_t f_string_ascii_bracket_open_s; + extern const f_string_static_t f_string_ascii_caret_s; + extern const f_string_static_t f_string_ascii_comma_s; + extern const f_string_static_t f_string_ascii_colon_s; + extern const f_string_static_t f_string_ascii_colon_semi_s; + extern const f_string_static_t f_string_ascii_dollar_s; + extern const f_string_static_t f_string_ascii_equal_s; + extern const f_string_static_t f_string_ascii_exclamation_s; + extern const f_string_static_t f_string_ascii_grave_s; + extern const f_string_static_t f_string_ascii_mark_question_s; + extern const f_string_static_t f_string_ascii_minus_s; + extern const f_string_static_t f_string_ascii_parenthesis_open_s; + extern const f_string_static_t f_string_ascii_parenthesis_close_s; + extern const f_string_static_t f_string_ascii_percent_s; + extern const f_string_static_t f_string_ascii_period_s; + extern const f_string_static_t f_string_ascii_pipe_s; + extern const f_string_static_t f_string_ascii_plus_s; + extern const f_string_static_t f_string_ascii_pound_s; + extern const f_string_static_t f_string_ascii_quote_double_s; + extern const f_string_static_t f_string_ascii_quote_single_s; + extern const f_string_static_t f_string_ascii_sign_at_s; + extern const f_string_static_t f_string_ascii_sign_greater_than_s; + extern const f_string_static_t f_string_ascii_sign_less_than_s; + extern const f_string_static_t f_string_ascii_slash_forward_s; + extern const f_string_static_t f_string_ascii_slash_backward_s; + extern const f_string_static_t f_string_ascii_tilde_s; + extern const f_string_static_t f_string_ascii_underscore_s; + + extern const f_string_static_t f_string_ascii_acknowledge_s; + extern const f_string_static_t f_string_ascii_acknowledge_negative_s; + extern const f_string_static_t f_string_ascii_bell_s; + extern const f_string_static_t f_string_ascii_cancel_s; + extern const f_string_static_t f_string_ascii_data_link_escape_s; + extern const f_string_static_t f_string_ascii_device_control_one_s; + extern const f_string_static_t f_string_ascii_device_control_two_s; + extern const f_string_static_t f_string_ascii_device_control_three_s; + extern const f_string_static_t f_string_ascii_device_control_four_s; + extern const f_string_static_t f_string_ascii_enquiry_s; + extern const f_string_static_t f_string_ascii_escape_s; + extern const f_string_static_t f_string_ascii_feed_form_s; + extern const f_string_static_t f_string_ascii_feed_line_s; + extern const f_string_static_t f_string_ascii_header_start_s; + extern const f_string_static_t f_string_ascii_medium_stop_s; + extern const f_string_static_t f_string_ascii_null_s; + extern const f_string_static_t f_string_ascii_return_carriage_s; + extern const f_string_static_t f_string_ascii_separator_file_s; + extern const f_string_static_t f_string_ascii_separator_group_s; + extern const f_string_static_t f_string_ascii_separator_record_s; + extern const f_string_static_t f_string_ascii_separator_unit_s; + extern const f_string_static_t f_string_ascii_shift_in_s; + extern const f_string_static_t f_string_ascii_shift_out_s; + extern const f_string_static_t f_string_ascii_space_s; + extern const f_string_static_t f_string_ascii_space_back_s; + extern const f_string_static_t f_string_ascii_substitute_s; + extern const f_string_static_t f_string_ascii_synchronous_idle_s; + extern const f_string_static_t f_string_ascii_tab_horizontal_s; + extern const f_string_static_t f_string_ascii_tab_vertical_s; + extern const f_string_static_t f_string_ascii_text_start_s; + extern const f_string_static_t f_string_ascii_text_stop_s; + extern const f_string_static_t f_string_ascii_transmission_stop_s; + extern const f_string_static_t f_string_ascii_transmission_block_end_s; +#endif // _di_string_ascii_s_ + +/** + * Define the end of line character. + * FLL forbids '\r' and '\r\n' as end of line characters, \r will be silently ignored. + */ +#ifndef _di_f_string_eol_s_ + #define f_string_eol_s f_string_ascii_feed_line_s + #define F_string_eol_s F_string_ascii_feed_line_s + + #define F_string_eol_s_length 1 +#endif // _di_f_string_eol_s_ + +/** + * Provide a character to represent a single basic space. + * + * This is generally intended to be an ASCII space character and should be effectively the same as F_string_ascii_space_s. + */ +#ifndef _di_f_string_space_s_ + #define F_string_space_s F_string_ascii_space_s + #define F_string_space_s_length F_string_ascii_space_s_length + + #define f_string_space_s f_string_ascii_space_s +#endif // _di_f_string_space_s_ /** * Resize the dynamic string. @@ -322,8 +787,6 @@ extern "C" { * * @param glue * A string to append between the source and destination, such as a space: ' '. - * @param glue_length - * The number of bytes the glue takes up. * @param source * The source string to append. * @param destination @@ -339,7 +802,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamic_mash_ - extern f_status_t f_string_dynamic_mash(const f_string_t glue, const f_array_length_t glue_length, const f_string_static_t source, f_string_dynamic_t *destination); + extern f_status_t f_string_dynamic_mash(const f_string_static_t glue, const f_string_static_t source, f_string_dynamic_t *destination); #endif // _di_f_string_dynamic_mash_ /** @@ -351,8 +814,6 @@ extern "C" { * * @param glue * A string to append between the source and destination, such as a space: ' '. - * @param glue_length - * The number of bytes the glue takes up. * @param source * The source string to append. * @param destination @@ -368,7 +829,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamic_mash_nulless_ - extern f_status_t f_string_dynamic_mash_nulless(const f_string_t glue, const f_array_length_t glue_length, const f_string_static_t source, f_string_dynamic_t *destination); + extern f_status_t f_string_dynamic_mash_nulless(const f_string_static_t glue, const f_string_static_t source, f_string_dynamic_t *destination); #endif // _di_f_string_dynamic_mash_nulless_ /** @@ -378,8 +839,6 @@ extern "C" { * * @param glue * A string to append between the source and destination, such as a space: ' '. - * @param glue_length - * The number of bytes the glue takes up. * @param source * The source string to append. * @param destination @@ -395,7 +854,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamic_mish_ - extern f_status_t f_string_dynamic_mish(const f_string_t glue, const f_array_length_t glue_length, const f_string_static_t source, f_string_dynamic_t *destination); + extern f_status_t f_string_dynamic_mish(const f_string_static_t glue, const f_string_static_t source, f_string_dynamic_t *destination); #endif // _di_f_string_dynamic_mish_ /** @@ -407,8 +866,6 @@ extern "C" { * * @param glue * A string to append between the source and destination, such as a space: ' '. - * @param glue_length - * The number of bytes the glue takes up. * @param source * The source string to append. * @param destination @@ -424,7 +881,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamic_mish_nulless_ - extern f_status_t f_string_dynamic_mish_nulless(const f_string_t glue, const f_array_length_t glue_length, const f_string_static_t source, f_string_dynamic_t *destination); + extern f_status_t f_string_dynamic_mish_nulless(const f_string_static_t glue, const f_string_static_t source, f_string_dynamic_t *destination); #endif // _di_f_string_dynamic_mish_nulless_ /** @@ -538,8 +995,6 @@ extern "C" { * * @param glue * A string to append between the source and destination, such as a space: ' '. - * @param glue_length - * The number of bytes the glue takes up. * @param source * The source string to append. * @param range @@ -558,7 +1013,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamic_partial_mash_ - extern f_status_t f_string_dynamic_partial_mash(const f_string_t glue, const f_array_length_t glue_length, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); + extern f_status_t f_string_dynamic_partial_mash(const f_string_static_t glue, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); #endif // _di_f_string_dynamic_partial_mash_ /** @@ -570,8 +1025,6 @@ extern "C" { * * @param glue * A string to append between the source and destination, such as a space: ' '. - * @param glue_length - * The number of bytes the glue takes up. * @param source * The source string to append. * @param range @@ -590,7 +1043,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamic_partial_mash_nulless_ - extern f_status_t f_string_dynamic_partial_mash_nulless(const f_string_t glue, const f_array_length_t glue_length, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); + extern f_status_t f_string_dynamic_partial_mash_nulless(const f_string_static_t glue, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); #endif // _di_f_string_dynamic_partial_mash_nulless_ /** @@ -600,8 +1053,6 @@ extern "C" { * * @param glue * A string to append between the source and destination, such as a space: ' '. - * @param glue_length - * The number of bytes the glue takes up. * @param source * The source string to append. * @param range @@ -620,7 +1071,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamic_partial_mish_ - extern f_status_t f_string_dynamic_partial_mish(const f_string_t glue, const f_array_length_t glue_length, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); + extern f_status_t f_string_dynamic_partial_mish(const f_string_static_t glue, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); #endif // _di_f_string_dynamic_partial_mish_ /** @@ -632,8 +1083,6 @@ extern "C" { * * @param glue * A string to append between the source and destination, such as a space: ' '. - * @param glue_length - * The number of bytes the glue takes up. * @param source * The source string to append. * @param range @@ -652,7 +1101,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_f_string_dynamic_partial_mish_nulless_ - extern f_status_t f_string_dynamic_partial_mish_nulless(const f_string_t glue, const f_array_length_t glue_length, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); + extern f_status_t f_string_dynamic_partial_mish_nulless(const f_string_static_t glue, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); #endif // _di_f_string_dynamic_partial_mish_nulless_ /** diff --git a/level_0/f_utf/c/utf.c b/level_0/f_utf/c/utf.c index 1fa152a..de435cd 100644 --- a/level_0/f_utf/c/utf.c +++ b/level_0/f_utf/c/utf.c @@ -583,7 +583,7 @@ extern "C" { return private_f_utf_character_is_word(character, strict); } - if (isalnum(macro_f_utf_character_t_to_char_1(character)) || character == f_string_ascii_underscore_s[0]) { + if (isalnum(macro_f_utf_character_t_to_char_1(character)) || character == f_string_ascii_underscore_s.string[0]) { return F_true; } @@ -602,7 +602,7 @@ extern "C" { return private_f_utf_character_is_word_dash(character, strict); } - if (isalnum(macro_f_utf_character_t_to_char_1(character)) || character == f_string_ascii_underscore_s[0] || character == f_string_ascii_minus_s[0]) { + if (isalnum(macro_f_utf_character_t_to_char_1(character)) || character == f_string_ascii_underscore_s.string[0] || character == f_string_ascii_minus_s.string[0]) { return F_true; } @@ -621,7 +621,7 @@ extern "C" { return private_f_utf_character_is_word_dash_plus(character, strict); } - if (isalnum(macro_f_utf_character_t_to_char_1(character)) || character == f_string_ascii_underscore_s[0] || character == f_string_ascii_minus_s[0] || character == f_string_ascii_plus_s[0]) { + if (isalnum(macro_f_utf_character_t_to_char_1(character)) || character == f_string_ascii_underscore_s.string[0] || character == f_string_ascii_minus_s.string[0] || character == f_string_ascii_plus_s.string[0]) { return F_true; } @@ -785,12 +785,12 @@ extern "C" { i = length; } else { - if (macro_f_utf_character_t_to_char_1(string[i]) == f_string_ascii_u_s[0] || macro_f_utf_character_t_to_char_1(string[i]) == f_string_ascii_U_s[0]) { + if (macro_f_utf_character_t_to_char_1(string[i]) == f_string_ascii_u_s.string[0] || macro_f_utf_character_t_to_char_1(string[i]) == f_string_ascii_U_s.string[0]) { do { ++i; } while (i < length && !string[i]); - if (i < length && !macro_f_utf_character_t_width_is(string[i]) && macro_f_utf_character_t_to_char_1(string[i]) == f_string_ascii_plus_s[0]) { + if (i < length && !macro_f_utf_character_t_width_is(string[i]) && macro_f_utf_character_t_to_char_1(string[i]) == f_string_ascii_plus_s.string[0]) { ++i; } else { @@ -1680,7 +1680,7 @@ extern "C" { return private_f_utf_character_is_word(character_utf, strict); } - if (isalnum(*character) || *character == f_string_ascii_underscore_s[0]) { + if (isalnum(*character) || *character == f_string_ascii_underscore_s.string[0]) { return F_true; } @@ -1713,7 +1713,7 @@ extern "C" { return private_f_utf_character_is_word_dash(character_utf, strict); } - if (isalnum(*character) || *character == f_string_ascii_underscore_s[0] || *character == f_string_ascii_minus_s[0]) { + if (isalnum(*character) || *character == f_string_ascii_underscore_s.string[0] || *character == f_string_ascii_minus_s.string[0]) { return F_true; } @@ -1746,7 +1746,7 @@ extern "C" { return private_f_utf_character_is_word_dash_plus(character_utf, strict); } - if (isalnum(*character) || *character == f_string_ascii_underscore_s[0] || *character == f_string_ascii_minus_s[0] || *character == f_string_ascii_plus_s[0]) { + if (isalnum(*character) || *character == f_string_ascii_underscore_s.string[0] || *character == f_string_ascii_minus_s.string[0] || *character == f_string_ascii_plus_s.string[0]) { return F_true; } @@ -1901,12 +1901,12 @@ extern "C" { } // while if (i < length) { - if (string[i] == f_string_ascii_u_s[0] || string[i] == f_string_ascii_U_s[0]) { + if (string[i] == f_string_ascii_u_s.string[0] || string[i] == f_string_ascii_U_s.string[0]) { do { ++i; } while (i < length && !string[i]); - if (i < length && string[i] == f_string_ascii_plus_s[0]) { + if (i < length && string[i] == f_string_ascii_plus_s.string[0]) { ++i; } else { diff --git a/level_1/fl_console/c/console.c b/level_1/fl_console/c/console.c index fe77f70..36cf6ff 100644 --- a/level_1/fl_console/c/console.c +++ b/level_1/fl_console/c/console.c @@ -20,14 +20,14 @@ extern "C" { } if (length > 1) { - while (length > 1 && argument[length - 1] == f_path_separator_s[0]) { + while (length > 1 && argument[length - 1] == f_path_separator_s.string[0]) { --length; } // while - if (argument[0] == f_path_separator_s[0]) { + if (argument[0] == f_path_separator_s.string[0]) { f_array_length_t begin = 1; - while (begin < length && argument[begin] == f_path_separator_s[0]) { + while (begin < length && argument[begin] == f_path_separator_s.string[0]) { ++begin; } // while @@ -44,8 +44,8 @@ extern "C" { directory->used = length; directory->size = length; - directory->string[0] = f_path_separator_s[0]; - directory->string[length - 1] = f_path_separator_s[0]; + directory->string[0] = f_path_separator_s.string[0]; + directory->string[length - 1] = f_path_separator_s.string[0]; } else { macro_f_string_dynamic_t_clear((*directory)) @@ -54,13 +54,13 @@ extern "C" { directory->used = 1; directory->size = 1; - directory->string[0] = f_path_separator_s[0]; + directory->string[0] = f_path_separator_s.string[0]; } } - else if (length > 3 && argument[0] == f_path_separator_current_s[0] && argument[1] == f_path_separator_current_s[0] && argument[2] == f_path_separator_s[0]) { + else if (length > 3 && argument[0] == f_path_separator_current_s.string[0] && argument[1] == f_path_separator_current_s.string[0] && argument[2] == f_path_separator_s.string[0]) { f_array_length_t begin = 3; - while (begin < length && argument[begin] == f_path_separator_s[0]) { + while (begin < length && argument[begin] == f_path_separator_s.string[0]) { ++begin; } // while @@ -77,10 +77,10 @@ extern "C" { directory->used = length; directory->size = length; - directory->string[0] = f_path_separator_current_s[0]; - directory->string[1] = f_path_separator_current_s[0]; - directory->string[2] = f_path_separator_s[0]; - directory->string[length - 1] = f_path_separator_s[0]; + directory->string[0] = f_path_separator_current_s.string[0]; + directory->string[1] = f_path_separator_current_s.string[0]; + directory->string[2] = f_path_separator_s.string[0]; + directory->string[length - 1] = f_path_separator_s.string[0]; } else { macro_f_string_dynamic_t_clear((*directory)) @@ -89,15 +89,15 @@ extern "C" { directory->used = 3; directory->size = 3; - directory->string[0] = f_path_separator_current_s[0]; - directory->string[1] = f_path_separator_current_s[0]; - directory->string[2] = f_path_separator_s[0]; + directory->string[0] = f_path_separator_current_s.string[0]; + directory->string[1] = f_path_separator_current_s.string[0]; + directory->string[2] = f_path_separator_s.string[0]; } } - else if (length > 2 && argument[0] == f_path_separator_current_s[0] && argument[1] == f_path_separator_s[0]) { + else if (length > 2 && argument[0] == f_path_separator_current_s.string[0] && argument[1] == f_path_separator_s.string[0]) { f_array_length_t begin = 2; - while (begin < length && argument[begin] == f_path_separator_s[0]) { + while (begin < length && argument[begin] == f_path_separator_s.string[0]) { ++begin; } // while @@ -114,9 +114,9 @@ extern "C" { directory->used = length; directory->size = length; - directory->string[0] = f_path_separator_current_s[0]; - directory->string[1] = f_path_separator_s[0]; - directory->string[length - 1] = f_path_separator_s[0]; + directory->string[0] = f_path_separator_current_s.string[0]; + directory->string[1] = f_path_separator_s.string[0]; + directory->string[length - 1] = f_path_separator_s.string[0]; } else { macro_f_string_dynamic_t_clear((*directory)) @@ -125,8 +125,8 @@ extern "C" { directory->used = 2; directory->size = 2; - directory->string[0] = f_path_separator_current_s[0]; - directory->string[1] = f_path_separator_s[0]; + directory->string[0] = f_path_separator_current_s.string[0]; + directory->string[1] = f_path_separator_s.string[0]; } } else { @@ -140,10 +140,10 @@ extern "C" { directory->used = length; directory->size = length; - directory->string[length - 1] = f_path_separator_s[0]; + directory->string[length - 1] = f_path_separator_s.string[0]; } } - else if (argument[0] != f_path_separator_s[0]) { + else if (argument[0] != f_path_separator_s.string[0]) { macro_f_string_dynamic_t_clear((*directory)) macro_f_string_dynamic_t_resize(status, (*directory), 2) if (F_status_is_error(status)) return status; @@ -152,7 +152,7 @@ extern "C" { directory->used = 2; directory->size = 2; - directory->string[1] = f_path_separator_s[0]; + directory->string[1] = f_path_separator_s.string[0]; } else { macro_f_string_dynamic_t_clear((*directory)) diff --git a/level_1/fl_directory/c/directory.c b/level_1/fl_directory/c/directory.c index c1b11b0..b27c9f0 100644 --- a/level_1/fl_directory/c/directory.c +++ b/level_1/fl_directory/c/directory.c @@ -30,7 +30,7 @@ extern "C" { for (; path[at_path]; ++at_path) { - if (at_path && path[at_path] == f_path_separator_s[0]) { + if (at_path && path[at_path] == f_path_separator_s.string[0]) { memcpy(tree, path + at_tree, at_path - at_tree); tree[at_path] = 0; @@ -101,7 +101,7 @@ extern "C" { for (; i > 0; --i, --static_source.used) { if (!source[i - 1]) continue; - if (source[i - 1] == f_path_separator_s[0]) continue; + if (source[i - 1] == f_path_separator_s.string[0]) continue; break; } // for @@ -111,7 +111,7 @@ extern "C" { for (; i > 0; --i, --static_destination.used) { if (!destination[i - 1]) continue; - if (destination[i - 1] == f_path_separator_s[0]) continue; + if (destination[i - 1] == f_path_separator_s.string[0]) continue; break; } // for @@ -155,7 +155,7 @@ extern "C" { for (; i > 0; --i, --static_source.used) { if (!source[i - 1]) continue; - if (source[i - 1] == f_path_separator_s[0]) continue; + if (source[i - 1] == f_path_separator_s.string[0]) continue; break; } // for @@ -165,7 +165,7 @@ extern "C" { for (; i > 0; --i, --static_destination.used) { if (!destination[i - 1]) continue; - if (destination[i - 1] == f_path_separator_s[0]) continue; + if (destination[i - 1] == f_path_separator_s.string[0]) continue; break; } // for @@ -223,7 +223,7 @@ extern "C" { for (; i > 0; --i, --static_source.used) { if (!source[i - 1]) continue; - if (source[i - 1] == f_path_separator_s[0]) continue; + if (source[i - 1] == f_path_separator_s.string[0]) continue; break; } // for @@ -233,7 +233,7 @@ extern "C" { for (; i > 0; --i, --static_destination.used) { if (!destination[i - 1]) continue; - if (destination[i - 1] == f_path_separator_s[0]) continue; + if (destination[i - 1] == f_path_separator_s.string[0]) continue; break; } // for @@ -277,7 +277,7 @@ extern "C" { for (; i > 0; --i, --static_source.used) { if (!source[i - 1]) continue; - if (source[i - 1] == f_path_separator_s[0]) continue; + if (source[i - 1] == f_path_separator_s.string[0]) continue; break; } // for @@ -287,7 +287,7 @@ extern "C" { for (; i > 0; --i, --static_destination.used) { if (!destination[i - 1]) continue; - if (destination[i - 1] == f_path_separator_s[0]) continue; + if (destination[i - 1] == f_path_separator_s.string[0]) continue; break; } // for @@ -348,7 +348,7 @@ extern "C" { } if (first_nulless) { - if (path->string[i] == f_path_separator_s[0]) { + if (path->string[i] == f_path_separator_s.string[0]) { if (null_terminated) { path->string[i + 1] = 0; path->used = i + 2; @@ -375,7 +375,7 @@ extern "C" { return status; } - if (path->string[j] != f_path_separator_s[0]) { + if (path->string[j] != f_path_separator_s.string[0]) { i = j + 1; break; } diff --git a/level_1/fl_directory/c/private-directory.c b/level_1/fl_directory/c/private-directory.c index 6efd35f..638b546 100644 --- a/level_1/fl_directory/c/private-directory.c +++ b/level_1/fl_directory/c/private-directory.c @@ -66,10 +66,10 @@ extern "C" { memcpy(path_destination_sub, destination.string, destination.used); memcpy(path_destination_sub + destination.used + 1, listing.directory.array[i].string, listing.directory.array[i].used); - path_source_sub[source.used] = f_path_separator_s[0]; + path_source_sub[source.used] = f_path_separator_s.string[0]; path_source_sub[source_sub.used] = 0; - path_destination_sub[destination.used] = f_path_separator_s[0]; + path_destination_sub[destination.used] = f_path_separator_s.string[0]; path_destination_sub[destination_sub.used] = 0; source_sub.string = path_source_sub; @@ -145,12 +145,12 @@ extern "C" { memcpy(path_source, source.string, source.used); memcpy(path_source + source.used + 1, file.string, file.used); - path_source[source.used] = f_path_separator_s[0]; + path_source[source.used] = f_path_separator_s.string[0]; path_source[source.used + file.used + 1] = 0; memcpy(path_destination, destination.string, destination.used); memcpy(path_destination + destination.used + 1, file.string, file.used); - path_destination[destination.used] = f_path_separator_s[0]; + path_destination[destination.used] = f_path_separator_s.string[0]; path_destination[destination.used + file.used + 1] = 0; f_status_t status = f_file_clone(path_source, path_destination, role, recurse.size_block, recurse.exclusive); @@ -284,10 +284,10 @@ extern "C" { memcpy(path_destination_sub, destination.string, destination.used); memcpy(path_destination_sub + destination.used + 1, listing.directory.array[i].string, listing.directory.array[i].used); - path_source_sub[source.used] = f_path_separator_s[0]; + path_source_sub[source.used] = f_path_separator_s.string[0]; path_source_sub[source_sub.used] = 0; - path_destination_sub[destination.used] = f_path_separator_s[0]; + path_destination_sub[destination.used] = f_path_separator_s.string[0]; path_destination_sub[destination_sub.used] = 0; source_sub.string = path_source_sub; @@ -348,12 +348,12 @@ extern "C" { memcpy(path_source, source.string, source.used); memcpy(path_source + source.used + 1, file.string, file.used); - path_source[source.used] = f_path_separator_s[0]; + path_source[source.used] = f_path_separator_s.string[0]; path_source[source.used + file.used + 1] = 0; memcpy(path_destination, destination.string, destination.used); memcpy(path_destination + destination.used + 1, file.string, file.used); - path_destination[destination.used] = f_path_separator_s[0]; + path_destination[destination.used] = f_path_separator_s.string[0]; path_destination[destination.used + file.used + 1] = 0; f_status_t status = f_file_copy(path_source, path_destination, mode, recurse.size_block, recurse.exclusive); @@ -627,7 +627,7 @@ extern "C" { return status; } - if (destination->string[i] == f_path_separator_s[0]) { + if (destination->string[i] == f_path_separator_s.string[0]) { if (i - 1 > 0) { for (j = i - 1; j > 0; --j) { @@ -642,7 +642,7 @@ extern "C" { return status; } - if (destination->string[j] == f_path_separator_s[0]) { + if (destination->string[j] == f_path_separator_s.string[0]) { destination->used = j + 1; } else { @@ -660,7 +660,7 @@ extern "C" { } // for if (destination->used > 0 && !i) { - if (destination->string[0] != 0 && destination->string[0] != f_path_separator_s[0]) { + if (destination->string[0] != 0 && destination->string[0] != f_path_separator_s.string[0]) { separator_prepend = F_true; ++total; } @@ -679,7 +679,7 @@ extern "C" { return status; } - if (source[i] == f_path_separator_s[0]) { + if (source[i] == f_path_separator_s.string[0]) { if (!separator_prepend && destination->used > 0) { --destination->used; } @@ -698,7 +698,7 @@ extern "C" { return status; } - if (source[j] == f_path_separator_s[0]) { + if (source[j] == f_path_separator_s.string[0]) { length_truncated = j + 1; } else { @@ -715,7 +715,7 @@ extern "C" { break; } // for - if (!i && source[0] != f_path_separator_s[0]) { + if (!i && source[0] != f_path_separator_s.string[0]) { separator_append = F_true; ++total; } @@ -735,7 +735,7 @@ extern "C" { start = i; - if (source[0] == f_path_separator_s[0]) { + if (source[0] == f_path_separator_s.string[0]) { if (i + 1 < length_truncated) { for (j = i + 1; j < length_truncated; ++j) { @@ -750,7 +750,7 @@ extern "C" { return status; } - if (source[j] == f_path_separator_s[0]) { + if (source[j] == f_path_separator_s.string[0]) { start = j; } else { @@ -776,7 +776,7 @@ extern "C" { } if (separator_prepend) { - destination->string[destination->used] = f_path_separator_s[0]; + destination->string[destination->used] = f_path_separator_s.string[0]; ++destination->used; --total; } @@ -789,11 +789,11 @@ extern "C" { if (separator_append) { if (terminated_null) { - destination->string[destination->used - 2] = f_path_separator_s[0]; + destination->string[destination->used - 2] = f_path_separator_s.string[0]; destination->string[destination->used - 1] = 0; } else { - destination->string[destination->used - 1] = f_path_separator_s[0]; + destination->string[destination->used - 1] = f_path_separator_s.string[0]; } } else if (terminated_null) { diff --git a/level_1/fl_environment/c/environment.c b/level_1/fl_environment/c/environment.c index f9ecea8..702b5d9 100644 --- a/level_1/fl_environment/c/environment.c +++ b/level_1/fl_environment/c/environment.c @@ -117,7 +117,7 @@ extern "C" { for (i = 0; i <= length; ++i) { - if (i == length || path[i] == f_path_separator_variable_s[0]) { + if (i == length || path[i] == f_path_separator_variable_s.string[0]) { macro_f_memory_structure_increment(status, (*paths), 1, F_memory_default_allocation_small_d, macro_f_string_dynamics_t_resize, F_array_too_large); if (F_status_is_error(status)) return status; @@ -134,7 +134,7 @@ extern "C" { total = i - first; if (total > 0) { - if (path[i - 1] == f_path_separator_s[0]) { + if (path[i - 1] == f_path_separator_s.string[0]) { macro_f_string_dynamic_t_clear(part) macro_f_string_dynamic_t_resize(status, part, total) if (F_status_is_error(status)) return status; @@ -145,7 +145,7 @@ extern "C" { macro_f_string_dynamic_t_resize(status, part, (total + 1)) if (F_status_is_error(status)) return status; - part.string[total] = f_path_separator_s[0]; + part.string[total] = f_path_separator_s.string[0]; part.used = total + 1; } @@ -196,7 +196,7 @@ extern "C" { for (i = 0; i <= path.used; ++i) { - if (i == path.used || path.string[i] == f_path_separator_variable_s[0]) { + if (i == path.used || path.string[i] == f_path_separator_variable_s.string[0]) { macro_f_memory_structure_increment(status, (*paths), 1, F_memory_default_allocation_small_d, macro_f_string_dynamics_t_resize, F_array_too_large); if (F_status_is_error(status)) return status; @@ -223,11 +223,11 @@ extern "C" { ++part.used; } // for - if (part.string[part.used - 1] != f_path_separator_s[0]) { + if (part.string[part.used - 1] != f_path_separator_s.string[0]) { macro_f_string_dynamic_t_resize(status, part, (total + 1)) if (F_status_is_error(status)) return status; - part.string[part.used] = f_path_separator_s[0]; + part.string[part.used] = f_path_separator_s.string[0]; ++part.used; } } @@ -278,15 +278,15 @@ extern "C" { // @fixme i is unsgned, it will never be less than 0! for (; i > 0; --i, --j) { - if (!j || path[j] == f_path_separator_variable_s[0]) { + if (!j || path[j] == f_path_separator_variable_s.string[0]) { macro_f_memory_structure_increment(status, (*paths), 1, F_memory_default_allocation_small_d, macro_f_string_dynamics_t_resize, F_array_too_large); if (F_status_is_error(status)) return status; - if (path[j] == f_path_separator_variable_s[0]) { + if (path[j] == f_path_separator_variable_s.string[0]) { total = last - i; if (total > 0) { - if (path[j + total] == f_path_separator_s[0]) { + if (path[j + total] == f_path_separator_s.string[0]) { macro_f_string_dynamic_t_clear(part) macro_f_string_dynamic_t_resize(status, part, total) if (F_status_is_error(status)) return status; @@ -297,7 +297,7 @@ extern "C" { macro_f_string_dynamic_t_resize(status, part, (total + 1)) if (F_status_is_error(status)) return status; - part.string[total] = f_path_separator_s[0]; + part.string[total] = f_path_separator_s.string[0]; part.used = total + 1; } @@ -312,7 +312,7 @@ extern "C" { total = last - j; if (total > 0) { - if (path[last - 1] == f_path_separator_s[0]) { + if (path[last - 1] == f_path_separator_s.string[0]) { macro_f_string_dynamic_t_clear(part) macro_f_string_dynamic_t_resize(status, part, total) if (F_status_is_error(status)) return status; @@ -324,7 +324,7 @@ extern "C" { if (F_status_is_error(status)) return status; part.used = total + 1; - part.string[total] = f_path_separator_s[0]; + part.string[total] = f_path_separator_s.string[0]; } memcpy(part.string, path, total); @@ -375,11 +375,11 @@ extern "C" { // @fixme i is unsgned, it will never be less than 0! for (; i > 0; --i, --j) { - if (!j || path.string[j] == f_path_separator_variable_s[0]) { + if (!j || path.string[j] == f_path_separator_variable_s.string[0]) { macro_f_memory_structure_increment(status, (*paths), 1, F_memory_default_allocation_small_d, macro_f_string_dynamics_t_resize, F_array_too_large); if (F_status_is_error(status)) return status; - if (path.string[j] == f_path_separator_variable_s[0]) { + if (path.string[j] == f_path_separator_variable_s.string[0]) { total = last - i; if (total > 0) { @@ -395,11 +395,11 @@ extern "C" { ++part.used; } // for - if (part.string[part.used - 1] != f_path_separator_s[0]) { + if (part.string[part.used - 1] != f_path_separator_s.string[0]) { macro_f_string_dynamic_t_resize(status, part, (total + 1)) if (F_status_is_error(status)) return status; - part.string[part.used] = f_path_separator_s[0]; + part.string[part.used] = f_path_separator_s.string[0]; ++part.used; } } @@ -422,11 +422,11 @@ extern "C" { ++part.used; } // for - if (part.string[part.used - 1] != f_path_separator_s[0]) { + if (part.string[part.used - 1] != f_path_separator_s.string[0]) { macro_f_string_dynamic_t_resize(status, part, (total + 1)) if (F_status_is_error(status)) return status; - part.string[part.used - 1] = f_path_separator_s[0]; + part.string[part.used - 1] = f_path_separator_s.string[0]; ++part.used; } } diff --git a/level_1/fl_fss/c/fss_basic.c b/level_1/fl_fss/c/fss_basic.c index 798625e..7e46531 100644 --- a/level_1/fl_fss/c/fss_basic.c +++ b/level_1/fl_fss/c/fss_basic.c @@ -76,7 +76,7 @@ extern "C" { return status; } - if (buffer.string[range->start] == f_fss_basic_close_s[0]) break; + if (buffer.string[range->start] == f_fss_basic_close_s.string[0]) break; } // for if (F_status_is_error(status)) { @@ -101,7 +101,7 @@ extern "C" { const f_array_length_t destination_used = destination->used; - f_status_t status = private_fl_fss_basic_write(F_true, object, quote ? quote : F_fss_delimit_quote_double_s, state, range, destination); + f_status_t status = private_fl_fss_basic_write(F_true, object, quote ? quote : f_fss_delimit_quote_double_s.string[0], state, range, destination); if (status == F_data_not_stop || status == F_data_not_eos) { @@ -114,8 +114,8 @@ extern "C" { return status_allocation; } - destination->string[destination->used++] = quote ? quote : F_fss_delimit_quote_double_s; - destination->string[destination->used++] = quote ? quote : F_fss_delimit_quote_double_s; + destination->string[destination->used++] = quote ? quote : f_fss_delimit_quote_double_s.string[0]; + destination->string[destination->used++] = quote ? quote : f_fss_delimit_quote_double_s.string[0]; } if (complete == f_fss_complete_partial_e || complete == f_fss_complete_partial_trim_e || complete == f_fss_complete_full_e || complete == f_fss_complete_full_trim_e) { @@ -123,7 +123,7 @@ extern "C" { f_status_t status2 = F_none; if (complete == f_fss_complete_full_trim_e) { - status2 = private_fl_fss_basic_write_object_trim(quote ? quote : F_fss_delimit_quote_double_s, destination_used, state, destination); + status2 = private_fl_fss_basic_write_object_trim(quote ? quote : f_fss_delimit_quote_double_s.string[0], destination_used, state, destination); if (F_status_is_error(status2)) { destination->used = destination_used; @@ -139,7 +139,7 @@ extern "C" { return status2; } - destination->string[destination->used++] = f_fss_basic_open_s[0]; + destination->string[destination->used++] = f_fss_basic_open_s.string[0]; } } @@ -170,7 +170,7 @@ extern "C" { status = f_string_dynamic_increase(state.step_large, destination); if (F_status_is_error(status)) return status; - destination->string[destination->used++] = f_fss_basic_close_s[0]; + destination->string[destination->used++] = f_fss_basic_close_s.string[0]; } if (range->start > range->stop) { @@ -196,13 +196,13 @@ extern "C" { } } - if (content.string[range->start] == f_fss_eol_s[0]) { + if (content.string[range->start] == f_fss_eol_s.string[0]) { destination->used = destination_used; return F_status_set_error(F_none_eol); } - if (content.string[range->start] == F_fss_delimit_placeholder_s) { + if (content.string[range->start] == f_fss_delimit_placeholder_s.string[0]) { continue; } @@ -210,7 +210,7 @@ extern "C" { } // for if (complete == f_fss_complete_full_e || complete == f_fss_complete_full_trim_e || complete == f_fss_complete_end_e) { - destination->string[destination->used++] = f_fss_basic_close_s[0]; + destination->string[destination->used++] = f_fss_basic_close_s.string[0]; } if (range->start > range->stop) { diff --git a/level_1/fl_fss/c/fss_basic_list.c b/level_1/fl_fss/c/fss_basic_list.c index 7d55d06..6272b1d 100644 --- a/level_1/fl_fss/c/fss_basic_list.c +++ b/level_1/fl_fss/c/fss_basic_list.c @@ -39,7 +39,7 @@ extern "C" { found->start = range->start; // Ignore all comment lines. - if (buffer.string[range->start] == f_fss_comment_s[0]) { + if (buffer.string[range->start] == f_fss_comment_s.string[0]) { status = f_fss_seek_to_eol(buffer, range); if (F_status_is_error(status)) return status; @@ -66,7 +66,7 @@ extern "C" { bool graph_first = F_true; // identify where the object ends. - while (range->start <= range->stop && range->start < buffer.used && buffer.string[range->start] != f_fss_eol_s[0]) { + while (range->start <= range->stop && range->start < buffer.used && buffer.string[range->start] != f_fss_eol_s.string[0]) { if (state.interrupt) { status = state.interrupt((void *) &state, 0); @@ -78,7 +78,7 @@ extern "C" { } } - if (buffer.string[range->start] == F_fss_delimit_slash_s) { + if (buffer.string[range->start] == f_fss_delimit_slash_s.string[0]) { slash_first = range->start; slash_count = 1; @@ -94,9 +94,9 @@ extern "C" { } } - if (buffer.string[range->start] == F_fss_delimit_placeholder_s) { + if (buffer.string[range->start] == f_fss_delimit_placeholder_s.string[0]) { continue; - } else if (buffer.string[range->start] != F_fss_delimit_slash_s) { + } else if (buffer.string[range->start] != f_fss_delimit_slash_s.string[0]) { break; } @@ -105,7 +105,7 @@ extern "C" { private_macro_fl_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop); - if (buffer.string[range->start] == f_fss_basic_list_open_s[0]) { + if (buffer.string[range->start] == f_fss_basic_list_open_s.string[0]) { graph_first = F_false; stop = range->start - 1; @@ -124,7 +124,7 @@ extern "C" { } } - if (buffer.string[range->start] == f_fss_eol_s[0]) break; + if (buffer.string[range->start] == f_fss_eol_s.string[0]) break; status = f_fss_is_space(buffer, *range); if (F_status_is_error(status)) break; @@ -137,7 +137,7 @@ extern "C" { private_macro_fl_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop); - if (buffer.string[range->start] == f_fss_eol_s[0]) { + if (buffer.string[range->start] == f_fss_eol_s.string[0]) { start = range->start; range->start = slash_first; @@ -148,7 +148,7 @@ extern "C" { if (slash_count % 2 == 0) { while (slash_count > 0) { - if (buffer.string[range->start] == F_fss_delimit_slash_s) { + if (buffer.string[range->start] == f_fss_delimit_slash_s.string[0]) { if (slash_count % 2 == 1) { delimits->array[delimits->used] = range->start; ++delimits->used; @@ -177,7 +177,7 @@ extern "C" { return F_fss_found_object_not; } } - else if (graph_first && buffer.string[range->start] == f_fss_comment_s[0]) { + else if (graph_first && buffer.string[range->start] == f_fss_comment_s.string[0]) { graph_first = F_false; // Comments may only have whitespace before the '#', therefore only the first slash needs to be delimited. @@ -194,7 +194,7 @@ extern "C" { continue; } - if (buffer.string[range->start] == f_fss_basic_list_open_s[0]) { + if (buffer.string[range->start] == f_fss_basic_list_open_s.string[0]) { graph_first = F_false; stop = range->start - 1; @@ -212,7 +212,7 @@ extern "C" { } } - if (buffer.string[range->start] == f_fss_eol_s[0]) break; + if (buffer.string[range->start] == f_fss_eol_s.string[0]) break; status = f_fss_is_space(buffer, *range); if (F_status_is_error(status)) break; @@ -225,7 +225,7 @@ extern "C" { private_macro_fl_fss_object_return_on_overflow_delimited((buffer), (*range), (*found), F_none_eos, F_none_stop); - if (buffer.string[range->start] == f_fss_eol_s[0]) { + if (buffer.string[range->start] == f_fss_eol_s.string[0]) { found->stop = stop; status = f_utf_buffer_increment(buffer, range, 1); @@ -316,7 +316,7 @@ extern "C" { } } - if (buffer.string[range->start] == f_fss_eol_s[0]) { + if (buffer.string[range->start] == f_fss_eol_s.string[0]) { if (graph_first == 0x2) { macro_f_fss_delimits_t_increase(status, state.step_small, (*delimits)); if (F_status_is_error(status)) break; @@ -331,7 +331,7 @@ extern "C" { continue; } - if (buffer.string[range->start] == F_fss_delimit_slash_s) { + if (buffer.string[range->start] == f_fss_delimit_slash_s.string[0]) { slash_first = range->start; slash_count = 1; @@ -347,9 +347,9 @@ extern "C" { } } - if (buffer.string[range->start] == F_fss_delimit_placeholder_s) { + if (buffer.string[range->start] == f_fss_delimit_placeholder_s.string[0]) { continue; - } else if (buffer.string[range->start] != F_fss_delimit_slash_s) { + } else if (buffer.string[range->start] != f_fss_delimit_slash_s.string[0]) { break; } @@ -358,7 +358,7 @@ extern "C" { if (range->start > range->stop || range->start >= buffer.used) break; - if (buffer.string[range->start] == f_fss_basic_list_open_s[0]) { + if (buffer.string[range->start] == f_fss_basic_list_open_s.string[0]) { graph_first = 0x0; ++range->start; @@ -374,7 +374,7 @@ extern "C" { } } - if (buffer.string[range->start] == f_fss_eol_s[0]) break; + if (buffer.string[range->start] == f_fss_eol_s.string[0]) break; status = f_fss_is_space(buffer, *range); if (F_status_is_error(status)) break; @@ -387,7 +387,7 @@ extern "C" { if (range->start > range->stop || range->start >= buffer.used) break; - if (buffer.string[range->start] == f_fss_eol_s[0]) { + if (buffer.string[range->start] == f_fss_eol_s.string[0]) { start = range->start; range->start = slash_first; @@ -403,7 +403,7 @@ extern "C" { while (slash_count > 0) { - if (buffer.string[range->start] == F_fss_delimit_slash_s) { + if (buffer.string[range->start] == f_fss_delimit_slash_s.string[0]) { if (slash_count % 2 == 1) { delimits->array[delimits->used++] = range->start; } @@ -428,7 +428,7 @@ extern "C" { range->start = start + 1; } } - else if (graph_first == 0x1 && buffer.string[range->start] == f_fss_comment_s[0]) { + else if (graph_first == 0x1 && buffer.string[range->start] == f_fss_comment_s.string[0]) { graph_first = 0x2; comment_delimit = slash_first; ++range->start; @@ -437,7 +437,7 @@ extern "C" { continue; } - if (buffer.string[range->start] == f_fss_basic_list_open_s[0]) { + if (buffer.string[range->start] == f_fss_basic_list_open_s.string[0]) { ++range->start; graph_first = 0x0; @@ -453,7 +453,7 @@ extern "C" { } } - if (buffer.string[range->start] == f_fss_eol_s[0]) break; + if (buffer.string[range->start] == f_fss_eol_s.string[0]) break; status = f_fss_is_space(buffer, *range); if (F_status_is_error(status)) break; @@ -469,9 +469,9 @@ extern "C" { if (range->start > range->stop || range->start >= buffer.used) break; // Found a valid object, set stop point to last newline. - if (buffer.string[range->start] == f_fss_eol_s[0]) { + if (buffer.string[range->start] == f_fss_eol_s.string[0]) { - if (newline_last == found->array[found->used].start && buffer.string[found->array[found->used].start] != f_fss_eol_s[0]) { + if (newline_last == found->array[found->used].start && buffer.string[found->array[found->used].start] != f_fss_eol_s.string[0]) { range->start = newline_last; return F_fss_found_content_not; } @@ -483,7 +483,7 @@ extern "C" { return F_fss_found_content; } - if (buffer.string[range->start] == f_fss_eol_s[0]) { + if (buffer.string[range->start] == f_fss_eol_s.string[0]) { if (graph_first == 0x2) { macro_f_fss_delimits_t_increase(status, state.step_small, (*delimits)); if (F_status_is_error(status)) break; @@ -498,7 +498,7 @@ extern "C" { continue; } - if (graph_first == 0x1 && buffer.string[range->start] == f_fss_comment_s[0]) { + if (graph_first == 0x1 && buffer.string[range->start] == f_fss_comment_s.string[0]) { start = newline_last + 1; status = f_fss_seek_to_eol(buffer, range); @@ -562,10 +562,10 @@ extern "C" { const f_status_t status_allocation = f_string_dynamic_increase_by(2, destination); if (F_status_is_error(status_allocation)) return status_allocation; - destination->string[destination->used++] = f_fss_basic_list_open_s[0]; + destination->string[destination->used++] = f_fss_basic_list_open_s.string[0]; if (complete == f_fss_complete_full_e || complete == f_fss_complete_full_trim_e) { - destination->string[destination->used++] = f_fss_basic_list_open_end_s[0]; + destination->string[destination->used++] = f_fss_basic_list_open_end_s.string[0]; } } @@ -600,13 +600,13 @@ extern "C" { } } - if (object.string[range->start] == f_fss_comment_s[0]) { + if (object.string[range->start] == f_fss_comment_s.string[0]) { // When a comment is found, escape it. status = f_string_dynamic_increase(state.step_large, destination); if (F_status_is_error(status)) break; - destination->string[destination->used++] = F_fss_delimit_slash_s; + destination->string[destination->used++] = f_fss_delimit_slash_s.string[0]; break; } @@ -617,8 +617,8 @@ extern "C" { if (status == F_true) break; // Objects will not have leading whitespaces, but having this does not result in an invalid object, so just write the provided spaces. - if (object.string[range->start] != F_fss_delimit_placeholder_s) { - if (object.string[range->start] == f_fss_eol_s[0]) { + if (object.string[range->start] != f_fss_delimit_placeholder_s.string[0]) { + if (object.string[range->start] == f_fss_eol_s.string[0]) { status = F_status_set_error(F_none_eol); break; @@ -661,7 +661,7 @@ extern "C" { } } - if (object.string[range->start] == F_fss_delimit_slash_s) { + if (object.string[range->start] == f_fss_delimit_slash_s.string[0]) { slash_count = 1; for (++range->start; range->start <= range->stop && range->start < object.used; ++range->start) { @@ -676,9 +676,9 @@ extern "C" { } } - if (object.string[range->start] == F_fss_delimit_placeholder_s) { + if (object.string[range->start] == f_fss_delimit_placeholder_s.string[0]) { continue; - } else if (object.string[range->start] != F_fss_delimit_slash_s) { + } else if (object.string[range->start] != f_fss_delimit_slash_s.string[0]) { break; } @@ -697,7 +697,7 @@ extern "C" { if (F_status_is_error(status)) break; while (--slash_count) { - destination->string[destination->used++] = F_fss_delimit_slash_s; + destination->string[destination->used++] = f_fss_delimit_slash_s.string[0]; } // while if (range->start > range->stop || range->start >= object.used) { @@ -705,8 +705,8 @@ extern "C" { } } - if (object.string[range->start] != F_fss_delimit_placeholder_s) { - if (object.string[range->start] == f_fss_eol_s[0]) { + if (object.string[range->start] != f_fss_delimit_placeholder_s.string[0]) { + if (object.string[range->start] == f_fss_eol_s.string[0]) { status = F_status_set_error(F_none_eol); break; @@ -751,10 +751,10 @@ extern "C" { return status; } - destination->string[destination->used++] = f_fss_basic_list_open_s[0]; + destination->string[destination->used++] = f_fss_basic_list_open_s.string[0]; if (complete == f_fss_complete_full_e || complete == f_fss_complete_full_trim_e) { - destination->string[destination->used++] = f_fss_basic_list_open_end_s[0]; + destination->string[destination->used++] = f_fss_basic_list_open_end_s.string[0]; } } @@ -785,7 +785,7 @@ extern "C" { const f_status_t status_allocation = f_string_dynamic_increase(state.step_large, destination); if (F_status_is_error(status_allocation)) return status_allocation; - destination->string[destination->used++] = f_fss_basic_list_close_s[0]; + destination->string[destination->used++] = f_fss_basic_list_close_s.string[0]; } if (status == F_none_stop) { @@ -823,7 +823,7 @@ extern "C" { } } - if (content.string[range->start] == F_fss_delimit_slash_s && !is_comment) { + if (content.string[range->start] == f_fss_delimit_slash_s.string[0] && !is_comment) { slash_count = 1; if (do_prepend) { @@ -847,31 +847,31 @@ extern "C" { } } - if (content.string[range->start] == F_fss_delimit_placeholder_s) continue; - if (content.string[range->start] != F_fss_delimit_slash_s) break; + if (content.string[range->start] == f_fss_delimit_placeholder_s.string[0]) continue; + if (content.string[range->start] != f_fss_delimit_slash_s.string[0]) break; - destination->string[destination->used++] = F_fss_delimit_slash_s; + destination->string[destination->used++] = f_fss_delimit_slash_s.string[0]; ++slash_count; } // for - if (content.string[range->start] == f_fss_basic_list_open_s[0]) { + if (content.string[range->start] == f_fss_basic_list_open_s.string[0]) { start = range->start++; status = f_fss_skip_past_space(content, range); if (F_status_is_error(status)) break; - if (content.string[range->start] == f_fss_eol_s[0] || range->start >= content.used || range->start > range->stop) { + if (content.string[range->start] == f_fss_eol_s.string[0] || range->start >= content.used || range->start > range->stop) { // Increase by total slashes + 1, along with the basic list open and possible newline. status = f_string_dynamic_increase_by(slash_count + 3, destination); if (F_status_is_error(status)) break; while (--slash_count) { - destination->string[destination->used++] = F_fss_delimit_slash_s; + destination->string[destination->used++] = f_fss_delimit_slash_s.string[0]; } // while - destination->string[destination->used++] = F_fss_delimit_slash_s; - destination->string[destination->used++] = f_fss_basic_list_open_s[0]; + destination->string[destination->used++] = f_fss_delimit_slash_s.string[0]; + destination->string[destination->used++] = f_fss_basic_list_open_s.string[0]; range->start = start + 1; @@ -884,13 +884,13 @@ extern "C" { status = f_string_dynamic_increase(state.step_large, destination); if (F_status_is_error(status)) break; - destination->string[destination->used++] = f_fss_basic_list_open_s[0]; + destination->string[destination->used++] = f_fss_basic_list_open_s.string[0]; range->start = start + 1; continue; } } - else if (content.string[range->start] == f_fss_basic_list_open_s[0] && !is_comment) { + else if (content.string[range->start] == f_fss_basic_list_open_s.string[0] && !is_comment) { start = range->start++; if (do_prepend) { @@ -905,14 +905,14 @@ extern "C" { status = f_fss_skip_past_space(content, range); if (F_status_is_error(status)) break; - if (content.string[range->start] == f_fss_eol_s[0] || range->start >= content.used || range->start > range->stop) { + if (content.string[range->start] == f_fss_eol_s.string[0] || range->start >= content.used || range->start > range->stop) { // Increase by slash and basic list open and possible newline. status = f_string_dynamic_increase_by(3, destination); if (F_status_is_error(status)) break; - destination->string[destination->used++] = F_fss_delimit_slash_s; - destination->string[destination->used++] = f_fss_basic_list_open_s[0]; + destination->string[destination->used++] = f_fss_delimit_slash_s.string[0]; + destination->string[destination->used++] = f_fss_basic_list_open_s.string[0]; range->start = start + 1; @@ -925,15 +925,15 @@ extern "C" { status = f_string_dynamic_increase(state.step_large, destination); if (F_status_is_error(status)) break; - destination->string[destination->used++] = f_fss_basic_list_open_s[0]; + destination->string[destination->used++] = f_fss_basic_list_open_s.string[0]; range->start = start + 1; continue; } - else if (content.string[range->start] == f_fss_comment_s[0] && !has_graph) { + else if (content.string[range->start] == f_fss_comment_s.string[0] && !has_graph) { is_comment = F_true; } - else if (content.string[range->start] == f_fss_eol_s[0]) { + else if (content.string[range->start] == f_fss_eol_s.string[0]) { has_graph = F_false; is_comment = F_false; } @@ -948,7 +948,7 @@ extern "C" { } } - if (content.string[range->start] != F_fss_delimit_placeholder_s) { + if (content.string[range->start] != f_fss_delimit_placeholder_s.string[0]) { if (do_prepend) { status = f_string_dynamic_prepend(*prepend, destination); if (F_status_is_error(status)) break; @@ -956,7 +956,7 @@ extern "C" { do_prepend = F_false; } - if (content.string[range->start] == f_fss_eol_s[0]) { + if (content.string[range->start] == f_fss_eol_s.string[0]) { do_prepend = F_true; } @@ -987,12 +987,12 @@ extern "C" { // Check to see if a newline exists, at the end. if (destination->used) { for (i = destination->used - 1; i > 0; --i) { - if (destination->string[i] != F_fss_delimit_placeholder_s) break; + if (destination->string[i] != f_fss_delimit_placeholder_s.string[0]) break; } // for } - if (!destination->used || destination->string[i] != f_fss_eol_s[0]) { - destination->string[destination->used++] = f_fss_basic_list_close_s[0]; + if (!destination->used || destination->string[i] != f_fss_eol_s.string[0]) { + destination->string[destination->used++] = f_fss_basic_list_close_s.string[0]; } } diff --git a/level_1/fl_fss/c/fss_embedded_list.c b/level_1/fl_fss/c/fss_embedded_list.c index b456b5d..be6986a 100644 --- a/level_1/fl_fss/c/fss_embedded_list.c +++ b/level_1/fl_fss/c/fss_embedded_list.c @@ -36,7 +36,7 @@ extern "C" { } // Return found nothing if this line only contains whitespace and delimit placeholders. - if (buffer.string[range->start] == f_fss_eol_s[0]) { + if (buffer.string[range->start] == f_fss_eol_s.string[0]) { // Move the start position to after the EOL. ++range->start; @@ -48,7 +48,7 @@ extern "C" { found->start = range->start; // Ignore all comment lines. - if (buffer.string[range->start] == f_fss_comment_s[0]) { + if (buffer.string[range->start] == f_fss_comment_s.string[0]) { status = f_fss_seek_to_eol(buffer, range); if (F_status_is_error(status)) { @@ -79,7 +79,7 @@ extern "C" { bool graph_first = F_true; // Identify where the object ends. - while (range->start <= range->stop && range->start < buffer.used && buffer.string[range->start] != f_fss_eol_s[0]) { + while (range->start <= range->stop && range->start < buffer.used && buffer.string[range->start] != f_fss_eol_s.string[0]) { if (state.interrupt) { status = state.interrupt((void *) &state, 0); @@ -91,14 +91,14 @@ extern "C" { } } - if (buffer.string[range->start] == F_fss_delimit_slash_s) { + if (buffer.string[range->start] == f_fss_delimit_slash_s.string[0]) { slash_first = range->start; slash_count = 1; status = f_utf_buffer_increment(buffer, range, 1); if (F_status_is_error(status)) break; - while (range->start <= range->stop && range->start < buffer.used && (buffer.string[range->start] == F_fss_delimit_placeholder_s || buffer.string[range->start] == F_fss_delimit_slash_s)) { + while (range->start <= range->stop && range->start < buffer.used && (buffer.string[range->start] == f_fss_delimit_placeholder_s.string[0] || buffer.string[range->start] == f_fss_delimit_slash_s.string[0])) { if (state.interrupt) { status = state.interrupt((void *) &state, 0); @@ -110,7 +110,7 @@ extern "C" { } } - if (buffer.string[range->start] == F_fss_delimit_slash_s) slash_count++; + if (buffer.string[range->start] == f_fss_delimit_slash_s.string[0]) slash_count++; status = f_utf_buffer_increment(buffer, range, 1); if (F_status_is_error(status)) break; @@ -120,7 +120,7 @@ extern "C" { private_macro_fl_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop); - if (buffer.string[range->start] == f_fss_embedded_list_open_s[0]) { + if (buffer.string[range->start] == f_fss_embedded_list_open_s.string[0]) { graph_first = F_false; stop = range->start - 1; ++range->start; @@ -137,7 +137,7 @@ extern "C" { } } - if (buffer.string[range->start] == f_fss_eol_s[0]) break; + if (buffer.string[range->start] == f_fss_eol_s.string[0]) break; status = f_fss_is_graph(buffer, *range); if (F_status_is_error(status)) break; @@ -150,7 +150,7 @@ extern "C" { private_macro_fl_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop); - if (buffer.string[range->start] == f_fss_eol_s[0]) { + if (buffer.string[range->start] == f_fss_eol_s.string[0]) { start = range->start; range->start = slash_first; @@ -161,7 +161,7 @@ extern "C" { if (slash_count % 2 == 0) { while (slash_count > 0) { - if (buffer.string[range->start] == F_fss_delimit_slash_s) { + if (buffer.string[range->start] == f_fss_delimit_slash_s.string[0]) { if (slash_count % 2 == 1) { delimits->array[delimits->used] = range->start; ++delimits->used; @@ -186,7 +186,7 @@ extern "C" { return F_fss_found_object_not; } } - else if (graph_first && buffer.string[range->start] == f_fss_comment_s[0]) { + else if (graph_first && buffer.string[range->start] == f_fss_comment_s.string[0]) { graph_first = F_false; // Comments may only have whitespace before the '#', therefore only the first slash needs to be delimited. @@ -202,7 +202,7 @@ extern "C" { continue; } - else if (buffer.string[range->start] == f_fss_embedded_list_open_s[0]) { + else if (buffer.string[range->start] == f_fss_embedded_list_open_s.string[0]) { graph_first = F_false; stop = range->start - 1; @@ -221,7 +221,7 @@ extern "C" { } } - if (buffer.string[range->start] == f_fss_eol_s[0]) break; + if (buffer.string[range->start] == f_fss_eol_s.string[0]) break; status = f_fss_is_space(buffer, *range); if (F_status_is_error(status)) break; @@ -236,7 +236,7 @@ extern "C" { private_macro_fl_fss_object_return_on_overflow_delimited((buffer), (*range), (*found), F_none_eos, F_none_stop); - if (buffer.string[range->start] == f_fss_eol_s[0]) { + if (buffer.string[range->start] == f_fss_eol_s.string[0]) { found->stop = stop; // Move the start position to after the EOL. @@ -266,7 +266,7 @@ extern "C" { } // Seek to the end of the line when no valid object is found. - while (range->start <= range->stop && range->start < buffer.used && buffer.string[range->start] != f_fss_eol_s[0]) { + while (range->start <= range->stop && range->start < buffer.used && buffer.string[range->start] != f_fss_eol_s.string[0]) { if (state.interrupt) { status = state.interrupt((void *) &state, 0); @@ -385,7 +385,7 @@ extern "C" { } } - if (buffer.string[range->start] == f_fss_eol_s[0]) { + if (buffer.string[range->start] == f_fss_eol_s.string[0]) { if (graph_first == 0x2) { macro_f_fss_delimits_t_increase(status, state.step_small, (*delimits)); if (F_status_is_error(status)) break; @@ -409,14 +409,14 @@ extern "C" { continue; } - if (buffer.string[range->start] == F_fss_delimit_slash_s) { + if (buffer.string[range->start] == f_fss_delimit_slash_s.string[0]) { slash_first = range->start; slash_last = range->start; slashes.array[depth] = 1; position_previous = range->start++; - while (range->start <= range->stop && range->start < buffer.used && (buffer.string[range->start] == F_fss_delimit_placeholder_s || buffer.string[range->start] == F_fss_delimit_slash_s)) { + while (range->start <= range->stop && range->start < buffer.used && (buffer.string[range->start] == f_fss_delimit_placeholder_s.string[0] || buffer.string[range->start] == f_fss_delimit_slash_s.string[0])) { if (state.interrupt) { status = state.interrupt((void *) &state, 0); @@ -430,7 +430,7 @@ extern "C" { position_previous = range->start; - if (buffer.string[range->start] == F_fss_delimit_slash_s) { + if (buffer.string[range->start] == f_fss_delimit_slash_s.string[0]) { slash_last = range->start++; ++slashes.array[depth]; } @@ -454,7 +454,7 @@ extern "C" { // Only the first slash before a close is delimited, all others are maintained. // For example '}' = valid close, '\}' represents '}', '\\}' represents '\}', '\\\}' represents '\\}', '\\\\}' represents '\\\}', and so on.. // When slash is odd and a (delimited) valid open/close is found, then save delimited positions and continue. - if (buffer.string[range->start] == f_fss_eol_s[0]) { + if (buffer.string[range->start] == f_fss_eol_s.string[0]) { if (graph_first == 0x2) { macro_f_fss_delimits_t_increase(status, state.step_small, (*delimits)); if (F_status_is_error(status)) break; @@ -467,12 +467,12 @@ extern "C" { line_start = range->start; graph_first = 0x1; } - else if (buffer.string[range->start] == f_fss_embedded_list_open_s[0] || buffer.string[range->start] == f_fss_embedded_list_close_s[0]) { + else if (buffer.string[range->start] == f_fss_embedded_list_open_s.string[0] || buffer.string[range->start] == f_fss_embedded_list_close_s.string[0]) { before_list_open = position_previous; is_open = F_false; graph_first = 0x0; - if (buffer.string[range->start] == f_fss_embedded_list_open_s[0]) { + if (buffer.string[range->start] == f_fss_embedded_list_open_s.string[0]) { is_open = F_true; } @@ -490,7 +490,7 @@ extern "C" { } } - if (buffer.string[range->start] == f_fss_eol_s[0]) { + if (buffer.string[range->start] == f_fss_eol_s.string[0]) { if (graph_first == 0x2) { macro_f_fss_delimits_t_increase(status, state.step_small, (*delimits)); if (F_status_is_error(status)) break; @@ -505,7 +505,7 @@ extern "C" { break; } - if (buffer.string[range->start] != F_fss_delimit_placeholder_s) { + if (buffer.string[range->start] != f_fss_delimit_placeholder_s.string[0]) { status = f_fss_is_space(buffer, *range); if (F_status_is_error(status)) break; @@ -528,7 +528,7 @@ extern "C" { } // This is a valid object open/close that has been delimited, save the slash delimit positions. - if (buffer.string[range->start] == f_fss_eol_s[0]) { + if (buffer.string[range->start] == f_fss_eol_s.string[0]) { newline_last = range->start; line_start = range->start + 1; graph_first = 0x1; @@ -548,7 +548,7 @@ extern "C" { // Apply slash delimits, only slashes and placeholders should be present. while (slashes.array[depth]) { - if (buffer.string[range->start] == F_fss_delimit_slash_s) { + if (buffer.string[range->start] == f_fss_delimit_slash_s.string[0]) { if (slashes.array[depth]-- % 2 == 1) { delimits->array[delimits->used++] = range->start; } @@ -598,7 +598,7 @@ extern "C" { range->start = newline_last; } } - else if (graph_first == 0x1 && buffer.string[range->start] == f_fss_comment_s[0]) { + else if (graph_first == 0x1 && buffer.string[range->start] == f_fss_comment_s.string[0]) { graph_first = 0x2; comment_delimit = slash_first; } @@ -606,7 +606,7 @@ extern "C" { graph_first = 0x0; } } - else if (buffer.string[range->start] == f_fss_embedded_list_open_s[0]) { + else if (buffer.string[range->start] == f_fss_embedded_list_open_s.string[0]) { graph_first = 0x0; before_list_open = position_previous; position_previous = range->start; @@ -626,9 +626,9 @@ extern "C" { } } - if (buffer.string[range->start] == f_fss_eol_s[0]) break; + if (buffer.string[range->start] == f_fss_eol_s.string[0]) break; - if (buffer.string[range->start] != F_fss_delimit_placeholder_s) { + if (buffer.string[range->start] != f_fss_delimit_placeholder_s.string[0]) { status = f_fss_is_space(buffer, *range); if (F_status_is_error(status)) break; @@ -650,7 +650,7 @@ extern "C" { private_macro_fl_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, slashes, F_data_not_eos, F_data_not_stop); } - if (buffer.string[range->start] == f_fss_eol_s[0]) { + if (buffer.string[range->start] == f_fss_eol_s.string[0]) { ++depth; if (depth >= positions_start.size) { @@ -715,7 +715,7 @@ extern "C" { } } - if (buffer.string[range->start] == f_fss_eol_s[0]) { + if (buffer.string[range->start] == f_fss_eol_s.string[0]) { newline_last = range->start; line_start = range->start + 1; break; @@ -737,7 +737,7 @@ extern "C" { } } } - else if (buffer.string[range->start] == f_fss_embedded_list_close_s[0]) { + else if (buffer.string[range->start] == f_fss_embedded_list_close_s.string[0]) { graph_first = 0x0; while (range->start <= range->stop && range->start < buffer.used) { @@ -757,11 +757,11 @@ extern "C" { status = f_utf_buffer_increment(buffer, range, 1); if (F_status_is_error(status)) break; - if (buffer.string[range->start] == f_fss_eol_s[0]) { + if (buffer.string[range->start] == f_fss_eol_s.string[0]) { break; } - if (buffer.string[range->start] != F_fss_delimit_placeholder_s) { + if (buffer.string[range->start] != f_fss_delimit_placeholder_s.string[0]) { status = f_fss_is_space(buffer, *range); if (F_status_is_error(status)) break; @@ -780,7 +780,7 @@ extern "C" { private_macro_fl_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, slashes, F_data_not_eos, F_data_not_stop); } - if (buffer.string[range->start] == f_fss_eol_s[0]) { + if (buffer.string[range->start] == f_fss_eol_s.string[0]) { macro_f_fss_nest_t_increase(status, state.step_small, (*found)); if (F_status_is_error(status)) break; @@ -857,7 +857,7 @@ extern "C" { } } - if (buffer.string[range->start] == f_fss_eol_s[0]) { + if (buffer.string[range->start] == f_fss_eol_s.string[0]) { if (graph_first == 0x2) { macro_f_fss_delimits_t_increase(status, state.step_small, (*delimits)); if (F_status_is_error(status)) break; @@ -888,7 +888,7 @@ extern "C" { } } } - else if (graph_first == 0x1 && buffer.string[range->start] == f_fss_comment_s[0]) { + else if (graph_first == 0x1 && buffer.string[range->start] == f_fss_comment_s.string[0]) { position = newline_last + 1; status = f_fss_seek_to_eol(buffer, range); @@ -917,7 +917,7 @@ extern "C" { continue; } - else if (buffer.string[range->start] != f_fss_eol_s[0]) { + else if (buffer.string[range->start] != f_fss_eol_s.string[0]) { position_previous = range->start; if (graph_first == 0x1) { @@ -993,10 +993,10 @@ extern "C" { const f_status_t status_allocation = f_string_dynamic_increase_by(2, destination); if (F_status_is_error(status_allocation)) return status_allocation; - destination->string[destination->used++] = f_fss_embedded_list_open_s[0]; + destination->string[destination->used++] = f_fss_embedded_list_open_s.string[0]; if (complete == f_fss_complete_full_e || complete == f_fss_complete_full_trim_e) { - destination->string[destination->used++] = f_fss_embedded_list_open_end_s[0]; + destination->string[destination->used++] = f_fss_embedded_list_open_end_s.string[0]; } } @@ -1028,13 +1028,13 @@ extern "C" { } } - if (object.string[range->start] == f_fss_comment_s[0]) { + if (object.string[range->start] == f_fss_comment_s.string[0]) { // When a comment is found, escape it. status = f_string_dynamic_increase(state.step_large, destination); if (F_status_is_error(status)) break; - destination->string[destination->used++] = F_fss_delimit_slash_s; + destination->string[destination->used++] = f_fss_delimit_slash_s.string[0]; break; } @@ -1044,8 +1044,8 @@ extern "C" { if (status == F_true) break; // Objects will not have leading whitespaces, but having this does not result in an invalid object, so just write the provided spaces. - if (object.string[range->start] != F_fss_delimit_placeholder_s) { - if (object.string[range->start] == f_fss_eol_s[0]) { + if (object.string[range->start] != f_fss_delimit_placeholder_s.string[0]) { + if (object.string[range->start] == f_fss_eol_s.string[0]) { status = F_status_set_error(F_none_eol); break; } @@ -1086,7 +1086,7 @@ extern "C" { } } - if (object.string[range->start] == F_fss_delimit_slash_s) { + if (object.string[range->start] == f_fss_delimit_slash_s.string[0]) { slash_count = 1; for (++range->start; range->start <= range->stop && range->start < object.used; ++range->start) { @@ -1100,9 +1100,9 @@ extern "C" { } } - if (object.string[range->start] == F_fss_delimit_placeholder_s) { + if (object.string[range->start] == f_fss_delimit_placeholder_s.string[0]) { continue; - } else if (object.string[range->start] != F_fss_delimit_slash_s) { + } else if (object.string[range->start] != f_fss_delimit_slash_s.string[0]) { break; } @@ -1121,7 +1121,7 @@ extern "C" { if (F_status_is_error(status)) break; while (--slash_count) { - destination->string[destination->used++] = F_fss_delimit_slash_s; + destination->string[destination->used++] = f_fss_delimit_slash_s.string[0]; } // while if (range->start > range->stop || range->start >= object.used) { @@ -1130,8 +1130,8 @@ extern "C" { } } - if (object.string[range->start] != F_fss_delimit_placeholder_s) { - if (object.string[range->start] == f_fss_eol_s[0]) { + if (object.string[range->start] != f_fss_delimit_placeholder_s.string[0]) { + if (object.string[range->start] == f_fss_eol_s.string[0]) { status = F_status_set_error(F_none_eol); break; } @@ -1184,13 +1184,13 @@ extern "C" { } if (!ends_on_space) { - destination->string[destination->used++] = F_fss_space_s[0]; + destination->string[destination->used++] = f_fss_space_s.string[0]; } - destination->string[destination->used++] = f_fss_embedded_list_open_s[0]; + destination->string[destination->used++] = f_fss_embedded_list_open_s.string[0]; if (complete == f_fss_complete_full_e || complete == f_fss_complete_full_trim_e) { - destination->string[destination->used++] = f_fss_embedded_list_open_end_s[0]; + destination->string[destination->used++] = f_fss_embedded_list_open_end_s.string[0]; } } @@ -1228,8 +1228,8 @@ extern "C" { const f_status_t status_allocation = f_string_dynamic_increase_by(2, destination); if (F_status_is_error(status_allocation)) return status_allocation; - destination->string[destination->used++] = f_fss_embedded_list_close_s[0]; - destination->string[destination->used++] = f_fss_embedded_list_close_end_s[0]; + destination->string[destination->used++] = f_fss_embedded_list_close_s.string[0]; + destination->string[destination->used++] = f_fss_embedded_list_close_end_s.string[0]; } return status; @@ -1265,7 +1265,7 @@ extern "C" { } } - if (content.string[range->start] == F_fss_delimit_slash_s && !is_comment) { + if (content.string[range->start] == f_fss_delimit_slash_s.string[0] && !is_comment) { slash_count = 1; if (do_prepend) { @@ -1288,32 +1288,32 @@ extern "C" { } } - if (content.string[range->start] == F_fss_delimit_placeholder_s) continue; - if (content.string[range->start] != F_fss_delimit_slash_s) break; + if (content.string[range->start] == f_fss_delimit_placeholder_s.string[0]) continue; + if (content.string[range->start] != f_fss_delimit_slash_s.string[0]) break; - destination->string[destination->used++] = F_fss_delimit_slash_s; + destination->string[destination->used++] = f_fss_delimit_slash_s.string[0]; ++slash_count; } // for - if (content.string[range->start] == f_fss_embedded_list_open_s[0] || content.string[range->start] == f_fss_embedded_list_close_s[0]) { + if (content.string[range->start] == f_fss_embedded_list_open_s.string[0] || content.string[range->start] == f_fss_embedded_list_close_s.string[0]) { start = range->start++; status = f_fss_skip_past_space(content, range); if (F_status_is_error(status)) break; - if (range->start >= content.used || range->start > range->stop || content.string[range->start] == f_fss_eol_s[0]) { + if (range->start >= content.used || range->start > range->stop || content.string[range->start] == f_fss_eol_s.string[0]) { // Increase by total slashes + 1 embedded list open/close. status = f_string_dynamic_increase_by(slash_count + 2, destination); if (F_status_is_error(status)) break; - if (content.string[range->start] == f_fss_embedded_list_open_s[0]) { + if (content.string[range->start] == f_fss_embedded_list_open_s.string[0]) { while (--slash_count) { - destination->string[destination->used++] = F_fss_delimit_slash_s; + destination->string[destination->used++] = f_fss_delimit_slash_s.string[0]; } // while } - destination->string[destination->used++] = F_fss_delimit_slash_s; + destination->string[destination->used++] = f_fss_delimit_slash_s.string[0]; destination->string[destination->used++] = content.string[start]; range->start = start + 1; @@ -1321,7 +1321,7 @@ extern "C" { status = private_fl_fss_basic_list_write_add_until_end(content, state, range, destination); if (F_status_is_error(status)) break; - if (content.string[range->start] != f_fss_eol_s[0]) { + if (content.string[range->start] != f_fss_eol_s.string[0]) { has_graph = F_true; } @@ -1334,8 +1334,8 @@ extern "C" { destination->string[destination->used++] = content.string[start]; - if (content.string[range->start] == f_fss_eol_s[0]) { - destination->string[destination->used++] = f_fss_eol_s[0]; + if (content.string[range->start] == f_fss_eol_s.string[0]) { + destination->string[destination->used++] = f_fss_eol_s.string[0]; ends_on_eol = F_true; } else { @@ -1346,7 +1346,7 @@ extern "C" { continue; } } - else if ((content.string[range->start] == f_fss_embedded_list_open_s[0] || (!has_graph && content.string[range->start] == f_fss_embedded_list_close_s[0])) && !is_comment) { + else if ((content.string[range->start] == f_fss_embedded_list_open_s.string[0] || (!has_graph && content.string[range->start] == f_fss_embedded_list_close_s.string[0])) && !is_comment) { start = range->start++; if (do_prepend) { @@ -1361,9 +1361,9 @@ extern "C" { status = f_fss_skip_past_space(content, range); if (F_status_is_error(status)) break; - if (range->start >= content.used || range->start > range->stop || content.string[range->start] == f_fss_eol_s[0]) { + if (range->start >= content.used || range->start > range->stop || content.string[range->start] == f_fss_eol_s.string[0]) { - if (content.string[range->start] == f_fss_eol_s[0]) { + if (content.string[range->start] == f_fss_eol_s.string[0]) { do_prepend = F_true; ends_on_eol = F_true; } @@ -1391,7 +1391,7 @@ extern "C" { status = f_string_dynamic_increase_by(3, destination); if (F_status_is_error(status)) break; - destination->string[destination->used++] = F_fss_delimit_slash_s; + destination->string[destination->used++] = f_fss_delimit_slash_s.string[0]; destination->string[destination->used++] = content.string[start]; range->start = start + 1; @@ -1409,10 +1409,10 @@ extern "C" { range->start = start + 1; continue; } - else if (content.string[range->start] == f_fss_comment_s[0] && !has_graph) { + else if (content.string[range->start] == f_fss_comment_s.string[0] && !has_graph) { is_comment = F_true; } - else if (content.string[range->start] == f_fss_eol_s[0]) { + else if (content.string[range->start] == f_fss_eol_s.string[0]) { has_graph = F_false; is_comment = F_false; } @@ -1423,7 +1423,7 @@ extern "C" { break; } - if (content.string[range->start] != F_fss_delimit_placeholder_s) { + if (content.string[range->start] != f_fss_delimit_placeholder_s.string[0]) { if (do_prepend) { status = f_string_dynamic_prepend(*prepend, destination); if (F_status_is_error(status)) break; @@ -1431,7 +1431,7 @@ extern "C" { do_prepend = F_false; } - if (content.string[range->start] == f_fss_eol_s[0]) { + if (content.string[range->start] == f_fss_eol_s.string[0]) { do_prepend = F_true; ends_on_eol = F_true; } @@ -1463,11 +1463,11 @@ extern "C" { if (F_status_is_error(status)) return status; if (!ends_on_eol) { - destination->string[destination->used++] = f_fss_eol_s[0]; + destination->string[destination->used++] = f_fss_eol_s.string[0]; } - destination->string[destination->used++] = f_fss_embedded_list_close_s[0]; - destination->string[destination->used++] = f_fss_embedded_list_close_end_s[0]; + destination->string[destination->used++] = f_fss_embedded_list_close_s.string[0]; + destination->string[destination->used++] = f_fss_embedded_list_close_end_s.string[0]; } if (range->start > range->stop) { diff --git a/level_1/fl_fss/c/fss_extended.c b/level_1/fl_fss/c/fss_extended.c index 7b30140..9a446e9 100644 --- a/level_1/fl_fss/c/fss_extended.c +++ b/level_1/fl_fss/c/fss_extended.c @@ -154,7 +154,7 @@ f_status_t fl_fss_extended_object_write(const f_string_static_t object, const f_ const f_array_length_t used_start = destination->used; - f_status_t status = private_fl_fss_basic_write(F_true, object, quote ? quote : F_fss_delimit_quote_double_s, state, range, destination); + f_status_t status = private_fl_fss_basic_write(F_true, object, quote ? quote : f_fss_delimit_quote_double_s.string[0], state, range, destination); if (status == F_data_not_stop || status == F_data_not_eos) { @@ -162,8 +162,8 @@ f_status_t fl_fss_extended_object_write(const f_string_static_t object, const f_ const f_status_t status_allocation = f_string_dynamic_increase_by(2, destination); if (F_status_is_error(status_allocation)) return status_allocation; - destination->string[destination->used++] = quote ? quote : F_fss_delimit_quote_double_s; - destination->string[destination->used++] = quote ? quote : F_fss_delimit_quote_double_s; + destination->string[destination->used++] = quote ? quote : f_fss_delimit_quote_double_s.string[0]; + destination->string[destination->used++] = quote ? quote : f_fss_delimit_quote_double_s.string[0]; } if (complete == f_fss_complete_partial_e || complete == f_fss_complete_partial_trim_e || complete == f_fss_complete_full_e || complete == f_fss_complete_full_trim_e) { @@ -171,14 +171,14 @@ f_status_t fl_fss_extended_object_write(const f_string_static_t object, const f_ f_status_t status2 = F_none; if (complete == f_fss_complete_full_trim_e) { - status2 = private_fl_fss_basic_write_object_trim(quote ? quote : F_fss_delimit_quote_double_s, used_start, state, destination); + status2 = private_fl_fss_basic_write_object_trim(quote ? quote : f_fss_delimit_quote_double_s.string[0], used_start, state, destination); if (F_status_is_error(status2)) return status2; } status2 = f_string_dynamic_increase(state.step_large, destination); if (F_status_is_error(status2)) return status2; - destination->string[destination->used++] = f_fss_extended_open_s[0]; + destination->string[destination->used++] = f_fss_extended_open_s.string[0]; } } @@ -194,7 +194,7 @@ f_status_t fl_fss_extended_object_write(const f_string_static_t object, const f_ #endif // _di_level_1_parameter_checking_ // this operates exactly like an object, syntax-wise. - const f_status_t status = private_fl_fss_basic_write(F_false, content, quote ? quote : F_fss_delimit_quote_double_s, state, range, destination); + const f_status_t status = private_fl_fss_basic_write(F_false, content, quote ? quote : f_fss_delimit_quote_double_s.string[0], state, range, destination); if (status == F_data_not_stop || status == F_data_not_eos) { @@ -202,16 +202,16 @@ f_status_t fl_fss_extended_object_write(const f_string_static_t object, const f_ const f_status_t status_allocation = f_string_dynamic_increase_by(4, destination); if (F_status_is_error(status_allocation)) return status_allocation; - destination->string[destination->used++] = quote ? quote : F_fss_delimit_quote_double_s; - destination->string[destination->used++] = quote ? quote : F_fss_delimit_quote_double_s; + destination->string[destination->used++] = quote ? quote : f_fss_delimit_quote_double_s.string[0]; + destination->string[destination->used++] = quote ? quote : f_fss_delimit_quote_double_s.string[0]; // content should be terminated, even if empty. if (complete == f_fss_complete_partial_e || complete == f_fss_complete_partial_trim_e || complete == f_fss_complete_full_e || complete == f_fss_complete_full_trim_e || complete == f_fss_complete_next_e) { - destination->string[destination->used++] = f_fss_extended_next_s[0]; + destination->string[destination->used++] = f_fss_extended_next_s.string[0]; } if (complete == f_fss_complete_full_e || complete == f_fss_complete_full_trim_e || complete == f_fss_complete_end_e) { - destination->string[destination->used++] = f_fss_extended_close_s[0]; + destination->string[destination->used++] = f_fss_extended_close_s.string[0]; } if (status == F_data_not_stop) { @@ -226,11 +226,11 @@ f_status_t fl_fss_extended_object_write(const f_string_static_t object, const f_ if (F_status_is_error(status_allocation)) return status_allocation; if (complete == f_fss_complete_partial_e || complete == f_fss_complete_partial_trim_e || complete == f_fss_complete_full_e || complete == f_fss_complete_full_trim_e || complete == f_fss_complete_next_e) { - destination->string[destination->used++] = f_fss_extended_next_s[0]; + destination->string[destination->used++] = f_fss_extended_next_s.string[0]; } if (complete == f_fss_complete_full_e || complete == f_fss_complete_full_trim_e || complete == f_fss_complete_end_e) { - destination->string[destination->used++] = f_fss_extended_close_s[0]; + destination->string[destination->used++] = f_fss_extended_close_s.string[0]; } } diff --git a/level_1/fl_fss/c/fss_extended_list.c b/level_1/fl_fss/c/fss_extended_list.c index b70f03e..e198d96 100644 --- a/level_1/fl_fss/c/fss_extended_list.c +++ b/level_1/fl_fss/c/fss_extended_list.c @@ -36,7 +36,7 @@ extern "C" { } // Return found nothing if this line only contains whitespace and delimit placeholders. - if (buffer.string[range->start] == f_fss_eol_s[0]) { + if (buffer.string[range->start] == f_fss_eol_s.string[0]) { // Move the start position to after the EOL. ++range->start; @@ -48,7 +48,7 @@ extern "C" { found->start = range->start; // Ignore all comment lines. - if (buffer.string[range->start] == f_fss_comment_s[0]) { + if (buffer.string[range->start] == f_fss_comment_s.string[0]) { status = f_fss_seek_to_eol(buffer, range); if (F_status_is_error(status)) { @@ -79,7 +79,7 @@ extern "C" { bool graph_first = F_true; // Identify where the object ends. - while (range->start <= range->stop && range->start < buffer.used && buffer.string[range->start] != f_fss_eol_s[0]) { + while (range->start <= range->stop && range->start < buffer.used && buffer.string[range->start] != f_fss_eol_s.string[0]) { if (state.interrupt) { status = state.interrupt((void *) &state, 0); @@ -91,14 +91,14 @@ extern "C" { } } - if (buffer.string[range->start] == F_fss_delimit_slash_s) { + if (buffer.string[range->start] == f_fss_delimit_slash_s.string[0]) { slash_first = range->start; slash_count = 1; status = f_utf_buffer_increment(buffer, range, 1); if (F_status_is_error(status)) break; - while (range->start <= range->stop && range->start < buffer.used && (buffer.string[range->start] == F_fss_delimit_placeholder_s || buffer.string[range->start] == F_fss_delimit_slash_s)) { + while (range->start <= range->stop && range->start < buffer.used && (buffer.string[range->start] == f_fss_delimit_placeholder_s.string[0] || buffer.string[range->start] == f_fss_delimit_slash_s.string[0])) { if (state.interrupt) { status = state.interrupt((void *) &state, 0); @@ -110,7 +110,7 @@ extern "C" { } } - if (buffer.string[range->start] == F_fss_delimit_slash_s) ++slash_count; + if (buffer.string[range->start] == f_fss_delimit_slash_s.string[0]) ++slash_count; status = f_utf_buffer_increment(buffer, range, 1); if (F_status_is_error(status)) break; @@ -120,7 +120,7 @@ extern "C" { private_macro_fl_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop); - if (buffer.string[range->start] == f_fss_extended_list_open_s[0]) { + if (buffer.string[range->start] == f_fss_extended_list_open_s.string[0]) { graph_first = F_false; stop = range->start - 1; ++range->start; @@ -137,7 +137,7 @@ extern "C" { } } - if (buffer.string[range->start] == f_fss_eol_s[0]) break; + if (buffer.string[range->start] == f_fss_eol_s.string[0]) break; status = f_fss_is_graph(buffer, *range); if (F_status_is_error(status)) break; @@ -150,7 +150,7 @@ extern "C" { private_macro_fl_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop); - if (buffer.string[range->start] == f_fss_eol_s[0]) { + if (buffer.string[range->start] == f_fss_eol_s.string[0]) { start = range->start; range->start = slash_first; @@ -161,7 +161,7 @@ extern "C" { if (slash_count % 2 == 0) { while (slash_count > 0) { - if (buffer.string[range->start] == F_fss_delimit_slash_s) { + if (buffer.string[range->start] == f_fss_delimit_slash_s.string[0]) { if (slash_count % 2 == 1) { delimits->array[delimits->used++] = range->start; } @@ -186,7 +186,7 @@ extern "C" { return F_fss_found_object_not; } } - else if (graph_first && buffer.string[range->start] == f_fss_comment_s[0]) { + else if (graph_first && buffer.string[range->start] == f_fss_comment_s.string[0]) { graph_first = F_false; // Comments may only have whitespace before the '#', therefore only the first slash needs to be delimited. @@ -202,7 +202,7 @@ extern "C" { continue; } - else if (buffer.string[range->start] == f_fss_extended_list_open_s[0]) { + else if (buffer.string[range->start] == f_fss_extended_list_open_s.string[0]) { graph_first = F_false; stop = range->start - 1; @@ -221,7 +221,7 @@ extern "C" { } } - if (buffer.string[range->start] == f_fss_eol_s[0]) break; + if (buffer.string[range->start] == f_fss_eol_s.string[0]) break; status = f_fss_is_space(buffer, *range); if (F_status_is_error(status)) break; @@ -236,7 +236,7 @@ extern "C" { private_macro_fl_fss_object_return_on_overflow_delimited((buffer), (*range), (*found), F_none_eos, F_none_stop); - if (buffer.string[range->start] == f_fss_eol_s[0]) { + if (buffer.string[range->start] == f_fss_eol_s.string[0]) { found->stop = stop; // Move the start position to after the EOL. @@ -267,7 +267,7 @@ extern "C" { } // Seek to the end of the line when no valid object is found. - while (range->start <= range->stop && range->start < buffer.used && buffer.string[range->start] != f_fss_eol_s[0]) { + while (range->start <= range->stop && range->start < buffer.used && buffer.string[range->start] != f_fss_eol_s.string[0]) { if (state.interrupt) { status = state.interrupt((void *) &state, 0); @@ -354,7 +354,7 @@ extern "C" { if (status == F_none_eos || status == F_none_stop) break; - if (buffer.string[range->start] == F_fss_delimit_slash_s) { + if (buffer.string[range->start] == f_fss_delimit_slash_s.string[0]) { slash_first = range->start; slash_count = 1; @@ -370,9 +370,9 @@ extern "C" { } } - if (buffer.string[range->start] == F_fss_delimit_placeholder_s) { + if (buffer.string[range->start] == f_fss_delimit_placeholder_s.string[0]) { continue; - } else if (buffer.string[range->start] != F_fss_delimit_slash_s) { + } else if (buffer.string[range->start] != f_fss_delimit_slash_s.string[0]) { break; } @@ -384,7 +384,7 @@ extern "C" { // Only the first slash before a close is delimited, all others are maintained. // For example '}' = valid close, '\}' represents '}', '\\}' represents '\}', '\\\}' represents '\\}', '\\\\}' represents '\\\}', and so on.. // With one or more slashes, even if delimited, this line may never designate a valid content close. - if (buffer.string[range->start] == f_fss_extended_list_close_s[0]) { + if (buffer.string[range->start] == f_fss_extended_list_close_s.string[0]) { ++range->start; while (range->start <= range->stop && range->start < buffer.used) { @@ -399,7 +399,7 @@ extern "C" { } } - if (buffer.string[range->start] == f_fss_eol_s[0]) break; + if (buffer.string[range->start] == f_fss_eol_s.string[0]) break; status = f_fss_is_space(buffer, *range); if (F_status_is_error(status)) break; @@ -412,7 +412,7 @@ extern "C" { if (range->start > range->stop || range->start >= buffer.used) break; - if (buffer.string[range->start] == f_fss_eol_s[0]) { + if (buffer.string[range->start] == f_fss_eol_s.string[0]) { macro_f_fss_delimits_t_increase(status, state.step_small, (*delimits)); if (F_status_is_error(status)) break; @@ -421,7 +421,7 @@ extern "C" { continue; } } - else if (buffer.string[range->start] == f_fss_comment_s[0]) { + else if (buffer.string[range->start] == f_fss_comment_s.string[0]) { macro_f_fss_delimits_t_increase(status, state.step_small, (*delimits)); if (F_status_is_error(status)) break; @@ -434,7 +434,7 @@ extern "C" { continue; } - if (buffer.string[range->start] == f_fss_extended_list_close_s[0]) { + if (buffer.string[range->start] == f_fss_extended_list_close_s.string[0]) { ++range->start; while (range->start <= range->stop && range->start < buffer.used) { @@ -449,7 +449,7 @@ extern "C" { } } - if (buffer.string[range->start] == f_fss_eol_s[0]) break; + if (buffer.string[range->start] == f_fss_eol_s.string[0]) break; status = f_fss_is_space(buffer, *range); if (F_status_is_error(status)) break; @@ -465,7 +465,7 @@ extern "C" { if (range->start > range->stop || range->start >= buffer.used) break; // Found a valid content close, set stop point to last newline. - if (buffer.string[range->start] == f_fss_eol_s[0]) { + if (buffer.string[range->start] == f_fss_eol_s.string[0]) { ++range->start; // If the last newline is the entire start, then there is no Content. @@ -484,7 +484,7 @@ extern "C" { continue; } - if (buffer.string[range->start] == f_fss_comment_s[0]) { + if (buffer.string[range->start] == f_fss_comment_s.string[0]) { start = newline_last + 1; status = f_fss_seek_to_eol(buffer, range); @@ -543,10 +543,10 @@ extern "C" { const f_status_t status_allocation = f_string_dynamic_increase_by(2, destination); if (F_status_is_error(status_allocation)) return status_allocation; - destination->string[destination->used++] = f_fss_extended_list_open_s[0]; + destination->string[destination->used++] = f_fss_extended_list_open_s.string[0]; if (complete == f_fss_complete_full_e || complete == f_fss_complete_full_trim_e) { - destination->string[destination->used++] = f_fss_extended_list_open_end_s[0]; + destination->string[destination->used++] = f_fss_extended_list_open_end_s.string[0]; } } @@ -579,13 +579,13 @@ extern "C" { } } - if (object.string[range->start] == f_fss_comment_s[0]) { + if (object.string[range->start] == f_fss_comment_s.string[0]) { // When a comment is found, escape it. status = f_string_dynamic_increase(state.step_large, destination); if (F_status_is_error(status)) break; - destination->string[destination->used++] = F_fss_delimit_slash_s; + destination->string[destination->used++] = f_fss_delimit_slash_s.string[0]; break; } @@ -596,8 +596,8 @@ extern "C" { if (status == F_true) break; // Objects will not have leading whitespaces, but having this does not result in an invalid object, so just write the provided spaces. - if (object.string[range->start] != F_fss_delimit_placeholder_s) { - if (object.string[range->start] == f_fss_eol_s[0]) { + if (object.string[range->start] != f_fss_delimit_placeholder_s.string[0]) { + if (object.string[range->start] == f_fss_eol_s.string[0]) { status = F_status_set_error(F_none_eol); break; @@ -640,7 +640,7 @@ extern "C" { } } - if (object.string[range->start] == F_fss_delimit_slash_s) { + if (object.string[range->start] == f_fss_delimit_slash_s.string[0]) { slash_count = 1; for (++range->start; range->start <= range->stop && range->start < object.used; ++range->start) { @@ -655,9 +655,9 @@ extern "C" { } } - if (object.string[range->start] == F_fss_delimit_placeholder_s) { + if (object.string[range->start] == f_fss_delimit_placeholder_s.string[0]) { continue; - } else if (object.string[range->start] != F_fss_delimit_slash_s) { + } else if (object.string[range->start] != f_fss_delimit_slash_s.string[0]) { break; } @@ -676,7 +676,7 @@ extern "C" { if (F_status_is_error(status)) break; while (--slash_count) { - destination->string[destination->used++] = F_fss_delimit_slash_s; + destination->string[destination->used++] = f_fss_delimit_slash_s.string[0]; } // while if (range->start > range->stop || range->start >= object.used) { @@ -686,8 +686,8 @@ extern "C" { } } - if (object.string[range->start] != F_fss_delimit_placeholder_s) { - if (object.string[range->start] == f_fss_eol_s[0]) { + if (object.string[range->start] != f_fss_delimit_placeholder_s.string[0]) { + if (object.string[range->start] == f_fss_eol_s.string[0]) { status = F_status_set_error(F_none_eol); break; @@ -741,13 +741,13 @@ extern "C" { } if (!ends_on_space) { - destination->string[destination->used++] = f_fss_space_s[0]; + destination->string[destination->used++] = f_fss_space_s.string[0]; } - destination->string[destination->used++] = f_fss_extended_list_open_s[0]; + destination->string[destination->used++] = f_fss_extended_list_open_s.string[0]; if (complete == f_fss_complete_full_e || complete == f_fss_complete_full_trim_e) { - destination->string[destination->used++] = f_fss_extended_list_open_end_s[0]; + destination->string[destination->used++] = f_fss_extended_list_open_end_s.string[0]; } } @@ -785,8 +785,8 @@ extern "C" { const f_status_t status_allocation = f_string_dynamic_increase_by(2, destination); if (F_status_is_error(status_allocation)) return status_allocation; - destination->string[destination->used++] = f_fss_extended_list_close_s[0]; - destination->string[destination->used++] = f_fss_extended_list_close_end_s[0]; + destination->string[destination->used++] = f_fss_extended_list_close_s.string[0]; + destination->string[destination->used++] = f_fss_extended_list_close_end_s.string[0]; } return status; @@ -823,7 +823,7 @@ extern "C" { } } - if (content.string[range->start] == F_fss_delimit_slash_s && !is_comment) { + if (content.string[range->start] == f_fss_delimit_slash_s.string[0] && !is_comment) { slash_count = 1; if (do_prepend) { @@ -846,14 +846,14 @@ extern "C" { } } - if (content.string[range->start] == F_fss_delimit_placeholder_s) continue; - if (content.string[range->start] != F_fss_delimit_slash_s) break; + if (content.string[range->start] == f_fss_delimit_placeholder_s.string[0]) continue; + if (content.string[range->start] != f_fss_delimit_slash_s.string[0]) break; - destination->string[destination->used++] = F_fss_delimit_slash_s; + destination->string[destination->used++] = f_fss_delimit_slash_s.string[0]; ++slash_count; } // for - if (content.string[range->start] == f_fss_extended_list_close_s[0]) { + if (content.string[range->start] == f_fss_extended_list_close_s.string[0]) { start = range->start++; status = f_fss_skip_past_space(content, range); @@ -862,21 +862,21 @@ extern "C" { if (has_graph) { // do nothing. } - else if (content.string[range->start] == f_fss_eol_s[0] || range->start >= content.used || range->start > range->stop) { + else if (content.string[range->start] == f_fss_eol_s.string[0] || range->start >= content.used || range->start > range->stop) { // increase by total slashes + 1 and extended list close. status = f_string_dynamic_increase_by(2, destination); if (F_status_is_error(status)) break; - destination->string[destination->used++] = F_fss_delimit_slash_s; - destination->string[destination->used++] = f_fss_extended_list_close_s[0]; + destination->string[destination->used++] = f_fss_delimit_slash_s.string[0]; + destination->string[destination->used++] = f_fss_extended_list_close_s.string[0]; range->start = start + 1; status = private_fl_fss_basic_list_write_add_until_end(content, state, range, destination); if (F_status_is_error(status)) break; - if (content.string[range->start] != f_fss_eol_s[0]) { + if (content.string[range->start] != f_fss_eol_s.string[0]) { has_graph = F_true; } @@ -889,8 +889,8 @@ extern "C" { destination->string[destination->used++] = content.string[start]; - if (content.string[range->start] == f_fss_eol_s[0]) { - destination->string[destination->used++] = f_fss_eol_s[0]; + if (content.string[range->start] == f_fss_eol_s.string[0]) { + destination->string[destination->used++] = f_fss_eol_s.string[0]; ends_on_eol = F_true; } else { @@ -902,7 +902,7 @@ extern "C" { continue; } } - else if (!has_graph && content.string[range->start] == f_fss_extended_list_close_s[0] && !is_comment) { + else if (!has_graph && content.string[range->start] == f_fss_extended_list_close_s.string[0] && !is_comment) { start = range->start++; if (do_prepend) { @@ -917,9 +917,9 @@ extern "C" { status = f_fss_skip_past_space(content, range); if (F_status_is_error(status)) break; - if (content.string[range->start] == f_fss_eol_s[0] || range->start >= content.used || range->start > range->stop) { + if (content.string[range->start] == f_fss_eol_s.string[0] || range->start >= content.used || range->start > range->stop) { - if (content.string[range->start] == f_fss_eol_s[0]) { + if (content.string[range->start] == f_fss_eol_s.string[0]) { do_prepend = F_true; ends_on_eol = F_true; } @@ -948,7 +948,7 @@ extern "C" { status = f_string_dynamic_increase_by(2, destination); if (F_status_is_error(status)) break; - destination->string[destination->used++] = F_fss_delimit_slash_s; + destination->string[destination->used++] = f_fss_delimit_slash_s.string[0]; destination->string[destination->used++] = content.string[start]; range->start = start + 1; @@ -967,10 +967,10 @@ extern "C" { continue; } - else if (content.string[range->start] == f_fss_comment_s[0] && !has_graph) { + else if (content.string[range->start] == f_fss_comment_s.string[0] && !has_graph) { is_comment = F_true; } - else if (content.string[range->start] == f_fss_eol_s[0]) { + else if (content.string[range->start] == f_fss_eol_s.string[0]) { has_graph = F_false; is_comment = F_false; } @@ -981,7 +981,7 @@ extern "C" { break; } - if (content.string[range->start] != F_fss_delimit_placeholder_s) { + if (content.string[range->start] != f_fss_delimit_placeholder_s.string[0]) { if (do_prepend) { status = f_string_dynamic_prepend(*prepend, destination); if (F_status_is_error(status)) break; @@ -989,7 +989,7 @@ extern "C" { do_prepend = F_false; } - if (content.string[range->start] == f_fss_eol_s[0]) { + if (content.string[range->start] == f_fss_eol_s.string[0]) { do_prepend = F_true; ends_on_eol = F_true; } @@ -1022,11 +1022,11 @@ extern "C" { if (F_status_is_error(status)) return status; if (!ends_on_eol) { - destination->string[destination->used++] = f_fss_eol_s[0]; + destination->string[destination->used++] = f_fss_eol_s.string[0]; } - destination->string[destination->used++] = f_fss_extended_list_close_s[0]; - destination->string[destination->used++] = f_fss_extended_list_close_end_s[0]; + destination->string[destination->used++] = f_fss_extended_list_close_s.string[0]; + destination->string[destination->used++] = f_fss_extended_list_close_end_s.string[0]; } if (range->start > range->stop) { diff --git a/level_1/fl_fss/c/private-fss.c b/level_1/fl_fss/c/private-fss.c index 94596aa..7b58818 100644 --- a/level_1/fl_fss/c/private-fss.c +++ b/level_1/fl_fss/c/private-fss.c @@ -28,7 +28,7 @@ extern "C" { } } - if (destination->string[destination_range.start] != F_fss_delimit_placeholder_s) break; + if (destination->string[destination_range.start] != f_fss_delimit_placeholder_s.string[0]) break; } // for if (destination->string[destination_range.start] == quote) { @@ -46,7 +46,7 @@ extern "C" { } } - if (destination->string[destination_range.start] == F_fss_delimit_placeholder_s) { + if (destination->string[destination_range.start] == f_fss_delimit_placeholder_s.string[0]) { continue; } @@ -63,7 +63,7 @@ extern "C" { width = macro_f_utf_byte_width(destination->string[destination_range.start]); for (i = 0; i < width; ++i) { - destination->string[destination_range.start + i] = F_fss_delimit_placeholder_s; + destination->string[destination_range.start + i] = f_fss_delimit_placeholder_s.string[0]; } // for } // for @@ -100,7 +100,7 @@ extern "C" { } } - if (destination->string[destination_range.start] == F_fss_delimit_placeholder_s) { + if (destination->string[destination_range.start] == f_fss_delimit_placeholder_s.string[0]) { continue; } @@ -120,7 +120,7 @@ extern "C" { width = macro_f_utf_byte_width(destination->string[destination_range.start]); for (i = 0; i < width; ++i) { - destination->string[destination_range.start + i] = F_fss_delimit_placeholder_s; + destination->string[destination_range.start + i] = f_fss_delimit_placeholder_s.string[0]; } // for } // for @@ -149,8 +149,8 @@ extern "C" { } // for if (destination_range.start == rear) { - destination->string[front] = F_fss_delimit_placeholder_s; - destination->string[rear] = F_fss_delimit_placeholder_s; + destination->string[front] = f_fss_delimit_placeholder_s.string[0]; + destination->string[rear] = f_fss_delimit_placeholder_s.string[0]; } } @@ -173,8 +173,8 @@ extern "C" { } } - if (buffer.string[range->start] == F_fss_delimit_placeholder_s) continue; - if (buffer.string[range->start] == f_fss_eol_s[0]) break; + if (buffer.string[range->start] == f_fss_delimit_placeholder_s.string[0]) continue; + if (buffer.string[range->start] == f_fss_eol_s.string[0]) break; status = f_string_dynamic_increase(state.step_large, destination); if (F_status_is_error(status)) break; @@ -205,7 +205,7 @@ extern "C" { } } - if (destination->string[destination_range.start] == F_fss_delimit_placeholder_s) { + if (destination->string[destination_range.start] == f_fss_delimit_placeholder_s.string[0]) { continue; } @@ -222,7 +222,7 @@ extern "C" { width = macro_f_utf_byte_width(destination->string[destination_range.start]); for (i = 0; i < width; ++i) { - destination->string[destination_range.start + i] = F_fss_delimit_placeholder_s; + destination->string[destination_range.start + i] = f_fss_delimit_placeholder_s.string[0]; } // for } // for @@ -236,7 +236,7 @@ extern "C" { } } - if (destination->string[destination_range.start] == F_fss_delimit_placeholder_s) { + if (destination->string[destination_range.start] == f_fss_delimit_placeholder_s.string[0]) { --destination->used; continue; @@ -302,9 +302,9 @@ extern "C" { found->start = range->start; // Ignore all comment lines. - if (object_as && buffer.string[range->start] == f_fss_comment_s[0]) { + if (object_as && buffer.string[range->start] == f_fss_comment_s.string[0]) { - while (buffer.string[range->start] != f_fss_eol_s[0]) { + while (buffer.string[range->start] != f_fss_eol_s.string[0]) { if (state.interrupt) { status = state.interrupt((void *) &state, 0); @@ -339,7 +339,7 @@ extern "C" { } // Identify where the object begins. - if (buffer.string[range->start] == F_fss_delimit_slash_s) { + if (buffer.string[range->start] == f_fss_delimit_slash_s.string[0]) { f_array_length_t first_slash = range->start; found->start = range->start; @@ -368,7 +368,7 @@ extern "C" { continue; } - if (buffer.string[range->start] != F_fss_delimit_slash_s) { + if (buffer.string[range->start] != f_fss_delimit_slash_s.string[0]) { status = f_fss_is_space(buffer, *range); if (F_status_is_error(status)) break; @@ -379,7 +379,7 @@ extern "C" { status = f_utf_buffer_increment(buffer, range, 1); if (F_status_is_error(status)) break; - if (buffer.string[range->start] == f_fss_eol_s[0]) { + if (buffer.string[range->start] == f_fss_eol_s.string[0]) { return F_fss_found_object_content_not; } @@ -407,7 +407,7 @@ extern "C" { return F_none_stop; } - if (buffer.string[range->start] == F_fss_delimit_quote_single_s || buffer.string[range->start] == F_fss_delimit_quote_double_s || (object_as && buffer.string[range->start] == f_fss_comment_s[0])) { + if (buffer.string[range->start] == f_fss_delimit_quote_single_s.string[0] || buffer.string[range->start] == f_fss_delimit_quote_double_s.string[0] || (object_as && buffer.string[range->start] == f_fss_comment_s.string[0])) { // Only the first slash before a quoted needs to be escaped (or not) as once there is a slash before a quoted, this cannot ever be a quote object. // This simplifies the number of slashes needed. @@ -421,7 +421,7 @@ extern "C" { if (F_status_is_error(status)) return status; } } - else if (buffer.string[range->start] == F_fss_delimit_quote_single_s || buffer.string[range->start] == F_fss_delimit_quote_double_s) { + else if (buffer.string[range->start] == f_fss_delimit_quote_single_s.string[0] || buffer.string[range->start] == f_fss_delimit_quote_double_s.string[0]) { quote_found = buffer.string[range->start]; status = f_utf_buffer_increment(buffer, range, 1); @@ -458,7 +458,7 @@ extern "C" { found->stop = range->start - 1; - if (buffer.string[range->start] == f_fss_eol_s[0]) { + if (buffer.string[range->start] == f_fss_eol_s.string[0]) { // Move the start position to after the EOL. ++range->start; @@ -486,7 +486,7 @@ extern "C" { } } - if (buffer.string[range->start] == F_fss_delimit_slash_s) { + if (buffer.string[range->start] == f_fss_delimit_slash_s.string[0]) { first_slash = range->start; slash_count = 1; @@ -503,13 +503,13 @@ extern "C" { } } - if (buffer.string[range->start] == F_fss_delimit_placeholder_s) { + if (buffer.string[range->start] == f_fss_delimit_placeholder_s.string[0]) { status = f_utf_buffer_increment(buffer, range, 1); if (F_status_is_error(status)) return status; continue; } - else if (buffer.string[range->start] != F_fss_delimit_slash_s) { + else if (buffer.string[range->start] != f_fss_delimit_slash_s.string[0]) { break; } @@ -561,10 +561,10 @@ extern "C" { if (status == F_true) { if (quote) { - if (quote_found == F_fss_delimit_quote_single_s) { + if (quote_found == f_fss_delimit_quote_single_s.string[0]) { *quote = f_fss_quote_type_single_e; } - else if (quote_found == F_fss_delimit_quote_double_s) { + else if (quote_found == f_fss_delimit_quote_double_s.string[0]) { *quote = f_fss_quote_type_double_e; } } @@ -577,7 +577,7 @@ extern "C" { while (slash_count > 0) { - if (buffer.string[range->start] == F_fss_delimit_slash_s) { + if (buffer.string[range->start] == f_fss_delimit_slash_s.string[0]) { if (slash_count % 2 == 1) { delimits->array[delimits->used] = range->start; ++delimits->used; @@ -592,7 +592,7 @@ extern "C" { range->start = location + 1; - while (buffer.string[range->start] == F_fss_delimit_placeholder_s) { + while (buffer.string[range->start] == f_fss_delimit_placeholder_s.string[0]) { if (state.interrupt) { status = state.interrupt((void *) &state, 0); @@ -613,7 +613,7 @@ extern "C" { if (status == F_true) { - while (range->start <= range->stop && range->start < buffer.used && buffer.string[range->start] != f_fss_eol_s[0]) { + while (range->start <= range->stop && range->start < buffer.used && buffer.string[range->start] != f_fss_eol_s.string[0]) { if (state.interrupt) { status = state.interrupt((void *) &state, 0); @@ -643,7 +643,7 @@ extern "C" { return F_fss_found_object_not; } - if (buffer.string[range->start] == f_fss_eol_s[0]) { + if (buffer.string[range->start] == f_fss_eol_s.string[0]) { found->stop = location - 1; // Move the start position to after the EOL. @@ -665,7 +665,7 @@ extern "C" { while (slash_count > 0) { - if (buffer.string[range->start] == F_fss_delimit_slash_s) { + if (buffer.string[range->start] == f_fss_delimit_slash_s.string[0]) { if (slash_count % 2 == 1) { delimits->array[delimits->used] = range->start; ++delimits->used; @@ -717,10 +717,10 @@ extern "C" { if (status == F_true) { if (quote) { - if (quote_found == F_fss_delimit_quote_single_s) { + if (quote_found == f_fss_delimit_quote_single_s.string[0]) { *quote = f_fss_quote_type_single_e; } - else if (quote_found == F_fss_delimit_quote_double_s) { + else if (quote_found == f_fss_delimit_quote_double_s.string[0]) { *quote = f_fss_quote_type_double_e; } } @@ -740,7 +740,7 @@ extern "C" { } } - if (buffer.string[range->start] == f_fss_eol_s[0]) { + if (buffer.string[range->start] == f_fss_eol_s.string[0]) { // Move the start position to after the EOL. ++range->start; @@ -758,9 +758,9 @@ extern "C" { return F_fss_found_object; } - if (buffer.string[range->start] != F_fss_delimit_placeholder_s) { + if (buffer.string[range->start] != f_fss_delimit_placeholder_s.string[0]) { - while (range->start <= range->stop && range->start < buffer.used && buffer.string[range->start] != f_fss_eol_s[0]) { + while (range->start <= range->stop && range->start < buffer.used && buffer.string[range->start] != f_fss_eol_s.string[0]) { if (state.interrupt) { status = state.interrupt((void *) &state, 0); @@ -809,7 +809,7 @@ extern "C" { } } } - else if (buffer.string[range->start] == f_fss_eol_s[0]) { + else if (buffer.string[range->start] == f_fss_eol_s.string[0]) { // Move the start position to after the EOL. ++range->start; @@ -874,14 +874,14 @@ extern "C" { f_array_length_t i = 0; // Use placeholders for potential quote and potential delimited quote to avoid doing things such as memmove(). - destination->string[destination->used++] = F_fss_delimit_placeholder_s; - destination->string[destination->used++] = F_fss_delimit_placeholder_s; + destination->string[destination->used++] = f_fss_delimit_placeholder_s.string[0]; + destination->string[destination->used++] = f_fss_delimit_placeholder_s.string[0]; // If there is an initial quote, then this must be quoted and the existing quote must be delimited. if (object.string[input_start] == quote) { quoted = F_true; } - else if (object_as && object.string[input_start] == f_fss_comment_s[0]) { + else if (object_as && object.string[input_start] == f_fss_comment_s.string[0]) { commented = F_true; } @@ -898,7 +898,7 @@ extern "C" { } } - if (object.string[range->start] == F_fss_delimit_slash_s) { + if (object.string[range->start] == f_fss_delimit_slash_s.string[0]) { item_first = range->start++; item_total = 1; @@ -913,10 +913,10 @@ extern "C" { } } - if (object.string[range->start] == F_fss_delimit_slash_s) { + if (object.string[range->start] == f_fss_delimit_slash_s.string[0]) { ++item_total; } - else if (object.string[range->start] != F_fss_delimit_placeholder_s) { + else if (object.string[range->start] != f_fss_delimit_placeholder_s.string[0]) { break; } } // for @@ -931,14 +931,14 @@ extern "C" { status = f_string_dynamic_increase(state.step_large, destination); if (F_status_is_error(status)) break; - destination->string[destination->used++] = F_fss_delimit_slash_s; + destination->string[destination->used++] = f_fss_delimit_slash_s.string[0]; } else { status = f_string_dynamic_increase_by(item_total, destination); if (F_status_is_error(status)) break; for (i = 0; i < item_total; ++i) { - destination->string[destination->used++] = F_fss_delimit_slash_s; + destination->string[destination->used++] = f_fss_delimit_slash_s.string[0]; } // for } } @@ -947,13 +947,13 @@ extern "C" { if (F_status_is_error(status)) break; for (i = 0; i < item_total; ++i) { - destination->string[destination->used++] = F_fss_delimit_slash_s; + destination->string[destination->used++] = f_fss_delimit_slash_s.string[0]; } // for break; } - if (object.string[range->start] == f_fss_eol_s[0]) { + if (object.string[range->start] == f_fss_eol_s.string[0]) { status = F_status_set_error(F_none_eol); break; } @@ -970,7 +970,7 @@ extern "C" { if (F_status_is_error(status)) break; for (i = 0; i < item_total; ++i) { - destination->string[destination->used++] = F_fss_delimit_slash_s; + destination->string[destination->used++] = f_fss_delimit_slash_s.string[0]; } // for destination->string[destination->used++] = quote; @@ -993,14 +993,14 @@ extern "C" { status = f_string_dynamic_increase(state.step_large, destination); if (F_status_is_error(status)) break; - destination->string[destination->used++] = F_fss_delimit_slash_s; + destination->string[destination->used++] = f_fss_delimit_slash_s.string[0]; } else { status = f_string_dynamic_increase_by(item_total, destination); if (F_status_is_error(status)) break; for (i = 0; i < item_total; ++i) { - destination->string[destination->used++] = F_fss_delimit_slash_s; + destination->string[destination->used++] = f_fss_delimit_slash_s.string[0]; } // for } } @@ -1011,7 +1011,7 @@ extern "C" { if (F_status_is_error(status)) break; for (i = 0; i < item_total; ++i) { - destination->string[destination->used++] = F_fss_delimit_slash_s; + destination->string[destination->used++] = f_fss_delimit_slash_s.string[0]; } // for destination->string[destination->used++] = quote; @@ -1020,7 +1020,7 @@ extern "C" { destination->string[destination->used++] = object.string[range->start + i]; } // for } - else if (object_as && object.string[range->start] == f_fss_comment_s[0]) { + else if (object_as && object.string[range->start] == f_fss_comment_s.string[0]) { // Only the first slash needs to be escaped for a comment, and then only if not quoted. if (item_first == input_start) { @@ -1031,7 +1031,7 @@ extern "C" { if (F_status_is_error(status)) break; for (i = 0; i < item_total; ++i) { - destination->string[destination->used++] = F_fss_delimit_slash_s; + destination->string[destination->used++] = f_fss_delimit_slash_s.string[0]; } // for destination->string[destination->used++] = object.string[range->start]; @@ -1056,7 +1056,7 @@ extern "C" { // There is nothing to delimit, so all slashes should be printed as is. for (i = 0; i < item_total; ++i) { - destination->string[destination->used++] = F_fss_delimit_slash_s; + destination->string[destination->used++] = f_fss_delimit_slash_s.string[0]; } // for status = f_string_dynamic_increase_by(width, destination); @@ -1075,7 +1075,7 @@ extern "C" { status = f_string_dynamic_increase(state.step_large, destination); if (F_status_is_error(status)) break; - destination->string[used_start + 1] = F_fss_delimit_slash_s; + destination->string[used_start + 1] = f_fss_delimit_slash_s.string[0]; } status = f_fss_skip_past_delimit(object, range); @@ -1109,7 +1109,7 @@ extern "C" { status = f_string_dynamic_increase(state.step_large, destination); if (F_status_is_error(status)) break; - destination->string[destination->used++] = F_fss_delimit_slash_s; + destination->string[destination->used++] = f_fss_delimit_slash_s.string[0]; } quoted = F_true; @@ -1126,11 +1126,11 @@ extern "C" { destination->string[destination->used++] = object.string[range->start + i]; } // for } - else if (object.string[range->start] == f_fss_eol_s[0]) { + else if (object.string[range->start] == f_fss_eol_s.string[0]) { status = F_status_set_error(F_none_eol); break; } - else if (object.string[range->start] != F_fss_delimit_placeholder_s) { + else if (object.string[range->start] != f_fss_delimit_placeholder_s.string[0]) { if (!quoted) { status = f_fss_is_space(object, *range); if (F_status_is_error(status)) break; @@ -1185,7 +1185,7 @@ extern "C" { } } - if (object.string[i] != F_fss_delimit_placeholder_s) break; + if (object.string[i] != f_fss_delimit_placeholder_s.string[0]) break; } // for // Only when followed by a space must the start quote be delimited. @@ -1203,13 +1203,13 @@ extern "C" { } if (status == F_false) { - destination->string[used_start + 1] = F_fss_delimit_placeholder_s; + destination->string[used_start + 1] = f_fss_delimit_placeholder_s.string[0]; } } } } else if (commented) { - destination->string[used_start] = F_fss_delimit_slash_s; + destination->string[used_start] = f_fss_delimit_slash_s.string[0]; } if (range->start > range->stop) { diff --git a/level_1/fl_print/c/print-common.c b/level_1/fl_print/c/print-common.c index b739e9f..3a7a5f2 100644 --- a/level_1/fl_print/c/print-common.c +++ b/level_1/fl_print/c/print-common.c @@ -6,9 +6,9 @@ extern "C" { #endif #ifndef _di_fl_print_t_ - const f_string_t fl_print_debug_s = FL_print_debug_s; - const f_string_t fl_print_error_s = FL_print_error_s; - const f_string_t fl_print_warning_s = FL_print_warning_s; + const f_string_static_t fl_print_debug_s = macro_f_string_static_t_initialize2(FL_print_debug_s, 0, FL_print_debug_s_length); + const f_string_static_t fl_print_error_s = macro_f_string_static_t_initialize2(FL_print_error_s, 0, FL_print_error_s_length); + const f_string_static_t fl_print_warning_s = macro_f_string_static_t_initialize2(FL_print_warning_s, 0, FL_print_warning_s_length); #endif // _di_fl_print_t_ #ifdef __cplusplus diff --git a/level_1/fl_print/c/print-common.h b/level_1/fl_print/c/print-common.h index f558e10..9eda188 100644 --- a/level_1/fl_print/c/print-common.h +++ b/level_1/fl_print/c/print-common.h @@ -32,20 +32,20 @@ extern "C" { #define FL_print_error_s "ERROR: " #define FL_print_warning_s "WARNING: " - #define FL_debug_s_length 7 - #define FL_error_s_length 7 - #define FL_warning_s_length 9 + #define FL_print_debug_s_length 7 + #define FL_print_error_s_length 7 + #define FL_print_warning_s_length 9 - extern const f_string_t fl_print_debug_s; - extern const f_string_t fl_print_error_s; - extern const f_string_t fl_print_warning_s; + extern const f_string_static_t fl_print_debug_s; + extern const f_string_static_t fl_print_error_s; + extern const f_string_static_t fl_print_warning_s; typedef struct { f_file_t to; uint8_t verbosity; - const char *prefix; - const char *suffix; + f_string_static_t prefix; + f_string_static_t suffix; f_color_set_t context; f_color_set_t notable; @@ -55,19 +55,19 @@ extern "C" { #define fl_print_t_initialize { \ macro_f_file_t_initialize2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d), \ f_console_verbosity_normal_e, \ - 0, \ - 0, \ + f_string_static_t_initialize, \ + f_string_static_t_initialize, \ f_color_set_t_initialize, \ f_color_set_t_initialize, \ 0, \ } #define macro_fl_print_t_initialize(to, verbosity, prefix, suffix, context, notable, set) { to, verbosity, prefix, suffix, context, notable, set } - #define macro_fl_print_t_initialize_debug() macro_fl_print_t_initialize(macro_f_file_t_initialize2(F_type_debug_d, F_type_descriptor_debug_d, F_file_flag_write_only_d), f_console_verbosity_normal_e, fl_print_debug_s, 0, f_color_set_t_initialize, f_color_set_t_initialize, 0) + #define macro_fl_print_t_initialize_debug() macro_fl_print_t_initialize(macro_f_file_t_initialize2(F_type_debug_d, F_type_descriptor_debug_d, F_file_flag_write_only_d), f_console_verbosity_normal_e, fl_print_debug_s, f_string_static_t_initialize, f_color_set_t_initialize, f_color_set_t_initialize, 0) #define macro_fl_print_t_initialize_debug2(suffix, set) macro_fl_print_t_initialize(macro_f_file_t_initialize2(F_type_debug_d, F_type_descriptor_debug_d, F_file_flag_write_only_d), f_console_verbosity_normal_e, fl_print_debug_s, suffix, f_color_set_t_initialize, f_color_set_t_initialize, set) - #define macro_fl_print_t_initialize_error() macro_fl_print_t_initialize(macro_f_file_t_initialize2(F_type_error_d, F_type_descriptor_error_d, F_file_flag_write_only_d), f_console_verbosity_normal_e, fl_print_error_s, 0, f_color_set_t_initialize, f_color_set_t_initialize, 0) + #define macro_fl_print_t_initialize_error() macro_fl_print_t_initialize(macro_f_file_t_initialize2(F_type_error_d, F_type_descriptor_error_d, F_file_flag_write_only_d), f_console_verbosity_normal_e, fl_print_error_s, f_string_static_t_initialize, f_color_set_t_initialize, f_color_set_t_initialize, 0) #define macro_fl_print_t_initialize_error2(suffix, set) macro_fl_print_t_initialize(macro_f_file_t_initialize2(F_type_error_d, F_type_descriptor_error_d, F_file_flag_write_only_d), f_console_verbosity_normal_e, fl_print_error_s, suffix, f_color_set_t_initialize, f_color_set_t_initialize, set) - #define macro_fl_print_t_initialize_warning() macro_fl_print_t_initialize(macro_f_file_t_initialize2(F_type_warning_d, F_type_descriptor_warning_d, F_file_flag_write_only_d), f_console_verbosity_normal_e, fl_print_warning_s, 0, f_color_set_t_initialize, f_color_set_t_initialize, 0) + #define macro_fl_print_t_initialize_warning() macro_fl_print_t_initialize(macro_f_file_t_initialize2(F_type_warning_d, F_type_descriptor_warning_d, F_file_flag_write_only_d), f_console_verbosity_normal_e, fl_print_warning_s, f_string_static_t_initialize, f_color_set_t_initialize, f_color_set_t_initialize, 0) #define macro_fl_print_t_initialize_warning2(suffix, set) macro_fl_print_t_initialize(macro_f_file_t_initialize2(F_type_warning_d, F_type_descriptor_warning_d, F_file_flag_write_only_d), f_console_verbosity_normal_e, fl_print_warning_s, suffix, f_color_set_t_initialize, f_color_set_t_initialize, set) #endif // _di_fl_print_t_ diff --git a/level_1/fl_print/c/print.c b/level_1/fl_print/c/print.c index 3350a62..93e19f8 100644 --- a/level_1/fl_print/c/print.c +++ b/level_1/fl_print/c/print.c @@ -20,7 +20,7 @@ extern "C" { for (f_string_t current = string; *current; ++current) { - if (*current == f_string_ascii_percent_s[0]) { + if (*current == f_string_ascii_percent_s.string[0]) { ++current; current = private_fl_print_format_convert(current, stream, &ap, &status); @@ -64,7 +64,7 @@ extern "C" { for (f_string_t current = string; *current; ++current) { - if (*current == f_string_ascii_percent_s[0]) { + if (*current == f_string_ascii_percent_s.string[0]) { ++current; current = private_fl_print_format_convert(current, stream, ap, &status); diff --git a/level_1/fl_print/c/private-print.c b/level_1/fl_print/c/private-print.c index 8257b72..b6a2c90 100644 --- a/level_1/fl_print/c/private-print.c +++ b/level_1/fl_print/c/private-print.c @@ -29,32 +29,32 @@ extern "C" { for (; *string; string += 1) { if (*string < 0x2c) { - if (*string == f_string_ascii_space_s[0]) { + if (*string == f_string_ascii_space_s.string[0]) { flag |= F_print_format_flag_sign_pad_d; continue; } - else if (*string == f_string_ascii_exclamation_s[0]) { + else if (*string == f_string_ascii_exclamation_s.string[0]) { base = 2; continue; } - else if (*string == f_string_ascii_pound_s[0]) { + else if (*string == f_string_ascii_pound_s.string[0]) { flag |= F_print_format_flag_convert_d; continue; } - else if (*string == f_string_ascii_dollar_s[0]) { + else if (*string == f_string_ascii_dollar_s.string[0]) { // If followed immediately by a '$' this is ignored. // Use '%$' to separate, such as '%l%$l' would allow for '0l' to be printed where '%ll' would interpret the 'l', resulting in a long long. return string; } - else if (*string == f_string_ascii_percent_s[0]) { + else if (*string == f_string_ascii_percent_s.string[0]) { // The first percent found represents a literal '%' to be printed, otherwise return as invalid. if (string == start) { - if (!fputc_unlocked(f_string_ascii_percent_s[0], stream)) { + if (fwrite_unlocked(f_string_ascii_percent_s.string, 1, f_string_ascii_percent_s.used, stream) < f_string_ascii_percent_s.used) { *status = F_status_set_error(F_output); } } @@ -64,16 +64,16 @@ extern "C" { return string; } - else if (*string == f_string_ascii_ampersand_s[0]) { + else if (*string == f_string_ascii_ampersand_s.string[0]) { base = 12; continue; } - else if (*string == f_string_ascii_asterisk_s[0]) { + else if (*string == f_string_ascii_asterisk_s.string[0]) { flag |= F_print_format_flag_width_d | F_print_format_flag_width_value_d; continue; } - else if (*string == f_string_ascii_plus_s[0]) { + else if (*string == f_string_ascii_plus_s.string[0]) { flag |= F_print_format_flag_sign_always_d; continue; @@ -85,12 +85,12 @@ extern "C" { } } else if (*string < 0x41) { - if (*string == f_string_ascii_minus_s[0]) { + if (*string == f_string_ascii_minus_s.string[0]) { flag |= F_print_format_flag_align_left_d; continue; } - else if (*string == f_string_ascii_period_s[0]) { + else if (*string == f_string_ascii_period_s.string[0]) { if (!*(string + 1)) { *status = F_status_set_error(F_eos); @@ -99,7 +99,7 @@ extern "C" { ++string; - if (*string == f_string_ascii_asterisk_s[0]) { + if (*string == f_string_ascii_asterisk_s.string[0]) { flag |= F_print_format_flag_precision_d | F_print_format_flag_precision_value_d; } else if (*string < 0x30 || *string > 0x39) { @@ -118,14 +118,14 @@ extern "C" { continue; } - else if (*string == f_string_ascii_slash_forward_s[0]) { + else if (*string == f_string_ascii_slash_forward_s.string[0]) { flag |= F_print_format_flag_range_d; continue; } else if (*string > 0x2f && *string < 0x3a) { if (!(flag & F_print_format_flag_width_d)) { - if (*string == f_string_ascii_0_s[0]) { + if (*string == f_string_ascii_0_s.string[0]) { flag |= F_print_format_flag_zeros_leading_d; continue; @@ -146,22 +146,22 @@ extern "C" { return string; } } - else if (*string == f_string_ascii_colon_s[0]) { + else if (*string == f_string_ascii_colon_s.string[0]) { flag |= F_print_format_flag_ignore_range_d; continue; } - else if (*string == f_string_ascii_colon_semi_s[0]) { + else if (*string == f_string_ascii_colon_semi_s.string[0]) { flag |= F_print_format_flag_ignore_index_d; continue; } - else if (*string == f_string_ascii_equal_s[0]) { + else if (*string == f_string_ascii_equal_s.string[0]) { flag |= F_print_format_flag_trim_d; continue; } - else if (*string == f_string_ascii_sign_at_s[0]) { + else if (*string == f_string_ascii_sign_at_s.string[0]) { base = 8; continue; @@ -173,34 +173,34 @@ extern "C" { } } else if (*string < 0x56) { - if (*string == f_string_ascii_C_s[0]) { + if (*string == f_string_ascii_C_s.string[0]) { char value[1] = { (char) va_arg(*ap, int) }; *status = f_print_safely(value, 1, stream); return string; } - else if (*string == f_string_ascii_D_s[0]) { + else if (*string == f_string_ascii_D_s.string[0]) { type = f_print_format_type_double_32_e; flag |= F_print_format_flag_uppercase_d; if (*(string + 1)) { - if (*(string + 1) == f_string_ascii_L_s[0]) { + if (*(string + 1) == f_string_ascii_L_s.string[0]) { type = f_print_format_type_double_64_e; - if (*(string + 2) == f_string_ascii_e_s[0]) { + if (*(string + 2) == f_string_ascii_e_s.string[0]) { flag |= F_print_format_flag_exponent_d; string += 2; } - else if (*(string + 2) == f_string_ascii_E_s[0]) { + else if (*(string + 2) == f_string_ascii_E_s.string[0]) { flag |= F_print_format_flag_exponent_d | F_print_format_flag_exponent_upper_d; string += 2; } - else if (*(string + 2) == f_string_ascii_g_s[0]) { + else if (*(string + 2) == f_string_ascii_g_s.string[0]) { flag |= F_print_format_flag_exponent_either_d; string += 2; } - else if (*(string + 2) == f_string_ascii_G_s[0]) { + else if (*(string + 2) == f_string_ascii_G_s.string[0]) { flag |= F_print_format_flag_exponent_either_d | F_print_format_flag_exponent_upper_d; string += 2; } @@ -208,30 +208,30 @@ extern "C" { ++string; } } - else if (*(string + 1) == f_string_ascii_e_s[0]) { + else if (*(string + 1) == f_string_ascii_e_s.string[0]) { flag |= F_print_format_flag_exponent_d; ++string; } - else if (*(string + 1) == f_string_ascii_E_s[0]) { + else if (*(string + 1) == f_string_ascii_E_s.string[0]) { flag |= F_print_format_flag_exponent_d | F_print_format_flag_exponent_upper_d; ++string; } - else if (*(string + 1) == f_string_ascii_g_s[0]) { + else if (*(string + 1) == f_string_ascii_g_s.string[0]) { flag |= F_print_format_flag_exponent_either_d; ++string; } - else if (*(string + 1) == f_string_ascii_G_s[0]) { + else if (*(string + 1) == f_string_ascii_G_s.string[0]) { flag |= F_print_format_flag_exponent_either_d | F_print_format_flag_exponent_upper_d; ++string; } } } - else if (*string == f_string_ascii_I_s[0]) { + else if (*string == f_string_ascii_I_s.string[0]) { type = f_print_format_type_signed_32_e; flag |= F_print_format_flag_uppercase_d; - if (*(string + 1) == f_string_ascii_I_s[0]) { - if (*(string + 2) == f_string_ascii_I_s[0]) { + if (*(string + 1) == f_string_ascii_I_s.string[0]) { + if (*(string + 2) == f_string_ascii_I_s.string[0]) { type = f_print_format_type_signed_8_e; string += 2; } @@ -240,8 +240,8 @@ extern "C" { ++string; } } - else if (*(string + 1) == f_string_ascii_L_s[0]) { - if (*(string + 2) == f_string_ascii_L_s[0]) { + else if (*(string + 1) == f_string_ascii_L_s.string[0]) { + if (*(string + 2) == f_string_ascii_L_s.string[0]) { type = f_print_format_type_signed_128_e; string += 2; } @@ -250,13 +250,13 @@ extern "C" { ++string; } } - else if (*(string + 1) == f_string_ascii_N_s[0]) { + else if (*(string + 1) == f_string_ascii_N_s.string[0]) { type = f_print_format_type_signed_number_e; flag |= F_print_format_flag_uppercase_d; ++string; } } - else if (*string == f_string_ascii_Q_s[0]) { + else if (*string == f_string_ascii_Q_s.string[0]) { const f_string_static_t value = va_arg(*ap, f_string_static_t); if (flag & F_print_format_flag_range_d) { @@ -373,19 +373,19 @@ extern "C" { return string; } - else if (*string == f_string_ascii_S_s[0]) { + else if (*string == f_string_ascii_S_s.string[0]) { const f_string_t value = va_arg(*ap, f_string_t); *status = f_print_safely_terminated(value, stream); return string; } - else if (*string == f_string_ascii_U_s[0]) { + else if (*string == f_string_ascii_U_s.string[0]) { type = f_print_format_type_unsigned_32_e; flag |= F_print_format_flag_uppercase_d; - if (*(string + 1) == f_string_ascii_I_s[0]) { - if (*(string + 2) == f_string_ascii_I_s[0]) { + if (*(string + 1) == f_string_ascii_I_s.string[0]) { + if (*(string + 2) == f_string_ascii_I_s.string[0]) { type = f_print_format_type_unsigned_8_e; string += 2; } @@ -394,8 +394,8 @@ extern "C" { ++string; } } - else if (*(string + 1) == f_string_ascii_L_s[0]) { - if (*(string + 2) == f_string_ascii_L_s[0]) { + else if (*(string + 1) == f_string_ascii_L_s.string[0]) { + if (*(string + 2) == f_string_ascii_L_s.string[0]) { type = f_print_format_type_unsigned_128_e; string += 2; } @@ -404,7 +404,7 @@ extern "C" { ++string; } } - else if (*(string + 1) == f_string_ascii_N_s[0]) { + else if (*(string + 1) == f_string_ascii_N_s.string[0]) { type = f_print_format_type_unsigned_number_e; ++string; } @@ -416,11 +416,11 @@ extern "C" { } } else if (*string < 0x60) { - if (*string == f_string_ascii_Z_s[0]) { + if (*string == f_string_ascii_Z_s.string[0]) { type = f_print_format_type_size_e; flag |= F_print_format_flag_uppercase_d; } - else if (*string == f_string_ascii_bracket_open_s[0]) { + else if (*string == f_string_ascii_bracket_open_s.string[0]) { const f_color_set_t value = va_arg(*ap, f_color_set_t); if (value.before) { @@ -429,7 +429,7 @@ extern "C" { return string; } - else if (*string == f_string_ascii_bracket_close_s[0]) { + else if (*string == f_string_ascii_bracket_close_s.string[0]) { const f_color_set_t value = va_arg(*ap, f_color_set_t); if (value.after) { @@ -438,12 +438,12 @@ extern "C" { return string; } - else if (*string == f_string_ascii_caret_s[0]) { + else if (*string == f_string_ascii_caret_s.string[0]) { base = 10; continue; } - else if (*string == f_string_ascii_underscore_s[0]) { + else if (*string == f_string_ascii_underscore_s.string[0]) { base = 16; continue; @@ -455,7 +455,7 @@ extern "C" { } } else if (*string < 0x72) { - if (*string == f_string_ascii_c_s[0]) { + if (*string == f_string_ascii_c_s.string[0]) { const char value = (char) va_arg(*ap, uint32_t); if (!fputc_unlocked(value, stream)) { @@ -464,26 +464,26 @@ extern "C" { return string; } - else if (*string == f_string_ascii_d_s[0]) { + else if (*string == f_string_ascii_d_s.string[0]) { type = f_print_format_type_double_32_e; if (*(string + 1)) { - if (*(string + 1) == f_string_ascii_L_s[0]) { + if (*(string + 1) == f_string_ascii_L_s.string[0]) { type = f_print_format_type_double_64_e; - if (*(string + 2) == f_string_ascii_e_s[0]) { + if (*(string + 2) == f_string_ascii_e_s.string[0]) { flag |= F_print_format_flag_exponent_d; string += 2; } - else if (*(string + 2) == f_string_ascii_E_s[0]) { + else if (*(string + 2) == f_string_ascii_E_s.string[0]) { flag |= F_print_format_flag_exponent_d | F_print_format_flag_exponent_upper_d; string += 2; } - else if (*(string + 2) == f_string_ascii_g_s[0]) { + else if (*(string + 2) == f_string_ascii_g_s.string[0]) { flag |= F_print_format_flag_exponent_either_d; string += 2; } - else if (*(string + 2) == f_string_ascii_G_s[0]) { + else if (*(string + 2) == f_string_ascii_G_s.string[0]) { flag |= F_print_format_flag_exponent_either_d | F_print_format_flag_exponent_upper_d; string += 2; } @@ -491,29 +491,29 @@ extern "C" { ++string; } } - else if (*(string + 1) == f_string_ascii_e_s[0]) { + else if (*(string + 1) == f_string_ascii_e_s.string[0]) { flag |= F_print_format_flag_exponent_d; ++string; } - else if (*(string + 1) == f_string_ascii_E_s[0]) { + else if (*(string + 1) == f_string_ascii_E_s.string[0]) { flag |= F_print_format_flag_exponent_d | F_print_format_flag_exponent_upper_d; ++string; } - else if (*(string + 1) == f_string_ascii_g_s[0]) { + else if (*(string + 1) == f_string_ascii_g_s.string[0]) { flag |= F_print_format_flag_exponent_either_d; ++string; } - else if (*(string + 1) == f_string_ascii_G_s[0]) { + else if (*(string + 1) == f_string_ascii_G_s.string[0]) { flag |= F_print_format_flag_exponent_either_d | F_print_format_flag_exponent_upper_d; ++string; } } } - else if (*string == f_string_ascii_i_s[0]) { + else if (*string == f_string_ascii_i_s.string[0]) { type = f_print_format_type_signed_32_e; - if (*(string + 1) == f_string_ascii_i_s[0]) { - if (*(string + 2) == f_string_ascii_i_s[0]) { + if (*(string + 1) == f_string_ascii_i_s.string[0]) { + if (*(string + 2) == f_string_ascii_i_s.string[0]) { type = f_print_format_type_signed_8_e; string += 2; } @@ -522,8 +522,8 @@ extern "C" { ++string; } } - else if (*(string + 1) == f_string_ascii_l_s[0]) { - if (*(string + 2) == f_string_ascii_l_s[0]) { + else if (*(string + 1) == f_string_ascii_l_s.string[0]) { + if (*(string + 2) == f_string_ascii_l_s.string[0]) { type = f_print_format_type_signed_128_e; string += 2; } @@ -532,12 +532,12 @@ extern "C" { ++string; } } - else if (*(string + 1) == f_string_ascii_n_s[0]) { + else if (*(string + 1) == f_string_ascii_n_s.string[0]) { type = f_print_format_type_signed_number_e; ++string; } } - else if (*string == f_string_ascii_q_s[0]) { + else if (*string == f_string_ascii_q_s.string[0]) { const f_string_static_t value = va_arg(*ap, f_string_static_t); if (flag & F_print_format_flag_range_d) { @@ -661,7 +661,7 @@ extern "C" { } } else { - if (*string == f_string_ascii_r_s[0]) { + if (*string == f_string_ascii_r_s.string[0]) { const f_string_static_t value = va_arg(*ap, f_string_static_t); if (flag & F_print_format_flag_range_d) { @@ -778,18 +778,18 @@ extern "C" { return string; } - else if (*string == f_string_ascii_s_s[0]) { + else if (*string == f_string_ascii_s_s.string[0]) { const f_string_t value = va_arg(*ap, f_string_t); *status = f_print_terminated(value, stream); return string; } - else if (*string == f_string_ascii_u_s[0]) { + else if (*string == f_string_ascii_u_s.string[0]) { type = f_print_format_type_unsigned_32_e; - if (*(string + 1) == f_string_ascii_i_s[0]) { - if (*(string + 2) == f_string_ascii_i_s[0]) { + if (*(string + 1) == f_string_ascii_i_s.string[0]) { + if (*(string + 2) == f_string_ascii_i_s.string[0]) { type = f_print_format_type_unsigned_8_e; string += 2; } @@ -798,8 +798,8 @@ extern "C" { ++string; } } - else if (*(string + 1) == f_string_ascii_l_s[0]) { - if (*(string + 2) == f_string_ascii_l_s[0]) { + else if (*(string + 1) == f_string_ascii_l_s.string[0]) { + if (*(string + 2) == f_string_ascii_l_s.string[0]) { type = f_print_format_type_unsigned_128_e; string += 2; } @@ -808,12 +808,12 @@ extern "C" { ++string; } } - else if (*(string + 1) == f_string_ascii_n_s[0]) { + else if (*(string + 1) == f_string_ascii_n_s.string[0]) { type = f_print_format_type_unsigned_number_e; ++string; } } - else if (*string == f_string_ascii_z_s[0]) { + else if (*string == f_string_ascii_z_s.string[0]) { type = f_print_format_type_size_e; } else { @@ -1023,7 +1023,7 @@ extern "C" { *number *= 10; *number += 0xf & *string; } - else if (*string == f_string_ascii_asterisk_s[0]) { + else if (*string == f_string_ascii_asterisk_s.string[0]) { *number = va_arg(*ap, unsigned int); break; @@ -1629,25 +1629,19 @@ extern "C" { } if (i + macro_f_utf_byte_width(string[i]) >= length) { - if (!fputc_unlocked(f_print_sequence_unknown_s[0], stream)) { - return F_status_set_error(F_output); - } - - if (!fputc_unlocked(f_print_sequence_unknown_s[1], stream)) { - return F_status_set_error(F_output); - } - - if (!fputc_unlocked(f_print_sequence_unknown_s[2], stream)) { + if (!fwrite_unlocked(f_print_sequence_unknown_s.string, 1, f_print_sequence_unknown_s.used, stream) < f_print_sequence_unknown_s.used) { return F_status_set_error(F_output); } i = length; status = F_none; + break; } if (!string[i]) { ++i; + continue; } @@ -1677,15 +1671,7 @@ extern "C" { } } else { - if (!fputc_unlocked(f_print_sequence_unknown_s[0], stream)) { - return F_status_set_error(F_output); - } - - if (!fputc_unlocked(f_print_sequence_unknown_s[1], stream)) { - return F_status_set_error(F_output); - } - - if (!fputc_unlocked(f_print_sequence_unknown_s[2], stream)) { + if (!fwrite_unlocked(f_print_sequence_unknown_s.string, 1, f_print_sequence_unknown_s.used, stream) < f_print_sequence_unknown_s.used) { return F_status_set_error(F_output); } } @@ -1707,15 +1693,7 @@ extern "C" { } if (status == F_false || i + macro_f_utf_byte_width(string[i]) >= length) { - if (!fputc_unlocked(f_print_sequence_unknown_s[0], stream)) { - return F_status_set_error(F_output); - } - - if (!fputc_unlocked(f_print_sequence_unknown_s[1], stream)) { - return F_status_set_error(F_output); - } - - if (!fputc_unlocked(f_print_sequence_unknown_s[2], stream)) { + if (!fwrite_unlocked(f_print_sequence_unknown_s.string, 1, f_print_sequence_unknown_s.used, stream) < f_print_sequence_unknown_s.used) { return F_status_set_error(F_output); } @@ -2093,25 +2071,19 @@ extern "C" { while (i < j) { if (i + macro_f_utf_byte_width(string[i]) >= length) { - if (!fputc_unlocked(f_print_sequence_unknown_s[0], stream)) { - return F_status_set_error(F_output); - } - - if (!fputc_unlocked(f_print_sequence_unknown_s[1], stream)) { - return F_status_set_error(F_output); - } - - if (!fputc_unlocked(f_print_sequence_unknown_s[2], stream)) { + if (!fwrite_unlocked(f_print_sequence_unknown_s.string, 1, f_print_sequence_unknown_s.used, stream) < f_print_sequence_unknown_s.used) { return F_status_set_error(F_output); } i = length; status = F_none; + break; } if (!string[i]) { ++i; + continue; } @@ -2141,15 +2113,7 @@ extern "C" { } } else { - if (!fputc_unlocked(f_print_sequence_unknown_s[0], stream)) { - return F_status_set_error(F_output); - } - - if (!fputc_unlocked(f_print_sequence_unknown_s[1], stream)) { - return F_status_set_error(F_output); - } - - if (!fputc_unlocked(f_print_sequence_unknown_s[2], stream)) { + if (!fwrite_unlocked(f_print_sequence_unknown_s.string, 1, f_print_sequence_unknown_s.used, stream) < f_print_sequence_unknown_s.used) { return F_status_set_error(F_output); } } @@ -2171,15 +2135,7 @@ extern "C" { } if (status == F_false || i + macro_f_utf_byte_width(string[i]) >= length) { - if (!fputc_unlocked(f_print_sequence_unknown_s[0], stream)) { - return F_status_set_error(F_output); - } - - if (!fputc_unlocked(f_print_sequence_unknown_s[1], stream)) { - return F_status_set_error(F_output); - } - - if (!fputc_unlocked(f_print_sequence_unknown_s[2], stream)) { + if (!fwrite_unlocked(f_print_sequence_unknown_s.string, 1, f_print_sequence_unknown_s.used, stream) < f_print_sequence_unknown_s.used) { return F_status_set_error(F_output); } diff --git a/level_1/fl_print/c/private-print.h b/level_1/fl_print/c/private-print.h index ce3eb53..a64c04f 100644 --- a/level_1/fl_print/c/private-print.h +++ b/level_1/fl_print/c/private-print.h @@ -59,6 +59,7 @@ extern "C" { * Errors (with error bit) from: f_print_terminated(). * * @see fputc_unlocked() + * @see fwrite_unlocked() * * @see f_conversion_number_signed_print() * @see f_conversion_number_unsigned_print() @@ -131,6 +132,7 @@ extern "C" { * Errors (with error bit) from: f_utf_is_whitespace(). * * @see fputc_unlocked() + * @see fwrite_unlocked() * * @see fl_print_trim_except() * @see fl_print_trim_except_dynamic() @@ -174,6 +176,7 @@ extern "C" { * Errors (with error bit) from: f_utf_is_whitespace(). * * @see fputc_unlocked() + * @see fwrite_unlocked() * * @see fl_print_trim_except_raw() * @see fl_print_trim_except_dynamic_raw() @@ -218,6 +221,7 @@ extern "C" { * Errors (with error bit) from: f_utf_is_whitespace(). * * @see fputc_unlocked() + * @see fwrite_unlocked() * * @see fl_print_trim_except_safely() * @see fl_print_trim_except_dynamic_safely() @@ -255,6 +259,7 @@ extern "C" { * Errors (with error bit) from: f_utf_is_whitespace(). * * @see fputc_unlocked() + * @see fwrite_unlocked() * * @see fl_print_trim() * @see fl_print_trim_dynamic() @@ -287,6 +292,7 @@ extern "C" { * Errors (with error bit) from: f_utf_is_whitespace(). * * @see fputc_unlocked() + * @see fwrite_unlocked() * * @see fl_print_trim_raw() * @see fl_print_trim_dynamic_raw() @@ -320,6 +326,7 @@ extern "C" { * Errors (with error bit) from: f_utf_is_whitespace(). * * @see fputc_unlocked() + * @see fwrite_unlocked() * * @see fl_print_trim_safely() * @see fl_print_trim_dynamic_safely() diff --git a/level_1/fl_string/c/string.c b/level_1/fl_string/c/string.c index 1a2081b..fd8b3be 100644 --- a/level_1/fl_string/c/string.c +++ b/level_1/fl_string/c/string.c @@ -450,7 +450,7 @@ extern "C" { if (!width) { width = 1; - if (string[range->start] == f_string_eol_s[0]) { + if (string[range->start] == f_string_eol_s.string[0]) { return F_none_eol; } @@ -520,7 +520,7 @@ extern "C" { return status; } - if (string[range->start] == f_string_eol_s[0]) { + if (string[range->start] == f_string_eol_s.string[0]) { return F_none_eol; } @@ -582,7 +582,7 @@ extern "C" { return status; } - if (string[range->start] == f_string_eol_s[0]) { + if (string[range->start] == f_string_eol_s.string[0]) { return F_none_eol; } @@ -716,7 +716,7 @@ extern "C" { // Increment until stop, while taking into consideration UTF-8 character widths. for (; range->start <= range->stop; ) { - if (buffer[range->start] == f_string_eol_s[0]) { + if (buffer[range->start] == f_string_eol_s.string[0]) { ++range->start; break; @@ -752,7 +752,7 @@ extern "C" { break; } - if (buffer[range->start] == f_string_eol_s[0]) { + if (buffer[range->start] == f_string_eol_s.string[0]) { ++range->start; return F_found_not; @@ -770,7 +770,7 @@ extern "C" { // Increment until stop, while taking into consideration UTF-8 character widths. for (; range->start <= range->stop; ) { - if (buffer[range->start] == f_string_eol_s[0]) { + if (buffer[range->start] == f_string_eol_s.string[0]) { ++range->start; break; @@ -802,12 +802,12 @@ extern "C" { range->start += macro_f_utf_byte_width(buffer[range->start]); } // for - if (range->start > range->stop || buffer[range->start] != F_string_ascii_minus_s[0]) { + if (range->start > range->stop || buffer[range->start] != f_string_ascii_minus_s.string[0]) { // Increment until stop, while taking into consideration UTF-8 character widths. for (; range->start <= range->stop; ) { - if (buffer[range->start] == f_string_eol_s[0]) { + if (buffer[range->start] == f_string_eol_s.string[0]) { ++range->start; break; @@ -831,7 +831,7 @@ extern "C" { // Increment until stop, while taking into consideration UTF-8 character widths. for (; range->start <= range->stop; ) { - if (buffer[range->start] == f_string_eol_s[0]) { + if (buffer[range->start] == f_string_eol_s.string[0]) { ++range->start; break; @@ -867,7 +867,7 @@ extern "C" { // Increment until stop, while taking into consideration UTF-8 character widths. for (; range->start <= range->stop; ) { - if (buffer[range->start] == f_string_eol_s[0]) { + if (buffer[range->start] == f_string_eol_s.string[0]) { ++range->start; break; @@ -906,7 +906,7 @@ extern "C" { // Increment until stop, while taking into consideration UTF-8 character widths. for (; range->start <= range->stop; ) { - if (buffer[range->start] == f_string_eol_s[0]) { + if (buffer[range->start] == f_string_eol_s.string[0]) { ++range->start; break; @@ -923,7 +923,7 @@ extern "C" { } } - if (buffer[range->start] == f_string_eol_s[0]) { + if (buffer[range->start] == f_string_eol_s.string[0]) { ++range->start; } @@ -931,7 +931,7 @@ extern "C" { for (f_array_length_t j = i, i = 0; j <= range->stop; ++j) { if (!buffer[j]) continue; - if (buffer[j] == F_string_ascii_minus_s[0]) break; + if (buffer[j] == f_string_ascii_minus_s.string[0]) break; id->name[i] = buffer[j]; ++i; @@ -1028,7 +1028,7 @@ extern "C" { if (!width) { width = 1; - if (string[range->start] == f_string_eol_s[0]) { + if (string[range->start] == f_string_eol_s.string[0]) { return F_none_eol; } @@ -1088,7 +1088,7 @@ extern "C" { return status; } - if (string[range->start] == f_string_eol_s[0]) { + if (string[range->start] == f_string_eol_s.string[0]) { return F_none_eol; } @@ -1146,7 +1146,7 @@ extern "C" { return status; } - if (string[range->start] == f_string_eol_s[0]) { + if (string[range->start] == f_string_eol_s.string[0]) { return F_none_eol; } diff --git a/level_2/fll_error/c/error-common.c b/level_2/fll_error/c/error-common.c index b03e48c..5504b0a 100644 --- a/level_2/fll_error/c/error-common.c +++ b/level_2/fll_error/c/error-common.c @@ -6,10 +6,10 @@ extern "C" { #endif #ifndef _di_fll_error_file_type_ - const f_string_t fll_error_file_type_directory_s = FLL_error_file_type_directory_s; - const f_string_t fll_error_file_type_file_s = FLL_error_file_type_file_s; - const f_string_t fll_error_file_type_path_s = FLL_error_file_type_path_s; - const f_string_t fll_error_file_type_pipe_s = FLL_error_file_type_pipe_s; + const f_string_static_t fll_error_file_type_directory_s = macro_f_string_static_t_initialize2(FLL_error_file_type_directory_s, 0, FLL_error_file_type_directory_s_length); + const f_string_static_t fll_error_file_type_file_s = macro_f_string_static_t_initialize2(FLL_error_file_type_file_s, 0, FLL_error_file_type_file_s_length); + const f_string_static_t fll_error_file_type_path_s = macro_f_string_static_t_initialize2(FLL_error_file_type_path_s, 0, FLL_error_file_type_path_s_length); + const f_string_static_t fll_error_file_type_pipe_s = macro_f_string_static_t_initialize2(FLL_error_file_type_pipe_s, 0, FLL_error_file_type_pipe_s_length); #endif // _di_fll_error_file_type_ #ifdef __cplusplus diff --git a/level_2/fll_error/c/error-common.h b/level_2/fll_error/c/error-common.h index 177c85f..8a7ce20 100644 --- a/level_2/fll_error/c/error-common.h +++ b/level_2/fll_error/c/error-common.h @@ -43,10 +43,10 @@ extern "C" { #define FLL_error_file_type_path_s_length 4 #define FLL_error_file_type_pipe_s_length 4 - extern const f_string_t fll_error_file_type_directory_s; - extern const f_string_t fll_error_file_type_file_s; - extern const f_string_t fll_error_file_type_path_s; - extern const f_string_t fll_error_file_type_pipe_s; + extern const f_string_static_t fll_error_file_type_directory_s; + extern const f_string_static_t fll_error_file_type_file_s; + extern const f_string_static_t fll_error_file_type_path_s; + extern const f_string_static_t fll_error_file_type_pipe_s; #endif // _di_fll_error_file_type_ #ifdef __cplusplus diff --git a/level_2/fll_error/c/error.c b/level_2/fll_error/c/error.c index 0cd9a87..bf9f697 100644 --- a/level_2/fll_error/c/error.c +++ b/level_2/fll_error/c/error.c @@ -31,9 +31,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SAccess denied while trying to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QAccess denied while trying to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%['.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -45,9 +45,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SCurrent user is not allowed to use the given group while trying to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QCurrent user is not allowed to use the given group while trying to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%['.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -59,9 +59,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SCurrent user is not allowed to use the given owner while trying to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QCurrent user is not allowed to use the given owner while trying to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%['.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -73,9 +73,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SInvalid directory while trying to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QInvalid directory while trying to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%['.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -87,9 +87,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SUnable to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QUnable to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%[', not empty.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%[', not empty.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -101,9 +101,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SFailed to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QFailed to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%['.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -115,9 +115,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SUnable to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QUnable to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%[', failed to close.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%[', failed to close.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -129,9 +129,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SUnable to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QUnable to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%[', is closed.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%[', is closed.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -143,9 +143,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SFile descriptor error while trying to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QFile descriptor error while trying to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%['.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -157,9 +157,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SMax file descriptors reached while trying to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QMax file descriptors reached while trying to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%['.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -171,9 +171,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SInvalid file descriptor while trying to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QInvalid file descriptor while trying to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%['.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -185,9 +185,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SUnable to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QUnable to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%[', %s is empty.%]%c", print.to.stream, print.context, type_name, print.context, f_string_eol_s[0]); + fl_print_format("%[', %s is empty.%]%q", print.to.stream, print.context, type_name, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -199,9 +199,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SUnable to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QUnable to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%[', flush failed.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%[', flush failed.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -213,9 +213,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SUnable to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QUnable to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%[', found.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%[', found.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -227,9 +227,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SUnable to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QUnable to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%[', could not find.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%[', could not find.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -241,9 +241,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SUnable to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QUnable to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%[', already open.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%[', already open.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -255,9 +255,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SMax open files reached while trying to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QMax open files reached while trying to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%['.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -269,9 +269,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SOverflow while trying to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QOverflow while trying to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%['.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -283,9 +283,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SUnable to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QUnable to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%[', purge failed.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%[', purge failed.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -297,9 +297,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SRead failed while trying to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QRead failed while trying to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%['.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -311,9 +311,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SSeek failed while trying to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QSeek failed while trying to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%['.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -325,9 +325,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SStat failed while trying to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QStat failed while trying to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%['.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -339,9 +339,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SSynchronize failed while trying to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QSynchronize failed while trying to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%['.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -353,9 +353,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SFailed to %S %S, the path '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QFailed to %S %S, the path '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%[' is an unknown file type.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%[' is an unknown file type.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -367,9 +367,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SUTF failure while trying to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QUTF failure while trying to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%['.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -381,9 +381,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SInvalid UTF while trying to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QInvalid UTF while trying to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%['.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -395,9 +395,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SUnderflow while trying to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QUnderflow while trying to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%['.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -409,9 +409,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SFailed to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QFailed to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%[', write failure.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%[', write failure.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -423,9 +423,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SLoop while trying to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QLoop while trying to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%['.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -437,9 +437,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SInvalid %S name '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, type_name, print.context); + fl_print_format("%q%[%QInvalid %S name '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%['.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -451,9 +451,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SNumber overflow while trying to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QNumber overflow while trying to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%['.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -465,9 +465,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SNumber underflow while trying to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QNumber underflow while trying to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%['.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -479,13 +479,13 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SInvalid parameter", print.to.stream, f_string_eol_s[0], print.context, print.prefix); + fl_print_format("%q%[%QInvalid parameter", print.to.stream, f_string_eol_s, print.context, print.prefix); private_fll_error_print_function(print, function); fl_print_format(" for the %S '%]", print.to.stream, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%['.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -497,9 +497,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SProhibited by system while trying to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QProhibited by system while trying to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%['.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -511,9 +511,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SUnable to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QUnable to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%[', %S is read only.%]%c", print.to.stream, print.context, type_name, print.context, f_string_eol_s[0]); + fl_print_format("%[', %S is read only.%]%q", print.to.stream, print.context, type_name, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -525,9 +525,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SUnable to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QUnable to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%[', %S is write only.%]%c", print.to.stream, print.context, type_name, print.context, f_string_eol_s[0]); + fl_print_format("%[', %S is write only.%]%q", print.to.stream, print.context, type_name, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -540,9 +540,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SInvalid or missing directory in path while trying to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QInvalid or missing directory in path while trying to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%['.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -554,9 +554,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SFailed to %S %S, the path '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QFailed to %S %S, the path '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%[' is a directory.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%[' is a directory.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -569,9 +569,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SFailed to %S %S, the path '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QFailed to %S %S, the path '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%[' is a file.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%[' is a file.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -585,9 +585,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SFailed to %S %S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QFailed to %S %S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%[' due to an invalid directory in the path.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%[' due to an invalid directory in the path.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -599,9 +599,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SFailed to %S %S, the path '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, operation, type_name, print.context); + fl_print_format("%q%[%QFailed to %S %S, the path '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, operation, type_name, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, name, print.notable); - fl_print_format("%[' is a %s.%]%c", print.to.stream, print.context, status == F_file_type_pipe ? "pipe" : "socket", print.context, f_string_eol_s[0]); + fl_print_format("%[' is a %s.%]%q", print.to.stream, print.context, status == F_file_type_pipe ? "pipe" : "socket", print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -621,9 +621,9 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SThe argument for the parameter '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, print.context); + fl_print_format("%q%[%QThe argument for the parameter '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, parameter, print.notable); - fl_print_format("%[' must not be an empty string.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%[' must not be an empty string.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -635,11 +635,11 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SThe argument '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, print.context); + fl_print_format("%q%[%QThe argument '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, argument, print.notable); fl_print_format("%[' is not a valid number for the parameter '%]", print.to.stream, print.context, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, parameter, print.notable); - fl_print_format("%['.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -651,11 +651,11 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SThe argument '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, print.context); + fl_print_format("%q%[%QThe argument '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, argument, print.notable); fl_print_format("%[' is negative, which is not allowed for the parameter '%]", print.to.stream, print.context, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, parameter, print.notable); - fl_print_format("%['.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -667,11 +667,11 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SThe argument '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, print.context); + fl_print_format("%q%[%QThe argument '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, argument, print.notable); fl_print_format("%[' is too large for the parameter '%]", print.to.stream, print.context, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, parameter, print.notable); - fl_print_format("%['.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -683,11 +683,11 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SThe argument '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, print.context); + fl_print_format("%q%[%QThe argument '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, argument, print.notable); fl_print_format("%[' is positive, which is not allowed for the parameter '%]", print.to.stream, print.context, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, parameter, print.notable); - fl_print_format("%['.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -699,11 +699,11 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SThe argument '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, print.context); + fl_print_format("%q%[%QThe argument '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, argument, print.notable); fl_print_format("%[' is too small for the parameter '%]", print.to.stream, print.context, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, parameter, print.notable); - fl_print_format("%['.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); funlockfile(print.to.stream); } diff --git a/level_2/fll_error/c/private-error.c b/level_2/fll_error/c/private-error.c index 81251a4..2db8b62 100644 --- a/level_2/fll_error/c/private-error.c +++ b/level_2/fll_error/c/private-error.c @@ -12,11 +12,11 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SAccess denied", print.to.stream, f_string_eol_s[0], print.context, print.prefix); + fl_print_format("%q%[%QAccess denied", print.to.stream, f_string_eol_s, print.context, print.prefix); private_fll_error_print_function(print, function); - fl_print_format(".%]%c", print.to.stream, print.context, f_string_eol_s[0]); + fl_print_format(".%]%q", print.to.stream, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -28,11 +28,11 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SMaximum array length reached", print.to.stream, f_string_eol_s[0], print.context, print.prefix); + fl_print_format("%q%[%QMaximum array length reached", print.to.stream, f_string_eol_s, print.context, print.prefix); private_fll_error_print_function(print, function); - fl_print_format(".%]%c", print.to.stream, print.context, f_string_eol_s[0]); + fl_print_format(".%]%q", print.to.stream, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -44,11 +44,11 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SMaximum buffer length reached", print.to.stream, f_string_eol_s[0], print.context, print.prefix); + fl_print_format("%q%[%QMaximum buffer length reached", print.to.stream, f_string_eol_s, print.context, print.prefix); private_fll_error_print_function(print, function); - fl_print_format(".%]%c", print.to.stream, print.context, f_string_eol_s[0]); + fl_print_format(".%]%q", print.to.stream, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -60,11 +60,11 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SFile not found", print.to.stream, f_string_eol_s[0], print.context, print.prefix); + fl_print_format("%q%[%QFile not found", print.to.stream, f_string_eol_s, print.context, print.prefix); private_fll_error_print_function(print, function); - fl_print_format(".%]%c", print.to.stream, print.context, f_string_eol_s[0]); + fl_print_format(".%]%q", print.to.stream, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -76,11 +76,11 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SUnable to allocate memory", print.to.stream, f_string_eol_s[0], print.context, print.prefix); + fl_print_format("%q%[%QUnable to allocate memory", print.to.stream, f_string_eol_s, print.context, print.prefix); private_fll_error_print_function(print, function); - fl_print_format(".%]%c", print.to.stream, print.context, f_string_eol_s[0]); + fl_print_format(".%]%q", print.to.stream, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -92,11 +92,11 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SInvalid parameter", print.to.stream, f_string_eol_s[0], print.context, print.prefix); + fl_print_format("%q%[%QInvalid parameter", print.to.stream, f_string_eol_s, print.context, print.prefix); private_fll_error_print_function(print, function); - fl_print_format(".%]%c", print.to.stream, print.context, f_string_eol_s[0]); + fl_print_format(".%]%q", print.to.stream, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -108,11 +108,11 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SMaximum string length reached", print.to.stream, f_string_eol_s[0], print.context, print.prefix); + fl_print_format("%q%[%QMaximum string length reached", print.to.stream, f_string_eol_s, print.context, print.prefix); private_fll_error_print_function(print, function); - fl_print_format(".%]%c", print.to.stream, print.context, f_string_eol_s[0]); + fl_print_format(".%]%q", print.to.stream, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -124,11 +124,11 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SInvalid UTF-8 character found", print.to.stream, f_string_eol_s[0], print.context, print.prefix); + fl_print_format("%q%[%QInvalid UTF-8 character found", print.to.stream, f_string_eol_s, print.context, print.prefix); private_fll_error_print_function(print, function); - fl_print_format(".%]%c", print.to.stream, print.context, f_string_eol_s[0]); + fl_print_format(".%]%q", print.to.stream, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -140,11 +140,11 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SInvalid UTF-8 character (Fragment) found", print.to.stream, f_string_eol_s[0], print.context, print.prefix); + fl_print_format("%q%[%QInvalid UTF-8 character (Fragment) found", print.to.stream, f_string_eol_s, print.context, print.prefix); private_fll_error_print_function(print, function); - fl_print_format(".%]%c", print.to.stream, print.context, f_string_eol_s[0]); + fl_print_format(".%]%q", print.to.stream, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -156,18 +156,18 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SInvalid (incomplete) UTF-8 character found", print.to.stream, f_string_eol_s[0], print.context, print.prefix); + fl_print_format("%q%[%QInvalid (incomplete) UTF-8 character found", print.to.stream, f_string_eol_s, print.context, print.prefix); private_fll_error_print_function(print, function); if (status == F_complete_not_utf_eos) { - fl_print_format(" at the end of string.%]%c", print.to.stream, print.context, f_string_eol_s[0]); + fl_print_format(" at the end of string.%]%q", print.to.stream, print.context, f_string_eol_s); } else if (status == F_complete_not_utf_stop) { - fl_print_format(" at the stop point of string.%]%c", print.to.stream, print.context, f_string_eol_s[0]); + fl_print_format(" at the stop point of string.%]%q", print.to.stream, print.context, f_string_eol_s); } else { - fl_print_format(".%]%c", print.to.stream, print.context, f_string_eol_s[0]); + fl_print_format(".%]%q", print.to.stream, print.context, f_string_eol_s); } funlockfile(print.to.stream); @@ -180,11 +180,11 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SFailure", print.to.stream, f_string_eol_s[0], print.context, print.prefix); + fl_print_format("%q%[%QFailure", print.to.stream, f_string_eol_s, print.context, print.prefix); private_fll_error_print_function(print, function); - fl_print_format(".%]%c", print.to.stream, print.context, f_string_eol_s[0]); + fl_print_format(".%]%q", print.to.stream, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -196,11 +196,11 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SSignal received", print.to.stream, f_string_eol_s[0], print.context, print.prefix); + fl_print_format("%q%[%QSignal received", print.to.stream, f_string_eol_s, print.context, print.prefix); private_fll_error_print_function(print, function); - fl_print_format(".%]%c", print.to.stream, print.context, f_string_eol_s[0]); + fl_print_format(".%]%q", print.to.stream, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -212,11 +212,11 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%SInterrupt signal received", print.to.stream, f_string_eol_s[0], print.context, print.prefix); + fl_print_format("%q%[%QInterrupt signal received", print.to.stream, f_string_eol_s, print.context, print.prefix); private_fll_error_print_function(print, function); - fl_print_format(".%]%c", print.to.stream, print.context, f_string_eol_s[0]); + fl_print_format(".%]%q", print.to.stream, print.context, f_string_eol_s); funlockfile(print.to.stream); } @@ -228,12 +228,12 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { flockfile(print.to.stream); - fl_print_format("%c%[%S(%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, print.context); + fl_print_format("%q%[%Q(%]", print.to.stream, f_string_eol_s, print.context, print.prefix, print.context); fl_print_format("%[%ui%]%[)", print.to.stream, print.notable, status, print.notable, print.context); private_fll_error_print_function(print, function); - fl_print_format(".%]%c", print.to.stream, print.context, f_string_eol_s[0]); + fl_print_format(".%]%q", print.to.stream, print.context, f_string_eol_s); funlockfile(print.to.stream); } diff --git a/level_2/fll_execute/c/execute.c b/level_2/fll_execute/c/execute.c index 1798fca..acb9328 100644 --- a/level_2/fll_execute/c/execute.c +++ b/level_2/fll_execute/c/execute.c @@ -139,7 +139,7 @@ extern "C" { // create a string array that is compatible with execv() calls. f_string_t fixed_arguments[arguments.used + 2]; - const f_string_t last_slash = strrchr(program ? program : arguments.array[0].string, f_path_separator_s[0]); + const f_string_t last_slash = strrchr(program ? program : arguments.array[0].string, f_path_separator_s.string[0]); const f_array_length_t size_name = last_slash ? strnlen(last_slash + 1, F_path_length_max_d) : strnlen(program ? program : arguments.array[0].string, F_path_length_max_d); char program_name[size_name + 1]; @@ -174,7 +174,7 @@ extern "C" { found = &path; } else { - status = f_environment_get(f_path_environment_s, &path); + status = f_environment_get(f_path_environment_s.string, &path); if (F_status_is_error(status)) { @@ -328,7 +328,7 @@ extern "C" { // create a string array that is compatible with execv() calls. f_string_t fixed_arguments[arguments.used + 2]; - const f_string_t last_slash = strrchr(program ? program : arguments.array[0].string, f_path_separator_s[0]); + const f_string_t last_slash = strrchr(program ? program : arguments.array[0].string, f_path_separator_s.string[0]); const f_array_length_t size_name = last_slash ? strnlen(last_slash + 1, F_path_length_max_d) : strnlen(program ? program : arguments.array[0].string, F_path_length_max_d); char program_name[size_name + 1]; @@ -357,7 +357,7 @@ extern "C" { found = &path; } else { - status = f_environment_get(f_path_environment_s, &path); + status = f_environment_get(f_path_environment_s.string, &path); if (F_status_is_error(status)) { diff --git a/level_2/fll_execute/c/execute.h b/level_2/fll_execute/c/execute.h index 86c294a..78c54f6 100644 --- a/level_2/fll_execute/c/execute.h +++ b/level_2/fll_execute/c/execute.h @@ -143,6 +143,8 @@ extern "C" { * This guarantees that an end of string exists at the end of each argument. * This does not check for NULL characters anywhere else in the string. * + * @todo functions like this should be changed to accept arrays of f_string_static, reducing the number of parameters passed to it. + * * @param prefix * An array of the strings prepend to the name. * @param prefix_length diff --git a/level_2/fll_file/c/private-file.c b/level_2/fll_file/c/private-file.c index 7e77cab..050902a 100644 --- a/level_2/fll_file/c/private-file.c +++ b/level_2/fll_file/c/private-file.c @@ -55,7 +55,7 @@ extern "C" { memcpy(path_sub, path, path_length); memcpy(path_sub + path_length + 1, list[i]->array[j].string, list[i]->array[j].used); - path_sub[path_length] = f_path_separator_s[0]; + path_sub[path_length] = f_path_separator_s.string[0]; path_sub[length] = 0; status = f_file_mode_set(path_sub, mode); @@ -76,7 +76,7 @@ extern "C" { memcpy(path_sub, path, path_length); memcpy(path_sub + path_length + 1, listing.directory.array[i].string, listing.directory.array[i].used); - path_sub[path_length] = f_path_separator_s[0]; + path_sub[path_length] = f_path_separator_s.string[0]; path_sub[length] = 0; status = f_directory_exists(path_sub); @@ -153,7 +153,7 @@ extern "C" { memcpy(path_sub, path, path_length); memcpy(path_sub + path_length + 1, list[i]->array[j].string, list[i]->array[j].used); - path_sub[path_length] = f_path_separator_s[0]; + path_sub[path_length] = f_path_separator_s.string[0]; path_sub[length] = 0; status = f_file_role_change(path_sub, uid, gid, dereference); @@ -172,7 +172,7 @@ extern "C" { memcpy(path_sub, path, path_length); memcpy(path_sub + path_length + 1, listing.directory.array[i].string, listing.directory.array[i].used); - path_sub[path_length] = f_path_separator_s[0]; + path_sub[path_length] = f_path_separator_s.string[0]; path_sub[length] = 0; status = f_directory_exists(path_sub); diff --git a/level_2/fll_fss/c/fss.c b/level_2/fll_fss/c/fss.c index 3c27a27..bdc1ce6 100644 --- a/level_2/fll_fss/c/fss.c +++ b/level_2/fll_fss/c/fss.c @@ -21,12 +21,12 @@ extern "C" { } // The first character must be a '#'. - if (buffer[range->start] != f_fss_pound_s[0]) { + if (buffer[range->start] != f_fss_pound_s.string[0]) { // Increment until stop, while taking into consideration UTF-8 character widths. for (; range->start <= range->stop; ) { - if (buffer[range->start] == f_string_eol_s[0]) { + if (buffer[range->start] == f_string_eol_s.string[0]) { ++range->start; break; @@ -61,7 +61,7 @@ extern "C" { // Increment until stop, while taking into consideration UTF-8 character widths. for (; range->start <= range->stop; ) { - if (buffer[range->start] == f_string_eol_s[0]) { + if (buffer[range->start] == f_string_eol_s.string[0]) { ++range->start; break; @@ -92,7 +92,7 @@ extern "C" { // Increment until stop, while taking into consideration UTF-8 character widths. for (; range->start <= range->stop; ) { - if (buffer[range->start] == f_string_eol_s[0]) { + if (buffer[range->start] == f_string_eol_s.string[0]) { ++range->start; break; @@ -104,7 +104,7 @@ extern "C" { return F_found_not; } - if (buffer[range->start] == f_string_eol_s[0]) { + if (buffer[range->start] == f_string_eol_s.string[0]) { ++range->start; if (ids) { @@ -137,12 +137,12 @@ extern "C" { if (!found_fss) { if (ids) { - if (ids->used && ids->array[ids->used - 1].used == 3 && ids->array[ids->used - 1].name[0] == f_fss_f_s[0] && ids->array[ids->used - 1].name[0] == f_fss_s_s[0] && ids->array[ids->used - 1].name[0] == f_fss_s_s[0]) { + if (ids->used && ids->array[ids->used - 1].used == 3 && ids->array[ids->used - 1].name[0] == f_fss_f_s.string[0] && ids->array[ids->used - 1].name[0] == f_fss_s_s.string[0] && ids->array[ids->used - 1].name[0] == f_fss_s_s.string[0]) { found_fss = F_true; } } else { - if (id.used == 3 && id.name[0] == f_fss_f_s[0] && id.name[0] == f_fss_s_s[0] && id.name[0] == f_fss_s_s[0]) { + if (id.used == 3 && id.name[0] == f_fss_f_s.string[0] && id.name[0] == f_fss_s_s.string[0] && id.name[0] == f_fss_s_s.string[0]) { found_fss = F_true; } } @@ -536,7 +536,7 @@ extern "C" { #endif // _di_fll_fss_snatch_map_apart_ #ifndef _di_fll_fss_snatch_map_mash_ - f_status_t fll_fss_snatch_map_mash(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_array_length_t lengths[], const f_array_length_t size, const f_string_t glue, const f_array_length_t glue_length, f_string_maps_t *values[], bool matches[], f_array_lengths_t *indexs[]) { + f_status_t fll_fss_snatch_map_mash(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_array_length_t lengths[], const f_array_length_t size, const f_string_static_t glue, f_string_maps_t *values[], bool matches[], f_array_lengths_t *indexs[]) { #ifndef _di_level_2_parameter_checking_ if (!size) return F_status_set_error(F_parameter); if (objects.used != contents.used) return F_status_set_error(F_parameter); @@ -596,7 +596,7 @@ extern "C" { if (contents.array[i].used > 1) { for (k = 1; k < contents.array[i].used; ++k) { - status = f_string_dynamic_partial_mash_nulless(glue, glue_length, buffer, contents.array[i].array[k], &map->value); + status = f_string_dynamic_partial_mash_nulless(glue, buffer, contents.array[i].array[k], &map->value); if (F_status_is_error(status)) return status; } // for } @@ -608,7 +608,7 @@ extern "C" { #endif // _di_fll_fss_snatch_map_mash_ #ifndef _di_fll_fss_snatch_map_mash_apart_ - f_status_t fll_fss_snatch_map_mash_apart(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_array_length_t lengths[], const f_array_length_t size, const f_string_t glue, const f_array_length_t glue_length, f_string_map_multis_t *values[], bool matches[], f_array_lengths_t *indexs[]) { + f_status_t fll_fss_snatch_map_mash_apart(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_array_length_t lengths[], const f_array_length_t size, const f_string_static_t glue, f_string_map_multis_t *values[], bool matches[], f_array_lengths_t *indexs[]) { #ifndef _di_level_2_parameter_checking_ if (!size) return F_status_set_error(F_parameter); if (objects.used != contents.used) return F_status_set_error(F_parameter); @@ -713,7 +713,7 @@ extern "C" { for (k = 1; k < contents.array[i].used; ++k) { - status = f_string_dynamic_partial_mash_nulless(glue, glue_length, buffer, contents.array[i].array[k], &map_multi->value.array[map_multi->value.used]); + status = f_string_dynamic_partial_mash_nulless(glue, buffer, contents.array[i].array[k], &map_multi->value.array[map_multi->value.used]); if (F_status_is_error(status)) return status; } // for @@ -728,7 +728,7 @@ extern "C" { #endif // _di_fll_fss_snatch_map_mash_apart_ #ifndef _di_fll_fss_snatch_map_together_ - f_status_t fll_fss_snatch_map_together(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_array_length_t lengths[], const f_array_length_t size, const f_string_t glue, const f_array_length_t glue_length, f_string_maps_t *values[], bool matches[], f_array_lengths_t *indexs[]) { + f_status_t fll_fss_snatch_map_together(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_array_length_t lengths[], const f_array_length_t size, const f_string_static_t glue, f_string_maps_t *values[], bool matches[], f_array_lengths_t *indexs[]) { #ifndef _di_level_2_parameter_checking_ if (!size) return F_status_set_error(F_parameter); if (objects.used != contents.used) return F_status_set_error(F_parameter); @@ -828,7 +828,7 @@ extern "C" { } if (contents.array[i].used > 1) { - status = f_string_dynamic_partial_mash_nulless(glue, glue_length, buffer, contents.array[i].array[1], &map->value); + status = f_string_dynamic_partial_mash_nulless(glue, buffer, contents.array[i].array[1], &map->value); if (F_status_is_error(status)) { macro_f_string_dynamic_t_delete_simple(name); @@ -846,7 +846,7 @@ extern "C" { #endif // _di_fll_fss_snatch_map_together_ #ifndef _di_fll_fss_snatch_mash_ - f_status_t fll_fss_snatch_mash(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_array_length_t lengths[], const f_array_length_t size, const f_string_t glue, const f_array_length_t glue_length, f_string_dynamic_t *values[], bool matches[], f_array_length_t *indexs[]) { + f_status_t fll_fss_snatch_mash(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_array_length_t lengths[], const f_array_length_t size, const f_string_static_t glue, f_string_dynamic_t *values[], bool matches[], f_array_length_t *indexs[]) { #ifndef _di_level_2_parameter_checking_ if (!size) return F_status_set_error(F_parameter); if (objects.used != contents.used) return F_status_set_error(F_parameter); @@ -889,7 +889,7 @@ extern "C" { for (k = 0; k < contents.array[i].used; ++k) { - status = f_string_dynamic_partial_mash_nulless(glue, glue_length, buffer, contents.array[i].array[k], values[j]); + status = f_string_dynamic_partial_mash_nulless(glue, buffer, contents.array[i].array[k], values[j]); if (F_status_is_error(status)) return status; } // for @@ -904,7 +904,7 @@ extern "C" { #endif // _di_fll_fss_snatch_mash_ #ifndef _di_fll_fss_snatch_mash_apart_ - f_status_t fll_fss_snatch_mash_apart(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_array_length_t lengths[], const f_array_length_t size, const f_string_t glue, const f_array_length_t glue_length, f_string_dynamics_t *values[], bool matches[], f_array_lengths_t *indexs[]) { + f_status_t fll_fss_snatch_mash_apart(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_array_length_t lengths[], const f_array_length_t size, const f_string_static_t glue, f_string_dynamics_t *values[], bool matches[], f_array_lengths_t *indexs[]) { #ifndef _di_level_2_parameter_checking_ if (!size) return F_status_set_error(F_parameter); if (objects.used != contents.used) return F_status_set_error(F_parameter); @@ -947,7 +947,7 @@ extern "C" { for (k = 0; k < contents.array[i].used; ++k) { - status = f_string_dynamic_partial_mash_nulless(glue, glue_length, buffer, contents.array[i].array[k], &values[j]->array[values[j]->used]); + status = f_string_dynamic_partial_mash_nulless(glue, buffer, contents.array[i].array[k], &values[j]->array[values[j]->used]); if (F_status_is_error(status)) return status; } // for @@ -965,7 +965,7 @@ extern "C" { #endif // _di_fll_fss_snatch_mash_apart_ #ifndef _di_fll_fss_snatch_together_ - f_status_t fll_fss_snatch_together(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_array_length_t lengths[], const f_array_length_t size, const f_string_t glue, const f_array_length_t glue_length, f_string_dynamic_t *values[], bool matches[], f_array_length_t *indexs[]) { + f_status_t fll_fss_snatch_together(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_array_length_t lengths[], const f_array_length_t size, const f_string_static_t glue, f_string_dynamic_t *values[], bool matches[], f_array_length_t *indexs[]) { #ifndef _di_level_2_parameter_checking_ if (!size) return F_status_set_error(F_parameter); if (objects.used != contents.used) return F_status_set_error(F_parameter); @@ -1000,7 +1000,7 @@ extern "C" { for (k = 0; k < contents.array[i].used; ++k) { - status = f_string_dynamic_partial_mash_nulless(glue, glue_length, buffer, contents.array[i].array[k], values[j]); + status = f_string_dynamic_partial_mash_nulless(glue, buffer, contents.array[i].array[k], values[j]); if (F_status_is_error(status)) return status; } // for diff --git a/level_2/fll_fss/c/fss.h b/level_2/fll_fss/c/fss.h index 0ddbcf6..363d382 100644 --- a/level_2/fll_fss/c/fss.h +++ b/level_2/fll_fss/c/fss.h @@ -311,8 +311,6 @@ extern "C" { * The total size of the names, lengths, and values arrays. * @param glue * A string to append between each duplicate name found when "snatching". - * @param glue_length - * The length of the glue string * @param values * An array of multi map value arrays where "snatched" content is stored. * @param matches @@ -332,7 +330,7 @@ extern "C" { * Errors (with error bit) from: f_string_dynamic_partial_mash_nulless(). */ #ifndef _di_fll_fss_snatch_map_mash_ - extern f_status_t fll_fss_snatch_map_mash(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_array_length_t lengths[], const f_array_length_t size, const f_string_t glue, const f_array_length_t glue_length, f_string_maps_t *values[], bool matches[], f_array_lengths_t *indexs[]); + extern f_status_t fll_fss_snatch_map_mash(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_array_length_t lengths[], const f_array_length_t size, const f_string_static_t glue, f_string_maps_t *values[], bool matches[], f_array_lengths_t *indexs[]); #endif // _di_fll_fss_snatch_map_mash_ /** @@ -366,8 +364,6 @@ extern "C" { * The total size of the names, lengths, and values arrays. * @param glue * A string to append between each duplicate name found when "snatching". - * @param glue_length - * The length of the glue string * @param values * An array of multi map value arrays where "snatched" content is stored. * @param matches @@ -390,7 +386,7 @@ extern "C" { * @see fl_string_compare_trim() */ #ifndef _di_fll_fss_snatch_map_mash_apart_ - extern f_status_t fll_fss_snatch_map_mash_apart(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_array_length_t lengths[], const f_array_length_t size, const f_string_t glue, const f_array_length_t glue_length, f_string_map_multis_t *values[], bool matches[], f_array_lengths_t *indexs[]); + extern f_status_t fll_fss_snatch_map_mash_apart(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_array_length_t lengths[], const f_array_length_t size, const f_string_static_t glue, f_string_map_multis_t *values[], bool matches[], f_array_lengths_t *indexs[]); #endif // _di_fll_fss_snatch_map_mash_apart_ /** @@ -423,8 +419,6 @@ extern "C" { * The total size of the names, lengths, and values arrays. * @param glue * A string to append between each duplicate name found when "snatching". - * @param glue_length - * The length of the glue string * @param values * An array of map arrays where "snatched" content is stored. * @param matches @@ -447,7 +441,7 @@ extern "C" { * @see fl_string_compare_trim() */ #ifndef _di_fll_fss_snatch_map_together_ - extern f_status_t fll_fss_snatch_map_together(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_array_length_t lengths[], const f_array_length_t size, const f_string_t glue, const f_array_length_t glue_length, f_string_maps_t *values[], bool matches[], f_array_lengths_t *indexs[]); + extern f_status_t fll_fss_snatch_map_together(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_array_length_t lengths[], const f_array_length_t size, const f_string_static_t glue, f_string_maps_t *values[], bool matches[], f_array_lengths_t *indexs[]); #endif // _di_fll_fss_snatch_map_together_ /** @@ -477,8 +471,6 @@ extern "C" { * The total size of the names, lengths, and values arrays. * @param glue * A string to append between each duplicate name found when "snatching". - * @param glue_length - * The length of the glue string. * @param values * An array of values where "snatched" content is stored. * @param matches @@ -498,7 +490,7 @@ extern "C" { * Errors (with error bit) from: f_string_dynamic_partial_mash_nulless(). */ #ifndef _di_fll_fss_snatch_mash_ - extern f_status_t fll_fss_snatch_mash(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_array_length_t lengths[], const f_array_length_t size, const f_string_t glue, const f_array_length_t glue_length, f_string_dynamic_t *values[], bool matches[], f_array_length_t *indexs[]); + extern f_status_t fll_fss_snatch_mash(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_array_length_t lengths[], const f_array_length_t size, const f_string_static_t glue, f_string_dynamic_t *values[], bool matches[], f_array_length_t *indexs[]); #endif // _di_fll_fss_snatch_mash_ /** @@ -529,8 +521,6 @@ extern "C" { * The total size of the names, lengths, and values arrays. * @param glue * A string to append between each duplicate name found when "snatching". - * @param glue_length - * The length of the glue string * @param values * An array of values where "snatched" content is stored. * @param matches @@ -553,7 +543,7 @@ extern "C" { * @see fl_string_compare_trim() */ #ifndef _di_fll_fss_snatch_mash_apart_ - extern f_status_t fll_fss_snatch_mash_apart(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_array_length_t lengths[], const f_array_length_t size, const f_string_t glue, const f_array_length_t glue_length, f_string_dynamics_t *values[], bool matches[], f_array_lengths_t *indexs[]); + extern f_status_t fll_fss_snatch_mash_apart(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_array_length_t lengths[], const f_array_length_t size, const f_string_static_t glue, f_string_dynamics_t *values[], bool matches[], f_array_lengths_t *indexs[]); #endif // _di_fll_fss_snatch_mash_apart_ /** @@ -579,6 +569,8 @@ extern "C" { * An array of lengths for each names string. * @param size * The total size of the names, lengths, and values arrays. + * @param glue + * A string to append between each duplicate name found when "snatching". * @param values * An array of values where "snatched" content is stored. * @param matches @@ -601,7 +593,7 @@ extern "C" { * @see fl_string_compare_trim() */ #ifndef _di_fll_fss_snatch_together_ - extern f_status_t fll_fss_snatch_together(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_array_length_t lengths[], const f_array_length_t size, const f_string_t glue, const f_array_length_t glue_length, f_string_dynamic_t *values[], bool matches[], f_array_length_t *indexs[]); + extern f_status_t fll_fss_snatch_together(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_array_length_t lengths[], const f_array_length_t size, const f_string_static_t glue, f_string_dynamic_t *values[], bool matches[], f_array_length_t *indexs[]); #endif // _di_fll_fss_snatch_together_ #ifdef __cplusplus diff --git a/level_2/fll_fss/c/fss_basic.c b/level_2/fll_fss/c/fss_basic.c index 4c631ad..f080375 100644 --- a/level_2/fll_fss/c/fss_basic.c +++ b/level_2/fll_fss/c/fss_basic.c @@ -180,7 +180,7 @@ extern "C" { status = f_string_dynamic_increase(F_fss_default_allocation_step_small_d, destination); if (F_status_is_error(status)) return status; - destination->string[destination->used++] = f_string_eol_s[0]; + destination->string[destination->used++] = f_string_eol_s.string[0]; } } diff --git a/level_2/fll_fss_status_string/c/fss_status_string.c b/level_2/fll_fss_status_string/c/fss_status_string.c index 08585c9..9176298 100644 --- a/level_2/fll_fss_status_string/c/fss_status_string.c +++ b/level_2/fll_fss_status_string/c/fss_status_string.c @@ -6,46 +6,45 @@ extern "C" { #ifndef _di_fll_fss_status_string_ #ifndef _di_fll_fss_status_error_ - const f_string_t fll_fss_status_format_s = FLL_fss_status_format_s; - const f_string_t fll_fss_status_format_eos_s = FLL_fss_status_format_eos_s; + const f_string_static_t fll_fss_status_format_s = macro_f_string_static_t_initialize2(FLL_fss_status_format_s, 0, FLL_fss_status_format_s_length); + const f_string_static_t fll_fss_status_format_eos_s = macro_f_string_static_t_initialize2(FLL_fss_status_format_eos_s, 0, FLL_fss_status_format_eos_s_length); #endif // _di_fll_fss_status_error_ #ifndef _di_fll_fss_status_warning_ - const f_string_t fll_fss_status_accepted_invalid_s = FLL_fss_status_accepted_invalid_s; - const f_string_t fll_fss_status_accepted_invalid_eos_s = FLL_fss_status_accepted_invalid_eos_s; + const f_string_static_t fll_fss_status_accepted_invalid_s = macro_f_string_static_t_initialize2(FLL_fss_status_accepted_invalid_s, 0, FLL_fss_status_accepted_invalid_s_length); + const f_string_static_t fll_fss_status_accepted_invalid_eos_s = macro_f_string_static_t_initialize2(FLL_fss_status_accepted_invalid_eos_s, 0, FLL_fss_status_accepted_invalid_eos_s_length); #endif // _di_fll_fss_status_warning_ #ifndef _di_fll_fss_status_success_ - const f_string_t fll_fss_status_found_object_s = FLL_fss_status_found_object_s; - const f_string_t fll_fss_status_found_content_s = FLL_fss_status_found_content_s; - const f_string_t fll_fss_status_found_object_not_s = FLL_fss_status_found_object_not_s; - const f_string_t fll_fss_status_found_content_not_s = FLL_fss_status_found_content_not_s; - const f_string_t fll_fss_status_found_object_content_not_s = FLL_fss_status_found_object_content_not_s; + const f_string_static_t fll_fss_status_found_object_s = macro_f_string_static_t_initialize2(FLL_fss_status_found_object_s, 0, FLL_fss_status_found_object_s_length); + const f_string_static_t fll_fss_status_found_content_s = macro_f_string_static_t_initialize2(FLL_fss_status_found_content_s, 0, FLL_fss_status_found_content_s_length); + const f_string_static_t fll_fss_status_found_object_not_s = macro_f_string_static_t_initialize2(FLL_fss_status_found_object_not_s, 0, FLL_fss_status_found_object_not_s_length); + const f_string_static_t fll_fss_status_found_content_not_s = macro_f_string_static_t_initialize2(FLL_fss_status_found_content_not_s, 0, FLL_fss_status_found_content_not_s_length); + const f_string_static_t fll_fss_status_found_object_content_not_s = macro_f_string_static_t_initialize2(FLL_fss_status_found_object_content_not_s, 0, FLL_fss_status_found_object_content_not_s_length); #endif // _di_fll_fss_status_success_ #ifndef _di_fll_fss_status_codes_ - const f_string_t fll_fss_status_found_comment_s = FLL_fss_status_found_comment_s; + const f_string_static_t fll_fss_status_found_comment_s = macro_f_string_static_t_initialize2(FLL_fss_status_found_comment_s, 0, FLL_fss_status_found_comment_s_length); #endif // _di_fll_fss_status_codes_ - const f_string_t fll_fss_status_status_code_first_s = FLL_fss_status_status_code_first_s; - const f_string_t fll_fss_status_status_code_last_s = FLL_fss_status_status_code_last_s; + const f_string_static_t fll_fss_status_status_code_first_s = macro_f_string_static_t_initialize2(FLL_fss_status_status_code_first_s, 0, FLL_fss_status_status_code_first_s_length); + const f_string_static_t fll_fss_status_status_code_last_s = macro_f_string_static_t_initialize2(FLL_fss_status_status_code_last_s, 0, FLL_fss_status_status_code_last_s_length); #endif // _di_FLL_fss_status_string_ #ifndef _di_fll_fss_status_string_from_ - f_status_t fll_fss_status_string_from(const f_string_t string, f_status_t *code) { + f_status_t fll_fss_status_string_from(const f_string_static_t name, f_status_t *code) { #ifndef _di_level_2_parameter_checking_ if (!code) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ f_status_t status = F_none; - const f_array_length_t length = strlen(string); - if (!length) { + if (!name.used) { return F_data_not; } // Numbers are not valid status code strings. - status = f_conversion_character_is_decimal(string[0]); + status = f_conversion_character_is_decimal(name.string[0]); if (status == F_true) { return F_status_set_error(F_data); @@ -56,13 +55,13 @@ extern "C" { } #ifndef _di_fll_fss_status_error_ - if (fl_string_compare(string, FLL_fss_status_format_s, length, FLL_fss_status_format_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, fll_fss_status_format_s) == F_equal_to) { *code = F_fss_format; return F_none; } - if (fl_string_compare(string, FLL_fss_status_format_eos_s, length, FLL_fss_status_format_eos_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, fll_fss_status_format_eos_s) == F_equal_to) { *code = F_fss_format_eos; return F_none; @@ -70,13 +69,13 @@ extern "C" { #endif // _di_fll_fss_status_error_ #ifndef _di_fll_fss_status_warning_ - if (fl_string_compare(string, FLL_fss_status_accepted_invalid_s, length, FLL_fss_status_accepted_invalid_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, fll_fss_status_accepted_invalid_s) == F_equal_to) { *code = F_fss_accepted_invalid; return F_none; } - if (fl_string_compare(string, FLL_fss_status_accepted_invalid_eos_s, length, FLL_fss_status_accepted_invalid_eos_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, fll_fss_status_accepted_invalid_eos_s) == F_equal_to) { *code = F_fss_accepted_invalid_eos; return F_none; @@ -84,31 +83,31 @@ extern "C" { #endif // _di_fll_fss_status_warning_ #ifndef _di_fll_fss_status_success_ - if (fl_string_compare(string, FLL_fss_status_found_object_s, length, FLL_fss_status_found_object_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, fll_fss_status_found_object_s) == F_equal_to) { *code = F_fss_found_object; return F_none; } - if (fl_string_compare(string, FLL_fss_status_found_content_s, length, FLL_fss_status_found_content_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, fll_fss_status_found_content_s) == F_equal_to) { *code = F_fss_found_content; return F_none; } - if (fl_string_compare(string, FLL_fss_status_found_object_not_s, length, FLL_fss_status_found_object_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, fll_fss_status_found_object_not_s) == F_equal_to) { *code = F_fss_found_object_not; return F_none; } - if (fl_string_compare(string, FLL_fss_status_found_content_not_s, length, FLL_fss_status_found_content_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, fll_fss_status_found_content_not_s) == F_equal_to) { *code = F_fss_found_content_not; return F_none; } - if (fl_string_compare(string, FLL_fss_status_found_object_content_not_s, length, FLL_fss_status_found_object_content_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, fll_fss_status_found_object_content_not_s) == F_equal_to) { *code = F_fss_found_object_content_not; return F_none; @@ -116,20 +115,20 @@ extern "C" { #endif // _di_fll_fss_status_success_ #ifndef _di_fll_fss_status_codes_ - if (fl_string_compare(string, FLL_fss_status_found_comment_s, length, FLL_fss_status_found_comment_length_s) == F_equal_to) { + if (fl_string_dynamic_compare(name, fll_fss_status_found_comment_s) == F_equal_to) { *code = F_fss_found_object; return F_none; } #endif // _di_fll_fss_status_codes_ - if (fl_string_compare(string, FLL_fss_status_status_code_first_s, length, FLL_fss_status_status_code_first_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, fll_fss_status_status_code_first_s) == F_equal_to) { *code = F_fss_status_code_first; return F_none; } - if (fl_string_compare(string, FLL_fss_status_status_code_last_s, length, FLL_fss_status_status_code_last_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, fll_fss_status_status_code_last_s) == F_equal_to) { *code = F_fss_status_code_last; return F_none; @@ -140,9 +139,9 @@ extern "C" { #endif // _di_fll_fss_status_string_from_ #ifndef _di_fll_fss_status_string_to_ - f_status_t fll_fss_status_string_to(const f_status_t code, f_string_t *string) { + f_status_t fll_fss_status_string_to(const f_status_t code, f_string_static_t *name) { #ifndef _di_level_2_parameter_checking_ - if (!string) return F_status_set_error(F_parameter); + if (!name) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ const f_status_t unmasked_code = F_status_set_fine(code); @@ -150,56 +149,62 @@ extern "C" { switch (unmasked_code) { #ifndef _di_fll_fss_status_error_ case F_fss_format: - *string = FLL_fss_status_format_s; + *name = fll_fss_status_format_s; break; + case F_fss_format_eos: - *string = FLL_fss_status_format_eos_s; + *name = fll_fss_status_format_eos_s; break; #endif // _di_fll_fss_status_error_ #ifndef _di_fll_fss_status_warning_ case F_fss_accepted_invalid: - *string = FLL_fss_status_accepted_invalid_s; + *name = fll_fss_status_accepted_invalid_s; break; + case F_fss_accepted_invalid_eos: - *string = FLL_fss_status_accepted_invalid_eos_s; + *name = fll_fss_status_accepted_invalid_eos_s; break; #endif // _di_fll_fss_status_warning_ #ifndef _di_fll_fss_status_success_ case F_fss_found_object: - *string = FLL_fss_status_found_object_s; + *name = fll_fss_status_found_object_s; break; + case F_fss_found_content: - *string = FLL_fss_status_found_content_s; + *name = fll_fss_status_found_content_s; break; + case F_fss_found_object_not: - *string = FLL_fss_status_found_object_not_s; + *name = fll_fss_status_found_object_not_s; break; + case F_fss_found_content_not: - *string = FLL_fss_status_found_content_not_s; + *name = fll_fss_status_found_content_not_s; break; + case F_fss_found_object_content_not: - *string = FLL_fss_status_found_object_content_not_s; + *name = fll_fss_status_found_object_content_not_s; break; #endif // _di_fll_fss_status_success_ #ifndef _di_fll_fss_status_codes_ case F_fss_found_comment: - *string = FLL_fss_status_found_comment_s; + *name = fll_fss_status_found_comment_s; break; #endif // _di_fll_fss_status_codes_ case F_fss_status_code_first: - *string = FLL_fss_status_status_code_first_s; + *name = fll_fss_status_status_code_first_s; break; case F_fss_status_code_last: - *string = FLL_fss_status_status_code_last_s; + *name = fll_fss_status_status_code_last_s; break; default: - return f_status_string_to(code, string); + return f_status_string_to(code, name); } return F_none; diff --git a/level_2/fll_fss_status_string/c/fss_status_string.h b/level_2/fll_fss_status_string/c/fss_status_string.h index 766ee43..02d1a69 100644 --- a/level_2/fll_fss_status_string/c/fss_status_string.h +++ b/level_2/fll_fss_status_string/c/fss_status_string.h @@ -35,8 +35,8 @@ extern "C" { #define FLL_fss_status_format_s_length 12 #define FLL_fss_status_format_eos_s_length 16 - extern const f_string_t fll_fss_status_format_s; - extern const f_string_t fll_fss_status_format_eos_s; + const f_string_static_t fll_fss_status_format_s; + const f_string_static_t fll_fss_status_format_eos_s; #endif // _di_fll_fss_status_error_ #ifndef _di_fll_fss_status_warning_ @@ -46,8 +46,8 @@ extern "C" { #define FLL_fss_status_accepted_invalid_s_length 22 #define FLL_fss_status_accepted_invalid_eos_s_length 26 - extern const f_string_t fll_fss_status_accepted_invalid_s; - extern const f_string_t fll_fss_status_accepted_invalid_eos_s; + const f_string_static_t fll_fss_status_accepted_invalid_s; + const f_string_static_t fll_fss_status_accepted_invalid_eos_s; #endif // _di_fll_fss_status_warning_ #ifndef _di_fll_fss_status_success_ @@ -63,19 +63,19 @@ extern "C" { #define FLL_fss_status_found_content_not_s_length 23 #define FLL_fss_status_found_object_content_not_s_length 30 - extern const f_string_t fll_fss_status_found_object_s; - extern const f_string_t fll_fss_status_found_content_s; - extern const f_string_t fll_fss_status_found_object_not_s; - extern const f_string_t fll_fss_status_found_content_not_s; - extern const f_string_t fll_fss_status_found_object_content_not_s; + const f_string_static_t fll_fss_status_found_object_s; + const f_string_static_t fll_fss_status_found_content_s; + const f_string_static_t fll_fss_status_found_object_not_s; + const f_string_static_t fll_fss_status_found_content_not_s; + const f_string_static_t fll_fss_status_found_object_content_not_s; #endif // _di_fll_fss_status_success_ #ifndef _di_fll_fss_status_codes_ #define FLL_fss_status_found_comment_s "F_fss_found_comment" - #define FLL_fss_status_found_comment_length_s 19 + #define FLL_fss_status_found_comment_s_length 19 - extern const f_string_t fll_fss_status_found_comment_s; + const f_string_static_t fll_fss_status_found_comment_s; #endif // _di_fll_fss_status_codes_ #define FLL_fss_status_status_code_first_s "F_fss_status_code_first" @@ -84,8 +84,8 @@ extern "C" { #define FLL_fss_status_status_code_first_s_length 23 #define FLL_fss_status_status_code_last_s_length 21 - extern const f_string_t fll_fss_status_status_code_first_s; - extern const f_string_t fll_fss_status_status_code_last_s; + const f_string_static_t fll_fss_status_status_code_first_s; + const f_string_static_t fll_fss_status_status_code_last_s; #endif // _di_fll_fss_status_string_ /** @@ -95,10 +95,10 @@ extern "C" { * * This process the string until either a match or NULL is reached. * - * @param string - * The code name to process. + * @param name + * The status name to process. * @param code - * The code code a matched string represents. + * The status number a matched string represents. * * @return * F_none on success. @@ -110,16 +110,16 @@ extern "C" { * Errors (with error bit) from: f_conversion_character_is_decimal(). */ #ifndef _di_fll_fss_status_string_from_ - extern f_status_t fll_fss_status_string_from(const f_string_t string, f_status_t *code); + extern f_status_t fll_fss_status_string_from(const f_string_static_t name, f_status_t *code); #endif // _di_fll_fss_status_string_to_ /** * Convert code codes to their string equivalents. * * @param code - * The code to process. - * @param string - * The code name that represents the given code. + * The status number to process. + * @param name + * The status name that represents the given code. * * @return * F_none on success. @@ -131,7 +131,7 @@ extern "C" { * @see f_status_string_to() */ #ifndef _di_fll_fss_status_string_to_ - extern f_status_t fll_fss_status_string_to(const f_status_t code, f_string_t *string); + extern f_status_t fll_fss_status_string_to(const f_status_t code, f_string_static_t *name); #endif // _di_fll_fss_status_string_to_ #ifdef __cplusplus diff --git a/level_2/fll_iki/c/iki.c b/level_2/fll_iki/c/iki.c index 3919c32..807eb6b 100644 --- a/level_2/fll_iki/c/iki.c +++ b/level_2/fll_iki/c/iki.c @@ -9,7 +9,7 @@ extern "C" { f_status_t fll_iki_content_escape(const f_string_static_t content, const uint8_t quote, f_string_dynamic_t *escaped) { #ifndef _di_level_2_parameter_checking_ if (content.used > content.size) return F_status_set_error(F_parameter); - if (quote != F_iki_syntax_quote_single_s[0] && quote != F_iki_syntax_quote_double_s[0]) return F_status_set_error(F_parameter); + if (quote != f_iki_syntax_quote_single_s.string[0] && quote != f_iki_syntax_quote_double_s.string[0]) return F_status_set_error(F_parameter); if (escaped->used > escaped->size) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ @@ -25,7 +25,7 @@ extern "C" { if (content.used > content.size) return F_status_set_error(F_parameter); if (range.start > range.stop) return F_status_set_error(F_parameter); if (range.start >= content.used) return F_status_set_error(F_parameter); - if (quote != F_iki_syntax_quote_single_s[0] && quote != F_iki_syntax_quote_double_s[0]) return F_status_set_error(F_parameter); + if (quote != f_iki_syntax_quote_single_s.string[0] && quote != f_iki_syntax_quote_double_s.string[0]) return F_status_set_error(F_parameter); if (escaped->used > escaped->size) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ @@ -39,7 +39,7 @@ extern "C" { if (content.used > content.size) return F_status_set_error(F_parameter); if (range.start > range.stop) return F_status_set_error(F_parameter); if (range.start >= content.used) return F_status_set_error(F_parameter); - if (quote != F_iki_syntax_quote_single_s[0] && quote != F_iki_syntax_quote_double_s[0]) return F_status_set_error(F_parameter); + if (quote != f_iki_syntax_quote_single_s.string[0] && quote != f_iki_syntax_quote_double_s.string[0]) return F_status_set_error(F_parameter); if (unescaped->used > unescaped->size) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ @@ -51,7 +51,7 @@ extern "C" { f_status_t fll_iki_content_unescape(const f_string_static_t content, const uint8_t quote, f_string_dynamic_t *unescaped) { #ifndef _di_level_2_parameter_checking_ if (content.used > content.size) return F_status_set_error(F_parameter); - if (quote != F_iki_syntax_quote_single_s[0] && quote != F_iki_syntax_quote_double_s[0]) return F_status_set_error(F_parameter); + if (quote != f_iki_syntax_quote_single_s.string[0] && quote != f_iki_syntax_quote_double_s.string[0]) return F_status_set_error(F_parameter); if (unescaped->used > unescaped->size) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ diff --git a/level_2/fll_iki/c/private-iki.c b/level_2/fll_iki/c/private-iki.c index d0d687f..637b1af 100644 --- a/level_2/fll_iki/c/private-iki.c +++ b/level_2/fll_iki/c/private-iki.c @@ -28,10 +28,10 @@ extern "C" { } for (j = 0; j < delimits; ++j) { - escaped->string[escaped->used++] = F_iki_syntax_slash_s[0]; + escaped->string[escaped->used++] = f_iki_syntax_slash_s.string[0]; } // for - escaped->string[escaped->used++] = F_iki_syntax_slash_s[0]; + escaped->string[escaped->used++] = f_iki_syntax_slash_s.string[0]; escaped->string[escaped->used++] = quote; delimits = 0; @@ -42,7 +42,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - if (content.string[i] == F_iki_syntax_slash_s[0]) { + if (content.string[i] == f_iki_syntax_slash_s.string[0]) { ++delimits; } else { @@ -61,7 +61,7 @@ extern "C" { } for (j = 0; j < delimits; ++j) { - escaped->string[escaped->used++] = F_iki_syntax_slash_s[0]; + escaped->string[escaped->used++] = f_iki_syntax_slash_s.string[0]; } // for } @@ -94,7 +94,7 @@ extern "C" { return F_status_set_error(F_syntax); } - else if (content.string[i] == F_iki_syntax_slash_s[0]) { + else if (content.string[i] == f_iki_syntax_slash_s.string[0]) { delimits = 1; if (i + 1 < content.used) { @@ -118,14 +118,14 @@ extern "C" { } for (j = 0; j < delimits; ++j) { - unescaped->string[unescaped->used++] = F_iki_syntax_slash_s[0]; + unescaped->string[unescaped->used++] = f_iki_syntax_slash_s.string[0]; } // for delimits = 0; unescaped->string[unescaped->used++] = quote; break; } - else if (content.string[j] == F_iki_syntax_slash_s[0]) { + else if (content.string[j] == f_iki_syntax_slash_s.string[0]) { ++delimits; } else if (content.string[j]) { @@ -165,7 +165,7 @@ extern "C" { } for (j = 0; j < delimits; ++j) { - unescaped->string[unescaped->used++] = F_iki_syntax_slash_s[0]; + unescaped->string[unescaped->used++] = f_iki_syntax_slash_s.string[0]; } // for break; diff --git a/level_2/fll_path/c/path.c b/level_2/fll_path/c/path.c index b9804d2..c37f475 100644 --- a/level_2/fll_path/c/path.c +++ b/level_2/fll_path/c/path.c @@ -13,7 +13,7 @@ extern "C" { f_status_t status = F_none; f_array_length_t at = 0; - uint8_t previous_1 = f_path_separator_s[0]; + uint8_t previous_1 = f_path_separator_s.string[0]; uint8_t previous_2 = 0; f_array_length_t size_chunk = 0; @@ -21,7 +21,7 @@ extern "C" { canonical->used = 0; - if (path[0] == f_path_separator_s[0]) { + if (path[0] == f_path_separator_s.string[0]) { at = 1; } else { @@ -35,20 +35,20 @@ extern "C" { at = 0; } - status = f_string_append_assure(f_path_separator_s, 1, canonical); + status = f_string_dynamic_append_assure(f_path_separator_s, canonical); if (F_status_is_error(status)) return status; for (; path[at]; ++at) { - if (!size_chunk && path[at] == f_path_separator_current_s[0]) { - if (!previous_1 || previous_1 == f_path_separator_s[0]) { - previous_1 = f_path_separator_current_s[0]; + if (!size_chunk && path[at] == f_path_separator_current_s.string[0]) { + if (!previous_1 || previous_1 == f_path_separator_s.string[0]) { + previous_1 = f_path_separator_current_s.string[0]; previous_2 = 0; continue; } - if (previous_1 == f_path_separator_current_s[0]) { + if (previous_1 == f_path_separator_current_s.string[0]) { if (previous_2) { previous_1 = 0; previous_2 = 0; @@ -56,23 +56,23 @@ extern "C" { position = at - 2; } else { - previous_2 = f_path_separator_current_s[0]; + previous_2 = f_path_separator_current_s.string[0]; } } } - else if (path[at] == f_path_separator_s[0]) { - if (previous_1 == f_path_separator_s[0]) { + else if (path[at] == f_path_separator_s.string[0]) { + if (previous_1 == f_path_separator_s.string[0]) { size_chunk = 0; position = 0; continue; } - if (previous_1 == f_path_separator_current_s[0]) { - if (previous_2 == f_path_separator_current_s[0]) { + if (previous_1 == f_path_separator_current_s.string[0]) { + if (previous_2 == f_path_separator_current_s.string[0]) { if (canonical->used > 1) { for (--canonical->used; canonical->used > 0; --canonical->used) { - if (canonical->string[canonical->used - 1] == f_path_separator_s[0]) break; + if (canonical->string[canonical->used - 1] == f_path_separator_s.string[0]) break; } // for } } @@ -84,7 +84,7 @@ extern "C" { } } - previous_1 = f_path_separator_s[0]; + previous_1 = f_path_separator_s.string[0]; previous_2 = 0; size_chunk = 0; position = 0; @@ -97,7 +97,7 @@ extern "C" { position -= 2; size_chunk = 2; } - else if (previous_1 && previous_1 != f_path_separator_s[0]) { + else if (previous_1 && previous_1 != f_path_separator_s.string[0]) { --position; size_chunk = 1; } @@ -112,14 +112,14 @@ extern "C" { } } // for - if (previous_2 == f_path_separator_current_s[0]) { + if (previous_2 == f_path_separator_current_s.string[0]) { if (canonical->used > 1) { for (--canonical->used; canonical->used > 0; --canonical->used) { - if (canonical->string[canonical->used - 1] == f_path_separator_s[0]) break; + if (canonical->string[canonical->used - 1] == f_path_separator_s.string[0]) break; } // for } } - else if (!(previous_1 == f_path_separator_current_s[0] || previous_1 == f_path_separator_s[0])) { + else if (!(previous_1 == f_path_separator_current_s.string[0] || previous_1 == f_path_separator_s.string[0])) { if (size_chunk) { status = f_string_append(path + position, size_chunk, canonical); if (F_status_is_error(status)) return status; @@ -127,7 +127,7 @@ extern "C" { } // Assure there is no trailing forward slash, unless it is the first slash. - if (canonical->used > 1 && canonical->string[canonical->used - 1] == f_path_separator_s[0]) { + if (canonical->used > 1 && canonical->string[canonical->used - 1] == f_path_separator_s.string[0]) { --canonical->used; } diff --git a/level_2/fll_program/c/program.c b/level_2/fll_program/c/program.c index aefba8c..a4c08f6 100644 --- a/level_2/fll_program/c/program.c +++ b/level_2/fll_program/c/program.c @@ -7,10 +7,10 @@ extern "C" { #ifndef _di_fll_program_print_help_header_ f_status_t fll_program_print_help_header(const f_file_t output, const f_color_context_t context, const f_string_t name, const f_string_t version) { - fl_print_format("%c %[%S%]%c", output.stream, f_string_eol_s[0], context.set.title, name, context.set.title, f_string_eol_s[0]); - fl_print_format(" %[Version %s%]%c", output.stream, context.set.notable, version, context.set.notable, f_string_eol_s[0]); + fl_print_format("%q %[%S%]%q", output.stream, f_string_eol_s, context.set.title, name, context.set.title, f_string_eol_s); + fl_print_format(" %[Version %s%]%q", output.stream, context.set.notable, version, context.set.notable, f_string_eol_s); - fl_print_format("%c %[Available Options:%] ", output.stream, f_string_eol_s[0], context.set.important, context.set.important); + fl_print_format("%q %[Available Options:%] ", output.stream, f_string_eol_s, context.set.important, context.set.important); return F_none; } @@ -19,7 +19,7 @@ extern "C" { #ifndef _di_fll_program_print_help_option_ f_status_t fll_program_print_help_option(const f_file_t output, const f_color_context_t context, const f_string_t option_short, const f_string_t option_long, const f_string_t symbol_short, const f_string_t symbol_long, const f_string_t description) { - fl_print_format("%c %s%[%S%]", output.stream, f_string_eol_s[0], symbol_short, context.set.standout, option_short, context.set.standout); + fl_print_format("%q %s%[%S%]", output.stream, f_string_eol_s, symbol_short, context.set.standout, option_short, context.set.standout); fl_print_format(", %s%[%S%]", output.stream, symbol_long, context.set.standout, option_long, context.set.standout); fl_print_format(" %S", output.stream, description); @@ -30,7 +30,7 @@ extern "C" { #ifndef _di_fll_program_print_help_option_long_ f_status_t fll_program_print_help_option_long(const f_file_t output, const f_color_context_t context, const f_string_t option_long, const f_string_t symbol_long, const f_string_t description) { - fl_print_format("%c %s%[%S%]", output.stream, f_string_eol_s[0], symbol_long, context.set.standout, option_long, context.set.standout); + fl_print_format("%q %s%[%S%]", output.stream, f_string_eol_s, symbol_long, context.set.standout, option_long, context.set.standout); fl_print_format(" %S", output.stream, description); return F_none; @@ -40,7 +40,7 @@ extern "C" { #ifndef _di_fll_program_print_help_option_other_ f_status_t fll_program_print_help_option_other(const f_file_t output, const f_color_context_t context, const f_string_t option_other, const f_string_t description) { - fl_print_format("%c %[%S%]", output.stream, f_string_eol_s[0], context.set.standout, option_other, context.set.standout); + fl_print_format("%q %[%S%]", output.stream, f_string_eol_s, context.set.standout, option_other, context.set.standout); fl_print_format(" %S", output.stream, description); return F_none; @@ -50,9 +50,9 @@ extern "C" { #ifndef _di_fll_program_print_help_usage_ f_status_t fll_program_print_help_usage(const f_file_t output, const f_color_context_t context, const f_string_t name, const f_string_t parameters) { - fl_print_format("%c%c %[Usage:%]", output.stream, f_string_eol_s[0], f_string_eol_s[0], context.set.important, context.set.important); + fl_print_format("%q%q %[Usage:%]", output.stream, f_string_eol_s, f_string_eol_s, context.set.important, context.set.important); - f_print_character(f_string_eol_s[0], output.stream); + f_print_dynamic(f_string_eol_s, output.stream); fl_print_format(" %[%S%]", output.stream, context.set.standout, name, context.set.standout); fl_print_format(" %[[%] options %[]%]", output.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable); @@ -61,8 +61,8 @@ extern "C" { fl_print_format(" %[[%] %S %[]%]", output.stream, context.set.notable, context.set.notable, parameters, context.set.notable, context.set.notable); } - f_print_character(f_string_eol_s[0], output.stream); - f_print_character(f_string_eol_s[0], output.stream); + f_print_dynamic(f_string_eol_s, output.stream); + f_print_dynamic(f_string_eol_s, output.stream); return F_none; } @@ -71,7 +71,7 @@ extern "C" { #ifndef _di_fll_program_print_version_ f_status_t fll_program_print_version(const f_file_t output, const f_string_t version) { - fl_print_format("%S%c", output.stream, version, f_string_eol_s[0]); + fl_print_format("%S%q", output.stream, version, f_string_eol_s); return F_none; } @@ -178,10 +178,9 @@ extern "C" { #endif // _di_fll_program_parameter_additional_append_ #ifndef _di_fll_program_parameter_additional_mash_ - f_status_t fll_program_parameter_additional_mash(const f_string_t glue, const f_array_length_t glue_length, const f_string_t *argv, const f_array_lengths_t values, f_string_dynamic_t *destination) { + f_status_t fll_program_parameter_additional_mash(const f_string_static_t glue, const f_string_t *argv, const f_array_lengths_t values, f_string_dynamic_t *destination) { #ifndef _di_level_2_parameter_checking_ if (!argv) return F_status_set_error(F_parameter); - if (glue_length < 1) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ @@ -195,7 +194,7 @@ extern "C" { length = strnlen(argv[values.array[i]], f_console_parameter_size); if (length > 0) { - status = f_string_mash(glue, glue_length, argv[values.array[i]], length, destination); + status = f_string_mash(glue.string, glue.used, argv[values.array[i]], length, destination); if (F_status_is_error(status)) return F_status_set_error(F_string_too_large); } } // for @@ -250,10 +249,9 @@ extern "C" { #endif // _di_fll_program_parameter_additional_rip_ #ifndef _di_fll_program_parameter_additional_rip_mash_ - f_status_t fll_program_parameter_additional_rip_mash(const f_string_t glue, const f_array_length_t glue_length, const f_string_t *argv, const f_array_lengths_t values, f_string_dynamic_t *destination) { + f_status_t fll_program_parameter_additional_rip_mash(const f_string_static_t glue, const f_string_t *argv, const f_array_lengths_t values, f_string_dynamic_t *destination) { #ifndef _di_level_2_parameter_checking_ if (!argv) return F_status_set_error(F_parameter); - if (glue_length < 1) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ @@ -276,10 +274,11 @@ extern "C" { } if (ripped.used > 0) { - status = f_string_dynamic_mash(glue, glue_length, ripped, destination); + status = f_string_dynamic_mash(glue, ripped, destination); if (F_status_is_error(status)) { - macro_f_string_dynamic_t_delete_simple(ripped) + status = f_string_dynamic_resize(0, &ripped); + return F_status_set_error(F_string_too_large); } } diff --git a/level_2/fll_program/c/program.h b/level_2/fll_program/c/program.h index cbc7f74..fec4193 100644 --- a/level_2/fll_program/c/program.h +++ b/level_2/fll_program/c/program.h @@ -268,8 +268,6 @@ extern "C" { * * @param glue * A string to append between the source and destination, such as a space: ' '. - * @param glue_length - * The number of bytes the glue takes up. * @param argv * The program argument array to parse. * @param values @@ -290,7 +288,7 @@ extern "C" { * @see f_string_mash() */ #ifndef _di_fll_program_parameter_additional_mash_ - extern f_status_t fll_program_parameter_additional_mash(const f_string_t glue, const f_array_length_t glue_length, const f_string_t *argv, const f_array_lengths_t values, f_string_dynamic_t *destination); + extern f_status_t fll_program_parameter_additional_mash(const f_string_static_t glue, const f_string_t *argv, const f_array_lengths_t values, f_string_dynamic_t *destination); #endif // _di_fll_program_parameter_additional_mash_ /** @@ -327,8 +325,6 @@ extern "C" { * * @param glue * A string to append between the source and destination, such as a space: ' '. - * @param glue_length - * The number of bytes the glue takes up. * @param argv * The program argument array to parse. * @param values @@ -351,7 +347,7 @@ extern "C" { * @see fl_string_rip() */ #ifndef _di_fll_program_parameter_additional_rip_mash_ - extern f_status_t fll_program_parameter_additional_rip_mash(const f_string_t glue, const f_array_length_t glue_length, const f_string_t *argv, const f_array_lengths_t values, f_string_dynamic_t *destination); + extern f_status_t fll_program_parameter_additional_rip_mash(const f_string_static_t glue, const f_string_t *argv, const f_array_lengths_t values, f_string_dynamic_t *destination); #endif // _di_fll_program_parameter_additional_rip_mash_ #ifdef __cplusplus diff --git a/level_2/fll_status_string/c/status_string.c b/level_2/fll_status_string/c/status_string.c index 5c3d2eb..7e3979a 100644 --- a/level_2/fll_status_string/c/status_string.c +++ b/level_2/fll_status_string/c/status_string.c @@ -5,20 +5,19 @@ extern "C" { #endif #ifndef _di_fll_status_string_from_ - f_status_t fll_status_string_from(const f_string_t string, f_status_t *code) { + f_status_t fll_status_string_from(const f_string_static_t name, f_status_t *code) { #ifndef _di_level_2_parameter_checking_ if (!code) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ f_status_t status = F_none; - const f_array_length_t length = strlen(string); - if (!length) { + if (!name.used) { return F_data_not; } // Numbers are not valid status code strings. - if ((status = f_conversion_character_is_decimal(string[0])) == F_true) { + if ((status = f_conversion_character_is_decimal(name.string[0])) == F_true) { return F_status_set_error(F_data); } @@ -27,13 +26,13 @@ extern "C" { } #ifndef _di_F_status_boolean_ - if (fl_string_compare(string, f_status_false_s, length, F_status_false_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_false_s) == F_equal_to) { *code = F_false; return F_none; } - if (fl_string_compare(string, f_status_true_s, length, F_status_true_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_true_s) == F_equal_to) { *code = F_true; return F_none; @@ -41,385 +40,385 @@ extern "C" { #endif // _di_F_status_boolean_ #ifndef _di_F_status_signal_ - if (fl_string_compare(string, f_status_signal_hangup_s, length, F_status_signal_hangup_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_hangup_s) == F_equal_to) { *code = F_signal_hangup; return F_none; } - if (fl_string_compare(string, f_status_signal_interrupt_s, length, F_status_signal_interrupt_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_interrupt_s) == F_equal_to) { *code = F_signal_interrupt; return F_none; } - if (fl_string_compare(string, f_status_signal_quit_s, length, F_status_signal_quit_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_quit_s) == F_equal_to) { *code = F_signal_quit; return F_none; } - if (fl_string_compare(string, f_status_signal_illegal_s, length, F_status_signal_illegal_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_illegal_s) == F_equal_to) { *code = F_signal_illegal; return F_none; } - if (fl_string_compare(string, f_status_signal_trap_s, length, F_status_signal_trap_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_trap_s) == F_equal_to) { *code = F_signal_trap; return F_none; } - if (fl_string_compare(string, f_status_signal_abort_s, length, F_status_signal_abort_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_abort_s) == F_equal_to) { *code = F_signal_abort; return F_none; } - if (fl_string_compare(string, f_status_signal_bus_error_s, length, F_status_signal_bus_error_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_bus_error_s) == F_equal_to) { *code = F_signal_bus_error; return F_none; } - if (fl_string_compare(string, f_status_signal_floating_point_error_s, length, F_status_signal_floating_point_error_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_floating_point_error_s) == F_equal_to) { *code = F_signal_floating_point_error; return F_none; } - if (fl_string_compare(string, f_status_signal_kill_s, length, F_status_signal_kill_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_kill_s) == F_equal_to) { *code = F_signal_kill; return F_none; } - if (fl_string_compare(string, f_status_signal_user_1_s, length, F_status_signal_user_1_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_user_1_s) == F_equal_to) { *code = F_signal_user_1; return F_none; } - if (fl_string_compare(string, f_status_signal_segmentation_fault_s, length, F_status_signal_segmentation_fault_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_segmentation_fault_s) == F_equal_to) { *code = F_signal_segmentation_fault; return F_none; } - if (fl_string_compare(string, f_status_signal_user_2_s, length, F_status_signal_user_2_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_user_2_s) == F_equal_to) { *code = F_signal_user_2; return F_none; } - if (fl_string_compare(string, f_status_signal_broken_pipe_s, length, F_status_signal_broken_pipe_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_broken_pipe_s) == F_equal_to) { *code = F_signal_broken_pipe; return F_none; } - if (fl_string_compare(string, f_status_signal_alarm_clock_s, length, F_status_signal_alarm_clock_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_alarm_clock_s) == F_equal_to) { *code = F_signal_alarm_clock; return F_none; } - if (fl_string_compare(string, f_status_signal_termination_s, length, F_status_signal_termination_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_termination_s) == F_equal_to) { *code = F_signal_termination; return F_none; } - if (fl_string_compare(string, f_status_signal_stack_fault_s, length, F_status_signal_stack_fault_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_stack_fault_s) == F_equal_to) { *code = F_signal_stack_fault; return F_none; } - if (fl_string_compare(string, f_status_signal_child_s, length, F_status_signal_child_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_child_s) == F_equal_to) { *code = F_signal_child; return F_none; } - if (fl_string_compare(string, f_status_signal_continue_s, length, F_status_signal_continue_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_continue_s) == F_equal_to) { *code = F_signal_continue; return F_none; } - if (fl_string_compare(string, f_status_signal_stop_s, length, F_status_signal_stop_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_stop_s) == F_equal_to) { *code = F_signal_stop; return F_none; } - if (fl_string_compare(string, f_status_signal_keyboard_stop_s, length, F_status_signal_keyboard_stop_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_keyboard_stop_s) == F_equal_to) { *code = F_signal_keyboard_stop; return F_none; } - if (fl_string_compare(string, f_status_signal_tty_in_s, length, F_status_signal_tty_in_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_tty_in_s) == F_equal_to) { *code = F_signal_tty_in; return F_none; } - if (fl_string_compare(string, f_status_signal_tty_out_s, length, F_status_signal_tty_out_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_tty_out_s) == F_equal_to) { *code = F_signal_tty_out; return F_none; } - if (fl_string_compare(string, f_status_signal_urgent_s, length, F_status_signal_urgent_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_urgent_s) == F_equal_to) { *code = F_signal_urgent; return F_none; } - if (fl_string_compare(string, f_status_signal_cpu_limit_s, length, F_status_signal_cpu_limit_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_cpu_limit_s) == F_equal_to) { *code = F_signal_cpu_limit; return F_none; } - if (fl_string_compare(string, f_status_signal_file_size_limit_s, length, F_status_signal_file_size_limit_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_file_size_limit_s) == F_equal_to) { *code = F_signal_file_size_limit; return F_none; } - if (fl_string_compare(string, f_status_signal_virtual_alarm_clock_s, length, F_status_signal_virtual_alarm_clock_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_virtual_alarm_clock_s) == F_equal_to) { *code = F_signal_virtual_alarm_clock; return F_none; } - if (fl_string_compare(string, f_status_signal_profile_alarm_clock_s, length, F_status_signal_profile_alarm_clock_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_profile_alarm_clock_s) == F_equal_to) { *code = F_signal_profile_alarm_clock; return F_none; } - if (fl_string_compare(string, f_status_signal_window_size_change_s, length, F_status_signal_window_size_change_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_window_size_change_s) == F_equal_to) { *code = F_signal_window_size_change; return F_none; } - if (fl_string_compare(string, f_status_signal_pollable_event_s, length, F_status_signal_pollable_event_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_pollable_event_s) == F_equal_to) { *code = F_signal_pollable_event; return F_none; } - if (fl_string_compare(string, f_status_signal_power_failure_s, length, F_status_signal_power_failure_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_power_failure_s) == F_equal_to) { *code = F_signal_power_failure; return F_none; } - if (fl_string_compare(string, f_status_signal_bad_system_call_s, length, F_status_signal_bad_system_call_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_bad_system_call_s) == F_equal_to) { *code = F_signal_bad_system_call; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_32_s, length, F_status_signal_reserved_32_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_32_s) == F_equal_to) { *code = F_signal_reserved_32; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_33_s, length, F_status_signal_reserved_33_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_33_s) == F_equal_to) { *code = F_signal_reserved_33; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_34_s, length, F_status_signal_reserved_34_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_34_s) == F_equal_to) { *code = F_signal_reserved_34; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_35_s, length, F_status_signal_reserved_35_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_35_s) == F_equal_to) { *code = F_signal_reserved_35; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_36_s, length, F_status_signal_reserved_36_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_36_s) == F_equal_to) { *code = F_signal_reserved_36; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_37_s, length, F_status_signal_reserved_37_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_37_s) == F_equal_to) { *code = F_signal_reserved_37; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_38_s, length, F_status_signal_reserved_38_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_38_s) == F_equal_to) { *code = F_signal_reserved_38; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_39_s, length, F_status_signal_reserved_39_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_39_s) == F_equal_to) { *code = F_signal_reserved_39; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_40_s, length, F_status_signal_reserved_40_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_40_s) == F_equal_to) { *code = F_signal_reserved_40; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_41_s, length, F_status_signal_reserved_41_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_41_s) == F_equal_to) { *code = F_signal_reserved_41; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_42_s, length, F_status_signal_reserved_42_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_42_s) == F_equal_to) { *code = F_signal_reserved_42; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_43_s, length, F_status_signal_reserved_43_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_43_s) == F_equal_to) { *code = F_signal_reserved_43; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_44_s, length, F_status_signal_reserved_44_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_44_s) == F_equal_to) { *code = F_signal_reserved_44; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_45_s, length, F_status_signal_reserved_45_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_45_s) == F_equal_to) { *code = F_signal_reserved_45; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_46_s, length, F_status_signal_reserved_46_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_46_s) == F_equal_to) { *code = F_signal_reserved_46; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_47_s, length, F_status_signal_reserved_47_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_47_s) == F_equal_to) { *code = F_signal_reserved_47; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_48_s, length, F_status_signal_reserved_48_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_48_s) == F_equal_to) { *code = F_signal_reserved_48; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_49_s, length, F_status_signal_reserved_49_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_49_s) == F_equal_to) { *code = F_signal_reserved_49; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_50_s, length, F_status_signal_reserved_50_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_50_s) == F_equal_to) { *code = F_signal_reserved_50; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_51_s, length, F_status_signal_reserved_51_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_51_s) == F_equal_to) { *code = F_signal_reserved_51; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_52_s, length, F_status_signal_reserved_52_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_52_s) == F_equal_to) { *code = F_signal_reserved_52; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_53_s, length, F_status_signal_reserved_53_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_53_s) == F_equal_to) { *code = F_signal_reserved_53; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_54_s, length, F_status_signal_reserved_54_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_54_s) == F_equal_to) { *code = F_signal_reserved_54; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_55_s, length, F_status_signal_reserved_55_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_55_s) == F_equal_to) { *code = F_signal_reserved_55; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_56_s, length, F_status_signal_reserved_56_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_56_s) == F_equal_to) { *code = F_signal_reserved_56; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_57_s, length, F_status_signal_reserved_57_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_57_s) == F_equal_to) { *code = F_signal_reserved_57; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_58_s, length, F_status_signal_reserved_58_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_58_s) == F_equal_to) { *code = F_signal_reserved_58; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_59_s, length, F_status_signal_reserved_59_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_59_s) == F_equal_to) { *code = F_signal_reserved_59; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_60_s, length, F_status_signal_reserved_60_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_60_s) == F_equal_to) { *code = F_signal_reserved_60; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_61_s, length, F_status_signal_reserved_61_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_61_s) == F_equal_to) { *code = F_signal_reserved_61; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_62_s, length, F_status_signal_reserved_62_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_62_s) == F_equal_to) { *code = F_signal_reserved_62; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_63_s, length, F_status_signal_reserved_63_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_63_s) == F_equal_to) { *code = F_signal_reserved_63; return F_none; } - if (fl_string_compare(string, f_status_signal_reserved_64_s, length, F_status_signal_reserved_64_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_reserved_64_s) == F_equal_to) { *code = F_signal_reserved_64; return F_none; @@ -427,1459 +426,1459 @@ extern "C" { #endif // _di_F_status_signal_ #ifndef _di_F_status_basic_ - if (fl_string_compare(string, f_status_none_s, length, F_status_none_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_none_s) == F_equal_to) { *code = F_none; return F_none; } - if (fl_string_compare(string, f_status_abort_s, length, F_status_abort_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_abort_s) == F_equal_to) { *code = F_abort; return F_none; } - if (fl_string_compare(string, f_status_abort_not_s, length, F_status_abort_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_abort_not_s) == F_equal_to) { *code = F_abort_not; return F_none; } - if (fl_string_compare(string, f_status_absolute_s, length, F_status_absolute_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_absolute_s) == F_equal_to) { *code = F_absolute; return F_none; } - if (fl_string_compare(string, f_status_absolute_not_s, length, F_status_absolute_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_absolute_not_s) == F_equal_to) { *code = F_absolute_not; return F_none; } - if (fl_string_compare(string, f_status_address_s, length, F_status_address_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_address_s) == F_equal_to) { *code = F_address; return F_none; } - if (fl_string_compare(string, f_status_address_not_s, length, F_status_address_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_address_not_s) == F_equal_to) { *code = F_address_not; return F_none; } - if (fl_string_compare(string, f_status_ascii_s, length, F_status_ascii_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_ascii_s) == F_equal_to) { *code = F_ascii; return F_none; } - if (fl_string_compare(string, f_status_ascii_not_s, length, F_status_ascii_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_ascii_not_s) == F_equal_to) { *code = F_ascii_not; return F_none; } - if (fl_string_compare(string, f_status_atomic_s, length, F_status_atomic_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_atomic_s) == F_equal_to) { *code = F_atomic; return F_none; } - if (fl_string_compare(string, f_status_atomic_not_s, length, F_status_atomic_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_atomic_not_s) == F_equal_to) { *code = F_atomic_not; return F_none; } - if (fl_string_compare(string, f_status_body_s, length, F_status_body_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_body_s) == F_equal_to) { *code = F_body; return F_none; } - if (fl_string_compare(string, f_status_body_not_s, length, F_status_body_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_body_not_s) == F_equal_to) { *code = F_body_not; return F_none; } - if (fl_string_compare(string, f_status_begin_s, length, F_status_begin_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_begin_s) == F_equal_to) { *code = F_begin; return F_none; } - if (fl_string_compare(string, f_status_begin_not_s, length, F_status_begin_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_begin_not_s) == F_equal_to) { *code = F_begin_not; return F_none; } - if (fl_string_compare(string, f_status_block_s, length, F_status_block_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_block_s) == F_equal_to) { *code = F_block; return F_none; } - if (fl_string_compare(string, f_status_block_not_s, length, F_status_block_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_block_not_s) == F_equal_to) { *code = F_block_not; return F_none; } - if (fl_string_compare(string, f_status_bound_s, length, F_status_bound_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_bound_s) == F_equal_to) { *code = F_bound; return F_none; } - if (fl_string_compare(string, f_status_bound_not_s, length, F_status_bound_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_bound_not_s) == F_equal_to) { *code = F_bound_not; return F_none; } - if (fl_string_compare(string, f_status_capability_s, length, F_status_capability_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_capability_s) == F_equal_to) { *code = F_capability; return F_none; } - if (fl_string_compare(string, f_status_capability_not_s, length, F_status_capability_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_capability_not_s) == F_equal_to) { *code = F_capability_not; return F_none; } - if (fl_string_compare(string, f_status_child_s, length, F_status_child_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_child_s) == F_equal_to) { *code = F_child; return F_none; } - if (fl_string_compare(string, f_status_child_not_s, length, F_status_child_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_child_not_s) == F_equal_to) { *code = F_child_not; return F_none; } - if (fl_string_compare(string, f_status_complete_s, length, F_status_complete_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_complete_s) == F_equal_to) { *code = F_complete; return F_none; } - if (fl_string_compare(string, f_status_complete_not_s, length, F_status_complete_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_complete_not_s) == F_equal_to) { *code = F_complete_not; return F_none; } - if (fl_string_compare(string, f_status_connect_s, length, F_status_connect_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_connect_s) == F_equal_to) { *code = F_connect; return F_none; } - if (fl_string_compare(string, f_status_connect_not_s, length, F_status_connect_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_connect_not_s) == F_equal_to) { *code = F_connect_not; return F_none; } - if (fl_string_compare(string, f_status_connect_refuse_s, length, F_status_connect_refuse_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_connect_refuse_s) == F_equal_to) { *code = F_connect_refuse; return F_none; } - if (fl_string_compare(string, f_status_connect_reset_s, length, F_status_connect_reset_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_connect_reset_s) == F_equal_to) { *code = F_connect_reset; return F_none; } - if (fl_string_compare(string, f_status_container_s, length, F_status_container_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_container_s) == F_equal_to) { *code = F_container; return F_none; } - if (fl_string_compare(string, f_status_container_not_s, length, F_status_container_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_container_not_s) == F_equal_to) { *code = F_container_not; return F_none; } - if (fl_string_compare(string, f_status_content_s, length, F_status_content_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_content_s) == F_equal_to) { *code = F_content; return F_none; } - if (fl_string_compare(string, f_status_content_not_s, length, F_status_content_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_content_not_s) == F_equal_to) { *code = F_content_not; return F_none; } - if (fl_string_compare(string, f_status_continue_s, length, F_status_continue_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_continue_s) == F_equal_to) { *code = F_continue; return F_none; } - if (fl_string_compare(string, f_status_continue_not_s, length, F_status_continue_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_continue_not_s) == F_equal_to) { *code = F_continue_not; return F_none; } - if (fl_string_compare(string, f_status_control_s, length, F_status_control_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_control_s) == F_equal_to) { *code = F_control; return F_none; } - if (fl_string_compare(string, f_status_control_not_s, length, F_status_control_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_control_not_s) == F_equal_to) { *code = F_control_not; return F_none; } - if (fl_string_compare(string, f_status_control_group_s, length, F_status_control_group_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_control_group_s) == F_equal_to) { *code = F_control_group; return F_none; } - if (fl_string_compare(string, f_status_control_group_not_s, length, F_status_control_group_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_control_group_not_s) == F_equal_to) { *code = F_control_group_not; return F_none; } - if (fl_string_compare(string, f_status_critical_s, length, F_status_critical_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_critical_s) == F_equal_to) { *code = F_critical; return F_none; } - if (fl_string_compare(string, f_status_critical_not_s, length, F_status_critical_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_critical_not_s) == F_equal_to) { *code = F_critical_not; return F_none; } - if (fl_string_compare(string, f_status_dead_s, length, F_status_dead_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_dead_s) == F_equal_to) { *code = F_dead; return F_none; } - if (fl_string_compare(string, f_status_dead_not_s, length, F_status_dead_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_dead_not_s) == F_equal_to) { *code = F_dead_not; return F_none; } - if (fl_string_compare(string, f_status_deadlock_s, length, F_status_deadlock_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_deadlock_s) == F_equal_to) { *code = F_deadlock; return F_none; } - if (fl_string_compare(string, f_status_deadlock_not_s, length, F_status_deadlock_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_deadlock_not_s) == F_equal_to) { *code = F_deadlock_not; return F_none; } - if (fl_string_compare(string, f_status_descriptor_s, length, F_status_descriptor_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_descriptor_s) == F_equal_to) { *code = F_descriptor; return F_none; } - if (fl_string_compare(string, f_status_descriptor_not_s, length, F_status_descriptor_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_descriptor_not_s) == F_equal_to) { *code = F_descriptor_not; return F_none; } - if (fl_string_compare(string, f_status_device_s, length, F_status_device_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_device_s) == F_equal_to) { *code = F_device; return F_none; } - if (fl_string_compare(string, f_status_device_not_s, length, F_status_device_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_device_not_s) == F_equal_to) { *code = F_device_not; return F_none; } - if (fl_string_compare(string, f_status_disable_s, length, F_status_disable_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_disable_s) == F_equal_to) { *code = F_disable; return F_none; } - if (fl_string_compare(string, f_status_disable_not_s, length, F_status_disable_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_disable_not_s) == F_equal_to) { *code = F_disable_not; return F_none; } - if (fl_string_compare(string, f_status_domain_s, length, F_status_domain_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_domain_s) == F_equal_to) { *code = F_domain; return F_none; } - if (fl_string_compare(string, f_status_domain_not_s, length, F_status_domain_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_domain_not_s) == F_equal_to) { *code = F_domain_not; return F_none; } - if (fl_string_compare(string, f_status_done_s, length, F_status_done_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_done_s) == F_equal_to) { *code = F_done; return F_none; } - if (fl_string_compare(string, f_status_done_not_s, length, F_status_done_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_done_not_s) == F_equal_to) { *code = F_done_not; return F_none; } - if (fl_string_compare(string, f_status_dummy_s, length, F_status_dummy_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_dummy_s) == F_equal_to) { *code = F_dummy; return F_none; } - if (fl_string_compare(string, f_status_dummy_not_s, length, F_status_dummy_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_dummy_not_s) == F_equal_to) { *code = F_dummy_not; return F_none; } - if (fl_string_compare(string, f_status_empty_s, length, F_status_empty_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_empty_s) == F_equal_to) { *code = F_empty; return F_none; } - if (fl_string_compare(string, f_status_empty_not_s, length, F_status_empty_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_empty_not_s) == F_equal_to) { *code = F_empty_not; return F_none; } - if (fl_string_compare(string, f_status_enable_s, length, F_status_enable_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_enable_s) == F_equal_to) { *code = F_enable; return F_none; } - if (fl_string_compare(string, f_status_enable_not_s, length, F_status_enable_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_enable_not_s) == F_equal_to) { *code = F_enable_not; return F_none; } - if (fl_string_compare(string, f_status_encoding_s, length, F_status_encoding_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_encoding_s) == F_equal_to) { *code = F_encoding; return F_none; } - if (fl_string_compare(string, f_status_encoding_not_s, length, F_status_encoding_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_encoding_not_s) == F_equal_to) { *code = F_encoding_not; return F_none; } - if (fl_string_compare(string, f_status_end_s, length, F_status_end_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_end_s) == F_equal_to) { *code = F_end; return F_none; } - if (fl_string_compare(string, f_status_end_not_s, length, F_status_end_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_end_not_s) == F_equal_to) { *code = F_end_not; return F_none; } - if (fl_string_compare(string, f_status_endian_s, length, F_status_endian_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_endian_s) == F_equal_to) { *code = F_endian; return F_none; } - if (fl_string_compare(string, f_status_endian_big_s, length, F_status_endian_big_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_endian_big_s) == F_equal_to) { *code = F_endian_big; return F_none; } - if (fl_string_compare(string, f_status_endian_little_s, length, F_status_endian_little_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_endian_little_s) == F_equal_to) { *code = F_endian_little; return F_none; } - if (fl_string_compare(string, f_status_endian_not_s, length, F_status_endian_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_endian_not_s) == F_equal_to) { *code = F_endian_not; return F_none; } - if (fl_string_compare(string, f_status_eoa_s, length, F_status_eoa_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_eoa_s) == F_equal_to) { *code = F_eoa; return F_none; } - if (fl_string_compare(string, f_status_eoa_not_s, length, F_status_eoa_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_eoa_not_s) == F_equal_to) { *code = F_eoa_not; return F_none; } - if (fl_string_compare(string, f_status_eof_s, length, F_status_eof_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_eof_s) == F_equal_to) { *code = F_eof; return F_none; } - if (fl_string_compare(string, f_status_eof_not_s, length, F_status_eof_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_eof_not_s) == F_equal_to) { *code = F_eof_not; return F_none; } - if (fl_string_compare(string, f_status_eol_s, length, F_status_eol_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_eol_s) == F_equal_to) { *code = F_eol; return F_none; } - if (fl_string_compare(string, f_status_eol_not_s, length, F_status_eol_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_eol_not_s) == F_equal_to) { *code = F_eol_not; return F_none; } - if (fl_string_compare(string, f_status_eos_s, length, F_status_eos_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_eos_s) == F_equal_to) { *code = F_eos; return F_none; } - if (fl_string_compare(string, f_status_eos_not_s, length, F_status_eos_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_eos_not_s) == F_equal_to) { *code = F_eos_not; return F_none; } - if (fl_string_compare(string, f_status_execute_s, length, F_status_execute_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_execute_s) == F_equal_to) { *code = F_execute; return F_none; } - if (fl_string_compare(string, f_status_execute_not_s, length, F_status_execute_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_execute_not_s) == F_equal_to) { *code = F_execute_not; return F_none; } - if (fl_string_compare(string, f_status_exist_s, length, F_status_exist_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_exist_s) == F_equal_to) { *code = F_exist; return F_none; } - if (fl_string_compare(string, f_status_exist_not_s, length, F_status_exist_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_exist_not_s) == F_equal_to) { *code = F_exist_not; return F_none; } - if (fl_string_compare(string, f_status_failure_s, length, F_status_failure_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_failure_s) == F_equal_to) { *code = F_failure; return F_none; } - if (fl_string_compare(string, f_status_failure_not_s, length, F_status_failure_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_failure_not_s) == F_equal_to) { *code = F_failure_not; return F_none; } - if (fl_string_compare(string, f_status_family_s, length, F_status_family_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_family_s) == F_equal_to) { *code = F_family; return F_none; } - if (fl_string_compare(string, f_status_family_not_s, length, F_status_family_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_family_not_s) == F_equal_to) { *code = F_family_not; return F_none; } - if (fl_string_compare(string, f_status_first_s, length, F_status_first_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_first_s) == F_equal_to) { *code = F_first; return F_none; } - if (fl_string_compare(string, f_status_first_not_s, length, F_status_first_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_first_not_s) == F_equal_to) { *code = F_first_not; return F_none; } - if (fl_string_compare(string, f_status_footer_s, length, F_status_footer_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_footer_s) == F_equal_to) { *code = F_footer; return F_none; } - if (fl_string_compare(string, f_status_footer_not_s, length, F_status_footer_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_footer_not_s) == F_equal_to) { *code = F_footer_not; return F_none; } - if (fl_string_compare(string, f_status_fork_s, length, F_status_fork_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_fork_s) == F_equal_to) { *code = F_fork; return F_none; } - if (fl_string_compare(string, f_status_fork_not_s, length, F_status_fork_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_fork_not_s) == F_equal_to) { *code = F_fork_not; return F_none; } - if (fl_string_compare(string, f_status_format_s, length, F_status_format_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_format_s) == F_equal_to) { *code = F_format; return F_none; } - if (fl_string_compare(string, f_status_format_not_s, length, F_status_format_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_format_not_s) == F_equal_to) { *code = F_format_not; return F_none; } - if (fl_string_compare(string, f_status_found_s, length, F_status_found_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_found_s) == F_equal_to) { *code = F_found; return F_none; } - if (fl_string_compare(string, f_status_found_not_s, length, F_status_found_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_found_not_s) == F_equal_to) { *code = F_found_not; return F_none; } - if (fl_string_compare(string, f_status_full_s, length, F_status_full_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_full_s) == F_equal_to) { *code = F_full; return F_none; } - if (fl_string_compare(string, f_status_full_not_s, length, F_status_full_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_full_not_s) == F_equal_to) { *code = F_full_not; return F_none; } - if (fl_string_compare(string, f_status_group_s, length, F_status_group_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_group_s) == F_equal_to) { *code = F_group; return F_none; } - if (fl_string_compare(string, f_status_group_not_s, length, F_status_group_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_group_not_s) == F_equal_to) { *code = F_group_not; return F_none; } - if (fl_string_compare(string, f_status_header_s, length, F_status_header_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_header_s) == F_equal_to) { *code = F_header; return F_none; } - if (fl_string_compare(string, f_status_header_not_s, length, F_status_header_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_header_not_s) == F_equal_to) { *code = F_header_not; return F_none; } - if (fl_string_compare(string, f_status_ignore_s, length, F_status_ignore_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_ignore_s) == F_equal_to) { *code = F_ignore; return F_none; } - if (fl_string_compare(string, f_status_ignore_not_s, length, F_status_ignore_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_ignore_not_s) == F_equal_to) { *code = F_ignore_not; return F_none; } - if (fl_string_compare(string, f_status_implemented_s, length, F_status_implemented_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_implemented_s) == F_equal_to) { *code = F_implemented; return F_none; } - if (fl_string_compare(string, f_status_implemented_not_s, length, F_status_implemented_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_implemented_not_s) == F_equal_to) { *code = F_implemented_not; return F_none; } - if (fl_string_compare(string, f_status_input_s, length, F_status_input_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_input_s) == F_equal_to) { *code = F_input; return F_none; } - if (fl_string_compare(string, f_status_input_not_s, length, F_status_input_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_input_not_s) == F_equal_to) { *code = F_input_not; return F_none; } - if (fl_string_compare(string, f_status_input_output_s, length, F_status_input_output_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_input_output_s) == F_equal_to) { *code = F_input_output; return F_none; } - if (fl_string_compare(string, f_status_interrupt_s, length, F_status_interrupt_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_interrupt_s) == F_equal_to) { *code = F_interrupt; return F_none; } - if (fl_string_compare(string, f_status_interrupt_not_s, length, F_status_interrupt_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_interrupt_not_s) == F_equal_to) { *code = F_interrupt_not; return F_none; } - if (fl_string_compare(string, f_status_known_s, length, F_status_known_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_known_s) == F_equal_to) { *code = F_known; return F_none; } - if (fl_string_compare(string, f_status_known_not_s, length, F_status_known_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_known_not_s) == F_equal_to) { *code = F_known_not; return F_none; } - if (fl_string_compare(string, f_status_last_s, length, F_status_last_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_last_s) == F_equal_to) { *code = F_last; return F_none; } - if (fl_string_compare(string, f_status_last_not_s, length, F_status_last_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_last_not_s) == F_equal_to) { *code = F_last_not; return F_none; } - if (fl_string_compare(string, f_status_limit_s, length, F_status_limit_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_limit_s) == F_equal_to) { *code = F_limit; return F_none; } - if (fl_string_compare(string, f_status_limit_not_s, length, F_status_limit_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_limit_not_s) == F_equal_to) { *code = F_limit_not; return F_none; } - if (fl_string_compare(string, f_status_link_s, length, F_status_link_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_link_s) == F_equal_to) { *code = F_link; return F_none; } - if (fl_string_compare(string, f_status_link_not_s, length, F_status_link_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_link_not_s) == F_equal_to) { *code = F_link_not; return F_none; } - if (fl_string_compare(string, f_status_live_s, length, F_status_live_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_live_s) == F_equal_to) { *code = F_live; return F_none; } - if (fl_string_compare(string, f_status_live_not_s, length, F_status_live_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_live_not_s) == F_equal_to) { *code = F_live_not; return F_none; } - if (fl_string_compare(string, f_status_lock_s, length, F_status_lock_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_lock_s) == F_equal_to) { *code = F_lock; return F_none; } - if (fl_string_compare(string, f_status_lock_not_s, length, F_status_lock_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_lock_not_s) == F_equal_to) { *code = F_lock_not; return F_none; } - if (fl_string_compare(string, f_status_loop_s, length, F_status_loop_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_loop_s) == F_equal_to) { *code = F_loop; return F_none; } - if (fl_string_compare(string, f_status_loop_not_s, length, F_status_loop_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_loop_not_s) == F_equal_to) { *code = F_loop_not; return F_none; } - if (fl_string_compare(string, f_status_maybe_s, length, F_status_maybe_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_maybe_s) == F_equal_to) { *code = F_maybe; return F_none; } - if (fl_string_compare(string, f_status_maybe_not_s, length, F_status_maybe_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_maybe_not_s) == F_equal_to) { *code = F_maybe_not; return F_none; } - if (fl_string_compare(string, f_status_memory_s, length, F_status_memory_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_memory_s) == F_equal_to) { *code = F_memory; return F_none; } - if (fl_string_compare(string, f_status_memory_not_s, length, F_status_memory_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_memory_not_s) == F_equal_to) { *code = F_memory_not; return F_none; } - if (fl_string_compare(string, f_status_message_s, length, F_status_message_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_message_s) == F_equal_to) { *code = F_message; return F_none; } - if (fl_string_compare(string, f_status_message_not_s, length, F_status_message_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_message_not_s) == F_equal_to) { *code = F_message_not; return F_none; } - if (fl_string_compare(string, f_status_minor_s, length, F_status_minor_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_minor_s) == F_equal_to) { *code = F_minor; return F_none; } - if (fl_string_compare(string, f_status_minor_not_s, length, F_status_minor_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_minor_not_s) == F_equal_to) { *code = F_minor_not; return F_none; } - if (fl_string_compare(string, f_status_moderate_s, length, F_status_moderate_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_moderate_s) == F_equal_to) { *code = F_moderate; return F_none; } - if (fl_string_compare(string, f_status_moderate_not_s, length, F_status_moderate_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_moderate_not_s) == F_equal_to) { *code = F_moderate_not; return F_none; } - if (fl_string_compare(string, f_status_mount_s, length, F_status_mount_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_mount_s) == F_equal_to) { *code = F_mount; return F_none; } - if (fl_string_compare(string, f_status_mount_not_s, length, F_status_mount_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_mount_not_s) == F_equal_to) { *code = F_mount_not; return F_none; } - if (fl_string_compare(string, f_status_name_s, length, F_status_name_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_name_s) == F_equal_to) { *code = F_name; return F_none; } - if (fl_string_compare(string, f_status_name_not_s, length, F_status_name_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_name_not_s) == F_equal_to) { *code = F_name_not; return F_none; } - if (fl_string_compare(string, f_status_next_s, length, F_status_next_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_next_s) == F_equal_to) { *code = F_next; return F_none; } - if (fl_string_compare(string, f_status_next_not_s, length, F_status_next_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_next_not_s) == F_equal_to) { *code = F_next_not; return F_none; } - if (fl_string_compare(string, f_status_nice_s, length, F_status_nice_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_nice_s) == F_equal_to) { *code = F_nice; return F_none; } - if (fl_string_compare(string, f_status_nice_not_s, length, F_status_nice_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_nice_not_s) == F_equal_to) { *code = F_nice_not; return F_none; } - if (fl_string_compare(string, f_status_object_s, length, F_status_object_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_object_s) == F_equal_to) { *code = F_object; return F_none; } - if (fl_string_compare(string, f_status_object_not_s, length, F_status_object_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_object_not_s) == F_equal_to) { *code = F_object_not; return F_none; } - if (fl_string_compare(string, f_status_option_s, length, F_status_option_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_option_s) == F_equal_to) { *code = F_option; return F_none; } - if (fl_string_compare(string, f_status_option_not_s, length, F_status_option_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_option_not_s) == F_equal_to) { *code = F_option_not; return F_none; } - if (fl_string_compare(string, f_status_output_s, length, F_status_output_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_output_s) == F_equal_to) { *code = F_output; return F_none; } - if (fl_string_compare(string, f_status_output_not_s, length, F_status_output_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_output_not_s) == F_equal_to) { *code = F_output_not; return F_none; } - if (fl_string_compare(string, f_status_packet_s, length, F_status_packet_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_packet_s) == F_equal_to) { *code = F_packet; return F_none; } - if (fl_string_compare(string, f_status_packet_not_s, length, F_status_packet_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_packet_not_s) == F_equal_to) { *code = F_packet_not; return F_none; } - if (fl_string_compare(string, f_status_parameter_s, length, F_status_parameter_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_parameter_s) == F_equal_to) { *code = F_parameter; return F_none; } - if (fl_string_compare(string, f_status_parameter_not_s, length, F_status_parameter_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_parameter_not_s) == F_equal_to) { *code = F_parameter_not; return F_none; } - if (fl_string_compare(string, f_status_parent_s, length, F_status_parent_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_parent_s) == F_equal_to) { *code = F_parent; return F_none; } - if (fl_string_compare(string, f_status_parent_not_s, length, F_status_parent_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_parent_not_s) == F_equal_to) { *code = F_parent_not; return F_none; } - if (fl_string_compare(string, f_status_payload_s, length, F_status_payload_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_payload_s) == F_equal_to) { *code = F_payload; return F_none; } - if (fl_string_compare(string, f_status_payload_not_s, length, F_status_payload_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_payload_not_s) == F_equal_to) { *code = F_payload_not; return F_none; } - if (fl_string_compare(string, f_status_pipe_s, length, F_status_pipe_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_pipe_s) == F_equal_to) { *code = F_pipe; return F_none; } - if (fl_string_compare(string, f_status_pipe_not_s, length, F_status_pipe_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_pipe_not_s) == F_equal_to) { *code = F_pipe_not; return F_none; } - if (fl_string_compare(string, f_status_port_s, length, F_status_port_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_port_s) == F_equal_to) { *code = F_port; return F_none; } - if (fl_string_compare(string, f_status_port_not_s, length, F_status_port_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_port_not_s) == F_equal_to) { *code = F_port_not; return F_none; } - if (fl_string_compare(string, f_status_previous_s, length, F_status_previous_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_previous_s) == F_equal_to) { *code = F_previous; return F_none; } - if (fl_string_compare(string, f_status_previous_not_s, length, F_status_previous_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_previous_not_s) == F_equal_to) { *code = F_previous_not; return F_none; } - if (fl_string_compare(string, f_status_processor_s, length, F_status_processor_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_processor_s) == F_equal_to) { *code = F_processor; return F_none; } - if (fl_string_compare(string, f_status_processor_not_s, length, F_status_processor_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_processor_not_s) == F_equal_to) { *code = F_processor_not; return F_none; } - if (fl_string_compare(string, f_status_progress_s, length, F_status_progress_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_progress_s) == F_equal_to) { *code = F_progress; return F_none; } - if (fl_string_compare(string, f_status_progress_not_s, length, F_status_progress_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_progress_not_s) == F_equal_to) { *code = F_progress_not; return F_none; } - if (fl_string_compare(string, f_status_prohibited_s, length, F_status_prohibited_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_prohibited_s) == F_equal_to) { *code = F_prohibited; return F_none; } - if (fl_string_compare(string, f_status_prohibited_not_s, length, F_status_prohibited_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_prohibited_not_s) == F_equal_to) { *code = F_prohibited_not; return F_none; } - if (fl_string_compare(string, f_status_property_s, length, F_status_property_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_property_s) == F_equal_to) { *code = F_property; return F_none; } - if (fl_string_compare(string, f_status_property_not_s, length, F_status_property_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_property_not_s) == F_equal_to) { *code = F_property_not; return F_none; } - if (fl_string_compare(string, f_status_protocol_s, length, F_status_protocol_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_protocol_s) == F_equal_to) { *code = F_protocol; return F_none; } - if (fl_string_compare(string, f_status_protocol_not_s, length, F_status_protocol_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_protocol_not_s) == F_equal_to) { *code = F_protocol_not; return F_none; } - if (fl_string_compare(string, f_status_range_s, length, F_status_range_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_range_s) == F_equal_to) { *code = F_range; return F_none; } - if (fl_string_compare(string, f_status_range_not_s, length, F_status_range_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_range_not_s) == F_equal_to) { *code = F_range_not; return F_none; } - if (fl_string_compare(string, f_status_read_s, length, F_status_read_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_read_s) == F_equal_to) { *code = F_read; return F_none; } - if (fl_string_compare(string, f_status_read_not_s, length, F_status_read_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_read_not_s) == F_equal_to) { *code = F_read_not; return F_none; } - if (fl_string_compare(string, f_status_read_only_s, length, F_status_read_only_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_read_only_s) == F_equal_to) { *code = F_read_only; return F_none; } - if (fl_string_compare(string, f_status_ready_s, length, F_status_ready_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_ready_s) == F_equal_to) { *code = F_ready; return F_none; } - if (fl_string_compare(string, f_status_ready_not_s, length, F_status_ready_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_ready_not_s) == F_equal_to) { *code = F_ready_not; return F_none; } - if (fl_string_compare(string, f_status_recover_s, length, F_status_recover_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_recover_s) == F_equal_to) { *code = F_recover; return F_none; } - if (fl_string_compare(string, f_status_recover_not_s, length, F_status_recover_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_recover_not_s) == F_equal_to) { *code = F_recover_not; return F_none; } - if (fl_string_compare(string, f_status_recurse_s, length, F_status_recurse_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_recurse_s) == F_equal_to) { *code = F_recurse; return F_none; } - if (fl_string_compare(string, f_status_recurse_not_s, length, F_status_recurse_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_recurse_not_s) == F_equal_to) { *code = F_recurse_not; return F_none; } - if (fl_string_compare(string, f_status_relative_s, length, F_status_relative_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_relative_s) == F_equal_to) { *code = F_relative; return F_none; } - if (fl_string_compare(string, f_status_relative_not_s, length, F_status_relative_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_relative_not_s) == F_equal_to) { *code = F_relative_not; return F_none; } - if (fl_string_compare(string, f_status_require_s, length, F_status_require_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_require_s) == F_equal_to) { *code = F_require; return F_none; } - if (fl_string_compare(string, f_status_require_not_s, length, F_status_require_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_require_not_s) == F_equal_to) { *code = F_require_not; return F_none; } - if (fl_string_compare(string, f_status_resource_s, length, F_status_resource_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_resource_s) == F_equal_to) { *code = F_resource; return F_none; } - if (fl_string_compare(string, f_status_resource_not_s, length, F_status_resource_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_resource_not_s) == F_equal_to) { *code = F_resource_not; return F_none; } - if (fl_string_compare(string, f_status_search_s, length, F_status_search_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_search_s) == F_equal_to) { *code = F_search; return F_none; } - if (fl_string_compare(string, f_status_search_not_s, length, F_status_search_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_search_not_s) == F_equal_to) { *code = F_search_not; return F_none; } - if (fl_string_compare(string, f_status_schedule_s, length, F_status_schedule_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_schedule_s) == F_equal_to) { *code = F_schedule; return F_none; } - if (fl_string_compare(string, f_status_schedule_not_s, length, F_status_schedule_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_schedule_not_s) == F_equal_to) { *code = F_schedule_not; return F_none; } - if (fl_string_compare(string, f_status_size_s, length, F_status_size_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_size_s) == F_equal_to) { *code = F_size; return F_none; } - if (fl_string_compare(string, f_status_size_not_s, length, F_status_size_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_size_not_s) == F_equal_to) { *code = F_size_not; return F_none; } - if (fl_string_compare(string, f_status_signal_s, length, F_status_signal_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_s) == F_equal_to) { *code = F_signal; return F_none; } - if (fl_string_compare(string, f_status_signal_not_s, length, F_status_signal_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_signal_not_s) == F_equal_to) { *code = F_signal_not; return F_none; } - if (fl_string_compare(string, f_status_space_s, length, F_status_space_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_space_s) == F_equal_to) { *code = F_space; return F_none; } - if (fl_string_compare(string, f_status_space_not_s, length, F_status_space_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_space_not_s) == F_equal_to) { *code = F_space_not; return F_none; } - if (fl_string_compare(string, f_status_start_s, length, F_status_start_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_start_s) == F_equal_to) { *code = F_start; return F_none; } - if (fl_string_compare(string, f_status_start_not_s, length, F_status_start_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_start_not_s) == F_equal_to) { *code = F_start_not; return F_none; } - if (fl_string_compare(string, f_status_stop_s, length, F_status_stop_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_stop_s) == F_equal_to) { *code = F_stop; return F_none; } - if (fl_string_compare(string, f_status_stop_not_s, length, F_status_stop_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_stop_not_s) == F_equal_to) { *code = F_stop_not; return F_none; } - if (fl_string_compare(string, f_status_stream_s, length, F_status_stream_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_stream_s) == F_equal_to) { *code = F_stream; return F_none; } - if (fl_string_compare(string, f_status_stream_not_s, length, F_status_stream_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_stream_not_s) == F_equal_to) { *code = F_stream_not; return F_none; } - if (fl_string_compare(string, f_status_string_s, length, F_status_string_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_string_s) == F_equal_to) { *code = F_string; return F_none; } - if (fl_string_compare(string, f_status_string_not_s, length, F_status_string_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_string_not_s) == F_equal_to) { *code = F_string_not; return F_none; } - if (fl_string_compare(string, f_status_string_too_large_s, length, F_status_string_too_large_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_string_too_large_s) == F_equal_to) { *code = F_string_too_large; return F_none; } - if (fl_string_compare(string, f_status_string_too_small_s, length, F_status_string_too_small_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_string_too_small_s) == F_equal_to) { *code = F_string_too_small; return F_none; } - if (fl_string_compare(string, f_status_success_s, length, F_status_success_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_success_s) == F_equal_to) { *code = F_success; return F_none; } - if (fl_string_compare(string, f_status_success_not_s, length, F_status_success_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_success_not_s) == F_equal_to) { *code = F_success_not; return F_none; } - if (fl_string_compare(string, f_status_supported_s, length, F_status_supported_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_supported_s) == F_equal_to) { *code = F_supported; return F_none; } - if (fl_string_compare(string, f_status_supported_not_s, length, F_status_supported_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_supported_not_s) == F_equal_to) { *code = F_supported_not; return F_none; } - if (fl_string_compare(string, f_status_syntax_s, length, F_status_syntax_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_syntax_s) == F_equal_to) { *code = F_syntax; return F_none; } - if (fl_string_compare(string, f_status_syntax_not_s, length, F_status_syntax_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_syntax_not_s) == F_equal_to) { *code = F_syntax_not; return F_none; } - if (fl_string_compare(string, f_status_thread_s, length, F_status_thread_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_thread_s) == F_equal_to) { *code = F_thread; return F_none; } - if (fl_string_compare(string, f_status_thread_not_s, length, F_status_thread_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_thread_not_s) == F_equal_to) { *code = F_thread_not; return F_none; } - if (fl_string_compare(string, f_status_time_s, length, F_status_time_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_time_s) == F_equal_to) { *code = F_time; return F_none; } - if (fl_string_compare(string, f_status_time_not_s, length, F_status_time_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_time_not_s) == F_equal_to) { *code = F_time_not; return F_none; } - if (fl_string_compare(string, f_status_time_out_s, length, F_status_time_out_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_time_out_s) == F_equal_to) { *code = F_time_out; return F_none; } - if (fl_string_compare(string, f_status_too_large_s, length, F_status_too_large_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_too_large_s) == F_equal_to) { *code = F_too_large; return F_none; } - if (fl_string_compare(string, f_status_too_small_s, length, F_status_too_small_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_too_small_s) == F_equal_to) { *code = F_too_small; return F_none; } - if (fl_string_compare(string, f_status_type_s, length, F_status_type_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_type_s) == F_equal_to) { *code = F_type; return F_none; } - if (fl_string_compare(string, f_status_type_not_s, length, F_status_type_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_type_not_s) == F_equal_to) { *code = F_type_not; return F_none; } - if (fl_string_compare(string, f_status_user_s, length, F_status_user_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_user_s) == F_equal_to) { *code = F_user; return F_none; } - if (fl_string_compare(string, f_status_user_not_s, length, F_status_user_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_user_not_s) == F_equal_to) { *code = F_user_not; return F_none; } - if (fl_string_compare(string, f_status_utf_s, length, F_status_utf_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_utf_s) == F_equal_to) { *code = F_utf; return F_none; } - if (fl_string_compare(string, f_status_utf_fragment_s, length, F_status_utf_fragment_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_utf_fragment_s) == F_equal_to) { *code = F_utf_fragment; return F_none; } - if (fl_string_compare(string, f_status_utf_fragment_not_s, length, F_status_utf_fragment_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_utf_fragment_not_s) == F_equal_to) { *code = F_utf_fragment_not; return F_none; } - if (fl_string_compare(string, f_status_utf_not_s, length, F_status_utf_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_utf_not_s) == F_equal_to) { *code = F_utf_not; return F_none; } - if (fl_string_compare(string, f_status_valid_s, length, F_status_valid_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_valid_s) == F_equal_to) { *code = F_valid; return F_none; } - if (fl_string_compare(string, f_status_valid_not_s, length, F_status_valid_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_valid_not_s) == F_equal_to) { *code = F_valid_not; return F_none; } - if (fl_string_compare(string, f_status_value_s, length, F_status_value_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_value_s) == F_equal_to) { *code = F_value; return F_none; } - if (fl_string_compare(string, f_status_value_not_s, length, F_status_value_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_value_not_s) == F_equal_to) { *code = F_value_not; return F_none; } - if (fl_string_compare(string, f_status_wait_s, length, F_status_wait_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_wait_s) == F_equal_to) { *code = F_wait; return F_none; } - if (fl_string_compare(string, f_status_wait_not_s, length, F_status_wait_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_wait_not_s) == F_equal_to) { *code = F_wait_not; return F_none; } - if (fl_string_compare(string, f_status_warn_s, length, F_status_warn_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_warn_s) == F_equal_to) { *code = F_warn; return F_none; } - if (fl_string_compare(string, f_status_warn_not_s, length, F_status_warn_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_warn_not_s) == F_equal_to) { *code = F_warn_not; return F_none; } - if (fl_string_compare(string, f_status_world_s, length, F_status_world_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_world_s) == F_equal_to) { *code = F_world; return F_none; } - if (fl_string_compare(string, f_status_world_not_s, length, F_status_world_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_world_not_s) == F_equal_to) { *code = F_world_not; return F_none; } - if (fl_string_compare(string, f_status_write_s, length, F_status_write_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_write_s) == F_equal_to) { *code = F_write; return F_none; } - if (fl_string_compare(string, f_status_write_not_s, length, F_status_write_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_write_not_s) == F_equal_to) { *code = F_write_not; return F_none; } - if (fl_string_compare(string, f_status_write_only_s, length, F_status_write_only_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_write_only_s) == F_equal_to) { *code = F_write_only; return F_none; @@ -1887,25 +1886,25 @@ extern "C" { #endif // _di_F_status_basic_ #ifndef _di_F_status_array_ - if (fl_string_compare(string, f_status_array_s, length, F_status_array_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_array_s) == F_equal_to) { *code = F_array; return F_none; } - if (fl_string_compare(string, f_status_array_not_s, length, F_status_array_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_array_not_s) == F_equal_to) { *code = F_array_not; return F_none; } - if (fl_string_compare(string, f_status_array_too_large_s, length, F_status_array_too_large_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_array_too_large_s) == F_equal_to) { *code = F_array_too_large; return F_none; } - if (fl_string_compare(string, f_status_array_too_small_s, length, F_status_array_too_small_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_array_too_small_s) == F_equal_to) { *code = F_array_too_small; return F_none; @@ -1913,55 +1912,55 @@ extern "C" { #endif // _di_F_status_array_ #ifndef _di_F_status_available_ - if (fl_string_compare(string, f_status_available_s, length, F_status_available_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_available_s) == F_equal_to) { *code = F_available; return F_none; } - if (fl_string_compare(string, f_status_available_not_s, length, F_status_available_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_available_not_s) == F_equal_to) { *code = F_available_not; return F_none; } - if (fl_string_compare(string, f_status_available_not_address_s, length, F_status_available_not_address_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_available_not_address_s) == F_equal_to) { *code = F_available_not_address; return F_none; } - if (fl_string_compare(string, f_status_available_not_buffer_s, length, F_status_available_not_buffer_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_available_not_buffer_s) == F_equal_to) { *code = F_available_not_buffer; return F_none; } - if (fl_string_compare(string, f_status_available_not_device_s, length, F_status_available_not_device_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_available_not_device_s) == F_equal_to) { *code = F_available_not_device; return F_none; } - if (fl_string_compare(string, f_status_available_not_pipe_s, length, F_status_available_not_pipe_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_available_not_pipe_s) == F_equal_to) { *code = F_available_not_pipe; return F_none; } - if (fl_string_compare(string, f_status_available_not_port_s, length, F_status_available_not_port_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_available_not_port_s) == F_equal_to) { *code = F_available_not_port; return F_none; } - if (fl_string_compare(string, f_status_available_not_process_s, length, F_status_available_not_process_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_available_not_process_s) == F_equal_to) { *code = F_available_not_process; return F_none; } - if (fl_string_compare(string, f_status_available_not_socket_s, length, F_status_available_not_socket_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_available_not_socket_s) == F_equal_to) { *code = F_available_not_socket; return F_none; @@ -1969,55 +1968,55 @@ extern "C" { #endif // _di_F_status_available_ #ifndef _di_F_status_busy_ - if (fl_string_compare(string, f_status_busy_s, length, F_status_busy_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_busy_s) == F_equal_to) { *code = F_busy; return F_none; } - if (fl_string_compare(string, f_status_busy_address_s, length, F_status_busy_address_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_busy_address_s) == F_equal_to) { *code = F_busy_address; return F_none; } - if (fl_string_compare(string, f_status_busy_buffer_s, length, F_status_busy_buffer_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_busy_buffer_s) == F_equal_to) { *code = F_busy_buffer; return F_none; } - if (fl_string_compare(string, f_status_busy_device_s, length, F_status_busy_device_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_busy_device_s) == F_equal_to) { *code = F_busy_device; return F_none; } - if (fl_string_compare(string, f_status_busy_not_s, length, F_status_busy_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_busy_not_s) == F_equal_to) { *code = F_busy_not; return F_none; } - if (fl_string_compare(string, f_status_busy_pipe_s, length, F_status_busy_pipe_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_busy_pipe_s) == F_equal_to) { *code = F_busy_pipe; return F_none; } - if (fl_string_compare(string, f_status_busy_port_s, length, F_status_busy_port_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_busy_port_s) == F_equal_to) { *code = F_busy_port; return F_none; } - if (fl_string_compare(string, f_status_busy_process_s, length, F_status_busy_process_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_busy_process_s) == F_equal_to) { *code = F_busy_process; return F_none; } - if (fl_string_compare(string, f_status_busy_socket_s, length, F_status_busy_socket_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_busy_socket_s) == F_equal_to) { *code = F_busy_socket; return F_none; @@ -2025,133 +2024,133 @@ extern "C" { #endif // _di_F_status_busy_ #ifndef _di_F_status_network_ - if (fl_string_compare(string, f_status_network_s, length, F_status_network_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_network_s) == F_equal_to) { *code = F_network; return F_none; } - if (fl_string_compare(string, f_status_network_busy_s, length, F_status_network_busy_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_network_busy_s) == F_equal_to) { *code = F_network_busy; return F_none; } - if (fl_string_compare(string, f_status_network_busy_not_s, length, F_status_network_busy_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_network_busy_not_s) == F_equal_to) { *code = F_network_busy_not; return F_none; } - if (fl_string_compare(string, f_status_network_client_s, length, F_status_network_client_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_network_client_s) == F_equal_to) { *code = F_network_client; return F_none; } - if (fl_string_compare(string, f_status_network_client_not_s, length, F_status_network_client_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_network_client_not_s) == F_equal_to) { *code = F_network_client_not; return F_none; } - if (fl_string_compare(string, f_status_network_device_s, length, F_status_network_device_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_network_device_s) == F_equal_to) { *code = F_network_device; return F_none; } - if (fl_string_compare(string, f_status_network_device_not_s, length, F_status_network_device_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_network_device_not_s) == F_equal_to) { *code = F_network_device_not; return F_none; } - if (fl_string_compare(string, f_status_network_found_s, length, F_status_network_found_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_network_found_s) == F_equal_to) { *code = F_network_found; return F_none; } - if (fl_string_compare(string, f_status_network_found_not_s, length, F_status_network_found_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_network_found_not_s) == F_equal_to) { *code = F_network_found_not; return F_none; } - if (fl_string_compare(string, f_status_network_lost_s, length, F_status_network_lost_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_network_lost_s) == F_equal_to) { *code = F_network_lost; return F_none; } - if (fl_string_compare(string, f_status_network_lost_not_s, length, F_status_network_lost_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_network_lost_not_s) == F_equal_to) { *code = F_network_lost_not; return F_none; } - if (fl_string_compare(string, f_status_network_not_s, length, F_status_network_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_network_not_s) == F_equal_to) { *code = F_network_not; return F_none; } - if (fl_string_compare(string, f_status_network_reach_s, length, F_status_network_reach_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_network_reach_s) == F_equal_to) { *code = F_network_reach; return F_none; } - if (fl_string_compare(string, f_status_network_reach_client_s, length, F_status_network_reach_client_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_network_reach_client_s) == F_equal_to) { *code = F_network_reach_client; return F_none; } - if (fl_string_compare(string, f_status_network_reach_client_not_s, length, F_status_network_reach_client_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_network_reach_client_not_s) == F_equal_to) { *code = F_network_reach_client_not; return F_none; } - if (fl_string_compare(string, f_status_network_reach_not_s, length, F_status_network_reach_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_network_reach_not_s) == F_equal_to) { *code = F_network_reach_not; return F_none; } - if (fl_string_compare(string, f_status_network_reach_server_s, length, F_status_network_reach_server_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_network_reach_server_s) == F_equal_to) { *code = F_network_reach_server; return F_none; } - if (fl_string_compare(string, f_status_network_reach_server_not_s, length, F_status_network_reach_server_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_network_reach_server_not_s) == F_equal_to) { *code = F_network_reach_server_not; return F_none; } - if (fl_string_compare(string, f_status_network_server_s, length, F_status_network_server_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_network_server_s) == F_equal_to) { *code = F_network_server; return F_none; } - if (fl_string_compare(string, f_status_network_server_not_s, length, F_status_network_server_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_network_server_not_s) == F_equal_to) { *code = F_network_server_not; return F_none; } - if (fl_string_compare(string, f_status_network_time_s, length, F_status_network_time_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_network_time_s) == F_equal_to) { *code = F_network_time; return F_none; } - if (fl_string_compare(string, f_status_network_time_not_s, length, F_status_network_time_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_network_time_not_s) == F_equal_to) { *code = F_network_time_not; return F_none; @@ -2159,103 +2158,103 @@ extern "C" { #endif // _di_F_status_network_ #ifndef _di_F_status_number_ - if (fl_string_compare(string, f_status_number_s, length, F_status_number_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_number_s) == F_equal_to) { *code = F_number; return F_none; } - if (fl_string_compare(string, f_status_number_decimal_s, length, F_status_number_decimal_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_number_decimal_s) == F_equal_to) { *code = F_number_decimal; return F_none; } - if (fl_string_compare(string, f_status_number_decimal_not_s, length, F_status_number_decimal_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_number_decimal_not_s) == F_equal_to) { *code = F_number_decimal_not; return F_none; } - if (fl_string_compare(string, f_status_number_divide_by_zero_s, length, F_status_number_divide_by_zero_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_number_divide_by_zero_s) == F_equal_to) { *code = F_number_divide_by_zero; return F_none; } - if (fl_string_compare(string, f_status_number_negative_s, length, F_status_number_negative_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_number_negative_s) == F_equal_to) { *code = F_number_negative; return F_none; } - if (fl_string_compare(string, f_status_number_negative_not_s, length, F_status_number_negative_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_number_negative_not_s) == F_equal_to) { *code = F_number_negative_not; return F_none; } - if (fl_string_compare(string, f_status_number_not_s, length, F_status_number_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_number_not_s) == F_equal_to) { *code = F_number_not; return F_none; } - if (fl_string_compare(string, f_status_number_overflow_s, length, F_status_number_overflow_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_number_overflow_s) == F_equal_to) { *code = F_number_overflow; return F_none; } - if (fl_string_compare(string, f_status_number_positive_s, length, F_status_number_positive_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_number_positive_s) == F_equal_to) { *code = F_number_positive; return F_none; } - if (fl_string_compare(string, f_status_number_positive_not_s, length, F_status_number_positive_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_number_positive_not_s) == F_equal_to) { *code = F_number_positive_not; return F_none; } - if (fl_string_compare(string, f_status_number_too_large_s, length, F_status_number_too_large_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_number_too_large_s) == F_equal_to) { *code = F_number_too_large; return F_none; } - if (fl_string_compare(string, f_status_number_too_small_s, length, F_status_number_too_small_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_number_too_small_s) == F_equal_to) { *code = F_number_too_small; return F_none; } - if (fl_string_compare(string, f_status_number_underflow_s, length, F_status_number_underflow_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_number_underflow_s) == F_equal_to) { *code = F_number_underflow; return F_none; } - if (fl_string_compare(string, f_status_number_whole_s, length, F_status_number_whole_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_number_whole_s) == F_equal_to) { *code = F_number_whole; return F_none; } - if (fl_string_compare(string, f_status_number_whole_not_s, length, F_status_number_whole_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_number_whole_not_s) == F_equal_to) { *code = F_number_whole_not; return F_none; } - if (fl_string_compare(string, f_status_number_zero_s, length, F_status_number_zero_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_number_zero_s) == F_equal_to) { *code = F_number_zero; return F_none; } - if (fl_string_compare(string, f_status_number_zero_not_s, length, F_status_number_zero_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_number_zero_not_s) == F_equal_to) { *code = F_number_zero_not; return F_none; @@ -2263,283 +2262,283 @@ extern "C" { #endif // _di_F_status_number_ #ifndef _di_F_status_buffer_ - if (fl_string_compare(string, f_status_buffer_s, length, F_status_buffer_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_buffer_s) == F_equal_to) { *code = F_buffer; return F_none; } - if (fl_string_compare(string, f_status_buffer_not_s, length, F_status_buffer_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_buffer_not_s) == F_equal_to) { *code = F_buffer_not; return F_none; } - if (fl_string_compare(string, f_status_buffer_too_large_s, length, F_status_buffer_too_large_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_buffer_too_large_s) == F_equal_to) { *code = F_buffer_too_large; return F_none; } - if (fl_string_compare(string, f_status_buffer_too_small_s, length, F_status_buffer_too_small_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_buffer_too_small_s) == F_equal_to) { *code = F_buffer_too_small; return F_none; } - if (fl_string_compare(string, f_status_complete_not_utf_s, length, F_status_complete_not_utf_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_complete_not_utf_s) == F_equal_to) { *code = F_complete_not_utf; return F_none; } - if (fl_string_compare(string, f_status_complete_not_utf_block_s, length, F_status_complete_not_utf_block_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_complete_not_utf_block_s) == F_equal_to) { *code = F_complete_not_utf_block; return F_none; } - if (fl_string_compare(string, f_status_complete_not_utf_eoa_s, length, F_status_complete_not_utf_eoa_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_complete_not_utf_eoa_s) == F_equal_to) { *code = F_complete_not_utf_eoa; return F_none; } - if (fl_string_compare(string, f_status_complete_not_utf_eof_s, length, F_status_complete_not_utf_eof_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_complete_not_utf_eof_s) == F_equal_to) { *code = F_complete_not_utf_eof; return F_none; } - if (fl_string_compare(string, f_status_complete_not_utf_eol_s, length, F_status_complete_not_utf_eol_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_complete_not_utf_eol_s) == F_equal_to) { *code = F_complete_not_utf_eol; return F_none; } - if (fl_string_compare(string, f_status_complete_not_utf_eos_s, length, F_status_complete_not_utf_eos_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_complete_not_utf_eos_s) == F_equal_to) { *code = F_complete_not_utf_eos; return F_none; } - if (fl_string_compare(string, f_status_complete_not_utf_stop_s, length, F_status_complete_not_utf_stop_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_complete_not_utf_stop_s) == F_equal_to) { *code = F_complete_not_utf_stop; return F_none; } - if (fl_string_compare(string, f_status_none_block_s, length, F_status_none_block_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_none_block_s) == F_equal_to) { *code = F_none_block; return F_none; } - if (fl_string_compare(string, f_status_none_eoa_s, length, F_status_none_eoa_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_none_eoa_s) == F_equal_to) { *code = F_none_eoa; return F_none; } - if (fl_string_compare(string, f_status_none_eof_s, length, F_status_none_eof_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_none_eof_s) == F_equal_to) { *code = F_none_eof; return F_none; } - if (fl_string_compare(string, f_status_none_eol_s, length, F_status_none_eol_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_none_eol_s) == F_equal_to) { *code = F_none_eol; return F_none; } - if (fl_string_compare(string, f_status_none_eos_s, length, F_status_none_eos_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_none_eos_s) == F_equal_to) { *code = F_none_eos; return F_none; } - if (fl_string_compare(string, f_status_none_stop_s, length, F_status_none_stop_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_none_stop_s) == F_equal_to) { *code = F_none_stop; return F_none; } - if (fl_string_compare(string, f_status_data_s, length, F_status_data_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_data_s) == F_equal_to) { *code = F_data; return F_none; } - if (fl_string_compare(string, f_status_data_not_s, length, F_status_data_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_data_not_s) == F_equal_to) { *code = F_data_not; return F_none; } - if (fl_string_compare(string, f_status_data_not_block_s, length, F_status_data_not_block_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_data_not_block_s) == F_equal_to) { *code = F_data_not_block; return F_none; } - if (fl_string_compare(string, f_status_data_not_eoa_s, length, F_status_data_not_eoa_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_data_not_eoa_s) == F_equal_to) { *code = F_data_not_eoa; return F_none; } - if (fl_string_compare(string, f_status_data_not_eof_s, length, F_status_data_not_eof_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_data_not_eof_s) == F_equal_to) { *code = F_data_not_eof; return F_none; } - if (fl_string_compare(string, f_status_data_not_eol_s, length, F_status_data_not_eol_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_data_not_eol_s) == F_equal_to) { *code = F_data_not_eol; return F_none; } - if (fl_string_compare(string, f_status_data_not_eos_s, length, F_status_data_not_eos_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_data_not_eos_s) == F_equal_to) { *code = F_data_not_eos; return F_none; } - if (fl_string_compare(string, f_status_data_not_stop_s, length, F_status_data_not_stop_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_data_not_stop_s) == F_equal_to) { *code = F_data_not_stop; return F_none; } - if (fl_string_compare(string, f_status_terminated_s, length, F_status_terminated_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_terminated_s) == F_equal_to) { *code = F_terminated; return F_none; } - if (fl_string_compare(string, f_status_terminated_not_s, length, F_status_terminated_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_terminated_not_s) == F_equal_to) { *code = F_terminated_not; return F_none; } - if (fl_string_compare(string, f_status_terminated_not_block_s, length, F_status_terminated_not_block_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_terminated_not_block_s) == F_equal_to) { *code = F_terminated_not_block; return F_none; } - if (fl_string_compare(string, f_status_terminated_not_eoa_s, length, F_status_terminated_not_eoa_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_terminated_not_eoa_s) == F_equal_to) { *code = F_terminated_not_eoa; return F_none; } - if (fl_string_compare(string, f_status_terminated_not_eof_s, length, F_status_terminated_not_eof_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_terminated_not_eof_s) == F_equal_to) { *code = F_terminated_not_eof; return F_none; } - if (fl_string_compare(string, f_status_terminated_not_eol_s, length, F_status_terminated_not_eol_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_terminated_not_eol_s) == F_equal_to) { *code = F_terminated_not_eol; return F_none; } - if (fl_string_compare(string, f_status_terminated_not_eos_s, length, F_status_terminated_not_eos_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_terminated_not_eos_s) == F_equal_to) { *code = F_terminated_not_eos; return F_none; } - if (fl_string_compare(string, f_status_terminated_not_group_s, length, F_status_terminated_not_group_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_terminated_not_group_s) == F_equal_to) { *code = F_terminated_not_group; return F_none; } - if (fl_string_compare(string, f_status_terminated_not_group_block_s, length, F_status_terminated_not_group_block_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_terminated_not_group_block_s) == F_equal_to) { *code = F_terminated_not_group_block; return F_none; } - if (fl_string_compare(string, f_status_terminated_not_group_eoa_s, length, F_status_terminated_not_group_eoa_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_terminated_not_group_eoa_s) == F_equal_to) { *code = F_terminated_not_group_eoa; return F_none; } - if (fl_string_compare(string, f_status_terminated_not_group_eof_s, length, F_status_terminated_not_group_eof_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_terminated_not_group_eof_s) == F_equal_to) { *code = F_terminated_not_group_eof; return F_none; } - if (fl_string_compare(string, f_status_terminated_not_group_eol_s, length, F_status_terminated_not_group_eol_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_terminated_not_group_eol_s) == F_equal_to) { *code = F_terminated_not_group_eol; return F_none; } - if (fl_string_compare(string, f_status_terminated_not_group_eos_s, length, F_status_terminated_not_group_eos_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_terminated_not_group_eos_s) == F_equal_to) { *code = F_terminated_not_group_eos; return F_none; } - if (fl_string_compare(string, f_status_terminated_not_group_stop_s, length, F_status_terminated_not_group_stop_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_terminated_not_group_stop_s) == F_equal_to) { *code = F_terminated_not_group_stop; return F_none; } - if (fl_string_compare(string, f_status_terminated_not_nest_s, length, F_status_terminated_not_nest_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_terminated_not_nest_s) == F_equal_to) { *code = F_terminated_not_nest; return F_none; } - if (fl_string_compare(string, f_status_terminated_not_nest_block_s, length, F_status_terminated_not_nest_block_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_terminated_not_nest_block_s) == F_equal_to) { *code = F_terminated_not_nest_block; return F_none; } - if (fl_string_compare(string, f_status_terminated_not_nest_eoa_s, length, F_status_terminated_not_nest_eoa_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_terminated_not_nest_eoa_s) == F_equal_to) { *code = F_terminated_not_nest_eoa; return F_none; } - if (fl_string_compare(string, f_status_terminated_not_nest_eof_s, length, F_status_terminated_not_nest_eof_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_terminated_not_nest_eof_s) == F_equal_to) { *code = F_terminated_not_nest_eof; return F_none; } - if (fl_string_compare(string, f_status_terminated_not_nest_eol_s, length, F_status_terminated_not_nest_eol_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_terminated_not_nest_eol_s) == F_equal_to) { *code = F_terminated_not_nest_eol; return F_none; } - if (fl_string_compare(string, f_status_terminated_not_nest_eos_s, length, F_status_terminated_not_nest_eos_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_terminated_not_nest_eos_s) == F_equal_to) { *code = F_terminated_not_nest_eos; return F_none; } - if (fl_string_compare(string, f_status_terminated_not_nest_stop_s, length, F_status_terminated_not_nest_stop_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_terminated_not_nest_stop_s) == F_equal_to) { *code = F_terminated_not_nest_stop; return F_none; } - if (fl_string_compare(string, f_status_terminated_not_stop_s, length, F_status_terminated_not_stop_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_terminated_not_stop_s) == F_equal_to) { *code = F_terminated_not_stop; return F_none; @@ -2547,19 +2546,19 @@ extern "C" { #endif // _di_F_status_buffer_ #ifndef _di_F_status_process_ - if (fl_string_compare(string, f_status_process_s, length, F_status_process_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_process_s) == F_equal_to) { *code = F_process; return F_none; } - if (fl_string_compare(string, f_status_process_not_s, length, F_status_process_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_process_not_s) == F_equal_to) { *code = F_process_not; return F_none; } - if (fl_string_compare(string, f_status_process_too_many_s, length, F_status_process_too_many_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_process_too_many_s) == F_equal_to) { *code = F_process_too_many; return F_none; @@ -2567,253 +2566,253 @@ extern "C" { #endif // _di_F_status_process_ #ifndef _di_F_status_file_ - if (fl_string_compare(string, f_status_file_s, length, F_status_file_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_s) == F_equal_to) { *code = F_file; return F_none; } - if (fl_string_compare(string, f_status_file_close_s, length, F_status_file_close_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_close_s) == F_equal_to) { *code = F_file_close; return F_none; } - if (fl_string_compare(string, f_status_file_closed_s, length, F_status_file_closed_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_closed_s) == F_equal_to) { *code = F_file_closed; return F_none; } - if (fl_string_compare(string, f_status_file_descriptor_s, length, F_status_file_descriptor_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_descriptor_s) == F_equal_to) { *code = F_file_descriptor; return F_none; } - if (fl_string_compare(string, f_status_file_descriptor_max_s, length, F_status_file_descriptor_max_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_descriptor_max_s) == F_equal_to) { *code = F_file_descriptor_max; return F_none; } - if (fl_string_compare(string, f_status_file_descriptor_not_s, length, F_status_file_descriptor_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_descriptor_not_s) == F_equal_to) { *code = F_file_descriptor_not; return F_none; } - if (fl_string_compare(string, f_status_file_empty_s, length, F_status_file_empty_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_empty_s) == F_equal_to) { *code = F_file_empty; return F_none; } - if (fl_string_compare(string, f_status_file_flush_s, length, F_status_file_flush_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_flush_s) == F_equal_to) { *code = F_file_flush; return F_none; } - if (fl_string_compare(string, f_status_file_found_s, length, F_status_file_found_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_found_s) == F_equal_to) { *code = F_file_found; return F_none; } - if (fl_string_compare(string, f_status_file_found_not_s, length, F_status_file_found_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_found_not_s) == F_equal_to) { *code = F_file_found_not; return F_none; } - if (fl_string_compare(string, f_status_file_not_s, length, F_status_file_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_not_s) == F_equal_to) { *code = F_file_not; return F_none; } - if (fl_string_compare(string, f_status_file_open_s, length, F_status_file_open_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_open_s) == F_equal_to) { *code = F_file_open; return F_none; } - if (fl_string_compare(string, f_status_file_open_max_s, length, F_status_file_open_max_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_open_max_s) == F_equal_to) { *code = F_file_open_max; return F_none; } - if (fl_string_compare(string, f_status_file_opened_s, length, F_status_file_opened_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_opened_s) == F_equal_to) { *code = F_file_opened; return F_none; } - if (fl_string_compare(string, f_status_file_overflow_s, length, F_status_file_overflow_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_overflow_s) == F_equal_to) { *code = F_file_overflow; return F_none; } - if (fl_string_compare(string, f_status_file_purge_s, length, F_status_file_purge_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_purge_s) == F_equal_to) { *code = F_file_purge; return F_none; } - if (fl_string_compare(string, f_status_file_read_s, length, F_status_file_read_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_read_s) == F_equal_to) { *code = F_file_read; return F_none; } - if (fl_string_compare(string, f_status_file_reallocation_s, length, F_status_file_reallocation_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_reallocation_s) == F_equal_to) { *code = F_file_reallocation; return F_none; } - if (fl_string_compare(string, f_status_file_seek_s, length, F_status_file_seek_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_seek_s) == F_equal_to) { *code = F_file_seek; return F_none; } - if (fl_string_compare(string, f_status_file_stat_s, length, F_status_file_stat_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_stat_s) == F_equal_to) { *code = F_file_stat; return F_none; } - if (fl_string_compare(string, f_status_file_synchronize_s, length, F_status_file_synchronize_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_synchronize_s) == F_equal_to) { *code = F_file_synchronize; return F_none; } - if (fl_string_compare(string, f_status_file_type_block_s, length, F_status_file_type_block_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_type_block_s) == F_equal_to) { *code = F_file_type_block; return F_none; } - if (fl_string_compare(string, f_status_file_type_character_s, length, F_status_file_type_character_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_type_character_s) == F_equal_to) { *code = F_file_type_character; return F_none; } - if (fl_string_compare(string, f_status_file_type_directory_s, length, F_status_file_type_directory_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_type_directory_s) == F_equal_to) { *code = F_file_type_directory; return F_none; } - if (fl_string_compare(string, f_status_file_type_link_s, length, F_status_file_type_link_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_type_link_s) == F_equal_to) { *code = F_file_type_link; return F_none; } - if (fl_string_compare(string, f_status_file_type_not_block_s, length, F_status_file_type_not_block_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_type_not_block_s) == F_equal_to) { *code = F_file_type_not_block; return F_none; } - if (fl_string_compare(string, f_status_file_type_not_character_s, length, F_status_file_type_not_character_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_type_not_character_s) == F_equal_to) { *code = F_file_type_not_character; return F_none; } - if (fl_string_compare(string, f_status_file_type_not_directory_s, length, F_status_file_type_not_directory_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_type_not_directory_s) == F_equal_to) { *code = F_file_type_not_directory; return F_none; } - if (fl_string_compare(string, f_status_file_type_not_fifo_s, length, F_status_file_type_not_fifo_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_type_not_fifo_s) == F_equal_to) { *code = F_file_type_not_fifo; return F_none; } - if (fl_string_compare(string, f_status_file_type_not_link_s, length, F_status_file_type_not_link_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_type_not_link_s) == F_equal_to) { *code = F_file_type_not_link; return F_none; } - if (fl_string_compare(string, f_status_file_type_not_pipe_s, length, F_status_file_type_not_pipe_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_type_not_pipe_s) == F_equal_to) { *code = F_file_type_not_pipe; return F_none; } - if (fl_string_compare(string, f_status_file_type_not_regular_s, length, F_status_file_type_not_regular_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_type_not_regular_s) == F_equal_to) { *code = F_file_type_not_regular; return F_none; } - if (fl_string_compare(string, f_status_file_type_not_socket_s, length, F_status_file_type_not_socket_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_type_not_socket_s) == F_equal_to) { *code = F_file_type_not_socket; return F_none; } - if (fl_string_compare(string, f_status_file_type_not_unknown_s, length, F_status_file_type_not_unknown_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_type_not_unknown_s) == F_equal_to) { *code = F_file_type_not_unknown; return F_none; } - if (fl_string_compare(string, f_status_file_type_pipe_s, length, F_status_file_type_pipe_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_type_pipe_s) == F_equal_to) { *code = F_file_type_pipe; return F_none; } - if (fl_string_compare(string, f_status_file_type_regular_s, length, F_status_file_type_regular_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_type_regular_s) == F_equal_to) { *code = F_file_type_regular; return F_none; } - if (fl_string_compare(string, f_status_file_type_socket_s, length, F_status_file_type_socket_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_type_socket_s) == F_equal_to) { *code = F_file_type_socket; return F_none; } - if (fl_string_compare(string, f_status_file_type_unknown_s, length, F_status_file_type_unknown_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_type_unknown_s) == F_equal_to) { *code = F_file_type_unknown; return F_none; } - if (fl_string_compare(string, f_status_file_underflow_s, length, F_status_file_underflow_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_underflow_s) == F_equal_to) { *code = F_file_underflow; return F_none; } - if (fl_string_compare(string, f_status_file_utf_s, length, F_status_file_utf_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_utf_s) == F_equal_to) { *code = F_file_utf; return F_none; } - if (fl_string_compare(string, f_status_file_utf_not_s, length, F_status_file_utf_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_utf_not_s) == F_equal_to) { *code = F_file_utf_not; return F_none; } - if (fl_string_compare(string, f_status_file_write_s, length, F_status_file_write_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_file_write_s) == F_equal_to) { *code = F_file_write; return F_none; @@ -2821,25 +2820,25 @@ extern "C" { #endif // _di_F_status_file_ #ifndef _di_F_status_filesystem_ - if (fl_string_compare(string, f_status_filesystem_s, length, F_status_filesystem_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_filesystem_s) == F_equal_to) { *code = F_filesystem; return F_none; } - if (fl_string_compare(string, f_status_filesystem_not_s, length, F_status_filesystem_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_filesystem_not_s) == F_equal_to) { *code = F_filesystem_not; return F_none; } - if (fl_string_compare(string, f_status_filesystem_quota_block_s, length, F_status_filesystem_quota_block_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_filesystem_quota_block_s) == F_equal_to) { *code = F_filesystem_quota_block; return F_none; } - if (fl_string_compare(string, f_status_filesystem_quota_reached_s, length, F_status_filesystem_quota_reached_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_filesystem_quota_reached_s) == F_equal_to) { *code = F_filesystem_quota_reached; return F_none; @@ -2847,121 +2846,121 @@ extern "C" { #endif // _di_F_status_filesystem_ #ifndef _di_F_status_directory_ - if (fl_string_compare(string, f_status_directory_s, length, F_status_directory_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_directory_s) == F_equal_to) { *code = F_directory; return F_none; } - if (fl_string_compare(string, f_status_directory_close_s, length, F_status_directory_close_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_directory_close_s) == F_equal_to) { *code = F_directory_close; return F_none; } - if (fl_string_compare(string, f_status_directory_closed_s, length, F_status_directory_closed_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_directory_closed_s) == F_equal_to) { *code = F_directory_closed; return F_none; } - if (fl_string_compare(string, f_status_directory_descriptor_s, length, F_status_directory_descriptor_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_directory_descriptor_s) == F_equal_to) { *code = F_directory_descriptor; return F_none; } - if (fl_string_compare(string, f_status_directory_empty_s, length, F_status_directory_empty_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_directory_empty_s) == F_equal_to) { *code = F_directory_empty; return F_none; } - if (fl_string_compare(string, f_status_directory_empty_not_s, length, F_status_directory_empty_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_directory_empty_not_s) == F_equal_to) { *code = F_directory_empty_not; return F_none; } - if (fl_string_compare(string, f_status_directory_found_s, length, F_status_directory_found_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_directory_found_s) == F_equal_to) { *code = F_directory_found; return F_none; } - if (fl_string_compare(string, f_status_directory_found_not_s, length, F_status_directory_found_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_directory_found_not_s) == F_equal_to) { *code = F_directory_found_not; return F_none; } - if (fl_string_compare(string, f_status_directory_flush_s, length, F_status_directory_flush_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_directory_flush_s) == F_equal_to) { *code = F_directory_flush; return F_none; } - if (fl_string_compare(string, f_status_directory_link_max_s, length, F_status_directory_link_max_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_directory_link_max_s) == F_equal_to) { *code = F_directory_link_max; return F_none; } - if (fl_string_compare(string, f_status_directory_not_s, length, F_status_directory_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_directory_not_s) == F_equal_to) { *code = F_directory_not; return F_none; } - if (fl_string_compare(string, f_status_directory_open_s, length, F_status_directory_open_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_directory_open_s) == F_equal_to) { *code = F_directory_open; return F_none; } - if (fl_string_compare(string, f_status_directory_purge_s, length, F_status_directory_purge_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_directory_purge_s) == F_equal_to) { *code = F_directory_purge; return F_none; } - if (fl_string_compare(string, f_status_directory_read_s, length, F_status_directory_read_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_directory_read_s) == F_equal_to) { *code = F_directory_read; return F_none; } - if (fl_string_compare(string, f_status_directory_stream_s, length, F_status_directory_stream_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_directory_stream_s) == F_equal_to) { *code = F_directory_stream; return F_none; } - if (fl_string_compare(string, f_status_directory_supported_not_s, length, F_status_directory_supported_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_directory_supported_not_s) == F_equal_to) { *code = F_directory_supported_not; return F_none; } - if (fl_string_compare(string, f_status_directory_synchronize_s, length, F_status_directory_synchronize_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_directory_synchronize_s) == F_equal_to) { *code = F_directory_synchronize; return F_none; } - if (fl_string_compare(string, f_status_directory_utf_s, length, F_status_directory_utf_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_directory_utf_s) == F_equal_to) { *code = F_directory_utf; return F_none; } - if (fl_string_compare(string, f_status_directory_utf_not_s, length, F_status_directory_utf_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_directory_utf_not_s) == F_equal_to) { *code = F_directory_utf_not; return F_none; } - if (fl_string_compare(string, f_status_directory_write_s, length, F_status_directory_write_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_directory_write_s) == F_equal_to) { *code = F_directory_write; return F_none; @@ -2969,37 +2968,37 @@ extern "C" { #endif // _di_F_status_directory_ #ifndef _di_F_status_socket_ - if (fl_string_compare(string, f_status_socket_s, length, F_status_socket_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_socket_s) == F_equal_to) { *code = F_socket; return F_none; } - if (fl_string_compare(string, f_status_socket_client_s, length, F_status_socket_client_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_socket_client_s) == F_equal_to) { *code = F_socket_client; return F_none; } - if (fl_string_compare(string, f_status_socket_not_s, length, F_status_socket_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_socket_not_s) == F_equal_to) { *code = F_socket_not; return F_none; } - if (fl_string_compare(string, f_status_socket_receive_s, length, F_status_socket_receive_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_socket_receive_s) == F_equal_to) { *code = F_socket_receive; return F_none; } - if (fl_string_compare(string, f_status_socket_send_s, length, F_status_socket_send_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_socket_send_s) == F_equal_to) { *code = F_socket_send; return F_none; } - if (fl_string_compare(string, f_status_socket_target_s, length, F_status_socket_target_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_socket_target_s) == F_equal_to) { *code = F_socket_target; return F_none; @@ -3007,25 +3006,25 @@ extern "C" { #endif // _di_F_status_socket_ #ifndef _di_F_status_compare_ - if (fl_string_compare(string, f_status_equal_to_s, length, F_status_equal_to_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_equal_to_s) == F_equal_to) { *code = F_equal_to; return F_none; } - if (fl_string_compare(string, f_status_equal_to_not_s, length, F_status_equal_to_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_equal_to_not_s) == F_equal_to) { *code = F_equal_to_not; return F_none; } - if (fl_string_compare(string, f_status_than_greater_s, length, F_status_than_greater_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_than_greater_s) == F_equal_to) { *code = F_than_greater; return F_none; } - if (fl_string_compare(string, f_status_than_less_s, length, F_status_than_less_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_than_less_s) == F_equal_to) { *code = F_than_less; return F_none; @@ -3033,127 +3032,127 @@ extern "C" { #endif // _di_F_status_compare_ #ifndef _di_F_status_access_ - if (fl_string_compare(string, f_status_access_s, length, F_status_access_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_access_s) == F_equal_to) { *code = F_access; return F_none; } - if (fl_string_compare(string, f_status_access_denied_s, length, F_status_access_denied_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_access_denied_s) == F_equal_to) { *code = F_access_denied; return F_none; } - if (fl_string_compare(string, f_status_access_denied_user_s, length, F_status_access_denied_user_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_access_denied_user_s) == F_equal_to) { *code = F_access_denied_user; return F_none; } - if (fl_string_compare(string, f_status_access_denied_group_s, length, F_status_access_denied_group_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_access_denied_group_s) == F_equal_to) { *code = F_access_denied_group; return F_none; } - if (fl_string_compare(string, f_status_access_denied_world_s, length, F_status_access_denied_world_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_access_denied_world_s) == F_equal_to) { *code = F_access_denied_world; return F_none; } - if (fl_string_compare(string, f_status_access_denied_read_s, length, F_status_access_denied_read_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_access_denied_read_s) == F_equal_to) { *code = F_access_denied_read; return F_none; } - if (fl_string_compare(string, f_status_access_denied_write_s, length, F_status_access_denied_write_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_access_denied_write_s) == F_equal_to) { *code = F_access_denied_write; return F_none; } - if (fl_string_compare(string, f_status_access_denied_execute_s, length, F_status_access_denied_execute_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_access_denied_execute_s) == F_equal_to) { *code = F_access_denied_execute; return F_none; } - if (fl_string_compare(string, f_status_access_denied_super_s, length, F_status_access_denied_super_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_access_denied_super_s) == F_equal_to) { *code = F_access_denied_super; return F_none; } - if (fl_string_compare(string, f_status_access_granted_s, length, F_status_access_granted_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_access_granted_s) == F_equal_to) { *code = F_access_granted; return F_none; } - if (fl_string_compare(string, f_status_access_granted_user_s, length, F_status_access_granted_user_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_access_granted_user_s) == F_equal_to) { *code = F_access_granted_user; return F_none; } - if (fl_string_compare(string, f_status_access_granted_group_s, length, F_status_access_granted_group_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_access_granted_group_s) == F_equal_to) { *code = F_access_granted_group; return F_none; } - if (fl_string_compare(string, f_status_access_granted_world_s, length, F_status_access_granted_world_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_access_granted_world_s) == F_equal_to) { *code = F_access_granted_world; return F_none; } - if (fl_string_compare(string, f_status_access_granted_read_s, length, F_status_access_granted_read_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_access_granted_read_s) == F_equal_to) { *code = F_access_granted_read; return F_none; } - if (fl_string_compare(string, f_status_access_granted_write_s, length, F_status_access_granted_write_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_access_granted_write_s) == F_equal_to) { *code = F_access_granted_write; return F_none; } - if (fl_string_compare(string, f_status_access_granted_execute_s, length, F_status_access_granted_execute_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_access_granted_execute_s) == F_equal_to) { *code = F_access_granted_execute; return F_none; } - if (fl_string_compare(string, f_status_access_granted_super_s, length, F_status_access_granted_super_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_access_granted_super_s) == F_equal_to) { *code = F_access_granted_super; return F_none; } - if (fl_string_compare(string, f_status_access_group_s, length, F_status_access_group_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_access_group_s) == F_equal_to) { *code = F_access_mode; return F_none; } - if (fl_string_compare(string, f_status_access_mode_s, length, F_status_access_mode_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_access_mode_s) == F_equal_to) { *code = F_access_group; return F_none; } - if (fl_string_compare(string, f_status_access_not_s, length, F_status_access_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_access_not_s) == F_equal_to) { *code = F_access_not; return F_none; } - if (fl_string_compare(string, f_status_access_owner_s, length, F_status_access_owner_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_access_owner_s) == F_equal_to) { *code = F_access_owner; return F_none; @@ -3161,68 +3160,68 @@ extern "C" { #endif // _di_F_status_access_ #ifndef _di_F_status_terminal_ - if (fl_string_compare(string, f_status_terminal_s, length, F_status_terminal_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_terminal_s) == F_equal_to) { *code = F_terminal; return F_none; } - if (fl_string_compare(string, f_status_terminal_access_s, length, F_status_terminal_access_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_terminal_access_s) == F_equal_to) { *code = F_terminal_access; return F_none; } - if (fl_string_compare(string, f_status_terminal_known_s, length, F_status_terminal_known_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_terminal_known_s) == F_equal_to) { *code = F_terminal_known; return F_none; } - if (fl_string_compare(string, f_status_terminal_known_not_s, length, F_status_terminal_known_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_terminal_known_not_s) == F_equal_to) { *code = F_terminal_known_not; return F_none; } - if (fl_string_compare(string, f_status_terminal_not_s, length, F_status_terminal_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_terminal_not_s) == F_equal_to) { *code = F_terminal_not; return F_none; } - if (fl_string_compare(string, f_status_terminal_prohibited_s, length, F_status_terminal_prohibited_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_terminal_prohibited_s) == F_equal_to) { *code = F_terminal_prohibited; return F_none; } - if (fl_string_compare(string, f_status_terminal_read_s, length, F_status_terminal_read_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_terminal_read_s) == F_equal_to) { *code = F_terminal_read; return F_none; } - if (fl_string_compare(string, f_status_terminal_valid_s, length, F_status_terminal_valid_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_terminal_valid_s) == F_equal_to) { *code = F_terminal_valid; return F_none; } - if (fl_string_compare(string, f_status_terminal_valid_not_s, length, F_status_terminal_valid_not_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_terminal_valid_not_s) == F_equal_to) { *code = F_terminal_valid_not; return F_none; } - if (fl_string_compare(string, f_status_terminal_write_s, length, F_status_terminal_write_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_terminal_write_s) == F_equal_to) { *code = F_terminal_write; return F_none; } #endif // _di_F_status_terminal_ - if (fl_string_compare(string, f_status_status_code_last_s, length, F_status_status_code_last_s_length) == F_equal_to) { + if (fl_string_dynamic_compare(name, f_status_status_code_last_s) == F_equal_to) { *code = F_status_code_last; return F_none; diff --git a/level_2/fll_status_string/c/status_string.h b/level_2/fll_status_string/c/status_string.h index df5b3cf..dfb942e 100644 --- a/level_2/fll_status_string/c/status_string.h +++ b/level_2/fll_status_string/c/status_string.h @@ -33,8 +33,8 @@ extern "C" { * * This process the string until either a match or NULL is reached. * - * @param string - * The error name to process. + * @param name + * The status name to process. * @param code * The status code a matched string represents. * @@ -48,7 +48,7 @@ extern "C" { * Errors (with error bit) from: f_conversion_character_is_decimal(). */ #ifndef _di_fll_status_string_from_ - extern f_status_t fll_status_string_from(const f_string_t string, f_status_t *code); + extern f_status_t fll_status_string_from(const f_string_static_t name, f_status_t *code); #endif // _di_fll_status_string_to_ #ifdef __cplusplus diff --git a/level_3/byte_dump/c/byte_dump.c b/level_3/byte_dump/c/byte_dump.c index 482dbb7..56be142 100644 --- a/level_3/byte_dump/c/byte_dump.c +++ b/level_3/byte_dump/c/byte_dump.c @@ -13,58 +13,58 @@ extern "C" { fll_program_print_help_header(file, context, byte_dump_program_name_long_s, byte_dump_version_s); - fll_program_print_help_option(file, context, f_console_standard_short_help_s, f_console_standard_long_help_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print this help message."); - fll_program_print_help_option(file, context, f_console_standard_short_dark_s, f_console_standard_long_dark_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_light_s, f_console_standard_long_light_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, "Do not file in color."); - fll_program_print_help_option(file, context, f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Decrease verbosity, silencing most output."); - fll_program_print_help_option(file, context, f_console_standard_short_normal_s, f_console_standard_long_normal_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Set verbosity to normal file."); - fll_program_print_help_option(file, context, f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Increase verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_debug_s, f_console_standard_long_debug_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Enable debugging, significantly increasing verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_version_s, f_console_standard_long_version_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Print only the version number."); + fll_program_print_help_option(file, context, f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print this help message."); + fll_program_print_help_option(file, context, f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, "Do not file in color."); + fll_program_print_help_option(file, context, f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Decrease verbosity, silencing most output."); + fll_program_print_help_option(file, context, f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Set verbosity to normal file."); + fll_program_print_help_option(file, context, f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Increase verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Enable debugging, significantly increasing verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Print only the version number."); - f_print_character(f_string_eol_s[0], file.stream); + f_print_dynamic(f_string_eol_s, file.stream); - fll_program_print_help_option(file, context, byte_dump_short_binary_s, byte_dump_long_binary_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Display binary representation."); - fll_program_print_help_option(file, context, byte_dump_short_decimal_s, byte_dump_long_decimal_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Display decimal representation."); - fll_program_print_help_option(file, context, byte_dump_short_duodecimal_s, byte_dump_long_duodecimal_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Display duodecimal representation."); - fll_program_print_help_option(file, context, byte_dump_short_hexidecimal_s, byte_dump_long_hexidecimal_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Display hexadecimal representation."); - fll_program_print_help_option(file, context, byte_dump_short_octal_s, byte_dump_long_octal_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Display octal representation."); - fll_program_print_help_option(file, context, byte_dump_short_unicode_s, byte_dump_long_unicode_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Display using Unicode representation for valid Unicode (like: U+0000)."); + fll_program_print_help_option(file, context, byte_dump_short_binary_s, byte_dump_long_binary_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Display binary representation."); + fll_program_print_help_option(file, context, byte_dump_short_decimal_s, byte_dump_long_decimal_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Display decimal representation."); + fll_program_print_help_option(file, context, byte_dump_short_duodecimal_s, byte_dump_long_duodecimal_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Display duodecimal representation."); + fll_program_print_help_option(file, context, byte_dump_short_hexidecimal_s, byte_dump_long_hexidecimal_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "Display hexadecimal representation."); + fll_program_print_help_option(file, context, byte_dump_short_octal_s, byte_dump_long_octal_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Display octal representation."); + fll_program_print_help_option(file, context, byte_dump_short_unicode_s, byte_dump_long_unicode_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Display using Unicode representation for valid Unicode (like: U+0000)."); - f_print_character(f_string_eol_s[0], file.stream); + f_print_dynamic(f_string_eol_s, file.stream); - fll_program_print_help_option(file, context, byte_dump_short_first_s, byte_dump_long_first_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Start reading at this byte offset."); - fll_program_print_help_option(file, context, byte_dump_short_last_s, byte_dump_long_last_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Stop reading at this (inclusive) byte offset."); + fll_program_print_help_option(file, context, byte_dump_short_first_s, byte_dump_long_first_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "Start reading at this byte offset."); + fll_program_print_help_option(file, context, byte_dump_short_last_s, byte_dump_long_last_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Stop reading at this (inclusive) byte offset."); - f_print_character(f_string_eol_s[0], file.stream); + f_print_dynamic(f_string_eol_s, file.stream); - fll_program_print_help_option(file, context, byte_dump_short_narrow_s, byte_dump_long_narrow_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Use narrow display, resulting in 1*width reducing size of the text columns."); - fll_program_print_help_option(file, context, byte_dump_short_placeholder_s, byte_dump_long_placeholder_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Use a placeholder character instead of a space for placeholders."); - fll_program_print_help_option(file, context, byte_dump_short_text_s, byte_dump_long_text_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Include a column of text when displaying the bytes."); - fll_program_print_help_option(file, context, byte_dump_short_wide_s, byte_dump_long_wide_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Use wide display, resulting in 2*width allowing for space for wide characters in the text columns."); - fll_program_print_help_option(file, context, byte_dump_short_width_s, byte_dump_long_width_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Set number of columns of Bytes to display."); + fll_program_print_help_option(file, context, byte_dump_short_narrow_s, byte_dump_long_narrow_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Use narrow display, resulting in 1*width reducing size of the text columns."); + fll_program_print_help_option(file, context, byte_dump_short_placeholder_s, byte_dump_long_placeholder_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "Use a placeholder character instead of a space for placeholders."); + fll_program_print_help_option(file, context, byte_dump_short_text_s, byte_dump_long_text_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Include a column of text when displaying the bytes."); + fll_program_print_help_option(file, context, byte_dump_short_wide_s, byte_dump_long_wide_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Use wide display, resulting in 2*width allowing for space for wide characters in the text columns."); + fll_program_print_help_option(file, context, byte_dump_short_width_s, byte_dump_long_width_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Set number of columns of Bytes to display."); - f_print_character(f_string_eol_s[0], file.stream); - f_print_character(f_string_eol_s[0], file.stream); + f_print_dynamic(f_string_eol_s, file.stream); + f_print_dynamic(f_string_eol_s, file.stream); fl_print_format(" %[Special Options:%] ", file.stream, context.set.important, context.set.important); - fll_program_print_help_option_long(file, context, byte_dump_long_normal_s, f_console_symbol_long_enable_s, " Display UTF-8 symbols for ASCII control codes."); - fll_program_print_help_option_long(file, context, byte_dump_long_simple_s, f_console_symbol_long_enable_s, " Display spaces for ASCII control codes."); - fll_program_print_help_option_long(file, context, byte_dump_long_classic_s, f_console_symbol_long_enable_s, "Display periods for ASCII control codes."); + fll_program_print_help_option_long(file, context, byte_dump_long_normal_s, f_console_symbol_long_enable_s.string, " Display UTF-8 symbols for ASCII control codes."); + fll_program_print_help_option_long(file, context, byte_dump_long_simple_s, f_console_symbol_long_enable_s.string, " Display spaces for ASCII control codes."); + fll_program_print_help_option_long(file, context, byte_dump_long_classic_s, f_console_symbol_long_enable_s.string, "Display periods for ASCII control codes."); fll_program_print_help_usage(file, context, byte_dump_program_name_s, "filename(s)"); - fl_print_format(" When using the %[%s%s%] option, some UTF-8 characters may be replaced by your instance and cause display alignment issues.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, byte_dump_long_text_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" When using the %[%q%s%] option, some UTF-8 characters may be replaced by your instance and cause display alignment issues.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, byte_dump_long_text_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" Special UTF-8 characters and non-spacing UTF-8 characters may be replaced with a space (or a placeholder when the %[%s%s%] option is used).%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, byte_dump_long_placeholder_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" Special UTF-8 characters and non-spacing UTF-8 characters may be replaced with a space (or a placeholder when the %[%q%s%] option is used).%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, byte_dump_long_placeholder_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" UTF-8 \"Combining\" characters might have a space appended to allow a proper display but this may cause copy and paste issues.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" UTF-8 \"Combining\" characters might have a space appended to allow a proper display but this may cause copy and paste issues.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" When %[%s%s%] is used, any UTF-8 sequences will still be printed in full should any part is found within the requested range.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, byte_dump_long_last_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" When %[%q%s%] is used, any UTF-8 sequences will still be printed in full should any part is found within the requested range.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, byte_dump_long_last_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" When using the %[%s%s%] option, invalid Unicode will fallback to being displayed using one of the other modes.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, byte_dump_long_unicode_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" When using the %[%q%s%] option, invalid Unicode will fallback to being displayed using one of the other modes.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, byte_dump_long_unicode_s, context.set.notable, f_string_eol_s, f_string_eol_s); funlockfile(file.stream); @@ -263,8 +263,8 @@ extern "C" { flockfile(main->error.to.stream); fl_print_format("%[%SThe parameter '%]", main->error.to.stream, main->context.set.error, main->error.prefix, main->context.set.error); - fl_print_format("%[%s%s%]", main->error.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, byte_dump_long_width_s, main->context.set.notable); - fl_print_format("%[' is specified, but no value is given.%]%c", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, byte_dump_long_width_s, main->context.set.notable); + fl_print_format("%[' is specified, but no value is given.%]%q", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); funlockfile(main->error.to.stream); @@ -285,12 +285,12 @@ extern "C" { flockfile(main->error.to.stream); fl_print_format("%[%SThe parameter '%]", main->error.to.stream, main->context.set.error, main->error.prefix, main->context.set.error); - fl_print_format("%[%s%s%]", main->error.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, byte_dump_long_width_s, main->context.set.notable); + fl_print_format("%[%q%s%]", main->error.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, byte_dump_long_width_s, main->context.set.notable); fl_print_format("%[' value can only be a number (inclusively) between %]", main->error.to.stream, main->context.set.error, main->context.set.error); fl_print_format("%[1%]", main->error.to.stream, main->context.set.notable, main->context.set.notable); fl_print_format(" %[and%] ", main->error.to.stream, main->context.set.error, main->context.set.error); fl_print_format("%[250%]", main->error.to.stream, main->context.set.notable, main->context.set.notable); - fl_print_format("%[.%]%c", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[.%]%q", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); funlockfile(main->error.to.stream); @@ -310,8 +310,8 @@ extern "C" { flockfile(main->error.to.stream); fl_print_format("%[%SThe parameter '%]", main->error.to.stream, main->context.set.error, main->error.prefix, main->context.set.error); - fl_print_format("%[%s%s%]", main->error.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, byte_dump_long_first_s, main->context.set.notable); - fl_print_format("%[' is specified, but no value is given.%]%c", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, byte_dump_long_first_s, main->context.set.notable); + fl_print_format("%[' is specified, but no value is given.%]%q", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); funlockfile(main->error.to.stream); @@ -332,12 +332,12 @@ extern "C" { flockfile(main->error.to.stream); fl_print_format("%[%SThe parameter '%]", main->error.to.stream, main->context.set.error, main->error.prefix, main->context.set.error); - fl_print_format("%[%s%s%]", main->error.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, byte_dump_long_first_s, main->context.set.notable); + fl_print_format("%[%q%s%]", main->error.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, byte_dump_long_first_s, main->context.set.notable); fl_print_format("%[' value can only be a number (inclusively) between %]", main->error.to.stream, main->context.set.error, main->context.set.error); fl_print_format("%[0%]", main->error.to.stream, main->context.set.notable, main->context.set.notable); fl_print_format(" %[and%] ", main->error.to.stream, main->context.set.error, main->context.set.error); fl_print_format("%[%un%]", main->error.to.stream, main->context.set.notable, F_number_t_size_unsigned_d, main->context.set.notable); - fl_print_format("%[.%]%c", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[.%]%q", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); funlockfile(main->error.to.stream); @@ -357,8 +357,8 @@ extern "C" { flockfile(main->error.to.stream); fl_print_format("%[%SThe parameter '%]", main->error.to.stream, main->context.set.error, main->error.prefix, main->context.set.error); - fl_print_format("%[%s%s%]", main->error.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, byte_dump_long_last_s, main->context.set.notable); - fl_print_format("%[' is specified, but no value is given.%]%c", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, byte_dump_long_last_s, main->context.set.notable); + fl_print_format("%[' is specified, but no value is given.%]%q", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); funlockfile(main->error.to.stream); @@ -379,12 +379,12 @@ extern "C" { flockfile(main->error.to.stream); fl_print_format("%[%SThe parameter '%]", main->error.to.stream, main->context.set.error, main->error.prefix, main->context.set.error); - fl_print_format("%[%s%s%]", main->error.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, byte_dump_long_last_s, main->context.set.notable); + fl_print_format("%[%q%s%]", main->error.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, byte_dump_long_last_s, main->context.set.notable); fl_print_format("%[' value can only be a number (inclusively) between %]", main->error.to.stream, main->context.set.error, main->context.set.error); fl_print_format("%[0%]", main->error.to.stream, main->context.set.notable, main->context.set.notable); fl_print_format(" %[and%] ", main->error.to.stream, main->context.set.error, main->context.set.error); fl_print_format("%[%un%]", main->error.to.stream, main->context.set.notable, F_number_t_size_unsigned_d, main->context.set.notable); - fl_print_format("%[.%]%c", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[.%]%q", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); funlockfile(main->error.to.stream); @@ -405,10 +405,10 @@ extern "C" { flockfile(main->error.to.stream); fl_print_format("%[%SThe parameter '%]", main->error.to.stream, main->context.set.error, main->error.prefix, main->context.set.error); - fl_print_format("%[%s%s%]", main->error.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, byte_dump_long_first_s, main->context.set.notable); + fl_print_format("%[%q%s%]", main->error.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, byte_dump_long_first_s, main->context.set.notable); fl_print_format("%[' value cannot be greater than the parameter '%]", main->error.to.stream, main->context.set.error, main->context.set.error); - fl_print_format("%[%s%s%]", main->error.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, byte_dump_long_last_s, main->context.set.notable); - fl_print_format("%[' value.%]%c", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, byte_dump_long_last_s, main->context.set.notable); + fl_print_format("%[' value.%]%q", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); funlockfile(main->error.to.stream); @@ -448,7 +448,7 @@ extern "C" { f_print_terminated("Decimal", main->output.to.stream); } - fl_print_format(")%]%c", main->output.to.stream, main->context.set.title, f_string_eol_s[0]); + fl_print_format(")%]%q", main->output.to.stream, main->context.set.title, f_string_eol_s); funlockfile(main->output.to.stream); @@ -531,7 +531,7 @@ extern "C" { f_print_terminated("Decimal", main->output.to.stream); } - fl_print_format(")%]%c", main->output.to.stream, main->context.set.title, f_string_eol_s[0]); + fl_print_format(")%]%q", main->output.to.stream, main->context.set.title, f_string_eol_s); funlockfile(main->output.to.stream); @@ -546,7 +546,7 @@ extern "C" { if (main->output.verbosity != f_console_verbosity_quiet_e) { fflush(main->output.to.stream); - fll_print_terminated(f_string_eol_s, main->output.to.stream); + fll_print_dynamic(f_string_eol_s, main->output.to.stream); } } else { @@ -566,7 +566,7 @@ extern "C" { } } else { - fll_print_format("%[%SYou failed to specify one or more filenames.%]%c", main->error.to.stream, main->context.set.error, main->error.prefix, main->context.set.error, f_string_eol_s[0]); + fll_print_format("%[%SYou failed to specify one or more filenames.%]%q", main->error.to.stream, main->context.set.error, main->error.prefix, main->context.set.error, f_string_eol_s); status = F_status_set_error(F_parameter); } diff --git a/level_3/byte_dump/c/byte_dump.h b/level_3/byte_dump/c/byte_dump.h index 7902e51..75535bc 100644 --- a/level_3/byte_dump/c/byte_dump.h +++ b/level_3/byte_dump/c/byte_dump.h @@ -223,15 +223,15 @@ extern "C" { #define byte_dump_console_parameter_t_initialize \ { \ - macro_f_console_parameter_t_initialize(f_console_standard_short_help_s, f_console_standard_long_help_s, 0, 0, f_console_type_normal_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_light_s, f_console_standard_long_light_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s, f_console_standard_long_dark_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s, f_console_standard_long_normal_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s, f_console_standard_long_debug_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_version_s, f_console_standard_long_version_s, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, 0, 0, f_console_type_normal_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, 0, 0, f_console_type_inverse_e), \ macro_f_console_parameter_t_initialize(byte_dump_short_binary_s, byte_dump_long_binary_s, 0, 0, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(byte_dump_short_decimal_s, byte_dump_long_decimal_s, 0, 0, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(byte_dump_short_duodecimal_s, byte_dump_long_duodecimal_s, 0, 0, f_console_type_normal_e), \ diff --git a/level_3/byte_dump/c/private-byte_dump.c b/level_3/byte_dump/c/private-byte_dump.c index 27db565..c0e56e8 100644 --- a/level_3/byte_dump/c/private-byte_dump.c +++ b/level_3/byte_dump/c/private-byte_dump.c @@ -228,32 +228,32 @@ extern "C" { if (cell.column < main->width) { if (main->parameters[byte_dump_parameter_unicode_e].result == f_console_result_found_e) { if (!(cell.column % 4)) { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } } else if (main->mode == byte_dump_mode_hexidecimal_e) { if (!(cell.column % 8)) { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } } else if (main->mode == byte_dump_mode_duodecimal_e) { if (!(cell.column % 6)) { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } } else if (main->mode == byte_dump_mode_octal_e) { if (!(cell.column % 6)) { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } } else if (main->mode == byte_dump_mode_binary_e) { if (!(cell.column % 6)) { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } } else if (main->mode == byte_dump_mode_decimal_e) { if (!(cell.column % 6)) { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } } } @@ -279,7 +279,7 @@ extern "C" { fl_print_format("%[Invalid UTF-8 codes were detected for file '%]", main->error.to.stream, main->context.set.error, main->context.set.error); fl_print_format("%[%S%]", main->error.to.stream, main->context.set.notable, file_name ? file_name : "-", main->context.set.notable); - fl_print_format("%['.%]%c%c", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format("%['.%]%q%q", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -290,7 +290,7 @@ extern "C" { fl_print_format("%[%Sread() failed for '%]", main->error.to.stream, main->context.set.error, main->error.prefix, main->context.set.error); fl_print_format("%[%S%]", main->error.to.stream, main->context.set.notable, file_name ? file_name : "-", main->context.set.notable); - fl_print_format("%['.%]%c%c", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format("%['.%]%q%q", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s, f_string_eol_s); funlockfile(main->error.to.stream); @@ -359,32 +359,32 @@ extern "C" { if (cell->column < main->width) { if (main->parameters[byte_dump_parameter_unicode_e].result == f_console_result_found_e) { if (!(cell->column % 4)) { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } } else if (main->mode == byte_dump_mode_hexidecimal_e) { if (!(cell->column % 8)) { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } } else if (main->mode == byte_dump_mode_duodecimal_e) { if (!(cell->column % 6)) { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } } else if (main->mode == byte_dump_mode_octal_e) { if (!(cell->column % 6)) { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } } else if (main->mode == byte_dump_mode_binary_e) { if (!(cell->column % 4)) { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } } else if (main->mode == byte_dump_mode_decimal_e) { if (!(cell->column % 6)) { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } } } @@ -530,32 +530,32 @@ extern "C" { else { if (main->parameters[byte_dump_parameter_unicode_e].result == f_console_result_found_e) { if (!(cell->column % 4)) { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } } else if (main->mode == byte_dump_mode_hexidecimal_e) { if (!(cell->column % 8)) { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } } else if (main->mode == byte_dump_mode_duodecimal_e) { if (!(cell->column % 6)) { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } } else if (main->mode == byte_dump_mode_octal_e) { if (!(cell->column % 6)) { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } } else if (main->mode == byte_dump_mode_binary_e) { if (!(cell->column % 4)) { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } } else if (main->mode == byte_dump_mode_decimal_e) { if (!(cell->column % 6)) { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } } } @@ -580,10 +580,10 @@ extern "C" { if (main->parameters[byte_dump_parameter_classic_e].result == f_console_result_found_e) { while (*offset && at < main->width) { - f_print_character(f_string_ascii_period_s[0], main->output.to.stream); + f_print_dynamic(f_string_ascii_period_s, main->output.to.stream); if (main->options & byte_dump_option_wide_d) { - f_print_character(f_string_ascii_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_ascii_space_s, main->output.to.stream); } --(*offset); @@ -597,17 +597,17 @@ extern "C" { fl_print_format("%[%s%]", main->output.to.stream, main->context.set.warning, byte_dump_character_placeholder_s, main->context.set.warning); if (main->options & byte_dump_option_wide_d) { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } } // for } else { for (; *offset && at < main->width; --(*offset), ++at) { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); if (main->options & byte_dump_option_wide_d) { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } } // for } @@ -630,24 +630,24 @@ extern "C" { fl_print_format("%[%s%]", main->output.to.stream, main->context.set.error, byte_dump_character_placeholder_s, main->context.set.error); } else if (main->parameters[byte_dump_parameter_classic_e].result == f_console_result_found_e) { - f_print_character(f_string_ascii_period_s[0], main->output.to.stream); + f_print_dynamic(f_string_ascii_period_s, main->output.to.stream); } else { fl_print_format("%[%s%]", main->output.to.stream, main->context.set.warning, byte_dump_character_placeholder_s, main->context.set.warning); } if (main->options & byte_dump_option_wide_d) { - f_print_character(f_string_ascii_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_ascii_space_s, main->output.to.stream); } } // for } else { for (; at < previous->bytes && at < main->width; ++at) { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); if (main->options & byte_dump_option_wide_d) { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } } // for } @@ -671,7 +671,7 @@ extern "C" { fl_print_format("%[%s%]", main->output.to.stream, main->context.set.error, byte_dump_character_incomplete_s, main->context.set.error); if (main->options & byte_dump_option_wide_d) { - f_print_character(f_string_ascii_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_ascii_space_s, main->output.to.stream); } } else if (f_utf_character_is_control(characters.string[i]) == F_true) { @@ -712,72 +712,72 @@ extern "C" { if (main->options & byte_dump_option_wide_d) { if (f_utf_character_is_wide(characters.string[i]) != F_true) { - f_print_character(f_string_ascii_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_ascii_space_s, main->output.to.stream); } } } else { if (main->presentation == byte_dump_presentation_simple_e) { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); if (width_utf > 1) { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); if (width_utf > 2) { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); if (width_utf > 3) { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } } } } else if (main->presentation == byte_dump_presentation_classic_e) { - f_print_character(f_string_ascii_period_s[0], main->output.to.stream); + f_print_dynamic(f_string_ascii_period_s, main->output.to.stream); if (width_utf > 1) { - f_print_character(f_string_ascii_period_s[0], main->output.to.stream); + f_print_dynamic(f_string_ascii_period_s, main->output.to.stream); if (width_utf > 2) { - f_print_character(f_string_ascii_period_s[0], main->output.to.stream); + f_print_dynamic(f_string_ascii_period_s, main->output.to.stream); if (width_utf > 3) { - f_print_character(f_string_ascii_period_s[0], main->output.to.stream); + f_print_dynamic(f_string_ascii_period_s, main->output.to.stream); } } } } if (main->options & byte_dump_option_wide_d) { - f_print_character(f_string_ascii_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_ascii_space_s, main->output.to.stream); } } } else if (f_utf_character_is_whitespace(characters.string[i]) == F_true) { if (main->parameters[byte_dump_parameter_classic_e].result == f_console_result_found_e) { - f_print_character(f_string_ascii_period_s[0], main->output.to.stream); + f_print_dynamic(f_string_ascii_period_s, main->output.to.stream); } else { fl_print_format("%[%[%s%]%]", main->output.to.stream, main->context.set.notable, main->context.set.warning, byte_dump_sequence_space_s, main->context.set.warning, main->context.set.notable); } if (main->options & byte_dump_option_wide_d) { - f_print_character(f_string_ascii_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_ascii_space_s, main->output.to.stream); } } else if (f_utf_character_is_zero_width(characters.string[i]) == F_true) { if (main->presentation == byte_dump_presentation_classic_e) { - f_print_character(f_string_ascii_period_s[0], main->output.to.stream); + f_print_dynamic(f_string_ascii_period_s, main->output.to.stream); } else if (main->parameters[byte_dump_parameter_placeholder_e].result == f_console_result_found_e) { fl_print_format("%[%[%s%]%]", main->output.to.stream, main->context.set.notable, main->context.set.warning, byte_dump_character_placeholder_s, main->context.set.warning, main->context.set.notable); } else { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } if (main->options & byte_dump_option_wide_d) { - f_print_character(f_string_ascii_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_ascii_space_s, main->output.to.stream); } } else if (width_utf) { @@ -801,17 +801,17 @@ extern "C" { // Use space to represent Specials codes. // 0xefbfbd00 is excluded because it is printable (and is the "Replacement Character" code). - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } else if (characters.string[i] >= 0xe290a700 && characters.string[i] <= 0xe290bf00) { // Use space to represent Control Pictues codes that are not currently defined but are reserved. - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } else if (characters.string[i] >= 0xee808000 && characters.string[i] <= 0xefa3bf00) { // Use space to represent Private Use Area codes. - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } else { print = F_true; @@ -820,17 +820,17 @@ extern "C" { else if (characters.string[i] >= 0xf09c80a0 && characters.string[i] <= 0xf09c80bd) { // Use space to represent Variation Selectors Supplement codes. - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } else if (characters.string[i] >= 0xf3b08080 && characters.string[i] <= 0xf3bfbfbf) { // Use space to represent Supplemental Private Use Area-A codes. - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } else if (characters.string[i] >= 0xf4808080 && characters.string[i] <= 0xf48fbfbf) { // Use space to represent Supplemental Private Use Area-B codes. - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } else { print = F_true; @@ -852,18 +852,18 @@ extern "C" { } if (f_utf_character_is_combining(characters.string[i]) == F_true) { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } if (main->options & byte_dump_option_wide_d) { if (width_utf == 1 || f_utf_character_is_wide(characters.string[i]) != F_true) { - f_print_character(f_string_ascii_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_ascii_space_s, main->output.to.stream); } } } else { if (main->options & byte_dump_option_wide_d) { - f_print_character(f_string_ascii_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_ascii_space_s, main->output.to.stream); } } } @@ -871,7 +871,7 @@ extern "C" { f_print_character(c, main->output.to.stream); if (main->options & byte_dump_option_wide_d) { - f_print_character(f_string_ascii_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_ascii_space_s, main->output.to.stream); } } @@ -882,18 +882,18 @@ extern "C" { fl_print_format("%[%s%]", main->output.to.stream, main->context.set.error, byte_dump_character_placeholder_s, main->context.set.error); } else if (main->parameters[byte_dump_parameter_classic_e].result == f_console_result_found_e) { - f_print_character(f_string_ascii_period_s[0], main->output.to.stream); + f_print_dynamic(f_string_ascii_period_s, main->output.to.stream); } else { fl_print_format("%[%s%]", main->output.to.stream, main->context.set.warning, byte_dump_character_placeholder_s, main->context.set.warning); } } else { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } if (main->options & byte_dump_option_wide_d) { - f_print_character(f_string_ascii_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_ascii_space_s, main->output.to.stream); } ++at; @@ -904,18 +904,18 @@ extern "C" { fl_print_format("%[%s%]", main->output.to.stream, main->context.set.error, byte_dump_character_placeholder_s, main->context.set.error); } else if (main->parameters[byte_dump_parameter_classic_e].result == f_console_result_found_e) { - f_print_character(f_string_ascii_period_s[0], main->output.to.stream); + f_print_dynamic(f_string_ascii_period_s, main->output.to.stream); } else { fl_print_format("%[%s%]", main->output.to.stream, main->context.set.warning, byte_dump_character_placeholder_s, main->context.set.warning); } } else { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } if (main->options & byte_dump_option_wide_d) { - f_print_character(f_string_ascii_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_ascii_space_s, main->output.to.stream); } ++at; @@ -926,18 +926,18 @@ extern "C" { fl_print_format("%[%s%]", main->output.to.stream, main->context.set.error, byte_dump_character_placeholder_s, main->context.set.error); } else if (main->parameters[byte_dump_parameter_classic_e].result == f_console_result_found_e) { - f_print_character(f_string_ascii_period_s[0], main->output.to.stream); + f_print_dynamic(f_string_ascii_period_s, main->output.to.stream); } else { fl_print_format("%[%s%]", main->output.to.stream, main->context.set.warning, byte_dump_character_placeholder_s, main->context.set.warning); } } else { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } if (main->options & byte_dump_option_wide_d) { - f_print_character(f_string_ascii_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_ascii_space_s, main->output.to.stream); } ++at; @@ -954,24 +954,24 @@ extern "C" { fl_print_format("%[%s%]", main->output.to.stream, main->context.set.error, byte_dump_character_placeholder_s, main->context.set.error); } else if (main->parameters[byte_dump_parameter_classic_e].result == f_console_result_found_e) { - f_print_character(f_string_ascii_period_s[0], main->output.to.stream); + f_print_dynamic(f_string_ascii_period_s, main->output.to.stream); } else { fl_print_format("%[%s%]", main->output.to.stream, main->context.set.warning, byte_dump_character_placeholder_s, main->context.set.warning); } if (main->options & byte_dump_option_wide_d) { - f_print_character(f_string_ascii_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_ascii_space_s, main->output.to.stream); } } // for } else { for (; at < main->width; ++at) { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); if (main->options & byte_dump_option_wide_d) { - f_print_character(f_string_space_s[0], main->output.to.stream); + f_print_dynamic(f_string_space_s, main->output.to.stream); } } // for } diff --git a/level_3/byte_dump/c/private-common.c b/level_3/byte_dump/c/private-common.c index 5a2d1ac..b5de09c 100644 --- a/level_3/byte_dump/c/private-common.c +++ b/level_3/byte_dump/c/private-common.c @@ -15,9 +15,9 @@ extern "C" { flockfile(main->warning.to.stream); - fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s[0], f_string_eol_s[0], main->context.set.warning, main->context.set.warning); + fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s, f_string_eol_s, main->context.set.warning, main->context.set.warning); fl_print_format("%[%i%]", main->warning.to.stream, main->context.set.notable, signal, main->context.set.notable); - fl_print_format("%[.%]%c", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s[0]); + fl_print_format("%[.%]%q", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s); funlockfile(main->warning.to.stream); } diff --git a/level_3/control/c/control.c b/level_3/control/c/control.c index 0d00bd6..5885998 100644 --- a/level_3/control/c/control.c +++ b/level_3/control/c/control.c @@ -33,30 +33,30 @@ extern "C" { fll_program_print_help_header(main->output.to, main->context, control_program_name_long_s.string, control_program_version_s.string); - fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_help_s, f_console_standard_long_help_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print this help message."); - fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_dark_s, f_console_standard_long_dark_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_light_s, f_console_standard_long_light_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, "Do not main->output.to in color."); - fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Decrease verbosity, silencing most output."); - fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_normal_s, f_console_standard_long_normal_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Set verbosity to normal main->output.to."); - fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Increase verbosity beyond normal output."); - fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_debug_s, f_console_standard_long_debug_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Enable debugging, significantly increasing verbosity beyond normal output."); - fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_version_s, f_console_standard_long_version_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Print only the version number."); - - f_print_character(f_string_eol_s[0], main->output.to.stream); - - fll_program_print_help_option(main->output.to, main->context, control_short_name_s.string, control_long_name_s.string, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Specify the name of the controller socket file."); - fll_program_print_help_option(main->output.to, main->context, control_short_settings_s.string, control_long_settings_s.string, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Specify a directory path or a full path to the control settings file."); - fll_program_print_help_option(main->output.to, main->context, control_short_socket_s.string, control_long_socket_s.string, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Specify a directory path or a full path to the controller socket file."); + fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print this help message."); + fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, "Do not main->output.to in color."); + fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Decrease verbosity, silencing most output."); + fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Set verbosity to normal main->output.to."); + fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Increase verbosity beyond normal output."); + fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Enable debugging, significantly increasing verbosity beyond normal output."); + fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Print only the version number."); + + f_print_dynamic(f_string_eol_s, main->output.to.stream); + + fll_program_print_help_option(main->output.to, main->context, control_short_name_s.string, control_long_name_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Specify the name of the controller socket file."); + fll_program_print_help_option(main->output.to, main->context, control_short_settings_s.string, control_long_settings_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "Specify a directory path or a full path to the control settings file."); + fll_program_print_help_option(main->output.to, main->context, control_short_socket_s.string, control_long_socket_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Specify a directory path or a full path to the controller socket file."); fll_program_print_help_usage(main->output.to, main->context, control_program_name_s.string, control_command_s.string); - fl_print_format(" When the %[%s%q%] parameter represents a directory path then the file name is generated from either the", main->output.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, control_long_socket_s, main->context.set.notable); - fl_print_format(" %[%s%q%] parameter or from the control settings file.%c%c", main->output.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, control_long_name_s, main->context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" When the %[%s%q%] parameter represents a directory path then the file name is generated from either the", main->output.to.stream, main->context.set.notable, f_console_symbol_long_enable_s.string, control_long_socket_s, main->context.set.notable); + fl_print_format(" %[%s%q%] parameter or from the control settings file.%q%q", main->output.to.stream, main->context.set.notable, f_console_symbol_long_enable_s.string, control_long_name_s, main->context.set.notable, f_string_eol_s, f_string_eol_s); fl_print_format(" A rule action allows for either the full rule path, such as '%[boot/root%]'", main->output.to.stream, main->context.set.notable, main->context.set.notable); fl_print_format(" as a single parameter or two parameters with the first representing the rule directory path '%[boot%]'", main->output.to.stream, main->context.set.notable, main->context.set.notable); - fl_print_format(" and the second representing the rule base name '%[root%]'.%c%c", main->output.to.stream, main->context.set.notable, main->context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" and the second representing the rule base name '%[root%]'.%q%q", main->output.to.stream, main->context.set.notable, main->context.set.notable, f_string_eol_s, f_string_eol_s); fflush(main->output.to.stream); funlockfile(main->output.to.stream); @@ -102,7 +102,7 @@ extern "C" { if (F_status_is_error(status)) { if (main->error.verbosity != f_console_verbosity_quiet_e) { fll_error_print(main->error, F_status_set_fine(status), "fll_program_parameter_process", F_true); - fll_print_terminated(f_string_eol_s, main->error.to.stream); + fll_print_dynamic(f_string_eol_s, main->error.to.stream); } control_main_delete(main); @@ -256,7 +256,7 @@ extern "C" { fflush(main->output.to.stream); } - fll_print_terminated(f_string_eol_s, main->output.to.stream); + fll_print_dynamic(f_string_eol_s, main->output.to.stream); } } diff --git a/level_3/control/c/control.h b/level_3/control/c/control.h index 19a2784..e8854e6 100644 --- a/level_3/control/c/control.h +++ b/level_3/control/c/control.h @@ -89,7 +89,7 @@ extern "C" { #ifndef _di_control_defines_ #define CONTROL_short_name_s "n" #define CONTROL_short_settings_s "s" - #define CONTROL_short_socket_s "S" + #define CONTROL_short_socket_s "k" #define CONTROL_long_name_s "name" #define CONTROL_long_settings_s "settings" @@ -129,15 +129,15 @@ extern "C" { #define control_console_parameter_t_initialize \ { \ - macro_f_console_parameter_t_initialize(f_console_standard_short_help_s, f_console_standard_long_help_s, 0, 0, f_console_type_normal_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_light_s, f_console_standard_long_light_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s, f_console_standard_long_dark_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s, f_console_standard_long_normal_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s, f_console_standard_long_debug_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_version_s, f_console_standard_long_version_s, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, 0, 0, f_console_type_normal_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, 0, 0, f_console_type_inverse_e), \ macro_f_console_parameter_t_initialize(control_short_name_s.string, control_long_name_s.string, 0, 1, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(control_short_settings_s.string, control_long_settings_s.string, 0, 1, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(control_short_socket_s.string, control_long_socket_s.string, 0, 1, f_console_type_normal_e), \ diff --git a/level_3/control/c/private-control.c b/level_3/control/c/private-control.c index bb21571..084b1af 100644 --- a/level_3/control/c/private-control.c +++ b/level_3/control/c/private-control.c @@ -288,7 +288,7 @@ extern "C" { fll_error_file_print(main->error, F_status_set_fine(status), "f_file_exists", F_true, data->cache.buffer_small.string, "find", fll_error_file_type_directory_e); if (main->error.verbosity != f_console_verbosity_quiet_e) { - fll_print_terminated(f_string_eol_s, main->error.to.stream); + fll_print_dynamic(f_string_eol_s, main->error.to.stream); } } @@ -299,10 +299,10 @@ extern "C" { // Construct the file name when the socket path is a directory. else if (f_file_is(data->cache.buffer_small.string, F_file_type_directory_d, F_true) == F_true) { - status = f_string_append_assure(f_path_separator_s, F_path_separator_s_length, &data->cache.buffer_small); + status = f_string_dynamic_append_assure(f_path_separator_s, &data->cache.buffer_small); if (F_status_is_error(status)) { - fll_error_print(main->error, F_status_set_fine(status), "f_string_append_assure", F_true); + fll_error_print(main->error, F_status_set_fine(status), "f_string_dynamic_append_assure", F_true); } else { uint8_t append_ids[] = { @@ -368,7 +368,7 @@ extern "C" { fll_error_file_print(main->error, F_status_set_fine(status), "f_file_exists", F_true, data->cache.buffer_small.string, "find", fll_error_file_type_directory_e); if (main->error.verbosity != f_console_verbosity_quiet_e) { - fll_print_terminated(f_string_eol_s, main->error.to.stream); + fll_print_dynamic(f_string_eol_s, main->error.to.stream); } } @@ -393,7 +393,7 @@ extern "C" { fll_error_print(main->error, F_status_set_fine(status), "f_socket_create", F_true); if (main->error.verbosity != f_console_verbosity_quiet_e) { - fll_print_terminated(f_string_eol_s, main->error.to.stream); + fll_print_dynamic(f_string_eol_s, main->error.to.stream); } control_print_error_socket_file_failed(main, data->cache.buffer_small); @@ -407,7 +407,7 @@ extern "C" { fll_error_print(main->error, F_status_set_fine(status), "f_socket_connect", F_true); if (main->error.verbosity != f_console_verbosity_quiet_e) { - fll_print_terminated(f_string_eol_s, main->error.to.stream); + fll_print_dynamic(f_string_eol_s, main->error.to.stream); } control_print_error_socket_file_failed(main, data->cache.buffer_small); diff --git a/level_3/control/c/private-print.c b/level_3/control/c/private-print.c index ab75ed7..6f6b638 100644 --- a/level_3/control/c/private-print.c +++ b/level_3/control/c/private-print.c @@ -15,7 +15,7 @@ extern "C" { fl_print_format("%[%SThe parameter '%]", main->error.to.stream, main->context.set.error, main->error.prefix, main->context.set.error); fl_print_format("%[%S%]", main->error.to.stream, main->context.set.notable, command, main->context.set.notable); - fl_print_format("%[' is not a known controller command.%]%c", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[' is not a known controller command.%]%q", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -30,7 +30,7 @@ extern "C" { fl_print_format("%[%SThe command parameter '%]", main->error.to.stream, main->context.set.error, main->error.prefix, main->context.set.error); fl_print_format("%[%S%]", main->error.to.stream, main->context.set.notable, command, main->context.set.notable); - fl_print_format("%[' a rule base name cannot be an empty string.%]%c", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[' a rule base name cannot be an empty string.%]%q", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -45,7 +45,7 @@ extern "C" { fl_print_format("%[%SThe command parameter '%]", main->error.to.stream, main->context.set.error, main->error.prefix, main->context.set.error); fl_print_format("%[%S%]", main->error.to.stream, main->context.set.notable, command, main->context.set.notable); - fl_print_format("%[' a rule directory path cannot be an empty string.%]%c", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[' a rule directory path cannot be an empty string.%]%q", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -60,7 +60,7 @@ extern "C" { fl_print_format("%[%SThe command parameter '%]", main->error.to.stream, main->context.set.error, main->error.prefix, main->context.set.error); fl_print_format("%[%S%]", main->error.to.stream, main->context.set.notable, command, main->context.set.notable); - fl_print_format("%[' a rule name cannot be an empty string.%]%c", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[' a rule name cannot be an empty string.%]%q", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -75,7 +75,7 @@ extern "C" { fl_print_format("%[%SThe command parameter '%]", main->error.to.stream, main->context.set.error, main->error.prefix, main->context.set.error); fl_print_format("%[%S%]", main->error.to.stream, main->context.set.notable, command, main->context.set.notable); - fl_print_format("%[' requires either a full rule name or a rule directory path along with the rule base name.%]%c", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[' requires either a full rule name or a rule directory path along with the rule base name.%]%q", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -90,7 +90,7 @@ extern "C" { fl_print_format("%[%SThe command parameter '%]", main->error.to.stream, main->context.set.error, main->error.prefix, main->context.set.error); fl_print_format("%[%S%]", main->error.to.stream, main->context.set.notable, command, main->context.set.notable); - fl_print_format("%[' has too many arguments.%]%c", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[' has too many arguments.%]%q", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -101,7 +101,7 @@ extern "C" { if (main->error.verbosity == f_console_verbosity_quiet_e) return; - fll_print_format("%[%SNo commands are provided.%]%c", main->error.to.stream, main->context.set.error, main->error.prefix, main->context.set.error, f_string_eol_s[0]); + fll_print_format("%[%SNo commands are provided.%]%q", main->error.to.stream, main->context.set.error, main->error.prefix, main->context.set.error, f_string_eol_s); } #endif // _di_control_print_error_commands_none_ @@ -113,8 +113,8 @@ extern "C" { flockfile(main->error.to.stream); fl_print_format("%[%SThe value for the parameter '%]", main->error.to.stream, main->context.set.error, main->error.prefix, main->context.set.error); - fl_print_format("%[%s%q%]", main->error.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, parameter, main->context.set.notable); - fl_print_format("%[' must not be an empty string.%]%c", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[%q%q%]", main->error.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, parameter, main->context.set.notable); + fl_print_format("%[' must not be an empty string.%]%q", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -128,8 +128,8 @@ extern "C" { flockfile(main->error.to.stream); fl_print_format("%[%SThe parameter '%]", main->error.to.stream, main->context.set.error, main->error.prefix, main->context.set.error); - fl_print_format("%[%s%q%]", main->error.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, parameter, main->context.set.notable); - fl_print_format("%[' is specified, but no value is given.%]%c", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[%q%q%]", main->error.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, parameter, main->context.set.notable); + fl_print_format("%[' is specified, but no value is given.%]%q", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -140,7 +140,7 @@ extern "C" { if (main->error.verbosity == f_console_verbosity_quiet_e) return; - fll_print_format("%[%SPipe input is not supported by this program.%]%c", main->error.to.stream, main->context.set.error, main->error.prefix, main->context.set.error, f_string_eol_s[0]); + fll_print_format("%[%SPipe input is not supported by this program.%]%q", main->error.to.stream, main->context.set.error, main->error.prefix, main->context.set.error, f_string_eol_s); } #endif // _di_control_print_error_pipe_supported_not_ @@ -153,7 +153,7 @@ extern "C" { fl_print_format("%[%SFailed to connect to the socket file '%]", main->error.to.stream, main->context.set.error, main->error.prefix, main->context.set.error); fl_print_format("%[%Q%]", main->error.to.stream, main->context.set.notable, path_socket, main->context.set.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -168,7 +168,7 @@ extern "C" { fl_print_format("%[%SThe controller socket file '%]", main->error.to.stream, main->context.set.error, main->error.prefix, main->context.set.error); fl_print_format("%[%Q%]", main->error.to.stream, main->context.set.notable, path_socket, main->context.set.notable); - fl_print_format("%[' could not be found and is required.%]%c", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[' could not be found and is required.%]%q", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -183,7 +183,7 @@ extern "C" { fl_print_format("%[%SThe controller socket file '%]", main->error.to.stream, main->context.set.error, main->error.prefix, main->context.set.error); fl_print_format("%[%Q%]", main->error.to.stream, main->context.set.notable, path_socket, main->context.set.notable); - fl_print_format("%[' is not a socket file.%]%c", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[' is not a socket file.%]%q", main->error.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -199,9 +199,9 @@ extern "C" { flockfile(main->warning.to.stream); - fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s[0], f_string_eol_s[0], main->context.set.warning, main->context.set.warning); + fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s, f_string_eol_s, main->context.set.warning, main->context.set.warning); fl_print_format("%[%i%]", main->warning.to.stream, main->context.set.notable, signal, main->context.set.notable); - fl_print_format("%[.%]%c", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s[0]); + fl_print_format("%[.%]%q", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s); funlockfile(main->warning.to.stream); } diff --git a/level_3/controller/c/common/private-common.c b/level_3/controller/c/common/private-common.c index 31b1e76..adb1eb6 100644 --- a/level_3/controller/c/common/private-common.c +++ b/level_3/controller/c/common/private-common.c @@ -6,124 +6,124 @@ extern "C" { #endif #ifndef _di_controller_string_s_ - const f_string_t controller_action_s = CONTROLLER_action_s; - const f_string_t controller_actions_s = CONTROLLER_actions_s; - const f_string_t controller_affinity_s = CONTROLLER_affinity_s; - const f_string_t controller_as_s = CONTROLLER_as_s; - const f_string_t controller_asynchronous_s = CONTROLLER_asynchronous_s; - const f_string_t controller_bash_s = CONTROLLER_bash_s; - const f_string_t controller_batch_s = CONTROLLER_batch_s; - const f_string_t controller_capability_s = CONTROLLER_capability_s; - const f_string_t controller_cgroup_s = CONTROLLER_cgroup_s; - const f_string_t controller_create_s = CONTROLLER_create_s; - const f_string_t controller_command_s = CONTROLLER_command_s; - const f_string_t controller_consider_s = CONTROLLER_consider_s; - const f_string_t controller_control_s = CONTROLLER_control_s; - const f_string_t controller_control_group_s = CONTROLLER_control_group_s; - const f_string_t controller_control_mode_s = CONTROLLER_control_mode_s; - const f_string_t controller_control_user_s = CONTROLLER_control_user_s; - const f_string_t controller_cpu_s = CONTROLLER_cpu_s; - const f_string_t controller_core_s = CONTROLLER_core_s; - const f_string_t controller_data_s = CONTROLLER_data_s; - const f_string_t controller_deadline_s = CONTROLLER_deadline_s; - const f_string_t controller_default_s = CONTROLLER_default_s; - const f_string_t controller_define_s = CONTROLLER_define_s; - const f_string_t controller_delay_s = CONTROLLER_delay_s; - const f_string_t controller_disable_s = CONTROLLER_disable_s; - const f_string_t controller_entry_s = CONTROLLER_entry_s; - const f_string_t controller_entries_s = CONTROLLER_entries_s; - const f_string_t controller_environment_s = CONTROLLER_environment_s; - const f_string_t controller_error_s = CONTROLLER_error_s; - const f_string_t controller_execute_s = CONTROLLER_execute_s; - const f_string_t controller_existing_s = CONTROLLER_existing_s; - const f_string_t controller_exit_s = CONTROLLER_exit_s; - const f_string_t controller_exits_s = CONTROLLER_exits_s; - const f_string_t controller_fail_s = CONTROLLER_fail_s; - const f_string_t controller_failsafe_s = CONTROLLER_failsafe_s; - const f_string_t controller_failure_s = CONTROLLER_failure_s; - const f_string_t controller_fifo_s = CONTROLLER_fifo_s; - const f_string_t controller_freeze_s = CONTROLLER_freeze_s; - const f_string_t controller_fsize_s = CONTROLLER_fsize_s; - const f_string_t controller_full_path_s = CONTROLLER_full_path_s; - const f_string_t controller_group_s = CONTROLLER_group_s; - const f_string_t controller_groups_s = CONTROLLER_groups_s; - const f_string_t controller_how_s = CONTROLLER_how_s; - const f_string_t controller_idle_s = CONTROLLER_idle_s; - const f_string_t controller_item_s = CONTROLLER_item_s; - const f_string_t controller_init_s = CONTROLLER_init_s; - const f_string_t controller_kill_s = CONTROLLER_kill_s; - const f_string_t controller_length_s = CONTROLLER_length_s; - const f_string_t controller_limit_s = CONTROLLER_limit_s; - const f_string_t controller_locks_s = CONTROLLER_locks_s; - const f_string_t controller_main_s = CONTROLLER_main_s; - const f_string_t controller_max_s = CONTROLLER_max_s; - const f_string_t controller_memlock_s = CONTROLLER_memlock_s; - const f_string_t controller_method_s = CONTROLLER_method_s; - const f_string_t controller_mode_s = CONTROLLER_mode_s; - const f_string_t controller_msgqueue_s = CONTROLLER_msgqueue_s; - const f_string_t controller_name_s = CONTROLLER_name_s; - const f_string_t controller_need_s = CONTROLLER_need_s; - const f_string_t controller_new_s = CONTROLLER_new_s; - const f_string_t controller_nice_s = CONTROLLER_nice_s; - const f_string_t controller_no_s = CONTROLLER_no_s; - const f_string_t controller_nofile_s = CONTROLLER_nofile_s; - const f_string_t controller_normal_s = CONTROLLER_normal_s; - const f_string_t controller_nproc_s = CONTROLLER_nproc_s; - const f_string_t controller_on_s = CONTROLLER_on_s; - const f_string_t controller_optional_s = CONTROLLER_optional_s; - const f_string_t controller_other_s = CONTROLLER_other_s; - const f_string_t controller_parameter_s = CONTROLLER_parameter_s; - const f_string_t controller_parameters_s = CONTROLLER_parameters_s; - const f_string_t controller_path_s = CONTROLLER_path_s; - const f_string_t controller_pause_s = CONTROLLER_pause_s; - const f_string_t controller_payload_type_s = CONTROLLER_payload_type_s; - const f_string_t controller_pid_s = CONTROLLER_pid_s; - const f_string_t controller_pid_file_s = CONTROLLER_pid_file_s; - const f_string_t controller_processor_s = CONTROLLER_processor_s; - const f_string_t controller_program_s = CONTROLLER_program_s; - const f_string_t controller_ready_s = CONTROLLER_ready_s; - const f_string_t controller_reload_s = CONTROLLER_reload_s; - const f_string_t controller_require_s = CONTROLLER_require_s; - const f_string_t controller_required_s = CONTROLLER_required_s; - const f_string_t controller_rerun_s = CONTROLLER_rerun_s; - const f_string_t controller_reset_s = CONTROLLER_reset_s; - const f_string_t controller_restart_s = CONTROLLER_restart_s; - const f_string_t controller_resume_s = CONTROLLER_resume_s; - const f_string_t controller_round_robin_s = CONTROLLER_round_robin_s; - const f_string_t controller_rss_s = CONTROLLER_rss_s; - const f_string_t controller_rtprio_s = CONTROLLER_rtprio_s; - const f_string_t controller_rttime_s = CONTROLLER_rttime_s; - const f_string_t controller_rule_s = CONTROLLER_rule_s; - const f_string_t controller_rules_s = CONTROLLER_rules_s; - const f_string_t controller_same_s = CONTROLLER_same_s; - const f_string_t controller_scheduler_s = CONTROLLER_scheduler_s; - const f_string_t controller_script_s = CONTROLLER_script_s; - const f_string_t controller_service_s = CONTROLLER_service_s; - const f_string_t controller_setting_s = CONTROLLER_setting_s; - const f_string_t controller_session_s = CONTROLLER_session_s; - const f_string_t controller_session_new_s = CONTROLLER_session_new_s; - const f_string_t controller_session_same_s = CONTROLLER_session_same_s; - const f_string_t controller_show_s = CONTROLLER_show_s; - const f_string_t controller_sigpending_s = CONTROLLER_sigpending_s; - const f_string_t controller_stack_s = CONTROLLER_stack_s; - const f_string_t controller_start_s = CONTROLLER_start_s; - const f_string_t controller_status_s = CONTROLLER_status_s; - const f_string_t controller_stop_s = CONTROLLER_stop_s; - const f_string_t controller_succeed_s = CONTROLLER_succeed_s; - const f_string_t controller_success_s = CONTROLLER_success_s; - const f_string_t controller_synchronous_s = CONTROLLER_synchronous_s; - const f_string_t controller_thaw_s = CONTROLLER_thaw_s; - const f_string_t controller_timeout_s = CONTROLLER_timeout_s; - const f_string_t controller_type_s = CONTROLLER_type_s; - const f_string_t controller_use_s = CONTROLLER_use_s; - const f_string_t controller_user_s = CONTROLLER_user_s; - const f_string_t controller_utility_s = CONTROLLER_utility_s; - const f_string_t controller_value_s = CONTROLLER_value_s; - const f_string_t controller_wait_s = CONTROLLER_wait_s; - const f_string_t controller_want_s = CONTROLLER_want_s; - const f_string_t controller_wish_s = CONTROLLER_wish_s; - const f_string_t controller_with_s = CONTROLLER_with_s; - const f_string_t controller_yes_s = CONTROLLER_yes_s; + const f_string_static_t controller_action_s = macro_f_string_static_t_initialize2(CONTROLLER_action_s, 0, CONTROLLER_action_s_length); + const f_string_static_t controller_actions_s = macro_f_string_static_t_initialize2(CONTROLLER_actions_s, 0, CONTROLLER_actions_s_length); + const f_string_static_t controller_affinity_s = macro_f_string_static_t_initialize2(CONTROLLER_affinity_s, 0, CONTROLLER_affinity_s_length); + const f_string_static_t controller_as_s = macro_f_string_static_t_initialize2(CONTROLLER_as_s, 0, CONTROLLER_as_s_length); + const f_string_static_t controller_asynchronous_s = macro_f_string_static_t_initialize2(CONTROLLER_asynchronous_s, 0, CONTROLLER_asynchronous_s_length); + const f_string_static_t controller_bash_s = macro_f_string_static_t_initialize2(CONTROLLER_bash_s, 0, CONTROLLER_bash_s_length); + const f_string_static_t controller_batch_s = macro_f_string_static_t_initialize2(CONTROLLER_batch_s, 0, CONTROLLER_batch_s_length); + const f_string_static_t controller_capability_s = macro_f_string_static_t_initialize2(CONTROLLER_capability_s, 0, CONTROLLER_capability_s_length); + const f_string_static_t controller_cgroup_s = macro_f_string_static_t_initialize2(CONTROLLER_cgroup_s, 0, CONTROLLER_cgroup_s_length); + const f_string_static_t controller_create_s = macro_f_string_static_t_initialize2(CONTROLLER_create_s, 0, CONTROLLER_create_s_length); + const f_string_static_t controller_command_s = macro_f_string_static_t_initialize2(CONTROLLER_command_s, 0, CONTROLLER_command_s_length); + const f_string_static_t controller_consider_s = macro_f_string_static_t_initialize2(CONTROLLER_consider_s, 0, CONTROLLER_consider_s_length); + const f_string_static_t controller_control_s = macro_f_string_static_t_initialize2(CONTROLLER_control_s, 0, CONTROLLER_control_s_length); + const f_string_static_t controller_control_group_s = macro_f_string_static_t_initialize2(CONTROLLER_control_group_s, 0, CONTROLLER_control_group_s_length); + const f_string_static_t controller_control_mode_s = macro_f_string_static_t_initialize2(CONTROLLER_control_mode_s, 0, CONTROLLER_control_mode_s_length); + const f_string_static_t controller_control_user_s = macro_f_string_static_t_initialize2(CONTROLLER_control_user_s, 0, CONTROLLER_control_user_s_length); + const f_string_static_t controller_cpu_s = macro_f_string_static_t_initialize2(CONTROLLER_cpu_s, 0, CONTROLLER_cpu_s_length); + const f_string_static_t controller_core_s = macro_f_string_static_t_initialize2(CONTROLLER_core_s, 0, CONTROLLER_core_s_length); + const f_string_static_t controller_data_s = macro_f_string_static_t_initialize2(CONTROLLER_data_s, 0, CONTROLLER_data_s_length); + const f_string_static_t controller_deadline_s = macro_f_string_static_t_initialize2(CONTROLLER_deadline_s, 0, CONTROLLER_deadline_s_length); + const f_string_static_t controller_default_s = macro_f_string_static_t_initialize2(CONTROLLER_default_s, 0, CONTROLLER_default_s_length); + const f_string_static_t controller_define_s = macro_f_string_static_t_initialize2(CONTROLLER_define_s, 0, CONTROLLER_define_s_length); + const f_string_static_t controller_delay_s = macro_f_string_static_t_initialize2(CONTROLLER_delay_s, 0, CONTROLLER_delay_s_length); + const f_string_static_t controller_disable_s = macro_f_string_static_t_initialize2(CONTROLLER_disable_s, 0, CONTROLLER_disable_s_length); + const f_string_static_t controller_entry_s = macro_f_string_static_t_initialize2(CONTROLLER_entry_s, 0, CONTROLLER_entry_s_length); + const f_string_static_t controller_entries_s = macro_f_string_static_t_initialize2(CONTROLLER_entries_s, 0, CONTROLLER_entries_s_length); + const f_string_static_t controller_environment_s = macro_f_string_static_t_initialize2(CONTROLLER_environment_s, 0, CONTROLLER_environment_s_length); + const f_string_static_t controller_error_s = macro_f_string_static_t_initialize2(CONTROLLER_error_s, 0, CONTROLLER_error_s_length); + const f_string_static_t controller_execute_s = macro_f_string_static_t_initialize2(CONTROLLER_execute_s, 0, CONTROLLER_execute_s_length); + const f_string_static_t controller_existing_s = macro_f_string_static_t_initialize2(CONTROLLER_existing_s, 0, CONTROLLER_existing_s_length); + const f_string_static_t controller_exit_s = macro_f_string_static_t_initialize2(CONTROLLER_exit_s, 0, CONTROLLER_exit_s_length); + const f_string_static_t controller_exits_s = macro_f_string_static_t_initialize2(CONTROLLER_exits_s, 0, CONTROLLER_exits_s_length); + const f_string_static_t controller_fail_s = macro_f_string_static_t_initialize2(CONTROLLER_fail_s, 0, CONTROLLER_fail_s_length); + const f_string_static_t controller_failsafe_s = macro_f_string_static_t_initialize2(CONTROLLER_failsafe_s, 0, CONTROLLER_failsafe_s_length); + const f_string_static_t controller_failure_s = macro_f_string_static_t_initialize2(CONTROLLER_failure_s, 0, CONTROLLER_failure_s_length); + const f_string_static_t controller_fifo_s = macro_f_string_static_t_initialize2(CONTROLLER_fifo_s, 0, CONTROLLER_fifo_s_length); + const f_string_static_t controller_freeze_s = macro_f_string_static_t_initialize2(CONTROLLER_freeze_s, 0, CONTROLLER_freeze_s_length); + const f_string_static_t controller_fsize_s = macro_f_string_static_t_initialize2(CONTROLLER_fsize_s, 0, CONTROLLER_fsize_s_length); + const f_string_static_t controller_full_path_s = macro_f_string_static_t_initialize2(CONTROLLER_full_path_s, 0, CONTROLLER_full_path_s_length); + const f_string_static_t controller_group_s = macro_f_string_static_t_initialize2(CONTROLLER_group_s, 0, CONTROLLER_group_s_length); + const f_string_static_t controller_groups_s = macro_f_string_static_t_initialize2(CONTROLLER_groups_s, 0, CONTROLLER_groups_s_length); + const f_string_static_t controller_how_s = macro_f_string_static_t_initialize2(CONTROLLER_how_s, 0, CONTROLLER_how_s_length); + const f_string_static_t controller_idle_s = macro_f_string_static_t_initialize2(CONTROLLER_idle_s, 0, CONTROLLER_idle_s_length); + const f_string_static_t controller_item_s = macro_f_string_static_t_initialize2(CONTROLLER_item_s, 0, CONTROLLER_item_s_length); + const f_string_static_t controller_init_s = macro_f_string_static_t_initialize2(CONTROLLER_init_s, 0, CONTROLLER_init_s_length); + const f_string_static_t controller_kill_s = macro_f_string_static_t_initialize2(CONTROLLER_kill_s, 0, CONTROLLER_kill_s_length); + const f_string_static_t controller_length_s = macro_f_string_static_t_initialize2(CONTROLLER_length_s, 0, CONTROLLER_length_s_length); + const f_string_static_t controller_limit_s = macro_f_string_static_t_initialize2(CONTROLLER_limit_s, 0, CONTROLLER_limit_s_length); + const f_string_static_t controller_locks_s = macro_f_string_static_t_initialize2(CONTROLLER_locks_s, 0, CONTROLLER_locks_s_length); + const f_string_static_t controller_main_s = macro_f_string_static_t_initialize2(CONTROLLER_main_s, 0, CONTROLLER_main_s_length); + const f_string_static_t controller_max_s = macro_f_string_static_t_initialize2(CONTROLLER_max_s, 0, CONTROLLER_max_s_length); + const f_string_static_t controller_memlock_s = macro_f_string_static_t_initialize2(CONTROLLER_memlock_s, 0, CONTROLLER_memlock_s_length); + const f_string_static_t controller_method_s = macro_f_string_static_t_initialize2(CONTROLLER_method_s, 0, CONTROLLER_method_s_length); + const f_string_static_t controller_mode_s = macro_f_string_static_t_initialize2(CONTROLLER_mode_s, 0, CONTROLLER_mode_s_length); + const f_string_static_t controller_msgqueue_s = macro_f_string_static_t_initialize2(CONTROLLER_msgqueue_s, 0, CONTROLLER_msgqueue_s_length); + const f_string_static_t controller_name_s = macro_f_string_static_t_initialize2(CONTROLLER_name_s, 0, CONTROLLER_name_s_length); + const f_string_static_t controller_need_s = macro_f_string_static_t_initialize2(CONTROLLER_need_s, 0, CONTROLLER_need_s_length); + const f_string_static_t controller_new_s = macro_f_string_static_t_initialize2(CONTROLLER_new_s, 0, CONTROLLER_new_s_length); + const f_string_static_t controller_nice_s = macro_f_string_static_t_initialize2(CONTROLLER_nice_s, 0, CONTROLLER_nice_s_length); + const f_string_static_t controller_no_s = macro_f_string_static_t_initialize2(CONTROLLER_no_s, 0, CONTROLLER_no_s_length); + const f_string_static_t controller_nofile_s = macro_f_string_static_t_initialize2(CONTROLLER_nofile_s, 0, CONTROLLER_nofile_s_length); + const f_string_static_t controller_normal_s = macro_f_string_static_t_initialize2(CONTROLLER_normal_s, 0, CONTROLLER_normal_s_length); + const f_string_static_t controller_nproc_s = macro_f_string_static_t_initialize2(CONTROLLER_nproc_s, 0, CONTROLLER_nproc_s_length); + const f_string_static_t controller_on_s = macro_f_string_static_t_initialize2(CONTROLLER_on_s, 0, CONTROLLER_on_s_length); + const f_string_static_t controller_optional_s = macro_f_string_static_t_initialize2(CONTROLLER_optional_s, 0, CONTROLLER_optional_s_length); + const f_string_static_t controller_other_s = macro_f_string_static_t_initialize2(CONTROLLER_other_s, 0, CONTROLLER_other_s_length); + const f_string_static_t controller_parameter_s = macro_f_string_static_t_initialize2(CONTROLLER_parameter_s, 0, CONTROLLER_parameter_s_length); + const f_string_static_t controller_parameters_s = macro_f_string_static_t_initialize2(CONTROLLER_parameters_s, 0, CONTROLLER_parameters_s_length); + const f_string_static_t controller_path_s = macro_f_string_static_t_initialize2(CONTROLLER_path_s, 0, CONTROLLER_path_s_length); + const f_string_static_t controller_pause_s = macro_f_string_static_t_initialize2(CONTROLLER_pause_s, 0, CONTROLLER_pause_s_length); + const f_string_static_t controller_payload_type_s = macro_f_string_static_t_initialize2(CONTROLLER_payload_type_s, 0, CONTROLLER_payload_type_s_length); + const f_string_static_t controller_pid_s = macro_f_string_static_t_initialize2(CONTROLLER_pid_s, 0, CONTROLLER_pid_s_length); + const f_string_static_t controller_pid_file_s = macro_f_string_static_t_initialize2(CONTROLLER_pid_file_s, 0, CONTROLLER_pid_file_s_length); + const f_string_static_t controller_processor_s = macro_f_string_static_t_initialize2(CONTROLLER_processor_s, 0, CONTROLLER_processor_s_length); + const f_string_static_t controller_program_s = macro_f_string_static_t_initialize2(CONTROLLER_program_s, 0, CONTROLLER_program_s_length); + const f_string_static_t controller_ready_s = macro_f_string_static_t_initialize2(CONTROLLER_ready_s, 0, CONTROLLER_ready_s_length); + const f_string_static_t controller_reload_s = macro_f_string_static_t_initialize2(CONTROLLER_reload_s, 0, CONTROLLER_reload_s_length); + const f_string_static_t controller_require_s = macro_f_string_static_t_initialize2(CONTROLLER_require_s, 0, CONTROLLER_require_s_length); + const f_string_static_t controller_required_s = macro_f_string_static_t_initialize2(CONTROLLER_required_s, 0, CONTROLLER_required_s_length); + const f_string_static_t controller_rerun_s = macro_f_string_static_t_initialize2(CONTROLLER_rerun_s, 0, CONTROLLER_rerun_s_length); + const f_string_static_t controller_reset_s = macro_f_string_static_t_initialize2(CONTROLLER_reset_s, 0, CONTROLLER_reset_s_length); + const f_string_static_t controller_restart_s = macro_f_string_static_t_initialize2(CONTROLLER_restart_s, 0, CONTROLLER_restart_s_length); + const f_string_static_t controller_resume_s = macro_f_string_static_t_initialize2(CONTROLLER_resume_s, 0, CONTROLLER_resume_s_length); + const f_string_static_t controller_round_robin_s = macro_f_string_static_t_initialize2(CONTROLLER_round_robin_s, 0, CONTROLLER_round_robin_s_length); + const f_string_static_t controller_rss_s = macro_f_string_static_t_initialize2(CONTROLLER_rss_s, 0, CONTROLLER_rss_s_length); + const f_string_static_t controller_rtprio_s = macro_f_string_static_t_initialize2(CONTROLLER_rtprio_s, 0, CONTROLLER_rtprio_s_length); + const f_string_static_t controller_rttime_s = macro_f_string_static_t_initialize2(CONTROLLER_rttime_s, 0, CONTROLLER_rttime_s_length); + const f_string_static_t controller_rule_s = macro_f_string_static_t_initialize2(CONTROLLER_rule_s, 0, CONTROLLER_rule_s_length); + const f_string_static_t controller_rules_s = macro_f_string_static_t_initialize2(CONTROLLER_rules_s, 0, CONTROLLER_rules_s_length); + const f_string_static_t controller_same_s = macro_f_string_static_t_initialize2(CONTROLLER_same_s, 0, CONTROLLER_same_s_length); + const f_string_static_t controller_scheduler_s = macro_f_string_static_t_initialize2(CONTROLLER_scheduler_s, 0, CONTROLLER_scheduler_s_length); + const f_string_static_t controller_script_s = macro_f_string_static_t_initialize2(CONTROLLER_script_s, 0, CONTROLLER_script_s_length); + const f_string_static_t controller_service_s = macro_f_string_static_t_initialize2(CONTROLLER_service_s, 0, CONTROLLER_service_s_length); + const f_string_static_t controller_setting_s = macro_f_string_static_t_initialize2(CONTROLLER_setting_s, 0, CONTROLLER_setting_s_length); + const f_string_static_t controller_session_s = macro_f_string_static_t_initialize2(CONTROLLER_session_s, 0, CONTROLLER_session_s_length); + const f_string_static_t controller_session_new_s = macro_f_string_static_t_initialize2(CONTROLLER_session_new_s, 0, CONTROLLER_session_new_s_length); + const f_string_static_t controller_session_same_s = macro_f_string_static_t_initialize2(CONTROLLER_session_same_s, 0, CONTROLLER_session_same_s_length); + const f_string_static_t controller_show_s = macro_f_string_static_t_initialize2(CONTROLLER_show_s, 0, CONTROLLER_show_s_length); + const f_string_static_t controller_sigpending_s = macro_f_string_static_t_initialize2(CONTROLLER_sigpending_s, 0, CONTROLLER_sigpending_s_length); + const f_string_static_t controller_stack_s = macro_f_string_static_t_initialize2(CONTROLLER_stack_s, 0, CONTROLLER_stack_s_length); + const f_string_static_t controller_start_s = macro_f_string_static_t_initialize2(CONTROLLER_start_s, 0, CONTROLLER_start_s_length); + const f_string_static_t controller_status_s = macro_f_string_static_t_initialize2(CONTROLLER_status_s, 0, CONTROLLER_status_s_length); + const f_string_static_t controller_stop_s = macro_f_string_static_t_initialize2(CONTROLLER_stop_s, 0, CONTROLLER_stop_s_length); + const f_string_static_t controller_succeed_s = macro_f_string_static_t_initialize2(CONTROLLER_succeed_s, 0, CONTROLLER_succeed_s_length); + const f_string_static_t controller_success_s = macro_f_string_static_t_initialize2(CONTROLLER_success_s, 0, CONTROLLER_success_s_length); + const f_string_static_t controller_synchronous_s = macro_f_string_static_t_initialize2(CONTROLLER_synchronous_s, 0, CONTROLLER_synchronous_s_length); + const f_string_static_t controller_thaw_s = macro_f_string_static_t_initialize2(CONTROLLER_thaw_s, 0, CONTROLLER_thaw_s_length); + const f_string_static_t controller_timeout_s = macro_f_string_static_t_initialize2(CONTROLLER_timeout_s, 0, CONTROLLER_timeout_s_length); + const f_string_static_t controller_type_s = macro_f_string_static_t_initialize2(CONTROLLER_type_s, 0, CONTROLLER_type_s_length); + const f_string_static_t controller_use_s = macro_f_string_static_t_initialize2(CONTROLLER_use_s, 0, CONTROLLER_use_s_length); + const f_string_static_t controller_user_s = macro_f_string_static_t_initialize2(CONTROLLER_user_s, 0, CONTROLLER_user_s_length); + const f_string_static_t controller_utility_s = macro_f_string_static_t_initialize2(CONTROLLER_utility_s, 0, CONTROLLER_utility_s_length); + const f_string_static_t controller_value_s = macro_f_string_static_t_initialize2(CONTROLLER_value_s, 0, CONTROLLER_value_s_length); + const f_string_static_t controller_wait_s = macro_f_string_static_t_initialize2(CONTROLLER_wait_s, 0, CONTROLLER_wait_s_length); + const f_string_static_t controller_want_s = macro_f_string_static_t_initialize2(CONTROLLER_want_s, 0, CONTROLLER_want_s_length); + const f_string_static_t controller_wish_s = macro_f_string_static_t_initialize2(CONTROLLER_wish_s, 0, CONTROLLER_wish_s_length); + const f_string_static_t controller_with_s = macro_f_string_static_t_initialize2(CONTROLLER_with_s, 0, CONTROLLER_with_s_length); + const f_string_static_t controller_yes_s = macro_f_string_static_t_initialize2(CONTROLLER_yes_s, 0, CONTROLLER_yes_s_length); #endif // _di_controller_string_s_ #ifdef __cplusplus diff --git a/level_3/controller/c/common/private-common.h b/level_3/controller/c/common/private-common.h index 21fb146..44ec719 100644 --- a/level_3/controller/c/common/private-common.h +++ b/level_3/controller/c/common/private-common.h @@ -269,124 +269,124 @@ extern "C" { #define controller_with_s_length 4 #define controller_yes_s_length 3 - extern const f_string_t controller_action_s; - extern const f_string_t controller_actions_s; - extern const f_string_t controller_affinity_s; - extern const f_string_t controller_as_s; - extern const f_string_t controller_asynchronous_s; - extern const f_string_t controller_bash_s; - extern const f_string_t controller_batch_s; - extern const f_string_t controller_capability_s; - extern const f_string_t controller_cgroup_s; - extern const f_string_t controller_create_s; - extern const f_string_t controller_command_s; - extern const f_string_t controller_consider_s; - extern const f_string_t controller_control_s; - extern const f_string_t controller_control_group_s; - extern const f_string_t controller_control_mode_s; - extern const f_string_t controller_control_user_s; - extern const f_string_t controller_core_s; - extern const f_string_t controller_cpu_s; - extern const f_string_t controller_data_s; - extern const f_string_t controller_deadline_s; - extern const f_string_t controller_default_s; - extern const f_string_t controller_define_s; - extern const f_string_t controller_delay_s; - extern const f_string_t controller_disable_s; - extern const f_string_t controller_entry_s; - extern const f_string_t controller_entries_s; - extern const f_string_t controller_environment_s; - extern const f_string_t controller_error_s; - extern const f_string_t controller_existing_s; - extern const f_string_t controller_execute_s; - extern const f_string_t controller_exit_s; - extern const f_string_t controller_exits_s; - extern const f_string_t controller_fail_s; - extern const f_string_t controller_failsafe_s; - extern const f_string_t controller_failure_s; - extern const f_string_t controller_fifo_s; - extern const f_string_t controller_freeze_s; - extern const f_string_t controller_fsize_s; - extern const f_string_t controller_full_path_s; - extern const f_string_t controller_group_s; - extern const f_string_t controller_groups_s; - extern const f_string_t controller_how_s; - extern const f_string_t controller_idle_s; - extern const f_string_t controller_init_s; - extern const f_string_t controller_item_s; - extern const f_string_t controller_kill_s; - extern const f_string_t controller_length_s; - extern const f_string_t controller_limit_s; - extern const f_string_t controller_locks_s; - extern const f_string_t controller_main_s; - extern const f_string_t controller_max_s; - extern const f_string_t controller_memlock_s; - extern const f_string_t controller_method_s; - extern const f_string_t controller_mode_s; - extern const f_string_t controller_msgqueue_s; - extern const f_string_t controller_name_s; - extern const f_string_t controller_need_s; - extern const f_string_t controller_new_s; - extern const f_string_t controller_nice_s; - extern const f_string_t controller_no_s; - extern const f_string_t controller_nofile_s; - extern const f_string_t controller_normal_s; - extern const f_string_t controller_nproc_s; - extern const f_string_t controller_on_s; - extern const f_string_t controller_optional_s; - extern const f_string_t controller_other_s; - extern const f_string_t controller_parameter_s; - extern const f_string_t controller_parameters_s; - extern const f_string_t controller_path_s; - extern const f_string_t controller_pause_s; - extern const f_string_t controller_payload_type_s; - extern const f_string_t controller_pid_s; - extern const f_string_t controller_pid_file_s; - extern const f_string_t controller_processor_s; - extern const f_string_t controller_program_s; - extern const f_string_t controller_ready_s; - extern const f_string_t controller_reload_s; - extern const f_string_t controller_require_s; - extern const f_string_t controller_required_s; - extern const f_string_t controller_rerun_s; - extern const f_string_t controller_reset_s; - extern const f_string_t controller_restart_s; - extern const f_string_t controller_resume_s; - extern const f_string_t controller_round_robin_s; - extern const f_string_t controller_rss_s; - extern const f_string_t controller_rtprio_s; - extern const f_string_t controller_rttime_s; - extern const f_string_t controller_rule_s; - extern const f_string_t controller_rules_s; - extern const f_string_t controller_same_s; - extern const f_string_t controller_scheduler_s; - extern const f_string_t controller_script_s; - extern const f_string_t controller_service_s; - extern const f_string_t controller_session_s; - extern const f_string_t controller_session_new_s; - extern const f_string_t controller_session_same_s; - extern const f_string_t controller_setting_s; - extern const f_string_t controller_show_s; - extern const f_string_t controller_sigpending_s; - extern const f_string_t controller_stack_s; - extern const f_string_t controller_start_s; - extern const f_string_t controller_status_s; - extern const f_string_t controller_stop_s; - extern const f_string_t controller_succeed_s; - extern const f_string_t controller_success_s; - extern const f_string_t controller_synchronous_s; - extern const f_string_t controller_thaw_s; - extern const f_string_t controller_timeout_s; - extern const f_string_t controller_type_s; - extern const f_string_t controller_use_s; - extern const f_string_t controller_user_s; - extern const f_string_t controller_utility_s; - extern const f_string_t controller_value_s; - extern const f_string_t controller_wait_s; - extern const f_string_t controller_want_s; - extern const f_string_t controller_wish_s; - extern const f_string_t controller_with_s; - extern const f_string_t controller_yes_s; + extern const f_string_static_t controller_action_s; + extern const f_string_static_t controller_actions_s; + extern const f_string_static_t controller_affinity_s; + extern const f_string_static_t controller_as_s; + extern const f_string_static_t controller_asynchronous_s; + extern const f_string_static_t controller_bash_s; + extern const f_string_static_t controller_batch_s; + extern const f_string_static_t controller_capability_s; + extern const f_string_static_t controller_cgroup_s; + extern const f_string_static_t controller_create_s; + extern const f_string_static_t controller_command_s; + extern const f_string_static_t controller_consider_s; + extern const f_string_static_t controller_control_s; + extern const f_string_static_t controller_control_group_s; + extern const f_string_static_t controller_control_mode_s; + extern const f_string_static_t controller_control_user_s; + extern const f_string_static_t controller_core_s; + extern const f_string_static_t controller_cpu_s; + extern const f_string_static_t controller_data_s; + extern const f_string_static_t controller_deadline_s; + extern const f_string_static_t controller_default_s; + extern const f_string_static_t controller_define_s; + extern const f_string_static_t controller_delay_s; + extern const f_string_static_t controller_disable_s; + extern const f_string_static_t controller_entry_s; + extern const f_string_static_t controller_entries_s; + extern const f_string_static_t controller_environment_s; + extern const f_string_static_t controller_error_s; + extern const f_string_static_t controller_existing_s; + extern const f_string_static_t controller_execute_s; + extern const f_string_static_t controller_exit_s; + extern const f_string_static_t controller_exits_s; + extern const f_string_static_t controller_fail_s; + extern const f_string_static_t controller_failsafe_s; + extern const f_string_static_t controller_failure_s; + extern const f_string_static_t controller_fifo_s; + extern const f_string_static_t controller_freeze_s; + extern const f_string_static_t controller_fsize_s; + extern const f_string_static_t controller_full_path_s; + extern const f_string_static_t controller_group_s; + extern const f_string_static_t controller_groups_s; + extern const f_string_static_t controller_how_s; + extern const f_string_static_t controller_idle_s; + extern const f_string_static_t controller_init_s; + extern const f_string_static_t controller_item_s; + extern const f_string_static_t controller_kill_s; + extern const f_string_static_t controller_length_s; + extern const f_string_static_t controller_limit_s; + extern const f_string_static_t controller_locks_s; + extern const f_string_static_t controller_main_s; + extern const f_string_static_t controller_max_s; + extern const f_string_static_t controller_memlock_s; + extern const f_string_static_t controller_method_s; + extern const f_string_static_t controller_mode_s; + extern const f_string_static_t controller_msgqueue_s; + extern const f_string_static_t controller_name_s; + extern const f_string_static_t controller_need_s; + extern const f_string_static_t controller_new_s; + extern const f_string_static_t controller_nice_s; + extern const f_string_static_t controller_no_s; + extern const f_string_static_t controller_nofile_s; + extern const f_string_static_t controller_normal_s; + extern const f_string_static_t controller_nproc_s; + extern const f_string_static_t controller_on_s; + extern const f_string_static_t controller_optional_s; + extern const f_string_static_t controller_other_s; + extern const f_string_static_t controller_parameter_s; + extern const f_string_static_t controller_parameters_s; + extern const f_string_static_t controller_path_s; + extern const f_string_static_t controller_pause_s; + extern const f_string_static_t controller_payload_type_s; + extern const f_string_static_t controller_pid_s; + extern const f_string_static_t controller_pid_file_s; + extern const f_string_static_t controller_processor_s; + extern const f_string_static_t controller_program_s; + extern const f_string_static_t controller_ready_s; + extern const f_string_static_t controller_reload_s; + extern const f_string_static_t controller_require_s; + extern const f_string_static_t controller_required_s; + extern const f_string_static_t controller_rerun_s; + extern const f_string_static_t controller_reset_s; + extern const f_string_static_t controller_restart_s; + extern const f_string_static_t controller_resume_s; + extern const f_string_static_t controller_round_robin_s; + extern const f_string_static_t controller_rss_s; + extern const f_string_static_t controller_rtprio_s; + extern const f_string_static_t controller_rttime_s; + extern const f_string_static_t controller_rule_s; + extern const f_string_static_t controller_rules_s; + extern const f_string_static_t controller_same_s; + extern const f_string_static_t controller_scheduler_s; + extern const f_string_static_t controller_script_s; + extern const f_string_static_t controller_service_s; + extern const f_string_static_t controller_session_s; + extern const f_string_static_t controller_session_new_s; + extern const f_string_static_t controller_session_same_s; + extern const f_string_static_t controller_setting_s; + extern const f_string_static_t controller_show_s; + extern const f_string_static_t controller_sigpending_s; + extern const f_string_static_t controller_stack_s; + extern const f_string_static_t controller_start_s; + extern const f_string_static_t controller_status_s; + extern const f_string_static_t controller_stop_s; + extern const f_string_static_t controller_succeed_s; + extern const f_string_static_t controller_success_s; + extern const f_string_static_t controller_synchronous_s; + extern const f_string_static_t controller_thaw_s; + extern const f_string_static_t controller_timeout_s; + extern const f_string_static_t controller_type_s; + extern const f_string_static_t controller_use_s; + extern const f_string_static_t controller_user_s; + extern const f_string_static_t controller_utility_s; + extern const f_string_static_t controller_value_s; + extern const f_string_static_t controller_wait_s; + extern const f_string_static_t controller_want_s; + extern const f_string_static_t controller_wish_s; + extern const f_string_static_t controller_with_s; + extern const f_string_static_t controller_yes_s; #endif // _di_controller_string_s_ /** diff --git a/level_3/controller/c/controller/controller.c b/level_3/controller/c/controller/controller.c index e9ecc0d..fe892a9 100644 --- a/level_3/controller/c/controller/controller.c +++ b/level_3/controller/c/controller/controller.c @@ -26,13 +26,14 @@ extern "C" { #ifndef _di_controller_defines_ const f_string_static_t controller_default_program_script_s = macro_f_string_static_t_initialize2(CONTROLLER_default_program_script_s, 0, CONTROLLER_default_program_script_s_length); - const f_string_static_t controller_name_socket_s = macro_f_string_static_t_initialize2(CONTROLLER_name_socket_s, 0, CONTROLLER_name_socket_s_length); const f_string_static_t controller_path_pid_s = macro_f_string_static_t_initialize2(CONTROLLER_path_pid_s, 0, CONTROLLER_path_pid_s_length); const f_string_static_t controller_path_pid_init_s = macro_f_string_static_t_initialize2(CONTROLLER_path_pid_init_s, 0, CONTROLLER_path_pid_init_s_length); - const f_string_static_t controller_path_pid_suffix_s = macro_f_string_static_t_initialize2(CONTROLLER_path_pid_s, 0, CONTROLLER_path_pid_s_length); + const f_string_static_t controller_path_pid_prefix_s = macro_f_string_static_t_initialize2(CONTROLLER_path_pid_prefix_s, 0, CONTROLLER_path_pid_prefix_s_length); + const f_string_static_t controller_path_pid_suffix_s = macro_f_string_static_t_initialize2(CONTROLLER_path_pid_suffix_s, 0, CONTROLLER_path_pid_suffix_s_length); const f_string_static_t controller_path_settings_s = macro_f_string_static_t_initialize2(CONTROLLER_path_settings_s, 0, CONTROLLER_path_settings_s_length); const f_string_static_t controller_path_settings_init_s = macro_f_string_static_t_initialize2(CONTROLLER_path_settings_init_s, 0, CONTROLLER_path_settings_init_s_length); const f_string_static_t controller_path_socket_s = macro_f_string_static_t_initialize2(CONTROLLER_path_socket_s, 0, CONTROLLER_path_socket_s_length); + const f_string_static_t controller_path_socket_init_s = macro_f_string_static_t_initialize2(CONTROLLER_path_socket_init_s, 0, CONTROLLER_path_socket_s_length); const f_string_static_t controller_path_socket_prefix_s = macro_f_string_static_t_initialize2(CONTROLLER_path_socket_prefix_s, 0, CONTROLLER_path_socket_prefix_s_length); const f_string_static_t controller_path_socket_suffix_s = macro_f_string_static_t_initialize2(CONTROLLER_path_socket_suffix_s, 0, CONTROLLER_path_socket_suffix_s_length); @@ -43,6 +44,7 @@ extern "C" { const f_string_static_t controller_short_pid_s = macro_f_string_static_t_initialize2(CONTROLLER_short_pid_s, 0, CONTROLLER_short_pid_s_length); const f_string_static_t controller_short_settings_s = macro_f_string_static_t_initialize2(CONTROLLER_short_settings_s, 0, CONTROLLER_short_settings_s_length); const f_string_static_t controller_short_simulate_s = macro_f_string_static_t_initialize2(CONTROLLER_short_simulate_s, 0, CONTROLLER_short_simulate_s_length); + const f_string_static_t controller_short_socket_s = macro_f_string_static_t_initialize2(CONTROLLER_short_socket_s, 0, CONTROLLER_short_socket_s_length); const f_string_static_t controller_short_uninterruptible_s = macro_f_string_static_t_initialize2(CONTROLLER_short_uninterruptible_s, 0, CONTROLLER_short_uninterruptible_s_length); const f_string_static_t controller_short_validate_s = macro_f_string_static_t_initialize2(CONTROLLER_short_validate_s, 0, CONTROLLER_short_validate_s_length); @@ -53,6 +55,7 @@ extern "C" { const f_string_static_t controller_long_pid_s = macro_f_string_static_t_initialize2(CONTROLLER_long_pid_s, 0, CONTROLLER_long_pid_s_length); const f_string_static_t controller_long_settings_s = macro_f_string_static_t_initialize2(CONTROLLER_long_settings_s, 0, CONTROLLER_long_settings_s_length); const f_string_static_t controller_long_simulate_s = macro_f_string_static_t_initialize2(CONTROLLER_long_simulate_s, 0, CONTROLLER_long_simulate_s_length); + const f_string_static_t controller_long_socket_s = macro_f_string_static_t_initialize2(CONTROLLER_long_socket_s, 0, CONTROLLER_long_socket_s_length); const f_string_static_t controller_long_uninterruptible_s = macro_f_string_static_t_initialize2(CONTROLLER_long_uninterruptible_s, 0, CONTROLLER_long_uninterruptible_s_length); const f_string_static_t controller_long_validate_s = macro_f_string_static_t_initialize2(CONTROLLER_long_validate_s, 0, CONTROLLER_long_validate_s_length); #endif // _di_controller_defines_ @@ -62,38 +65,39 @@ extern "C" { controller_lock_print(main->output.to, 0); - fll_program_print_help_header(main->output.to, main->context, main->program_name_long.string, controller_program_version_s.string); + fll_program_print_help_header(main->output.to, main->context, main->program_name_long->string, controller_program_version_s.string); - fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_help_s, f_console_standard_long_help_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print this help message."); - fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_dark_s, f_console_standard_long_dark_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_light_s, f_console_standard_long_light_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, "Do not main->output.to in color."); - fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Decrease verbosity beyond normal main->output.to."); - fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_normal_s, f_console_standard_long_normal_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Set verbosity to normal main->output.to."); - fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Increase verbosity beyond normal main->output.to."); - fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_debug_s, f_console_standard_long_debug_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Enable debugging, inceasing verbosity beyond normal main->output.to."); - fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_version_s, f_console_standard_long_version_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Print only the version number."); + fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print this help message."); + fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, "Do not main->output.to in color."); + fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Decrease verbosity beyond normal main->output.to."); + fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Set verbosity to normal main->output.to."); + fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Increase verbosity beyond normal main->output.to."); + fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Enable debugging, inceasing verbosity beyond normal main->output.to."); + fll_program_print_help_option(main->output.to, main->context, f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Print only the version number."); - f_print_character(f_string_eol_s[0], main->output.to.stream); + f_print_dynamic(f_string_eol_s, main->output.to.stream); - fll_program_print_help_option(main->output.to, main->context, controller_short_cgroup_s.string, controller_long_cgroup_s.string, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Specify a custom control group file path, such as '" F_control_group_path_system_prefix_s F_control_group_path_system_default_s "'."); - fll_program_print_help_option(main->output.to, main->context, controller_short_daemon_s.string, controller_long_daemon_s.string, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Run in daemon only mode (do not process the entry)."); - fll_program_print_help_option(main->output.to, main->context, controller_short_init_s.string, controller_long_init_s.string, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " The program will run as an init replacement."); - fll_program_print_help_option(main->output.to, main->context, controller_short_interruptible_s.string, controller_long_interruptible_s.string, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Designate that this program can be interrupted by a signal."); - fll_program_print_help_option(main->output.to, main->context, controller_short_pid_s.string, controller_long_pid_s.string, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Specify a custom pid file path, such as '" CONTROLLER_path_pid_s CONTROLLER_default_s CONTROLLER_path_pid_suffix_s "'."); - fll_program_print_help_option(main->output.to, main->context, controller_short_settings_s.string, controller_long_settings_s.string, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Specify a custom settings path, such as '" CONTROLLER_path_settings_s "'."); - fll_program_print_help_option(main->output.to, main->context, controller_short_simulate_s.string, controller_long_simulate_s.string, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Run as a simulation."); - fll_program_print_help_option(main->output.to, main->context, controller_short_uninterruptible_s.string, controller_long_uninterruptible_s.string, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Designate that this program cannot be interrupted by a signal."); - fll_program_print_help_option(main->output.to, main->context, controller_short_validate_s.string, controller_long_validate_s.string, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Validate the settings (entry and rules) without running (does not simulate)."); + fll_program_print_help_option(main->output.to, main->context, controller_short_cgroup_s.string, controller_long_cgroup_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Specify a custom control group file path, such as '" F_control_group_path_system_prefix_s F_control_group_path_system_default_s "'."); + fll_program_print_help_option(main->output.to, main->context, controller_short_daemon_s.string, controller_long_daemon_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Run in daemon only mode (do not process the entry)."); + fll_program_print_help_option(main->output.to, main->context, controller_short_init_s.string, controller_long_init_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " The program will run as an init replacement."); + fll_program_print_help_option(main->output.to, main->context, controller_short_interruptible_s.string, controller_long_interruptible_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Designate that this program can be interrupted by a signal."); + fll_program_print_help_option(main->output.to, main->context, controller_short_pid_s.string, controller_long_pid_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Specify a custom pid file path, such as '" CONTROLLER_path_pid_s CONTROLLER_default_s CONTROLLER_path_pid_suffix_s "'."); + fll_program_print_help_option(main->output.to, main->context, controller_short_settings_s.string, controller_long_settings_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Specify a custom settings path, such as '" CONTROLLER_path_settings_s "'."); + fll_program_print_help_option(main->output.to, main->context, controller_short_simulate_s.string, controller_long_simulate_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Run as a simulation."); + fll_program_print_help_option(main->output.to, main->context, controller_short_socket_s.string, controller_long_socket_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Specify a custom socket file path, such as '" CONTROLLER_path_socket_s CONTROLLER_default_s CONTROLLER_path_socket_suffix_s "'."); + fll_program_print_help_option(main->output.to, main->context, controller_short_uninterruptible_s.string, controller_long_uninterruptible_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "Designate that this program cannot be interrupted by a signal."); + fll_program_print_help_option(main->output.to, main->context, controller_short_validate_s.string, controller_long_validate_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Validate the settings (entry and rules) without running (does not simulate)."); - fll_program_print_help_usage(main->output.to, main->context, main->program_name.string, "entry"); + fll_program_print_help_usage(main->output.to, main->context, main->program_name->string, "entry"); - fl_print_format(" When both the %[%s%q%] parameter and the", main->output.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, controller_long_simulate_s, main->context.set.notable); - fl_print_format(" %[%s%q%] parameter are specified, then additional information on each would be executed rule is printed but no simulation is performed.%c%c", main->output.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, controller_long_validate_s, main->context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" When both the %[%q%q%] parameter and the", main->output.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, controller_long_simulate_s, main->context.set.notable); + fl_print_format(" %[%q%q%] parameter are specified, then additional information on each would be executed rule is printed but no simulation is performed.%q%q", main->output.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, controller_long_validate_s, main->context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" The default interrupt behavior is to operate as if the %[%s%q%] parameter is passed.%c%c", main->output.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, main->setting_default.used ? controller_long_uninterruptible_s : controller_long_interruptible_s, main->context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The default interrupt behavior is to operate as if the %[%q%q%] parameter is passed.%q%q", main->output.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, main->setting_default.used ? controller_long_uninterruptible_s : controller_long_interruptible_s, main->context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" Specify an empty string for the %[%s%q%] parameter to disable pid file creation for this program.%c%c", main->output.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, controller_long_pid_s, main->context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" Specify an empty string for the %[%q%q%] parameter to disable pid file creation for this program.%q%q", main->output.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, controller_long_pid_s, main->context.set.notable, f_string_eol_s, f_string_eol_s); controller_unlock_print_flush(main->output.to, 0); @@ -138,7 +142,7 @@ extern "C" { if (F_status_is_error(status)) { if (main->error.verbosity != f_console_verbosity_quiet_e) { fll_error_print(main->error, F_status_set_fine(status), "fll_program_parameter_process", F_true); - fll_print_terminated(f_string_eol_s, main->error.to.stream); + fll_print_dynamic(f_string_eol_s, main->error.to.stream); } controller_main_delete(main); @@ -253,9 +257,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(main->error.to, 0); - fl_print_format("%c%[%SThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix ? main->error.prefix : f_string_empty_s, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, controller_long_settings_s, main->context.set.notable); - fl_print_format("%[' is specified, but no value is given.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%SThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix ? main->error.prefix : f_string_empty_s, main->error.context); + fl_print_format("%[%q%q%]", main->error.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, controller_long_settings_s, main->context.set.notable); + fl_print_format("%[' is specified, but no value is given.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); controller_unlock_print_flush(main->error.to, 0); } @@ -275,8 +279,8 @@ extern "C" { if (main->parameters[controller_parameter_init_e].result == f_console_result_found_e && !main->as_init) { status = f_string_dynamic_append(controller_path_settings_init_s, &setting.path_setting); } - else if (main->setting_default.used) { - status = f_string_dynamic_append(main->setting_default, &setting.path_setting); + else if (main->setting_default->used) { + status = f_string_dynamic_append(*main->setting_default, &setting.path_setting); } else { status = f_string_dynamic_append(controller_path_settings_s, &setting.path_setting); @@ -292,9 +296,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(main->error.to, 0); - fl_print_format("%c%[%SThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix ? main->error.prefix : f_string_empty_s, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, controller_long_pid_s, main->context.set.notable); - fl_print_format("%[' is specified, but no value is given.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%SThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix ? main->error.prefix : f_string_empty_s, main->error.context); + fl_print_format("%[%q%q%]", main->error.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, controller_long_pid_s, main->context.set.notable); + fl_print_format("%[' is specified, but no value is given.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); controller_unlock_print_flush(main->error.to, 0); } @@ -322,7 +326,15 @@ extern "C" { status = f_string_dynamic_append(controller_path_pid_init_s, &setting.path_pid); } else { - status = f_string_dynamic_append(main->path_pid, &setting.path_pid); + status = f_string_dynamic_append(main->default_path_pid, &setting.path_pid); + } + + if (F_status_is_error_not(status)) { + status = f_string_dynamic_append(f_path_separator_s, &setting.path_pid); + } + + if (F_status_is_error_not(status)) { + status = f_string_dynamic_append(controller_path_pid_prefix_s, &setting.path_pid); } if (F_status_is_error_not(status)) { @@ -343,9 +355,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(main->error.to, 0); - fl_print_format("%c%[%SThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix ? main->error.prefix : f_string_empty_s, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, controller_long_cgroup_s, main->context.set.notable); - fl_print_format("%[' is specified, but no value is given.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%SThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix ? main->error.prefix : f_string_empty_s, main->error.context); + fl_print_format("%[%q%q%]", main->error.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, controller_long_cgroup_s, main->context.set.notable); + fl_print_format("%[' is specified, but no value is given.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); controller_unlock_print_flush(main->error.to, 0); } @@ -380,9 +392,9 @@ extern "C" { if (main->warning.verbosity == f_console_verbosity_debug_e) { controller_lock_print(main->warning.to, 0); - fl_print_format("%c%[%SThe parameter '%]", main->warning.to.stream, f_string_eol_s[0], main->warning.context, main->warning.prefix ? main->warning.prefix : f_string_empty_s, main->warning.context); - fl_print_format("%[%s%s%]", main->warning.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, controller_long_cgroup_s, main->context.set.notable); - fl_print_format("%[' must be a file directory path but instead is an empty string, falling back to the default.%]%c", main->warning.to.stream, main->warning.context, main->warning.context, f_string_eol_s[0]); + fl_print_format("%q%[%SThe parameter '%]", main->warning.to.stream, f_string_eol_s, main->warning.context, main->warning.prefix ? main->warning.prefix : f_string_empty_s, main->warning.context); + fl_print_format("%[%q%q%]", main->warning.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, controller_long_cgroup_s, main->context.set.notable); + fl_print_format("%[' must be a file directory path but instead is an empty string, falling back to the default.%]%q", main->warning.to.stream, main->warning.context, main->warning.context, f_string_eol_s); controller_unlock_print_flush(main->warning.to, 0); } @@ -395,10 +407,10 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(main->error.to, 0); - fl_print_format("%c%[%SThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix ? main->error.prefix : f_string_empty_s, main->error.context); + fl_print_format("%q%[%SThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix ? main->error.prefix : f_string_empty_s, main->error.context); fl_print_format("%[' must not be specified with the parameter '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, controller_long_daemon_s, main->context.set.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%q%]", main->error.to.stream, main->context.set.notable, f_console_symbol_long_enable_s, controller_long_daemon_s, main->context.set.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); controller_unlock_print_flush(main->error.to, 0); } @@ -481,7 +493,7 @@ extern "C" { fflush(main->output.to.stream); } - fll_print_terminated(f_string_eol_s, main->output.to.stream); + fll_print_dynamic(f_string_eol_s, main->output.to.stream); } if (status != F_child && setting.pid_created) { @@ -491,11 +503,11 @@ extern "C" { if (F_status_set_fine(status_delete) == F_number_not) { controller_lock_print(main->warning.to, 0); - fl_print_format("%c%[%SThe pid file '%]", main->warning.to.stream, f_string_eol_s[0], main->warning.context, main->warning.prefix ? main->warning.prefix : f_string_empty_s, main->warning.context); + fl_print_format("%q%[%SThe pid file '%]", main->warning.to.stream, f_string_eol_s, main->warning.context, main->warning.prefix ? main->warning.prefix : f_string_empty_s, main->warning.context); fl_print_format("%[%Q%]", main->warning.to.stream, main->warning.notable, setting.path_pid, main->warning.notable); fl_print_format("%[' must not be specified with the parameter '%]", main->warning.to.stream, main->warning.context, main->warning.context); fl_print_format("%[%i%]", main->warning.to.stream, main->warning.notable, main->pid, main->warning.notable); - fl_print_format("%[' doesn't contain the expected number, not deleting file.%]%c", main->warning.to.stream, main->warning.context, main->warning.context, f_string_eol_s[0]); + fl_print_format("%[' doesn't contain the expected number, not deleting file.%]%q", main->warning.to.stream, main->warning.context, main->warning.context, f_string_eol_s); controller_unlock_print_flush(main->warning.to, 0); } diff --git a/level_3/controller/c/controller/controller.h b/level_3/controller/c/controller/controller.h index 87fb5f8..2666ea4 100644 --- a/level_3/controller/c/controller/controller.h +++ b/level_3/controller/c/controller/controller.h @@ -136,19 +136,63 @@ extern "C" { #ifndef _di_controller_defines_ + // The pid path is a system-specific path and needs to be more easily contolled at compile time. + #if defined(_override_controller_path_pid_) && defined(_override_controller_path_pid_length_) + #define CONTROLLER_path_pid_s _override_controller_path_pid_ + #define CONTROLLER_path_pid_s_length _override_controller_path_pid_length_ + #else + #define CONTROLLER_path_pid_s "controller/run" + #define CONTROLLER_path_pid_s_length 14 + #endif // defined(_override_controller_path_pid_) && defined(_override_controller_path_pid_length_) + // The init pid path is a system-specific path and needs to be more easily contolled at compile time. #if defined(_override_controller_path_pid_init_) && defined(_override_controller_path_pid_init_length_) #define CONTROLLER_path_pid_init_s _override_controller_path_pid_init_ #define CONTROLLER_path_pid_init_s_length _override_controller_path_pid_init_length_ #elif defined(_controller_as_init_) - #define CONTROLLER_path_pid_init_s "/var/run/init/init-" - #define CONTROLLER_path_pid_init_s_length 19 + #define CONTROLLER_path_pid_init_s "/var/run/init" + #define CONTROLLER_path_pid_init_s_length 13 #else - #define CONTROLLER_path_pid_init_s "/var/run/controller/controller-" - #define CONTROLLER_path_pid_init_s_length 31 + #define CONTROLLER_path_pid_init_s "/var/run/controller" + #define CONTROLLER_path_pid_init_s_length 19 #endif // defined(_override_controller_path_pid_init_) && defined(_override_controller_path_pid_init_length_) - // The settings path is a system-specific path and needs to be more easily contolled at compile time. + // The pid prefix is a system-specific path part and needs to be more easily contolled at compile time. + #if defined(_override_controller_path_pid_prefix_) && defined(_override_controller_path_pid_prefix_length_) + #define CONTROLLER_path_pid_prefix_s _override_controller_path_pid_prefix_ + + #define CONTROLLER_path_pid_prefix_s_length _override_controller_path_pid_prefix_length_ + #elif defined(_controller_as_init_) + #define CONTROLLER_path_pid_prefix_s "init-" + + #define CONTROLLER_path_pid_prefix_s_length 5 + #else + #define CONTROLLER_path_pid_prefix_s "" + + #define CONTROLLER_path_pid_prefix_s_length 0 + #endif // defined(_override_controller_name_pid_prefix_) && defined(_override_controller_name_pid_prefix_length_) + + // The socket suffix path is a system-specific path part and needs to be more easily contolled at compile time. + #if defined(_override_controller_path_pid_suffix_) && defined(_override_controller_path_pid_suffix_length_) + #define CONTROLLER_path_pid_suffix_s _override_controller_path_pid_suffix_ + + #define CONTROLLER_path_pid_suffix_s_length _override_controller_path_pid_suffix_length_ + #else + #define CONTROLLER_path_pid_suffix_s ".pid" + + #define CONTROLLER_path_pid_suffix_s_length 4 + #endif // defined(_override_controller_name_pid_suffix_) && defined(_override_controller_name_pid_suffix_length_) + + // The settings path is a system-specific path part and needs to be more easily contolled at compile time. + #if defined(_override_controller_path_settings_) && defined(_override_controller_path_settings_length_) + #define CONTROLLER_path_settings_s _override_controller_path_settings_ + #define CONTROLLER_path_settings_s_length _override_controller_path_settings_length_ + #else + #define CONTROLLER_path_settings_s "controller" + #define CONTROLLER_path_settings_s_length 10 + #endif // defined(_override_controller_path_settings_) && defined(_override_controller_path_settings_length_) + + // The init settings path is a system-specific path part and needs to be more easily contolled at compile time. #if defined(_override_controller_path_settings_init_) && defined(_override_controller_path_settings_init_length_) #define CONTROLLER_path_settings_init_s _override_controller_path_settings_init_ #define CONTROLLER_path_settings_init_s_length _override_controller_path_settings_init_length_ @@ -161,32 +205,32 @@ extern "C" { #endif // defined(_override_controller_path_settings_init_) && defined(_override_controller_path_settings_init_length_) // The socket path is a system-specific path and needs to be more easily contolled at compile time. - #if defined(_override_controller_name_socket_) && defined(_override_controller_name_socket_length_) - #define CONTROLLER_name_socket_s _override_controller_name_socket_ + #if defined(_override_controller_path_socket_) && defined(_override_controller_path_socket_length_) + #define CONTROLLER_path_socket_s _override_controller_path_socket_ - #define CONTROLLER_name_socket_s_length _override_controller_name_socket_length_ + #define CONTROLLER_path_socket_s_length _override_controller_path_socket_length_ #else - #define CONTROLLER_name_socket_s "default" + #define CONTROLLER_path_socket_s "controller/run" - #define CONTROLLER_name_socket_s_length 7 - #endif // defined(_override_controller_name_socket_) && defined(_override_controller_name_socket_length_) + #define CONTROLLER_path_socket_s_length 14 + #endif // defined(_override_controller_path_socket_) && defined(_override_controller_path_socket_length_) - // The path_socket is a system-specific path and should match the path compiled into the controller program. - #if defined(_override_controller_path_socket_) && defined(_override_controller_path_socket_length_) - #define CONTROLLER_path_socket_s _override_controller_path_socket_ + // The socket path is a system-specific path and needs to be more easily contolled at compile time. + #if defined(_override_controller_path_socket_init_) && defined(_override_controller_path_socket_init_length_) + #define CONTROLLER_path_socket_init_s _override_controller_path_socket_init_ - #define CONTROLLER_path_socket_s_length _override_controller_path_socket_length_ + #define CONTROLLER_path_socket_init_s_length _override_controller_path_socket_init_length_ #elif defined(_controller_as_init_) - #define CONTROLLER_path_socket_s "/var/run/init" + #define CONTROLLER_path_socket_init_s "/var/run/init" - #define CONTROLLER_path_socket_s_length 13 + #define CONTROLLER_path_socket_init_s_length 13 #else - #define CONTROLLER_path_socket_s "/var/run/controller" + #define CONTROLLER_path_socket_init_s "/var/run/controller" - #define CONTROLLER_path_socket_s_length 19 - #endif // defined(_override_controller_path_socket_) && defined(_override_controller_path_socket_length_) + #define CONTROLLER_path_socket_init_s_length 19 + #endif // defined(_override_controller_path_socket_init_) && defined(_override_controller_path_socket_init_length_) - // The name_socket_prefix is a system-specific path and should match the path compiled into the controller program. + // The socket prefix path is a system-specific path part and needs to be more easily contolled at compile time. #if defined(_override_controller_path_socket_prefix_) && defined(_override_controller_path_socket_prefix_length_) #define CONTROLLER_path_socket_prefix_s _override_controller_path_socket_prefix_ @@ -199,9 +243,9 @@ extern "C" { #define CONTROLLER_path_socket_prefix_s "" #define CONTROLLER_path_socket_prefix_s_length 0 - #endif // defined(_override_controller_name_socket_prefix_) && defined(_override_controller_name_socket_prefix_length_) + #endif // defined(_override_controller_path_socket_prefix_) && defined(_override_controller_path_socket_prefix_length_) - // The name_socket_suffix is a system-specific path and should match the path compiled into the controller program. + // The socket suffix path is a system-specific path part and needs to be more easily contolled at compile time. #if defined(_override_controller_path_socket_suffix_) && defined(_override_controller_path_socket_suffix_length_) #define CONTROLLER_path_socket_suffix_s _override_controller_path_socket_suffix_ @@ -210,7 +254,7 @@ extern "C" { #define CONTROLLER_path_socket_suffix_s ".socket" #define CONTROLLER_path_socket_suffix_s_length 7 - #endif // defined(_override_controller_name_socket_suffix_) && defined(_override_controller_name_socket_suffix_length_) + #endif // defined(_override_controller_path_socket_suffix_) && defined(_override_controller_path_socket_suffix_length_) #if defined(_override_controller_default_program_script_) && defined(_override_controller_default_program_script_length_) #define CONTROLLER_default_program_script_s _override_controller_default_program_script_ @@ -222,22 +266,15 @@ extern "C" { #define CONTROLLER_default_program_script_s_length 4 #endif // defined(_override_controller_default_program_script_) && defined(_override_controller_default_program_script_length_) - #define CONTROLLER_path_pid_s "controller/run/controller-" - #define CONTROLLER_path_pid_suffix_s ".pid" - #define CONTROLLER_path_settings_s "controller" - - #define CONTROLLER_path_pid_s_length 26 - #define CONTROLLER_path_pid_suffix_s_length 4 - #define CONTROLLER_path_settings_s_length 10 - extern const f_string_static_t controller_default_program_script_s; - extern const f_string_static_t controller_name_socket_s; extern const f_string_static_t controller_path_pid_s; extern const f_string_static_t controller_path_pid_init_s; + extern const f_string_static_t controller_path_pid_prefix_s; extern const f_string_static_t controller_path_pid_suffix_s; extern const f_string_static_t controller_path_settings_s; extern const f_string_static_t controller_path_settings_init_s; extern const f_string_static_t controller_path_socket_s; + extern const f_string_static_t controller_path_socket_init_s; extern const f_string_static_t controller_path_socket_prefix_s; extern const f_string_static_t controller_path_socket_suffix_s; @@ -248,6 +285,7 @@ extern "C" { #define CONTROLLER_short_pid_s "p" #define CONTROLLER_short_settings_s "s" #define CONTROLLER_short_simulate_s "S" + #define CONTROLLER_short_socket_s "k" #define CONTROLLER_short_uninterruptible_s "U" #define CONTROLLER_short_validate_s "v" @@ -258,6 +296,7 @@ extern "C" { #define CONTROLLER_long_pid_s "pid" #define CONTROLLER_long_settings_s "settings" #define CONTROLLER_long_simulate_s "simulate" + #define CONTROLLER_long_socket_s "socket" #define CONTROLLER_long_uninterruptible_s "uninterruptible" #define CONTROLLER_long_validate_s "validate" @@ -268,6 +307,7 @@ extern "C" { #define CONTROLLER_short_pid_s_length 1 #define CONTROLLER_short_settings_s_length 1 #define CONTROLLER_short_simulate_s_length 1 + #define CONTROLLER_short_socket_s_length 1 #define CONTROLLER_short_uninterruptible_s_length 1 #define CONTROLLER_short_validate_s_length 1 @@ -278,6 +318,7 @@ extern "C" { #define CONTROLLER_long_pid_s_length 3 #define CONTROLLER_long_settings_s_length 8 #define CONTROLLER_long_simulate_s_length 8 + #define CONTROLLER_long_socket_s_length 6 #define CONTROLLER_long_uninterruptible_s_length 15 #define CONTROLLER_long_validate_s_length 8 @@ -288,6 +329,7 @@ extern "C" { extern const f_string_static_t controller_short_pid_s; extern const f_string_static_t controller_short_settings_s; extern const f_string_static_t controller_short_simulate_s; + extern const f_string_static_t controller_short_socket_s; extern const f_string_static_t controller_short_uninterruptible_s; extern const f_string_static_t controller_short_validate_s; @@ -298,6 +340,7 @@ extern "C" { extern const f_string_static_t controller_long_pid_s; extern const f_string_static_t controller_long_settings_s; extern const f_string_static_t controller_long_simulate_s; + extern const f_string_static_t controller_long_socket_s; extern const f_string_static_t controller_long_uninterruptible_s; extern const f_string_static_t controller_long_validate_s; @@ -319,21 +362,22 @@ extern "C" { controller_parameter_pid_e, controller_parameter_settings_e, controller_parameter_simulate_e, + controller_parameter_socket_e, controller_parameter_uninterruptible_e, controller_parameter_validate_e, }; #define controller_console_parameter_t_initialize \ { \ - macro_f_console_parameter_t_initialize(f_console_standard_short_help_s, f_console_standard_long_help_s, 0, 0, f_console_type_normal_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_light_s, f_console_standard_long_light_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s, f_console_standard_long_dark_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s, f_console_standard_long_normal_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s, f_console_standard_long_debug_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_version_s, f_console_standard_long_version_s, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, 0, 0, f_console_type_normal_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, 0, 0, f_console_type_inverse_e), \ macro_f_console_parameter_t_initialize(controller_short_cgroup_s.string, controller_long_cgroup_s.string, 0, 1, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(controller_short_daemon_s.string, controller_long_daemon_s.string, 0, 0, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(controller_short_init_s.string, controller_long_init_s.string, 0, 0, f_console_type_normal_e), \ @@ -341,11 +385,12 @@ extern "C" { macro_f_console_parameter_t_initialize(controller_short_pid_s.string, controller_long_pid_s.string, 0, 1, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(controller_short_settings_s.string, controller_long_settings_s.string, 0, 1, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(controller_short_simulate_s.string, controller_long_simulate_s.string, 0, 0, f_console_type_normal_e), \ + macro_f_console_parameter_t_initialize(controller_short_socket_s.string, controller_long_socket_s.string, 0, 1, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(controller_short_uninterruptible_s.string, controller_long_uninterruptible_s.string, 0, 0, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(controller_short_validate_s.string, controller_long_validate_s.string, 0, 0, f_console_type_normal_e), \ } - #define controller_total_parameters_d 18 + #define controller_total_parameters_d 19 #endif // _di_controller_defines_ #ifndef _di_controller_main_t_ @@ -366,10 +411,11 @@ extern "C" { mode_t umask; int child; - f_string_static_t program_name; - f_string_static_t program_name_long; - f_string_static_t setting_default; - f_string_static_t path_pid; + const f_string_static_t *program_name; + const f_string_static_t *program_name_long; + const f_string_static_t *default_path_setting; + const f_string_static_t *default_path_pid; + const f_string_static_t *default_path_socket; f_color_context_t context; } controller_main_t; @@ -387,10 +433,11 @@ extern "C" { 0, \ 0, \ 0, \ - f_string_static_t_initialize, \ - f_string_static_t_initialize, \ - f_string_static_t_initialize, \ - f_string_static_t_initialize, \ + 0, \ + 0, \ + 0, \ + 0, \ + 0, \ f_color_context_t_initialize, \ } #endif // _di_controller_main_t_ diff --git a/level_3/controller/c/controller/private-controller.c b/level_3/controller/c/controller/private-controller.c index b777611..f07f766 100644 --- a/level_3/controller/c/controller/private-controller.c +++ b/level_3/controller/c/controller/private-controller.c @@ -114,7 +114,7 @@ extern "C" { memcpy(path, global.setting->path_setting.string, global.setting->path_setting.used); memcpy(path + global.setting->path_setting.used + F_path_separator_s_length, cache->action.name_file.string, cache->action.name_file.used); - path[global.setting->path_setting.used] = f_path_separator_s[0]; + path[global.setting->path_setting.used] = f_path_separator_s.string[0]; } path[path_length] = 0; @@ -202,7 +202,7 @@ extern "C" { status = f_file_stream_open(path.string, f_file_open_mode_truncate_s, &file); if (F_status_is_error(status)) return status; - fll_print_format("%i%c", file.stream, pid, f_string_eol_s[0]); + fll_print_format("%i%q", file.stream, pid, f_string_eol_s); f_file_stream_close(F_true, &file); @@ -418,9 +418,9 @@ extern "C" { controller_lock_print(global->main->warning.to, global->thread); if (F_status_set_fine(status) == F_read_only) { - fl_print_format("%c%[%SThe pid file '%]", global->main->warning.to.stream, f_string_eol_s[0], global->main->warning.context, global->main->warning.prefix, global->main->warning.context); + fl_print_format("%q%[%SThe pid file '%]", global->main->warning.to.stream, f_string_eol_s, global->main->warning.context, global->main->warning.prefix, global->main->warning.context); fl_print_format("%[%Q%]", global->main->warning.to.stream, global->main->warning.notable, global->setting->path_pid, global->main->warning.notable); - fl_print_format("%[' could not be written because the destination is read only.%]%c", global->main->warning.to.stream, global->main->warning.context, global->main->warning.context, f_string_eol_s[0]); + fl_print_format("%[' could not be written because the destination is read only.%]%q", global->main->warning.to.stream, global->main->warning.context, global->main->warning.context, f_string_eol_s); } else { controller_print_error_file(0, global->main->warning, F_status_set_fine(status), "controller_file_pid_create", F_true, global->setting->path_pid.string, "create", fll_error_file_type_file_e); @@ -439,14 +439,14 @@ extern "C" { if (global->main->output.verbosity == f_console_verbosity_debug_e) { controller_lock_print(global->main->output.to, global->thread); - fl_print_format("%cPID file '", global->main->output.to.stream, f_string_eol_s[0]); + fl_print_format("%qPID file '", global->main->output.to.stream, f_string_eol_s); fl_print_format("%[%Q%]", global->main->output.to.stream, global->main->context.set.notable, global->setting->path_pid, global->main->context.set.notable); if (global->main->parameters[controller_parameter_validate_e].result == f_console_result_none_e) { - fl_print_format("' created.%c", global->main->output.to.stream, f_string_eol_s[0]); + fl_print_format("' created.%q", global->main->output.to.stream, f_string_eol_s); } else { - fl_print_format("'.%c", global->main->output.to.stream, f_string_eol_s[0]); + fl_print_format("'.%q", global->main->output.to.stream, f_string_eol_s); } controller_unlock_print_flush(global->main->output.to, global->thread); @@ -460,10 +460,10 @@ extern "C" { if (global->main->output.verbosity == f_console_verbosity_debug_e) { controller_lock_print(global->main->output.to, global->thread); - fl_print_format("%c%[%SControl socket '%]", global->main->warning.to.stream, f_string_eol_s[0], global->main->warning.context, global->main->warning.prefix, global->main->warning.context); + fl_print_format("%q%[%SControl socket '%]", global->main->warning.to.stream, f_string_eol_s, global->main->warning.context, global->main->warning.prefix, global->main->warning.context); fl_print_format("%[%Q%]", global->main->output.to.stream, global->main->context.set.notable, global->setting->path_control, global->main->context.set.notable); - fl_print_format("' .%c", global->main->output.to.stream, f_string_eol_s[0]); - fl_print_format("%[' cannot be found while read only mode is enabled and so the Control socket is unavailable.%]%c", global->main->output.to.stream, global->main->warning.context, global->main->warning.context, f_string_eol_s[0]); + fl_print_format("' .%q", global->main->output.to.stream, f_string_eol_s); + fl_print_format("%[' cannot be found while read only mode is enabled and so the Control socket is unavailable.%]%q", global->main->output.to.stream, global->main->warning.context, global->main->warning.context, f_string_eol_s); controller_unlock_print_flush(global->main->output.to, global->thread); } @@ -484,11 +484,11 @@ extern "C" { if (global->main->output.verbosity == f_console_verbosity_debug_e) { controller_lock_print(global->main->output.to, global->thread); - fl_print_format("%c%[%SControl socket '%]", global->main->warning.to.stream, f_string_eol_s[0], global->main->warning.context, global->main->warning.prefix, global->main->warning.context); + fl_print_format("%q%[%SControl socket '%]", global->main->warning.to.stream, f_string_eol_s, global->main->warning.context, global->main->warning.prefix, global->main->warning.context); fl_print_format("%[%Q%]", global->main->output.to.stream, global->main->context.set.notable, global->setting->path_control, global->main->context.set.notable); fl_print_format("%[' could not be created, code %]", global->main->output.to.stream, global->main->warning.context, global->main->warning.context); fl_print_format("%[%ui%]", global->main->output.to.stream, global->main->context.set.notable, F_status_set_fine(status), global->main->context.set.notable); - fl_print_format("%[.%]%c", global->main->output.to.stream, global->main->warning.context, global->main->warning.context, f_string_eol_s[0]); + fl_print_format("%[.%]%q", global->main->output.to.stream, global->main->warning.context, global->main->warning.context, f_string_eol_s); controller_unlock_print_flush(global->main->output.to, global->thread); } @@ -518,11 +518,11 @@ extern "C" { if (global->main->output.verbosity == f_console_verbosity_debug_e) { controller_lock_print(global->main->output.to, global->thread); - fl_print_format("%c%[%SControl socket '%]", global->main->warning.to.stream, f_string_eol_s[0], global->main->warning.context, global->main->warning.prefix, global->main->warning.context); + fl_print_format("%q%[%SControl socket '%]", global->main->warning.to.stream, f_string_eol_s, global->main->warning.context, global->main->warning.prefix, global->main->warning.context); fl_print_format("%[%Q%]", global->main->output.to.stream, global->main->context.set.notable, global->setting->path_control, global->main->context.set.notable); fl_print_format("%[' could not be bound, code %]", global->main->output.to.stream, global->main->warning.context, global->main->warning.context); fl_print_format("%[%ui%]", global->main->output.to.stream, global->main->context.set.notable, F_status_set_fine(status), global->main->context.set.notable); - fl_print_format("%[.%]%c", global->main->output.to.stream, global->main->warning.context, global->main->warning.context, f_string_eol_s[0]); + fl_print_format("%[.%]%q", global->main->output.to.stream, global->main->warning.context, global->main->warning.context, f_string_eol_s); controller_unlock_print_flush(global->main->output.to, global->thread); } @@ -542,11 +542,11 @@ extern "C" { if (global->main->output.verbosity == f_console_verbosity_debug_e) { controller_lock_print(global->main->output.to, global->thread); - fl_print_format("%c%[%SControl socket '%]", global->main->warning.to.stream, f_string_eol_s[0], global->main->warning.context, global->main->warning.prefix, global->main->warning.context); + fl_print_format("%q%[%SControl socket '%]", global->main->warning.to.stream, f_string_eol_s, global->main->warning.context, global->main->warning.prefix, global->main->warning.context); fl_print_format("%[%Q%]", global->main->output.to.stream, global->main->context.set.notable, global->setting->path_control, global->main->context.set.notable); fl_print_format("%[' failed to set file roles, code %]", global->main->output.to.stream, global->main->warning.context, global->main->warning.context); fl_print_format("%[%ui%]", global->main->output.to.stream, global->main->context.set.notable, F_status_set_fine(status), global->main->context.set.notable); - fl_print_format("%[.%]%c", global->main->output.to.stream, global->main->warning.context, global->main->warning.context, f_string_eol_s[0]); + fl_print_format("%[.%]%q", global->main->output.to.stream, global->main->warning.context, global->main->warning.context, f_string_eol_s); controller_unlock_print_flush(global->main->output.to, global->thread); } @@ -566,11 +566,11 @@ extern "C" { if (global->main->output.verbosity == f_console_verbosity_debug_e) { controller_lock_print(global->main->output.to, global->thread); - fl_print_format("%c%[%SControl socket '%]", global->main->warning.to.stream, f_string_eol_s[0], global->main->warning.context, global->main->warning.prefix, global->main->warning.context); + fl_print_format("%q%[%SControl socket '%]", global->main->warning.to.stream, f_string_eol_s, global->main->warning.context, global->main->warning.prefix, global->main->warning.context); fl_print_format("%[%Q%]", global->main->output.to.stream, global->main->context.set.notable, global->setting->path_control, global->main->context.set.notable); fl_print_format("%[' failed to set file mode, code %]", global->main->output.to.stream, global->main->warning.context, global->main->warning.context); fl_print_format("%[%ui%]", global->main->output.to.stream, global->main->context.set.notable, F_status_set_fine(status), global->main->context.set.notable); - fl_print_format("%[.%]%c", global->main->output.to.stream, global->main->warning.context, global->main->warning.context, f_string_eol_s[0]); + fl_print_format("%[.%]%q", global->main->output.to.stream, global->main->warning.context, global->main->warning.context, f_string_eol_s); controller_unlock_print_flush(global->main->output.to, global->thread); } @@ -579,14 +579,14 @@ extern "C" { if (global->main->output.verbosity == f_console_verbosity_debug_e) { controller_lock_print(global->main->output.to, global->thread); - fl_print_format("%cControl socket '", global->main->output.to.stream, f_string_eol_s[0]); + fl_print_format("%qControl socket '", global->main->output.to.stream, f_string_eol_s); fl_print_format("%[%Q%]", global->main->output.to.stream, global->main->context.set.notable, global->setting->path_control, global->main->context.set.notable); if (global->main->parameters[controller_parameter_validate_e].result == f_console_result_none_e) { - fl_print_format("' created.%c", global->main->output.to.stream, f_string_eol_s[0]); + fl_print_format("' created.%q", global->main->output.to.stream, f_string_eol_s); } else { - fl_print_format("'.%c", global->main->output.to.stream, f_string_eol_s[0]); + fl_print_format("'.%q", global->main->output.to.stream, f_string_eol_s); } controller_unlock_print_flush(global->main->output.to, global->thread); diff --git a/level_3/controller/c/controller/private-controller_print.c b/level_3/controller/c/controller/private-controller_print.c index 7646f03..b33f50f 100644 --- a/level_3/controller/c/controller/private-controller_print.c +++ b/level_3/controller/c/controller/private-controller_print.c @@ -55,9 +55,9 @@ extern "C" { flockfile(main->warning.to.stream); - fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s[0], f_string_eol_s[0], main->context.set.warning, main->context.set.warning); + fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s, f_string_eol_s, main->context.set.warning, main->context.set.warning); fl_print_format("%[%i%]", main->warning.to.stream, main->context.set.notable, signal, main->context.set.notable); - fl_print_format("%[.%]%c", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s[0]); + fl_print_format("%[.%]%q", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s); funlockfile(main->warning.to.stream); } diff --git a/level_3/controller/c/entry/private-entry.c b/level_3/controller/c/entry/private-entry.c index 4b16437..717db9e 100644 --- a/level_3/controller/c/entry/private-entry.c +++ b/level_3/controller/c/entry/private-entry.c @@ -300,9 +300,9 @@ extern "C" { if (global.main->warning.verbosity == f_console_verbosity_debug_e) { controller_lock_print(global.main->warning.to, global.thread); - fl_print_format("%c%[%SUnknown %s item action '%]", global.main->warning.to.stream, f_string_eol_s[0], global.main->warning.context, global.main->warning.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->warning.context); + fl_print_format("%q%[%SUnknown %s item action '%]", global.main->warning.to.stream, f_string_eol_s, global.main->warning.context, global.main->warning.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->warning.context); fl_print_format("%[%S%]", global.main->warning.to.stream, global.main->warning.notable, cache->action.name_action, global.main->warning.notable); - fl_print_format("%['.%]%c", global.main->warning.to.stream, global.main->warning.context, global.main->warning.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", global.main->warning.to.stream, global.main->warning.context, global.main->warning.context, f_string_eol_s); controller_entry_print_error_cache(is_entry, global.main->warning, cache->action); @@ -346,7 +346,7 @@ extern "C" { flockfile(global.main->error.to.stream); - fl_print_format("%c%[%SThe %s item action '%]", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context); + fl_print_format("%q%[%SThe %s item action '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context); fl_print_format("%[%Q%]", global.main->error.to.stream, global.main->error.notable, cache->action.name_action, global.main->error.notable); fl_print_format("%[' requires ", global.main->error.to.stream, global.main->error.context); @@ -357,16 +357,16 @@ extern "C" { fl_print_format("%]%[%un%]", global.main->error.to.stream, global.main->error.context, global.main->error.notable, at_least, global.main->error.notable); if (action->type == controller_entry_action_type_consider_e || controller_entry_action_type_is_rule(action->type)) { - fl_print_format("%[ or more parameters.%]%c", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%[ or more parameters.%]%q", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); } else { if (at_least == at_most) { - fl_print_format("%[ parameters.%]%c", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%[ parameters.%]%q", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); } else { fl_print_format("%[ to %]", global.main->error.to.stream, global.main->error.context, global.main->error.context); fl_print_format("%[%un%]", global.main->error.to.stream, global.main->error.notable, at_most, global.main->error.notable); - fl_print_format("%[ parameters.%]%c", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%[ parameters.%]%q", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); } } @@ -455,7 +455,7 @@ extern "C" { } if (global.main->error.verbosity != f_console_verbosity_quiet_e) { - fll_print_format("%c%[%SThe %s item action must not have an empty string for a path (the first parameter).%]%c", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%SThe %s item action must not have an empty string for a path (the first parameter).%]%q", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context, f_string_eol_s); } } @@ -498,11 +498,11 @@ extern "C" { flockfile(global.main->error.to.stream); - fl_print_format("%c%[%SThe %s item action second parameter '%]", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context); + fl_print_format("%q%[%SThe %s item action second parameter '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context); fl_print_format("%[%Q%]", global.main->error.to.stream, global.main->error.notable, action->parameters.array[1], global.main->error.notable); fl_print_format("%[' must be a base path name, such as '%]", global.main->error.to.stream, global.main->error.context, global.main->error.context); fl_print_format("%[%Q%]", global.main->error.to.stream, global.main->error.notable, cache->buffer_path, global.main->error.notable); - fl_print_format("%['.%]", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); funlockfile(global.main->error.to.stream); } @@ -523,7 +523,7 @@ extern "C" { } if (global.main->error.verbosity != f_console_verbosity_quiet_e) { - fll_print_format("%c%[%SThe %s item action must not have an empty string for a rule name (the second parameter).%]", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%SThe %s item action must not have an empty string for a rule name (the second parameter).%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context, f_string_eol_s); } } @@ -550,7 +550,7 @@ extern "C" { if (global.main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(global.main->error.to.stream); - fl_print_format("%c%[%SThe %s item action third parameter (and beyond) must be one of '%]", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context); + fl_print_format("%q%[%SThe %s item action third parameter (and beyond) must be one of '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context); fl_print_format("%[%s%]", global.main->error.to.stream, global.main->error.notable, controller_asynchronous_s, global.main->error.notable); fl_print_format("%[', '%]", global.main->error.to.stream, global.main->error.context, global.main->error.context); fl_print_format("%[%s%]", global.main->error.to.stream, global.main->error.notable, controller_require_s, global.main->error.notable); @@ -558,7 +558,7 @@ extern "C" { fl_print_format("%[%s%]", global.main->error.to.stream, global.main->error.notable, controller_wait_s, global.main->error.notable); fl_print_format("%[' but instead has '%]", global.main->error.to.stream, global.main->error.context, global.main->error.context); fl_print_format("%[%Q%]", global.main->error.to.stream, global.main->error.notable, action->parameters.array[j], global.main->error.notable); - fl_print_format("%['.%]", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); funlockfile(global.main->error.to.stream); } @@ -576,9 +576,9 @@ extern "C" { if (global.main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(global.main->error.to.stream); - fl_print_format("%c%[%SThe %s item action may not specify the reserved item '%]", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context); + fl_print_format("%q%[%SThe %s item action may not specify the reserved item '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context); fl_print_format("%[%s%]", global.main->error.to.stream, global.main->error.notable, controller_main_s, global.main->error.notable); - fl_print_format("%['.%]", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); funlockfile(global.main->error.to.stream); } @@ -605,7 +605,7 @@ extern "C" { if (global.main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(global.main->error.to.stream); - fl_print_format("%c%[%SThe %s item action must have one of '%]", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context); + fl_print_format("%q%[%SThe %s item action must have one of '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context); fl_print_format("%[%s%]", global.main->error.to.stream, global.main->error.notable, controller_kill_s, global.main->error.notable); fl_print_format("%[', '%]", global.main->error.to.stream, global.main->error.context, global.main->error.context); fl_print_format("%[%s%]", global.main->error.to.stream, global.main->error.notable, controller_start_s, global.main->error.notable); @@ -613,7 +613,7 @@ extern "C" { fl_print_format("%[%s%]", global.main->error.to.stream, global.main->error.notable, controller_stop_s, global.main->error.notable); fl_print_format("%[' but instead has '%]", global.main->error.to.stream, global.main->error.context, global.main->error.context); fl_print_format("%[%Q%]", global.main->error.to.stream, global.main->error.notable, action->parameters.array[0], global.main->error.notable); - fl_print_format("%['.%]", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); funlockfile(global.main->error.to.stream); } @@ -644,9 +644,9 @@ extern "C" { if (global.main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(global.main->error.to.stream); - fl_print_format("%c%[%SThe %s item action parameter '%]", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context); + fl_print_format("%q%[%SThe %s item action parameter '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context); fl_print_format("%[%Q%]", global.main->error.to.stream, global.main->error.notable, action->parameters.array[1], global.main->error.notable); - fl_print_format("%[' is not a valid supported number.%]", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%[' is not a valid supported number.%]", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); funlockfile(global.main->error.to.stream); } @@ -664,11 +664,11 @@ extern "C" { if (global.main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(global.main->error.to.stream); - fl_print_format("%c%[%SThe %s item action may only have '%]", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context); + fl_print_format("%q%[%SThe %s item action may only have '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context); fl_print_format("%[%s%]", global.main->error.to.stream, global.main->error.notable, controller_wait_s, global.main->error.notable); fl_print_format("%[' but instead has '%]", global.main->error.to.stream, global.main->error.context, global.main->error.context); fl_print_format("%[%Q%]", global.main->error.to.stream, global.main->error.notable, action->parameters.array[0], global.main->error.notable); - fl_print_format("%['.%]", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); funlockfile(global.main->error.to.stream); } @@ -766,9 +766,9 @@ extern "C" { if (global.main->warning.verbosity == f_console_verbosity_debug_e) { controller_lock_print(global.main->warning.to, global.thread); - fl_print_format("%c%[%SMultiple '%]", global.main->warning.to.stream, f_string_eol_s[0], global.main->warning.context, global.main->warning.prefix, global.main->warning.context); + fl_print_format("%q%[%SMultiple '%]", global.main->warning.to.stream, f_string_eol_s, global.main->warning.context, global.main->warning.prefix, global.main->warning.context); fl_print_format("%[%s%]", global.main->warning.to.stream, global.main->warning.notable, controller_ready_s, global.main->warning.notable); - fl_print_format("%[' %s item actions detected; only the first will be used.%]%c", global.main->warning.to.stream, global.main->warning.context, is_entry ? controller_entry_s : controller_exit_s, global.main->warning.context, f_string_eol_s[0]); + fl_print_format("%[' %s item actions detected; only the first will be used.%]%q", global.main->warning.to.stream, global.main->warning.context, is_entry ? controller_entry_s : controller_exit_s, global.main->warning.context, f_string_eol_s); controller_entry_print_error_cache(is_entry, global.main->warning, cache->action); @@ -802,9 +802,9 @@ extern "C" { if (global.main->error.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(global.main->error.to, global.thread); - fl_print_format("%c%[%SThe %s item named '%]", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, is_entry ? controller_entry_s : controller_exit_s, global.main->error.prefix, global.main->error.context); + fl_print_format("%q%[%SThe %s item named '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, is_entry ? controller_entry_s : controller_exit_s, global.main->error.prefix, global.main->error.context); fl_print_format("%[%Q%]", global.main->error.to.stream, global.main->error.notable, entry->items.array[i].name, global.main->error.notable); - fl_print_format("%[' cannot be executed because recursion is not allowed.%]%c", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%[' cannot be executed because recursion is not allowed.%]%q", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); controller_entry_print_error_cache(is_entry, global.main->error, cache->action); @@ -864,9 +864,9 @@ extern "C" { if (global.main->error.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(global.main->error.to, global.thread); - fl_print_format("%c%[%SThe %s item named '%]", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, is_entry ? controller_entry_s : controller_exit_s, global.main->error.prefix, global.main->error.context); + fl_print_format("%q%[%SThe %s item named '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, is_entry ? controller_entry_s : controller_exit_s, global.main->error.prefix, global.main->error.context); fl_print_format("%[%Q%]", global.main->error.to.stream, global.main->error.notable, actions->array[cache->ats.array[at_j]].parameters.array[0], global.main->error.notable); - fl_print_format("%[' does not exist.%]%c", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%[' does not exist.%]%q", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); controller_entry_print_error_cache(is_entry, global.main->error, cache->action); @@ -984,8 +984,8 @@ extern "C" { if (global->main->error.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(global->main->output.to, global->thread); - fl_print_format("%cProcessing %s%s item '", global->main->output.to.stream, f_string_eol_s[0], failsafe ? "failsafe " : "", is_entry ? controller_entry_s : controller_exit_s); - fl_print_format("%[%Q%]'.%c", global->main->output.to.stream, global->main->context.set.notable, cache->action.name_item, global->main->context.set.notable, f_string_eol_s[0]); + fl_print_format("%qProcessing %s%s item '", global->main->output.to.stream, f_string_eol_s, failsafe ? "failsafe " : "", is_entry ? controller_entry_s : controller_exit_s); + fl_print_format("%[%Q%]'.%q", global->main->output.to.stream, global->main->context.set.notable, cache->action.name_item, global->main->context.set.notable, f_string_eol_s); controller_unlock_print_flush(global->main->output.to, global->thread); } @@ -1021,7 +1021,7 @@ extern "C" { if (global->main->error.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(global->main->output.to, global->thread); - fl_print_format("%cThe %s item action '", global->main->output.to.stream, f_string_eol_s[0], is_entry ? controller_entry_s : controller_exit_s); + fl_print_format("%qThe %s item action '", global->main->output.to.stream, f_string_eol_s, is_entry ? controller_entry_s : controller_exit_s); fl_print_format("%[%Q%]", global->main->output.to.stream, global->main->context.set.title, cache->action.name_action, global->main->context.set.title); if (entry_action->parameters.used) { @@ -1034,7 +1034,7 @@ extern "C" { fl_print_format("' is %[%s%] and is in a ", global->main->output.to.stream, global->main->context.set.notable, entry_action->code & controller_entry_rule_code_require_d ? "required" : "optional", global->main->context.set.notable); - fl_print_format("%[failed%] state, skipping.%c", global->main->output.to.stream, global->main->context.set.notable, global->main->context.set.notable, global->main->context.set.notable, f_string_eol_s[0]); + fl_print_format("%[failed%] state, skipping.%q", global->main->output.to.stream, global->main->context.set.notable, global->main->context.set.notable, global->main->context.set.notable, f_string_eol_s); controller_unlock_print_flush(global->main->output.to, global->thread); } @@ -1052,7 +1052,7 @@ extern "C" { controller_lock_print(output->to, global->thread); - fl_print_format("%c%[%SThe %s item action '%]", output->to.stream, f_string_eol_s[0], output->context, output->prefix ? output->prefix : f_string_empty_s, is_entry ? controller_entry_s : controller_exit_s, output->context); + fl_print_format("%q%[%QThe %s item action '%]", output->to.stream, f_string_eol_s, output->context, output->prefix ? output->prefix : f_string_empty_s, is_entry ? controller_entry_s : controller_exit_s, output->context); fl_print_format("%[%Q%]", output->to.stream, output->notable, cache->action.name_action, output->notable); @@ -1074,10 +1074,10 @@ extern "C" { fl_print_format(" %[and is in a%] %[failed%]", output->to.stream, output->context, output->context, output->notable, output->notable); if (entry_action->code & controller_entry_rule_code_require_d) { - fl_print_format(" %[state, aborting.%]%c", output->to.stream, output->context, output->context, f_string_eol_s[0]); + fl_print_format(" %[state, aborting.%]%q", output->to.stream, output->context, output->context, f_string_eol_s); } else { - fl_print_format(" %[state, skipping.%]%c", output->to.stream, output->context, output->context, f_string_eol_s[0]); + fl_print_format(" %[state, skipping.%]%q", output->to.stream, output->context, output->context, f_string_eol_s); } controller_entry_print_error_cache(is_entry, *output, cache->action); @@ -1099,9 +1099,9 @@ extern "C" { if (global->main->output.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(global->main->output.to, global->thread); - fl_print_format("%cWaiting before processing %s item action '", global->main->output.to.stream, f_string_eol_s[0], is_entry ? controller_entry_s : controller_exit_s); + fl_print_format("%qWaiting before processing %s item action '", global->main->output.to.stream, f_string_eol_s, is_entry ? controller_entry_s : controller_exit_s); fl_print_format("%[%s%]", global->main->output.to.stream, global->main->context.set.title, controller_ready_s, global->main->context.set.title); - fl_print_format("'.%c", global->main->output.to.stream, f_string_eol_s[0]); + fl_print_format("'.%q", global->main->output.to.stream, f_string_eol_s); controller_unlock_print_flush(global->main->output.to, global->thread); } @@ -1118,9 +1118,9 @@ extern "C" { if (global->main->output.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(global->main->output.to, global->thread); - fl_print_format("%cIgnoring %s item action '", global->main->output.to.stream, f_string_eol_s[0], is_entry ? controller_entry_s : controller_exit_s); + fl_print_format("%qIgnoring %s item action '", global->main->output.to.stream, f_string_eol_s, is_entry ? controller_entry_s : controller_exit_s); fl_print_format("%[%s%]", global->main->output.to.stream, global->main->context.set.title, controller_ready_s, global->main->context.set.title); - fl_print_format("', state already is ready.%c", global->main->output.to.stream, f_string_eol_s[0]); + fl_print_format("', state already is ready.%q", global->main->output.to.stream, f_string_eol_s); controller_unlock_print_flush(global->main->output.to, global->thread); } @@ -1128,7 +1128,7 @@ extern "C" { } else { if (!failsafe && (global->main->error.verbosity == f_console_verbosity_verbose_e || entry->show == controller_entry_show_init_e) && global->main->parameters[controller_parameter_simulate_e].result == f_console_result_none_e) { - fl_print_format("%cState is now '%[%s%]'.%c", global->main->output.to.stream, f_string_eol_s[0], global->main->context.set.notable, controller_ready_s, global->main->context.set.notable, f_string_eol_s[0]); + fl_print_format("%qState is now '%[%s%]'.%q", global->main->output.to.stream, f_string_eol_s, global->main->context.set.notable, controller_ready_s, global->main->context.set.notable, f_string_eol_s); } status = controller_perform_ready(global, cache, is_entry); @@ -1142,9 +1142,9 @@ extern "C" { if (global->main->error.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(global->main->error.to, global->thread); - fl_print_format("%c%[Invalid %s item index '%]", global->main->error.to.stream, f_string_eol_s[0], global->main->error.context, is_entry ? controller_entry_s : controller_exit_s, global->main->error.context); + fl_print_format("%q%[Invalid %s item index '%]", global->main->error.to.stream, f_string_eol_s, global->main->error.context, is_entry ? controller_entry_s : controller_exit_s, global->main->error.context); fl_print_format("%[%un%]", global->main->error.to.stream, global->main->error.notable, entry_action->number, global->main->error.notable); - fl_print_format("%[' detected.%]%c", global->main->error.to.stream, global->main->error.context, global->main->error.context, f_string_eol_s[0]); + fl_print_format("%[' detected.%]%q", global->main->error.to.stream, global->main->error.context, global->main->error.context, f_string_eol_s); controller_entry_print_error_cache(is_entry, global->main->error, cache->action); @@ -1189,9 +1189,9 @@ extern "C" { if (global->main->output.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(global->main->output.to, global->thread); - fl_print_format("%cProcessing %s item '", global->main->output.to.stream, f_string_eol_s[0], is_entry ? controller_entry_s : controller_exit_s); + fl_print_format("%qProcessing %s item '", global->main->output.to.stream, f_string_eol_s, is_entry ? controller_entry_s : controller_exit_s); fl_print_format("%[%Q%]", global->main->output.to.stream, global->main->context.set.title, cache->action.name_item, global->main->context.set.title); - fl_print_format("'.%c", global->main->output.to.stream, f_string_eol_s[0]); + fl_print_format("'.%q", global->main->output.to.stream, f_string_eol_s); controller_unlock_print_flush(global->main->output.to, global->thread); } @@ -1226,7 +1226,7 @@ extern "C" { memcpy(id_rule_name, entry_action->parameters.array[0].string, entry_action->parameters.array[0].used); memcpy(id_rule_name + entry_action->parameters.array[0].used + 1, entry_action->parameters.array[1].string, entry_action->parameters.array[1].used); - id_rule_name[entry_action->parameters.array[0].used] = f_path_separator_s[0]; + id_rule_name[entry_action->parameters.array[0].used] = f_path_separator_s.string[0]; id_rule_name[id_rule_length] = 0; status_lock = controller_lock_read(is_entry, global->thread, &global->thread->lock.rule); @@ -1245,7 +1245,7 @@ extern "C" { if (global->main->output.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(global->main->output.to, global->thread); - fl_print_format("%c%s %s item rule ", global->main->output.to.stream, f_string_eol_s[0], entry_action->type == controller_entry_action_type_consider_e ? "Considering" : "Processing", is_entry ? controller_entry_s : controller_exit_s); + fl_print_format("%q%s %s item rule ", global->main->output.to.stream, f_string_eol_s, entry_action->type == controller_entry_action_type_consider_e ? "Considering" : "Processing", is_entry ? controller_entry_s : controller_exit_s); fl_print_format("'%[%Q%]'", global->main->output.to.stream, global->main->context.set.title, alias_rule, global->main->context.set.title); if (entry->show == controller_entry_show_init_e && global->main->parameters[controller_parameter_simulate_e].result == f_console_result_none_e) { @@ -1260,7 +1260,7 @@ extern "C" { } } - fl_print_format(".%c", global->main->output.to.stream, f_string_eol_s[0]); + fl_print_format(".%q", global->main->output.to.stream, f_string_eol_s); controller_unlock_print_flush(global->main->output.to, global->thread); } @@ -1394,18 +1394,18 @@ extern "C" { if (global->main->output.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(global->main->output.to, global->thread); - fl_print_format("%c%s is executing '", global->main->output.to.stream, f_string_eol_s[0], is_entry ? controller_entry_s : controller_exit_s); + fl_print_format("%q%s is executing '", global->main->output.to.stream, f_string_eol_s, is_entry ? controller_entry_s : controller_exit_s); for (f_array_length_t k = 0; k < entry_action->parameters.used; ++k) { fl_print_format("%[%Q%]", global->main->output.to.stream, global->main->context.set.title, entry_action->parameters.array[k], global->main->context.set.title); if (k + 1 < entry_action->parameters.used) { - f_print_character(f_string_space_s[0], global->main->output.to.stream); + f_print_dynamic(f_string_space_s, global->main->output.to.stream); } } // for - fl_print_format("'.%c", global->main->output.to.stream, f_string_eol_s[0]); + fl_print_format("'.%q", global->main->output.to.stream, f_string_eol_s); controller_unlock_print_flush(global->main->output.to, global->thread); } @@ -1431,9 +1431,9 @@ extern "C" { if (global->main->error.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(global->main->error.to, global->thread); - fl_print_format("%c%[%SExecution failed, unable to find program or script '%]", global->main->error.to.stream, f_string_eol_s[0], global->main->error.context, global->main->error.prefix ? global->main->error.prefix : f_string_empty_s, global->main->error.context); + fl_print_format("%q%[%SExecution failed, unable to find program or script '%]", global->main->error.to.stream, f_string_eol_s, global->main->error.context, global->main->error.prefix ? global->main->error.prefix : f_string_empty_s, global->main->error.context); fl_print_format("%[%Q%]", global->main->error.to.stream, global->main->error.notable, entry_action->parameters.array[0], global->main->error.notable); - fl_print_format("%['.%]%c", global->main->error.to.stream, global->main->error.context, global->main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", global->main->error.to.stream, global->main->error.context, global->main->error.context, f_string_eol_s); controller_entry_print_error_cache(is_entry, global->main->error, cache->action); @@ -1450,9 +1450,9 @@ extern "C" { if (global->main->error.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(global->main->error.to, global->thread); - fl_print_format("%c%[%SExecution failed with return value of '%]", global->main->error.to.stream, f_string_eol_s[0], global->main->error.context, global->main->error.prefix ? global->main->error.prefix : f_string_empty_s, global->main->error.context); + fl_print_format("%q%[%SExecution failed with return value of '%]", global->main->error.to.stream, f_string_eol_s, global->main->error.context, global->main->error.prefix ? global->main->error.prefix : f_string_empty_s, global->main->error.context); fl_print_format("%[%i%]", global->main->error.to.stream, global->main->error.notable, result, global->main->error.notable); - fl_print_format("$['.%]%c", global->main->error.to.stream, global->main->error.context, global->main->error.context, f_string_eol_s[0]); + fl_print_format("$['.%]%q", global->main->error.to.stream, global->main->error.context, global->main->error.context, f_string_eol_s); controller_entry_print_error_cache(is_entry, global->main->error, cache->action); @@ -1489,7 +1489,7 @@ extern "C" { if (global->main->warning.verbosity == f_console_verbosity_debug_e) { controller_lock_print(global->main->warning.to, global->thread); - fl_print_format("%c%[%SFailsafe may not be specified when running in failsafe, ignoring.%]%c", global->main->warning.to.stream, f_string_eol_s[0], global->main->warning.context, global->main->warning.prefix, global->main->warning.context, f_string_eol_s[0]); + fl_print_format("%q%[%SFailsafe may not be specified when running in failsafe, ignoring.%]%q", global->main->warning.to.stream, f_string_eol_s, global->main->warning.context, global->main->warning.prefix, global->main->warning.context, f_string_eol_s); controller_entry_print_error_cache(is_entry, global->main->warning, cache->action); @@ -1503,9 +1503,9 @@ extern "C" { if (global->main->error.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(global->main->error.to, global->thread); - fl_print_format("%c%[%SInvalid %s item index '%]", global->main->error.to.stream, f_string_eol_s[0], global->main->error.context, global->main->error.prefix ? global->main->error.prefix : f_string_empty_s, is_entry ? controller_entry_s : controller_exit_s, global->main->error.context); + fl_print_format("%q%[%SInvalid %s item index '%]", global->main->error.to.stream, f_string_eol_s, global->main->error.context, global->main->error.prefix ? global->main->error.prefix : f_string_empty_s, is_entry ? controller_entry_s : controller_exit_s, global->main->error.context); fl_print_format("%[%un%]", global->main->error.to.stream, global->main->error.notable, entry_action->number, global->main->error.notable); - fl_print_format("%[' detected.%]%c", global->main->error.to.stream, global->main->error.context, global->main->error.context, f_string_eol_s[0]); + fl_print_format("%[' detected.%]%q", global->main->error.to.stream, global->main->error.context, global->main->error.context, f_string_eol_s); controller_entry_print_error_cache(is_entry, global->main->error, cache->action); @@ -1588,9 +1588,9 @@ extern "C" { if ((global->main->parameters[controller_parameter_simulate_e].result == f_console_result_found_e && global->main->error.verbosity != f_console_verbosity_quiet_e) || global->main->error.verbosity == f_console_verbosity_verbose_e) { controller_lock_print(global->main->output.to, global->thread); - fl_print_format("%cDone processing %s item '", global->main->output.to.stream, f_string_eol_s[0], is_entry ? controller_entry_s : controller_exit_s); + fl_print_format("%qDone processing %s item '", global->main->output.to.stream, f_string_eol_s, is_entry ? controller_entry_s : controller_exit_s); fl_print_format("%[%s%]", global->main->output.to.stream, global->main->context.set.title, controller_main_s, global->main->context.set.title); - fl_print_format("'.%c", global->main->output.to.stream, f_string_eol_s[0]); + fl_print_format("'.%q", global->main->output.to.stream, f_string_eol_s); // failsafe should not print the extra newline because the failure exit from controller_main should handle this. if (!failsafe) { @@ -1690,7 +1690,7 @@ extern "C" { if (global.main->error.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(global.main->error.to, global.thread); - fll_print_format("%c%[%SThe %s file is empty.%]%c", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : is_entry ? controller_entry_s : controller_exit_s, global.main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%SThe %s file is empty.%]%q", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : is_entry ? controller_entry_s : controller_exit_s, global.main->error.context, f_string_eol_s); controller_unlock_print_flush(global.main->error.to, global.thread); } @@ -1770,9 +1770,9 @@ extern "C" { if (global.main->warning.verbosity == f_console_verbosity_debug_e) { controller_lock_print(global.main->warning.to, global.thread); - fl_print_format("%c%[%SIgnoring duplicate %s item '%]", global.main->warning.to.stream, f_string_eol_s[0], global.main->warning.context, global.main->warning.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->warning.context); + fl_print_format("%q%[%SIgnoring duplicate %s item '%]", global.main->warning.to.stream, f_string_eol_s, global.main->warning.context, global.main->warning.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->warning.context); fl_print_format("%[%Q%]", global.main->warning.to.stream, global.main->warning.notable, cache->action.name_file, global.main->warning.notable); - fl_print_format("%['.%]%c", global.main->warning.to.stream, global.main->warning.context, global.main->warning.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", global.main->warning.to.stream, global.main->warning.context, global.main->warning.context, f_string_eol_s); controller_entry_print_error_cache(is_entry, global.main->warning, cache->action); @@ -1853,9 +1853,9 @@ extern "C" { if (global.main->error.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(global.main->error.to, global.thread); - fl_print_format("%c%[%SThe required %s item '%]", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context); + fl_print_format("%q%[%SThe required %s item '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context); fl_print_format("%[%s%]", global.main->error.to.stream, global.main->error.notable, controller_main_s, global.main->error.notable); - fl_print_format("%[' was not found.%]%c", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%[' was not found.%]%q", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); controller_unlock_print_flush(global.main->error.to, global.thread); } @@ -1915,9 +1915,9 @@ extern "C" { if (global.main->error.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(global.main->error.to, global.thread); - fl_print_format("%c%[%SThe required %s item '%]", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context); + fl_print_format("%q%[%SThe required %s item '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context); fl_print_format("%[%Q%]", global.main->error.to.stream, global.main->error.notable, action->parameters.array[0], global.main->error.notable); - fl_print_format("%[' does not exist.%]%c", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%[' does not exist.%]%q", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); controller_entry_print_error_cache(is_entry, global.main->error, cache->action); diff --git a/level_3/controller/c/entry/private-entry_print.c b/level_3/controller/c/entry/private-entry_print.c index 86aeb15..23ec05c 100644 --- a/level_3/controller/c/entry/private-entry_print.c +++ b/level_3/controller/c/entry/private-entry_print.c @@ -32,7 +32,7 @@ extern "C" { controller_lock_print(global.main->output.to, global.thread); - fl_print_format("%cProcessing %s item action '", global.main->output.to.stream, f_string_eol_s[0], is_entry ? controller_entry_s : controller_exit_s); + fl_print_format("%qProcessing %s item action '", global.main->output.to.stream, f_string_eol_s, is_entry ? controller_entry_s : controller_exit_s); fl_print_format("%[%S%]' setting ", global.main->output.to.stream, global.main->context.set.title, name, global.main->context.set.title); @@ -45,7 +45,7 @@ extern "C" { fl_print_format(" to '%[%Q%]", global.main->output.to.stream, global.main->context.set.important, value, global.main->context.set.important); - fl_print_format("'%S.%c", global.main->output.to.stream, suffix, f_string_eol_s[0]); + fl_print_format("'%S.%q", global.main->output.to.stream, suffix, f_string_eol_s); controller_unlock_print_flush(global.main->output.to, global.thread); } @@ -73,7 +73,7 @@ extern "C" { #ifndef _di_controller_entry_print_error_cache_ void controller_entry_print_error_cache(const bool is_entry, const fl_print_t output, const controller_cache_action_t cache) { - fl_print_format("%c%[%SWhile processing ", output.to.stream, f_string_eol_s[0], output.context, output.prefix); + fl_print_format("%q%[%SWhile processing ", output.to.stream, f_string_eol_s, output.context, output.prefix); if (cache.name_action.used) { fl_print_format("action '%]", output.to.stream, output.context); @@ -96,7 +96,7 @@ extern "C" { fl_print_format("%[%Q%]%['", output.to.stream, output.notable, cache.name_file, output.notable, output.context); } - fl_print_format(".%]%c", output.to.stream, output.context, f_string_eol_s[0]); + fl_print_format(".%]%q", output.to.stream, output.context, f_string_eol_s); } #endif // _di_controller_entry_print_error_cache_ @@ -126,9 +126,9 @@ extern "C" { controller_lock_print(print.to, thread); - fl_print_format("%c%[%S%s setting%S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, is_entry ? "Entry" : "Exit", before, print.context); + fl_print_format("%q%[%Q%s setting%S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, is_entry ? "Entry" : "Exit", before, print.context); fl_print_format("%[%/Q%]", print.to.stream, print.notable, cache->buffer_file, range, print.notable); - fl_print_format("%['%S.%]%c", print.to.stream, print.context, after, print.context, f_string_eol_s[0]); + fl_print_format("%['%S.%]%q", print.to.stream, print.context, after, print.context, f_string_eol_s); controller_entry_print_error_cache(is_entry, print, cache->action); @@ -143,11 +143,11 @@ extern "C" { controller_lock_print(global.main->error.to, global.thread); - fl_print_format("%c%[%SThe %s item setting '%]", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context); + fl_print_format("%q%[%SThe %s item setting '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context); fl_print_format("%[%Q%]", global.main->error.to.stream, global.main->error.notable, cache.action.name_action, global.main->error.notable); fl_print_format("%[' requires exactly %]", global.main->error.to.stream, global.main->error.context, global.main->error.context); fl_print_format("%[%un%]", global.main->error.to.stream, global.main->error.notable, total, global.main->error.notable); - fl_print_format("%[' %s.%]%c", global.main->error.to.stream, global.main->error.context, total > 1 ? controller_parameters_s : controller_parameter_s, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%[' %s.%]%q", global.main->error.to.stream, global.main->error.context, total > 1 ? controller_parameters_s : controller_parameter_s, global.main->error.context, f_string_eol_s); controller_entry_print_error_cache(is_entry, global.main->error, cache.action); @@ -162,9 +162,9 @@ extern "C" { controller_lock_print(global.main->warning.to, global.thread); - fl_print_format("%c%[%SUnknown %s item setting '%]", global.main->warning.to.stream, f_string_eol_s[0], global.main->warning.context, global.main->warning.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->warning.context); + fl_print_format("%q%[%SUnknown %s item setting '%]", global.main->warning.to.stream, f_string_eol_s, global.main->warning.context, global.main->warning.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->warning.context); fl_print_format("%[%Q%]", global.main->warning.to.stream, global.main->warning.notable, cache.action.name_action, global.main->warning.notable); - fl_print_format("%['.%]%c", global.main->warning.to.stream, global.main->warning.context, global.main->warning.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", global.main->warning.to.stream, global.main->warning.context, global.main->warning.context, f_string_eol_s); controller_entry_print_error_cache(is_entry, global.main->warning, cache.action); @@ -179,11 +179,11 @@ extern "C" { controller_lock_print(global.main->warning.to, global.thread); - fl_print_format("%c%[%SThe %s item setting '%]", global.main->warning.to.stream, f_string_eol_s[0], global.main->warning.context, global.main->warning.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->warning.context); + fl_print_format("%q%[%SThe %s item setting '%]", global.main->warning.to.stream, f_string_eol_s, global.main->warning.context, global.main->warning.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->warning.context); fl_print_format("%[%Q%]", global.main->warning.to.stream, global.main->warning.notable, cache.action.name_action, global.main->warning.notable); - fl_print_format("%[' has an unknown value '%]", global.main->warning.to.stream, f_string_eol_s[0], global.main->warning.context, global.main->warning.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->warning.context); + fl_print_format("%[' has an unknown value '%]", global.main->warning.to.stream, f_string_eol_s, global.main->warning.context, global.main->warning.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->warning.context); fl_print_format("%[%Q%]", global.main->warning.to.stream, global.main->warning.notable, cache.content_actions.array[index].array[0], global.main->warning.notable); - fl_print_format("%['.%]%c", global.main->warning.to.stream, global.main->warning.context, global.main->warning.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", global.main->warning.to.stream, global.main->warning.context, global.main->warning.context, f_string_eol_s); controller_entry_print_error_cache(is_entry, global.main->warning, cache.action); diff --git a/level_3/controller/c/lock/private-lock_print.c b/level_3/controller/c/lock/private-lock_print.c index 1cb3751..17de5f5 100644 --- a/level_3/controller/c/lock/private-lock_print.c +++ b/level_3/controller/c/lock/private-lock_print.c @@ -15,7 +15,7 @@ extern "C" { if (print.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(print.to, thread); - fl_print_format("%c%[%SThe pid file '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix ? print.prefix : f_string_empty_s, print.context); + fl_print_format("%q%[%QThe pid file '%]", print.to.stream, f_string_eol_s, print.context, print.prefix ? print.prefix : f_string_empty_s, print.context); fl_print_format("%['Critical failure while attempting to establish '%]", print.to.stream, print.context, print.context); fl_print_format("%[%s lock%]", print.to.stream, print.notable, read ? "read" : "write", print.notable); @@ -36,7 +36,7 @@ extern "C" { } } - fl_print_format("%['.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); controller_unlock_print_flush(print.to, thread); } diff --git a/level_3/controller/c/main.c b/level_3/controller/c/main.c index f1f031d..3bc632c 100644 --- a/level_3/controller/c/main.c +++ b/level_3/controller/c/main.c @@ -43,15 +43,18 @@ int main(const int argc, const f_string_t *argv) { // when run as "init" by default, provide the default system-level init path. // This change must only exist within this main file so that the change only exists within the program rather than the library. #ifdef _controller_as_init_ - data.program_name = controller_program_name_init_s; - data.program_name_long = controller_program_name_init_long_s; - data.setting_default = controller_path_settings_init_s; - data.path_pid = controller_path_pid_init_s; + data.program_name = &controller_program_name_init_s; + data.program_name_long = &controller_program_name_init_long_s; + data.default_path_setting = &controller_path_settings_init_s; + data.default_path_pid = &controller_path_pid_init_s; + data.default_path_socket = &controller_path_socket_init_s; data.as_init = F_true; #else - data.program_name = controller_program_name_s; - data.program_name_long = controller_program_name_long_s; - data.path_pid = controller_path_pid_s; + data.program_name = &controller_program_name_s; + data.program_name_long = &controller_program_name_long_s; + data.default_path_setting = &controller_path_settings_s; + data.default_path_pid = &controller_path_pid_s; + data.default_path_socket = &controller_path_socket_s; #endif // _controller_as_init_ const f_status_t status = controller_main(&data, &arguments); diff --git a/level_3/controller/c/rule/private-rule.c b/level_3/controller/c/rule/private-rule.c index 340010d..b9972cb 100644 --- a/level_3/controller/c/rule/private-rule.c +++ b/level_3/controller/c/rule/private-rule.c @@ -529,7 +529,7 @@ extern "C" { if (global.main->error.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(global.main->error.to, global.thread); - fl_print_format("%c%[%SRule item action '%]", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.prefix, global.main->error.context); + fl_print_format("%q%[%SRule item action '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, global.main->error.context); fl_print_format("%[%s%]", global.main->error.to.stream, global.main->error.notable, controller_rerun_s, global.main->error.notable); fl_print_format("%[' has '%]", global.main->error.to.stream, global.main->error.context, global.main->error.context); fl_print_format("%[%/Q%]", global.main->error.to.stream, global.main->error.notable, cache->buffer_item, cache->content_action.array[0], global.main->error.notable); @@ -543,7 +543,7 @@ extern "C" { fl_print_format("%[%s%]%[', '%]", global.main->error.to.stream, global.main->error.notable, controller_start_s, global.main->error.notable, global.main->error.context, global.main->error.context); fl_print_format("%[%s%]%[', or '%]", global.main->error.to.stream, global.main->error.notable, controller_stop_s, global.main->error.notable, global.main->error.context, global.main->error.context); fl_print_format("%[%s%]", global.main->error.to.stream, global.main->error.notable, controller_thaw_s, global.main->error.notable, global.main->error.context); - fl_print_format("%['.%]%c", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); controller_rule_print_error_cache(global.main->error, cache->action, F_true); @@ -569,14 +569,14 @@ extern "C" { if (global.main->error.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(global.main->error.to, global.thread); - fl_print_format("%c%[%SRule item action '%]", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.prefix, global.main->error.context); + fl_print_format("%q%[%SRule item action '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, global.main->error.context); fl_print_format("%[%s%]", global.main->error.to.stream, global.main->error.notable, controller_rerun_s, global.main->error.notable); fl_print_format("%[' has '%]", global.main->error.to.stream, global.main->error.context, global.main->error.context); fl_print_format("%[%/Q%]", global.main->error.to.stream, global.main->error.notable, cache->buffer_item, cache->content_action.array[1], global.main->error.notable); fl_print_format("%[' as the second value, only the following are allowed: '%]", global.main->error.to.stream, global.main->error.context, global.main->error.context); fl_print_format("%[%s%]%[' or '%]", global.main->error.to.stream, global.main->error.notable, controller_stop_s, global.main->error.notable, global.main->error.context, global.main->error.context); fl_print_format("%[%s%]", global.main->error.to.stream, global.main->error.notable, controller_thaw_s, global.main->error.notable, global.main->error.context); - fl_print_format("%['.%]%c", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); controller_rule_print_error_cache(global.main->error, cache->action, F_true); @@ -601,11 +601,11 @@ extern "C" { if (global.main->error.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(global.main->error.to, global.thread); - fl_print_format("%c%[%SRule item action '%]", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.prefix, global.main->error.context); + fl_print_format("%q%[%SRule item action '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, global.main->error.context); fl_print_format("%[%s%]", global.main->error.to.stream, global.main->error.notable, controller_rerun_s, global.main->error.notable); fl_print_format("%[' has an unknown value '%]", global.main->error.to.stream, global.main->error.context, global.main->error.context); fl_print_format("%[%/Q%]", global.main->error.to.stream, global.main->error.notable, cache->buffer_item, cache->content_action.array[i], global.main->error.notable); - fl_print_format("%['.%]%c", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); controller_rule_print_error_cache(global.main->error, cache->action, F_true); @@ -643,10 +643,10 @@ extern "C" { if (global.main->error.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(global.main->error.to, global.thread); - fl_print_format("%c%[%SUnknown value '%]", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.prefix, global.main->error.context); + fl_print_format("%q%[%SUnknown value '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, global.main->error.context); fl_print_format("%[%/Q%]", global.main->error.to.stream, global.main->error.notable, cache->buffer_item, cache->content_action.array[i], global.main->error.notable); fl_print_format("%[' for rule item action '%]%[%s%]", global.main->error.to.stream, global.main->error.context, global.main->error.context, global.main->error.notable, controller_with_s, global.main->error.notable); - fl_print_format("%['.%]%c", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); controller_rule_print_error_cache(global.main->error, cache->action, F_true); @@ -727,7 +727,7 @@ extern "C" { if (global.main->warning.verbosity == f_console_verbosity_debug_e) { controller_lock_print(global.main->warning.to, global.thread); - fl_print_format("%c%[%SAction is empty, nothing to do.%]%c", global.main->warning.to.stream, f_string_eol_s[0], global.main->warning.context, global.main->warning.prefix, global.main->warning.context, f_string_eol_s[0]); + fl_print_format("%q%[%SAction is empty, nothing to do.%]%q", global.main->warning.to.stream, f_string_eol_s, global.main->warning.context, global.main->warning.prefix, global.main->warning.context, f_string_eol_s); controller_rule_print_error_cache(global.main->warning, cache->action, F_true); @@ -770,26 +770,26 @@ extern "C" { else { controller_lock_print(global.main->error.to, global.thread); - fl_print_format("%c%[%SRule item action '%]", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.prefix, global.main->error.context); + fl_print_format("%q%[%SRule item action '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, global.main->error.context); fl_print_format("%[%s%]", global.main->error.to.stream, global.main->error.notable, controller_rerun_s, global.main->error.notable); fl_print_format("%[' requires a positive whole number or 0 for the '%]", global.main->error.to.stream, global.main->error.context, global.main->error.context); fl_print_format("%[%S%]", global.main->error.to.stream, global.main->error.notable, name, global.main->error.notable); fl_print_format("%[' value", global.main->error.to.stream, global.main->error.context, global.main->error.context); if (*index + 1 == cache->content_action.used) { - fl_print_format(", but none were given.%]%c", global.main->error.to.stream, global.main->error.context, f_string_eol_s[0]); + fl_print_format(", but none were given.%]%q", global.main->error.to.stream, global.main->error.context, f_string_eol_s); } else { fl_print_format(", but '%]%[%/Q%]", global.main->error.to.stream, global.main->error.context, global.main->error.notable, cache->buffer_item, cache->content_action.array[*index], global.main->error.notable); if (status == F_number || status == F_number_decimal) { - fl_print_format("%[' was given.%]%c", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%[' was given.%]%q", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); } else if (status == F_number_overflow) { - fl_print_format("%[' is too large.%]%c", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%[' is too large.%]%q", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); } else { - fl_print_format("%[' is negative.%]%c", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%[' is negative.%]%q", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); } } @@ -1265,7 +1265,7 @@ extern "C" { if (global.main->warning.verbosity == f_console_verbosity_debug_e) { controller_lock_print(global.main->warning.to, global.thread); - fl_print_format("%c%[%SAction type is unknown, ignoring.%]%c", global.main->warning.to.stream, f_string_eol_s[0], global.main->warning.context, global.main->warning.prefix, global.main->warning.context, f_string_eol_s[0]); + fl_print_format("%q%[%SAction type is unknown, ignoring.%]%q", global.main->warning.to.stream, f_string_eol_s, global.main->warning.context, global.main->warning.prefix, global.main->warning.context, f_string_eol_s); controller_rule_print_error_cache(global.main->warning, process->cache.action, F_true); @@ -1360,7 +1360,7 @@ extern "C" { if (main->output.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(main->output.to, thread); - fl_print_format("%cSimulating execution of '%[", main->output.to.stream, f_string_eol_s[0], main->context.set.title); + fl_print_format("%qSimulating execution of '%[", main->output.to.stream, f_string_eol_s, main->context.set.title); if (program.used) { f_print_dynamic_safely(program, main->output.to.stream); @@ -1381,7 +1381,7 @@ extern "C" { } // for fl_print_format("%]' from '", main->output.to.stream, main->context.set.important); - fl_print_format("%[%Q%]'.%c", main->output.to.stream, main->context.set.notable, process->rule.name, main->context.set.notable, f_string_eol_s[0]); + fl_print_format("%[%Q%]'.%q", main->output.to.stream, main->context.set.notable, process->rule.name, main->context.set.notable, f_string_eol_s); controller_unlock_print_flush(main->output.to, thread); } @@ -1616,7 +1616,7 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(main->error.to, thread); - fl_print_format("%cSimulating execution of '%[", main->error.to.stream, f_string_eol_s[0], main->context.set.title); + fl_print_format("%qSimulating execution of '%[", main->error.to.stream, f_string_eol_s, main->context.set.title); if (program.used) { f_print_dynamic_safely(program, main->error.to.stream); @@ -1637,7 +1637,7 @@ extern "C" { } // for fl_print_format("%]' from '", main->error.to.stream, main->context.set.important); - fl_print_format("%[%Q%]'.%c", main->error.to.stream, main->context.set.notable, process->rule.name, main->context.set.notable, f_string_eol_s[0]); + fl_print_format("%[%Q%]'.%q", main->error.to.stream, main->context.set.notable, process->rule.name, main->context.set.notable, f_string_eol_s); controller_unlock_print_flush(main->error.to, thread); } @@ -1808,7 +1808,7 @@ extern "C" { if (main->error.verbosity == f_console_verbosity_debug_e) { controller_lock_print(main->output.to, thread); - fl_print_format("%cRe-running '", main->output.to.stream, f_string_eol_s[0]); + fl_print_format("%qRe-running '", main->output.to.stream, f_string_eol_s); fl_print_format("%[%q%]", main->output.to.stream, main->context.set.title, process->rule.alias, main->context.set.title); f_print_terminated("' '", main->output.to.stream); fl_print_format("%[%q%]", main->output.to.stream, main->context.set.notable, controller_rule_action_type_execute_name(action), main->context.set.notable); @@ -1823,10 +1823,10 @@ extern "C" { f_print_terminated(" of ", main->output.to.stream); fl_print_format("%[%s%] ", main->output.to.stream, main->context.set.notable, controller_max_s, main->context.set.notable); fl_print_format("%[%ul%]", main->output.to.stream, main->context.set.notable, rerun_item->max, main->context.set.notable); - fl_print_format(".%c", main->output.to.stream, f_string_eol_s[0]); + fl_print_format(".%q", main->output.to.stream, f_string_eol_s); } else { - fl_print_format(" with no %[%s%].%c", main->output.to.stream, main->context.set.notable, controller_max_s, main->context.set.notable, f_string_eol_s[0]); + fl_print_format(" with no %[%s%].%q", main->output.to.stream, main->context.set.notable, controller_max_s, main->context.set.notable, f_string_eol_s); } controller_unlock_print_flush(main->output.to, thread); @@ -2038,9 +2038,9 @@ extern "C" { if (global.main->warning.verbosity == f_console_verbosity_debug_e) { controller_lock_print(global.main->warning.to, global.thread); - fl_print_format("%c%[%SUnknown rule item action '%]", global.main->warning.to.stream, f_string_eol_s[0], global.main->warning.context, global.main->warning.prefix, global.main->warning.context); + fl_print_format("%q%[%SUnknown rule item action '%]", global.main->warning.to.stream, f_string_eol_s, global.main->warning.context, global.main->warning.prefix, global.main->warning.context); fl_print_format("%[%Q%]", global.main->warning.to.stream, global.main->warning.notable, cache->action.name_action, global.main->warning.notable); - fl_print_format("%['.%]%c", global.main->warning.to.stream, global.main->warning.context, global.main->warning.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", global.main->warning.to.stream, global.main->warning.context, global.main->warning.context, f_string_eol_s); controller_rule_print_error_cache(global.main->warning, cache->action, F_true); @@ -2056,9 +2056,9 @@ extern "C" { if (global.main->error.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(global.main->error.to, global.thread); - fl_print_format("%c%[%SFSS Extended List is not allowed for the rule item action '%]", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.prefix, global.main->error.context); + fl_print_format("%q%[%SFSS Extended List is not allowed for the rule item action '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, global.main->error.context); fl_print_format("%[%Q%]", global.main->error.to.stream, global.main->error.notable, cache->action.name_action, global.main->error.notable); - fl_print_format("%['.%]%c", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); controller_unlock_print_flush(global.main->error.to, global.thread); } @@ -2260,9 +2260,9 @@ extern "C" { if (global.main->error.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(global.main->error.to, global.thread); - fl_print_format("%c%[%SUnsupported action type '%]", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.prefix, global.main->error.context); + fl_print_format("%q%[%SUnsupported action type '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, global.main->error.context); fl_print_format("%[%q%]", global.main->error.to.stream, global.main->error.notable, controller_rule_action_type_name(process->action), global.main->error.notable); - fl_print_format("%[' while attempting to execute rule.%]%c", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%[' while attempting to execute rule.%]%q", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); controller_rule_print_error_cache(global.main->error, process->cache.action, F_true); @@ -2687,14 +2687,14 @@ extern "C" { controller_lock_print(global.main->error.to, global.thread); if (process->rule.items.used) { - fl_print_format("%c%[%SThe rule '%]", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.prefix, global.main->error.context); + fl_print_format("%q%[%SThe rule '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, global.main->error.context); fl_print_format("%[%Q%]", global.main->error.to.stream, global.main->error.notable, process->rule.name, global.main->error.notable); fl_print_format("%[' has no '%]", global.main->error.to.stream, global.main->error.context, global.main->error.context); fl_print_format("%[%q%]", global.main->error.to.stream, global.main->error.notable, controller_rule_action_type_name(process->action), global.main->error.notable); - fl_print_format("%[' action to execute.%]%c", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%[' action to execute.%]%q", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); } else { - fl_print_format("%c%[%SThe rule '%]", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.prefix, global.main->error.context); + fl_print_format("%q%[%SThe rule '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, global.main->error.context); fl_print_format("%[%Q%]", global.main->error.to.stream, global.main->error.notable, process->rule.name, global.main->error.notable); fl_print_format("%[ has no known '%]", global.main->error.to.stream, global.main->error.context, global.main->error.context); fl_print_format("%[%s %s%]", global.main->error.to.stream, global.main->error.notable, controller_rule_s, controller_type_s, global.main->error.notable); @@ -2706,7 +2706,7 @@ extern "C" { fl_print_format("%[%s%]", global.main->error.to.stream, global.main->error.notable, controller_script_s, global.main->error.notable); fl_print_format("%[', or '%]", global.main->error.to.stream, global.main->error.context, global.main->error.context); fl_print_format("%[%s%]", global.main->error.to.stream, global.main->error.notable, controller_utility_s, global.main->error.notable); - fl_print_format("%[') to execute.%]%c", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%[') to execute.%]%q", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); } controller_rule_print_error_cache(global.main->error, process->cache.action, F_true); @@ -3149,9 +3149,9 @@ extern "C" { if (global.main->error.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(global.main->error.to, global.thread); - fl_print_format("%c%[%SThe rule '%]", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.prefix, global.main->error.context); + fl_print_format("%q%[%SThe rule '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, global.main->error.context); fl_print_format("%[%Q%]", global.main->error.to.stream, global.main->error.notable, process->rule.alias, global.main->error.notable); - fl_print_format("%[' is already on the execution dependency stack, this recursion is prohibited.%]%c", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%[' is already on the execution dependency stack, this recursion is prohibited.%]%q", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); controller_rule_print_error_cache(global.main->error, process->cache.action, F_true); @@ -3521,9 +3521,9 @@ extern "C" { if (global.main->warning.verbosity == f_console_verbosity_debug_e) { controller_lock_print(global.main->warning.to, global.thread); - fl_print_format("%c%[%SUnknown rule item '%]", global.main->warning.to.stream, f_string_eol_s[0], global.main->warning.context, global.main->warning.prefix, global.main->warning.context); + fl_print_format("%q%[%SUnknown rule item '%]", global.main->warning.to.stream, f_string_eol_s, global.main->warning.context, global.main->warning.prefix, global.main->warning.context); fl_print_format("%[%Q%]", global.main->warning.to.stream, global.main->warning.notable, cache->action.name_item, global.main->warning.notable); - fl_print_format("%['.%]%c", global.main->warning.to.stream, global.main->warning.context, global.main->warning.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", global.main->warning.to.stream, global.main->warning.context, global.main->warning.context, f_string_eol_s); controller_rule_print_error_cache(global.main->warning, cache->action, F_true); @@ -3739,9 +3739,9 @@ extern "C" { controller_lock_print(global.main->warning.to, global.thread); - fl_print_format("%c%[%SUnknown rule setting '%]", global.main->warning.to.stream, f_string_eol_s[0], global.main->warning.context, global.main->warning.prefix, global.main->warning.context); + fl_print_format("%q%[%SUnknown rule setting '%]", global.main->warning.to.stream, f_string_eol_s, global.main->warning.context, global.main->warning.prefix, global.main->warning.context); fl_print_format("%[%Q%]", global.main->warning.to.stream, global.main->warning.notable, cache->action.name_item, global.main->warning.notable); - fl_print_format("%['.%]%c", global.main->warning.to.stream, global.main->warning.context, global.main->warning.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", global.main->warning.to.stream, global.main->warning.context, global.main->warning.context, f_string_eol_s); controller_rule_print_error_cache(global.main->warning, cache->action, F_false); @@ -3802,7 +3802,7 @@ extern "C" { controller_lock_print(global.main->warning.to, global.thread); - fl_print_format("%c%[%SEmpty rule setting.%]%c", global.main->warning.to.stream, f_string_eol_s[0], global.main->warning.context, global.main->warning.prefix, global.main->warning.context, f_string_eol_s[0]); + fl_print_format("%q%[%SEmpty rule setting.%]%q", global.main->warning.to.stream, f_string_eol_s, global.main->warning.context, global.main->warning.prefix, global.main->warning.context, f_string_eol_s); controller_rule_print_error_cache(global.main->warning, cache->action, F_false); @@ -4179,9 +4179,9 @@ extern "C" { controller_lock_print(global.main->error.to, global.thread); - fl_print_format("%c%[%SUnknown resource limit type '%]", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.prefix, global.main->error.context); + fl_print_format("%q%[%SUnknown resource limit type '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, global.main->error.context); fl_print_format("%[%Q%]", global.main->error.to.stream, global.main->error.notable, cache->action.name_action, global.main->error.notable); - fl_print_format("%['.%]%c", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); controller_rule_print_error_cache(global.main->error, cache->action, F_true); @@ -4208,7 +4208,7 @@ extern "C" { controller_lock_print(global.main->error.to, global.thread); - fl_print_format("%c%[%SThe resource limit type is already specified%]%c", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%SThe resource limit type is already specified%]%q", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.context, f_string_eol_s); controller_rule_print_error_cache(global.main->error, cache->action, F_false); @@ -4379,9 +4379,9 @@ extern "C" { if (global.main->error.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(global.main->error.to, global.thread); - fl_print_format("%c%[%SRule setting has an invalid name '%]", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.prefix, global.main->error.context); + fl_print_format("%q%[%SRule setting has an invalid name '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, global.main->error.context); fl_print_format("%[%Q%]", global.main->error.to.stream, global.main->error.notable, *setting_value, global.main->error.notable); - fl_print_format("%[', there must be at least 1 graph character.%]%c", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%[', there must be at least 1 graph character.%]%q", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); controller_rule_print_error_cache(global.main->error, cache->action, F_false); @@ -4530,7 +4530,7 @@ extern "C" { controller_lock_print(global.main->error.to, global.thread); - fl_print_format("%c%[%SRule setting has an invalid number '%]", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.prefix, global.main->error.context); + fl_print_format("%q%[%SRule setting has an invalid number '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, global.main->error.context); fl_print_format("%[%/Q%]", global.main->error.to.stream, global.main->error.notable, cache->buffer_item, cache->content_actions.array[i].array[1], global.main->error.notable); if (zero_only) { @@ -4543,7 +4543,7 @@ extern "C" { fl_print_format("%[99%] %[are", global.main->error.to.stream, global.main->error.notable, global.main->error.notable, global.main->error.context); } - fl_print_format(" allowed for the designated scheduler.%]%c", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s[0]); + fl_print_format(" allowed for the designated scheduler.%]%q", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); controller_rule_print_error_cache(global.main->error, cache->action, F_false); @@ -4609,9 +4609,9 @@ extern "C" { controller_lock_print(global.main->error.to, global.thread); - fl_print_format("%c%[%SRule setting's first value has '%]", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.prefix, global.main->error.context); + fl_print_format("%q%[%SRule setting's first value has '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, global.main->error.context); fl_print_format("%[%/Q%]", global.main->error.to.stream, global.main->error.notable, cache->buffer_item, cache->content_actions.array[i].array[0], global.main->error.notable); - fl_print_format("%[' but only supports %s, %s, and %s.%]%c", global.main->error.to.stream, global.main->error.context, controller_kill_s, controller_start_s, controller_stop_s, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%[' but only supports %s, %s, and %s.%]%q", global.main->error.to.stream, global.main->error.context, controller_kill_s, controller_start_s, controller_stop_s, global.main->error.context, f_string_eol_s); controller_rule_print_error_cache(global.main->error, cache->action, F_false); @@ -4832,13 +4832,13 @@ extern "C" { controller_lock_print(global.main->error.to, global.thread); - fl_print_format("%c%[%SRule setting has an invalid number '%]", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.prefix, global.main->error.context); + fl_print_format("%q%[%SRule setting has an invalid number '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, global.main->error.context); fl_print_format("%[%/Q%]", global.main->error.to.stream, global.main->error.notable, cache->buffer_item, cache->content_actions.array[i].array[0], global.main->error.notable); fl_print_format("%[', only the whole numbers inclusively between%] ", global.main->error.to.stream, global.main->error.context, global.main->error.context); fl_print_format("%[-20%]", global.main->error.to.stream, global.main->error.notable, global.main->error.notable); fl_print_format(" %[and%] ", global.main->error.to.stream, global.main->error.context, global.main->error.context); fl_print_format("%[19%]", global.main->error.to.stream, global.main->error.notable, global.main->error.notable); - fl_print_format(" %[are allowed.%]%c", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s[0]); + fl_print_format(" %[are allowed.%]%q", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); controller_rule_print_error_cache(global.main->error, cache->action, F_false); @@ -5129,9 +5129,9 @@ extern "C" { if (global.main->error.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(global.main->error.to, global.thread); - fl_print_format("%c%[%SRule setting has an invalid environment variable name '%]", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.prefix, global.main->error.context); + fl_print_format("%q%[%SRule setting has an invalid environment variable name '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, global.main->error.context); fl_print_format("%[%Q%]", global.main->error.to.stream, global.main->error.notable, setting_values->array[setting_values->used], global.main->error.notable); - fl_print_format("%['.%]%c", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); controller_rule_print_error_cache(global.main->error, cache->action, F_false); @@ -5171,7 +5171,7 @@ extern "C" { if (global.main->error.verbosity == f_console_verbosity_debug_e || (global.main->error.verbosity == f_console_verbosity_verbose_e && global.main->parameters[controller_parameter_simulate_e].result == f_console_result_found_e)) { controller_lock_print(global.main->output.to, global.thread); - fl_print_format("%cProcessing rule item action '%[%s%]' setting value to an empty set.%c", global.main->output.to.stream, f_string_eol_s[0], global.main->context.set.title, controller_environment_s, global.main->context.set.title, f_string_eol_s[0]); + fl_print_format("%qProcessing rule item action '%[%s%]' setting value to an empty set.%q", global.main->output.to.stream, f_string_eol_s, global.main->context.set.title, controller_environment_s, global.main->context.set.title, f_string_eol_s); controller_unlock_print_flush(global.main->output.to, global.thread); } @@ -5231,10 +5231,10 @@ extern "C" { controller_lock_print(global.main->error.to, global.thread); - fl_print_format("%c%[%SRule setting's second value has '%]", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.prefix, global.main->error.context); + fl_print_format("%q%[%SRule setting's second value has '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, global.main->error.context); fl_print_format("%[%/Q%]", global.main->error.to.stream, global.main->error.notable, cache->buffer_item, cache->content_actions.array[i].array[1], global.main->error.notable); fl_print_format("%[' but only supports %s, %s, %s, %s, %s", global.main->error.to.stream, global.main->error.context, controller_freeze_s, controller_kill_s, controller_pause_s, controller_reload_s, controller_restart_s); - fl_print_format("%s, %s, %s, and %s.%]%c", global.main->error.to.stream, controller_resume_s, controller_start_s, controller_stop_s, controller_thaw_s, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%s, %s, %s, and %s.%]%q", global.main->error.to.stream, controller_resume_s, controller_start_s, controller_stop_s, controller_thaw_s, global.main->error.context, f_string_eol_s); controller_rule_print_error_cache(global.main->error, cache->action, F_false); @@ -5280,9 +5280,9 @@ extern "C" { controller_lock_print(global.main->error.to, global.thread); - fl_print_format("%c%[%SRule setting's second value has '%]", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.prefix, global.main->error.context); + fl_print_format("%q%[%SRule setting's second value has '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, global.main->error.context); fl_print_format("%[%/Q%]", global.main->error.to.stream, global.main->error.notable, cache->buffer_item, cache->content_actions.array[i].array[1], global.main->error.notable); - fl_print_format("%[' but only supports %s, %s, and %s.%]%c", global.main->error.to.stream, global.main->error.context, controller_need_s, controller_want_s, controller_wish_s, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%[' but only supports %s, %s, and %s.%]%q", global.main->error.to.stream, global.main->error.context, controller_need_s, controller_want_s, controller_wish_s, global.main->error.context, f_string_eol_s); controller_rule_print_error_cache(global.main->error, cache->action, F_false); @@ -5375,11 +5375,11 @@ extern "C" { if (global.main->error.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(global.main->error.to, global.thread); - fl_print_format("%c%[%SThe rule item action third parameter '%]", global.main->error.to.stream, f_string_eol_s[0], global.main->error.context, global.main->error.prefix, global.main->error.context); + fl_print_format("%q%[%SThe rule item action third parameter '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, global.main->error.context); fl_print_format("%[%/Q%]", global.main->error.to.stream, global.main->error.notable, cache->buffer_item, cache->content_actions.array[i].array[2], global.main->error.notable); fl_print_format("%[' must be a base path name, such as %un '.%]", global.main->error.to.stream, global.main->error.context, cache->buffer_path.used, global.main->error.context); fl_print_format("%[%Q%]", global.main->error.to.stream, cache->buffer_path, global.main->error.notable); - fl_print_format("%['.%]%c", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); controller_unlock_print_flush(global.main->error.to, global.thread); } @@ -5400,10 +5400,10 @@ extern "C" { if (global.main->error.verbosity == f_console_verbosity_debug_e || (global.main->error.verbosity == f_console_verbosity_verbose_e && global.main->parameters[controller_parameter_simulate_e].result == f_console_result_found_e)) { controller_lock_print(global.main->output.to, global.thread); - fl_print_format("%cProcessing rule item action '%[%S%]', adding ", global.main->output.to.stream, f_string_eol_s[0], global.main->context.set.title, controller_on_s, global.main->context.set.title); + fl_print_format("%qProcessing rule item action '%[%S%]', adding ", global.main->output.to.stream, f_string_eol_s, global.main->context.set.title, controller_on_s, global.main->context.set.title); fl_print_format("'%[%/Q%]' of ", global.main->output.to.stream, global.main->context.set.notable, cache->buffer_item, cache->content_actions.array[i].array[1], global.main->context.set.notable); fl_print_format("'%[%/Q%]/", global.main->output.to.stream, global.main->context.set.important, cache->buffer_item, cache->content_actions.array[i].array[2], global.main->context.set.important); - fl_print_format("%[%/Q%]'.%c", global.main->output.to.stream, global.main->context.set.important, cache->buffer_item, cache->content_actions.array[i].array[3], global.main->context.set.important, f_string_eol_s[0]); + fl_print_format("%[%/Q%]'.%q", global.main->output.to.stream, global.main->context.set.important, cache->buffer_item, cache->content_actions.array[i].array[3], global.main->context.set.important, f_string_eol_s); controller_unlock_print_flush(global.main->output.to, global.thread); } @@ -5442,9 +5442,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(main->error.to, global.thread); - fl_print_format("%c%[%SUnsupported action type '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix ? main->error.prefix : f_string_empty_s, main->error.context); + fl_print_format("%q%[%SUnsupported action type '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix ? main->error.prefix : f_string_empty_s, main->error.context); fl_print_format("%[%q%]", main->error.to.stream, main->error.notable, controller_rule_action_type_name(action), main->error.notable); - fl_print_format("%[' while attempting to validate rule execution.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' while attempting to validate rule execution.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); controller_rule_print_error_cache(main->error, cache->action, F_true); @@ -5476,14 +5476,14 @@ extern "C" { controller_lock_print(main->output.to, global.thread); if (rule.items.used) { - fl_print_format("%cRule '", main->output.to.stream, f_string_eol_s[0]); + fl_print_format("%qRule '", main->output.to.stream, f_string_eol_s); fl_print_format("%[%Q%]' has no '", main->output.to.stream, main->context.set.title, rule.name, main->context.set.title); fl_print_format("%[%q%]' action to execute and would '", main->output.to.stream, main->context.set.title, controller_rule_action_type_name(action), main->context.set.title); fl_print_format("%[%s%]' because it is '", main->output.to.stream, main->context.set.important, options & controller_process_option_require_d ? controller_fail_s : controller_succeed_s, main->context.set.important); - fl_print_format("%[%s%]'.%c", main->output.to.stream, main->context.set.important, options & controller_process_option_require_d ? controller_required_s : controller_optional_s, main->context.set.important, f_string_eol_s[0]); + fl_print_format("%[%s%]'.%q", main->output.to.stream, main->context.set.important, options & controller_process_option_require_d ? controller_required_s : controller_optional_s, main->context.set.important, f_string_eol_s); } else { - fl_print_format("%cRule '", main->output.to.stream, f_string_eol_s[0]); + fl_print_format("%qRule '", main->output.to.stream, f_string_eol_s); fl_print_format("%[%Q%]' has no known '", main->output.to.stream, main->context.set.title, rule.name, main->context.set.title); fl_print_format("%[%s %s%]' (such as ", main->output.to.stream, main->context.set.title, controller_rule_s, controller_type_s, main->context.set.title); fl_print_format("'%[%s%]', ", main->output.to.stream, main->context.set.title, controller_command_s, main->context.set.title); @@ -5491,7 +5491,7 @@ extern "C" { fl_print_format("'%[%s%]', or ", main->output.to.stream, main->context.set.title, controller_script_s, main->context.set.title); fl_print_format("'%[%s%]'", main->output.to.stream, main->context.set.title, controller_utility_s, main->context.set.title); fl_print_format(") and would '%[%s%]' because it is '", main->output.to.stream, main->context.set.important, options & controller_process_option_require_d ? controller_fail_s : controller_succeed_s, main->context.set.important); - fl_print_format("%[%s%]'.%c", main->output.to.stream, main->context.set.important, options & controller_process_option_require_d ? controller_required_s : controller_optional_s, main->context.set.important, f_string_eol_s[0]); + fl_print_format("%[%s%]'.%q", main->output.to.stream, main->context.set.important, options & controller_process_option_require_d ? controller_required_s : controller_optional_s, main->context.set.important, f_string_eol_s); } controller_unlock_print_flush(main->output.to, global.thread); @@ -5500,10 +5500,10 @@ extern "C" { controller_lock_print(main->output.to, global.thread); - fl_print_format("%cRule %[%Q%] {%c", main->output.to.stream, f_string_eol_s[0], main->context.set.title, rule.alias, main->context.set.title, f_string_eol_s[0]); + fl_print_format("%qRule %[%Q%] {%q", main->output.to.stream, f_string_eol_s, main->context.set.title, rule.alias, main->context.set.title, f_string_eol_s); // name. - fl_print_format(" %[%s%] %Q%c", main->output.to.stream, main->context.set.important, controller_name_s, main->context.set.important, rule.name, f_string_eol_s[0]); + fl_print_format(" %[%s%] %Q%q", main->output.to.stream, main->context.set.important, controller_name_s, main->context.set.important, rule.name, f_string_eol_s); // capability. fl_print_format(" %[%s%] ", main->output.to.stream, main->context.set.important, controller_capability_s, main->context.set.important); @@ -5520,7 +5520,7 @@ extern "C" { f_print_terminated(f_string_eol_s, main->output.to.stream); } else { - fl_print_format("%[(unsupported)%]%c", main->output.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s[0]); + fl_print_format("%[(unsupported)%]%q", main->output.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s); } // control group. @@ -5540,7 +5540,7 @@ extern "C" { f_print_terminated(f_string_eol_s, main->output.to.stream); // how. - fl_print_format(" %[%s%] %s%c", main->output.to.stream, main->context.set.important, controller_how_s, main->context.set.important, options & controller_process_option_asynchronous_d ? controller_asynchronous_s : controller_synchronous_s, f_string_eol_s[0]); + fl_print_format(" %[%s%] %s%q", main->output.to.stream, main->context.set.important, controller_how_s, main->context.set.important, options & controller_process_option_asynchronous_d ? controller_asynchronous_s : controller_synchronous_s, f_string_eol_s); // nice. fl_print_format(" %[%s%]", main->output.to.stream, main->context.set.important, controller_nice_s, main->context.set.important); @@ -5582,7 +5582,7 @@ extern "C" { f_print_terminated(f_string_eol_s, main->output.to.stream); // script. - fl_print_format(" %[%s%] %Q%c", main->output.to.stream, main->context.set.important, controller_script_s, main->context.set.important, rule.script, f_string_eol_s[0]); + fl_print_format(" %[%s%] %Q%q", main->output.to.stream, main->context.set.important, controller_script_s, main->context.set.important, rule.script, f_string_eol_s); // user. fl_print_format(" %[%s%]", main->output.to.stream, main->context.set.important, controller_user_s, main->context.set.important); @@ -5594,69 +5594,69 @@ extern "C" { f_print_terminated(f_string_eol_s, main->output.to.stream); // wait. - fl_print_format(" %[%s%] %s%c", main->output.to.stream, main->context.set.important, controller_wait_s, main->context.set.important, options & controller_process_option_wait_d ? controller_yes_s : controller_no_s, f_string_eol_s[0]); + fl_print_format(" %[%s%] %s%q", main->output.to.stream, main->context.set.important, controller_wait_s, main->context.set.important, options & controller_process_option_wait_d ? controller_yes_s : controller_no_s, f_string_eol_s); // affinity. - fl_print_format(" %[%s%] {%c", main->output.to.stream, main->context.set.important, controller_affinity_s, main->context.set.important, f_string_eol_s[0]); + fl_print_format(" %[%s%] {%q", main->output.to.stream, main->context.set.important, controller_affinity_s, main->context.set.important, f_string_eol_s); for (i = 0; i < rule.affinity.used; ++i) { - fl_print_format(" %i%c", main->output.to.stream, rule.affinity.array[i], f_string_eol_s[0]); + fl_print_format(" %i%q", main->output.to.stream, rule.affinity.array[i], f_string_eol_s); } // for // define. - fl_print_format(" }%c %[%s%] {%c", main->output.to.stream, f_string_eol_s[0], main->context.set.important, controller_define_s, main->context.set.important, f_string_eol_s[0]); + fl_print_format(" }%q %[%s%] {%q", main->output.to.stream, f_string_eol_s, main->context.set.important, controller_define_s, main->context.set.important, f_string_eol_s); for (i = 0; i < rule.define.used; ++i) { if (rule.define.array[i].name.used && rule.define.array[i].value.used) { - fl_print_format(" %Q %[=%] %Q%c", main->output.to.stream, rule.define.array[i].name, main->context.set.important, main->context.set.important, rule.define.array[i].value, f_string_eol_s[0]); + fl_print_format(" %Q %[=%] %Q%q", main->output.to.stream, rule.define.array[i].name, main->context.set.important, main->context.set.important, rule.define.array[i].value, f_string_eol_s); } } // for // environment. - fl_print_format(" }%c %[%s%] {%c", main->output.to.stream, f_string_eol_s[0], main->context.set.important, controller_environment_s, main->context.set.important, f_string_eol_s[0]); + fl_print_format(" }%q %[%s%] {%q", main->output.to.stream, f_string_eol_s, main->context.set.important, controller_environment_s, main->context.set.important, f_string_eol_s); for (i = 0; i < rule.environment.used; ++i) { if (rule.environment.array[i].used) { - fl_print_format(" %Q%c", main->output.to.stream, rule.environment.array[i], f_string_eol_s[0]); + fl_print_format(" %Q%q", main->output.to.stream, rule.environment.array[i], f_string_eol_s); } } // for - fl_print_format(" }%c %[%s%] {%c", main->output.to.stream, f_string_eol_s[0], main->context.set.important, controller_parameter_s, main->context.set.important, f_string_eol_s[0]); + fl_print_format(" }%q %[%s%] {%q", main->output.to.stream, f_string_eol_s, main->context.set.important, controller_parameter_s, main->context.set.important, f_string_eol_s); // parameter. for (i = 0; i < rule.parameter.used; ++i) { if (rule.parameter.array[i].name.used && rule.parameter.array[i].value.used) { - fl_print_format(" %Q %[=%] %Q%c", main->output.to.stream, rule.parameter.array[i].name, main->context.set.important, main->context.set.important, rule.parameter.array[i].value, f_string_eol_s[0]); + fl_print_format(" %Q %[=%] %Q%q", main->output.to.stream, rule.parameter.array[i].name, main->context.set.important, main->context.set.important, rule.parameter.array[i].value, f_string_eol_s); } } // for // group. - fl_print_format(" }%c %[%s%] {%c", main->output.to.stream, f_string_eol_s[0], main->context.set.important, controller_group_s, main->context.set.important, f_string_eol_s[0]); + fl_print_format(" }%q %[%s%] {%q", main->output.to.stream, f_string_eol_s, main->context.set.important, controller_group_s, main->context.set.important, f_string_eol_s); if (rule.has & controller_rule_has_group_d) { - fl_print_format(" %i%c", main->output.to.stream, rule.group, f_string_eol_s[0]); + fl_print_format(" %i%q", main->output.to.stream, rule.group, f_string_eol_s); for (i = 0; i < rule.groups.used; ++i) { - fl_print_format(" %i%c", main->output.to.stream, rule.groups.array[i], f_string_eol_s[0]); + fl_print_format(" %i%q", main->output.to.stream, rule.groups.array[i], f_string_eol_s); } // for } // limit. - fl_print_format(" }%c %[%s%] {%c", main->output.to.stream, f_string_eol_s[0], main->context.set.important, controller_limit_s, main->context.set.important, f_string_eol_s[0]); + fl_print_format(" }%q %[%s%] {%q", main->output.to.stream, f_string_eol_s, main->context.set.important, controller_limit_s, main->context.set.important, f_string_eol_s); for (i = 0; i < rule.limits.used; ++i) { - fl_print_format(" %Q %[=%] %un %un%c", main->output.to.stream, controller_rule_setting_limit_type_name(rule.limits.array[i].type), main->context.set.important, main->context.set.important, rule.limits.array[i].value.rlim_cur, rule.limits.array[i].value.rlim_max, f_string_eol_s[0]); + fl_print_format(" %Q %[=%] %un %un%q", main->output.to.stream, controller_rule_setting_limit_type_name(rule.limits.array[i].type), main->context.set.important, main->context.set.important, rule.limits.array[i].value.rlim_cur, rule.limits.array[i].value.rlim_max, f_string_eol_s); } // for // on. - fl_print_format(" }%c %[%s%] {%c", main->output.to.stream, f_string_eol_s[0], main->context.set.important, controller_on_s, main->context.set.important, f_string_eol_s[0]); + fl_print_format(" }%q %[%s%] {%q", main->output.to.stream, f_string_eol_s, main->context.set.important, controller_on_s, main->context.set.important, f_string_eol_s); for (i = 0; i < rule.ons.used; ++i) { - fl_print_format(" %[%s%] {%c", main->output.to.stream, main->context.set.important, controller_action_s, main->context.set.important, f_string_eol_s[0]); + fl_print_format(" %[%s%] {%q", main->output.to.stream, main->context.set.important, controller_action_s, main->context.set.important, f_string_eol_s); { f_string_t action = ""; @@ -5689,40 +5689,40 @@ extern "C" { action = controller_thaw_s; } - fl_print_format(" %[%s%] %s%c", main->output.to.stream, main->context.set.important, controller_type_s, main->context.set.important, action, f_string_eol_s[0]); + fl_print_format(" %[%s%] %s%q", main->output.to.stream, main->context.set.important, controller_type_s, main->context.set.important, action, f_string_eol_s); } - fl_print_format(" %[%s%] {%c", main->output.to.stream, main->context.set.important, controller_need_s, main->context.set.important, f_string_eol_s[0]); + fl_print_format(" %[%s%] {%q", main->output.to.stream, main->context.set.important, controller_need_s, main->context.set.important, f_string_eol_s); for (j = 0; j < rule.ons.array[i].need.used; ++j) { if (rule.ons.array[i].need.array[j].used) { - fl_print_format(" %Q%c", main->output.to.stream, rule.ons.array[i].need.array[j], f_string_eol_s[0]); + fl_print_format(" %Q%q", main->output.to.stream, rule.ons.array[i].need.array[j], f_string_eol_s); } } // for - fl_print_format(" }%c %[%s%] {%c", main->output.to.stream, f_string_eol_s[0], main->context.set.important, controller_want_s, main->context.set.important, f_string_eol_s[0]); + fl_print_format(" }%q %[%s%] {%q", main->output.to.stream, f_string_eol_s, main->context.set.important, controller_want_s, main->context.set.important, f_string_eol_s); for (j = 0; j < rule.ons.array[i].want.used; ++j) { if (rule.ons.array[i].want.array[j].used) { - fl_print_format(" %Q%c", main->output.to.stream, rule.ons.array[i].want.array[j], f_string_eol_s[0]); + fl_print_format(" %Q%q", main->output.to.stream, rule.ons.array[i].want.array[j], f_string_eol_s); } } // for - fl_print_format(" }%c %[%s%] {%c", main->output.to.stream, f_string_eol_s[0], main->context.set.important, controller_wish_s, main->context.set.important, f_string_eol_s[0]); + fl_print_format(" }%q %[%s%] {%q", main->output.to.stream, f_string_eol_s, main->context.set.important, controller_wish_s, main->context.set.important, f_string_eol_s); for (j = 0; j < rule.ons.array[i].wish.used; ++j) { if (rule.ons.array[i].wish.array[j].used) { - fl_print_format(" %Q%c", main->output.to.stream, rule.ons.array[i].wish.array[j], f_string_eol_s[0]); + fl_print_format(" %Q%q", main->output.to.stream, rule.ons.array[i].wish.array[j], f_string_eol_s); } } // for - fl_print_format(" }%c }%c", main->output.to.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" }%q }%q", main->output.to.stream, f_string_eol_s, f_string_eol_s); } // for - fl_print_format(" }%c", main->output.to.stream, f_string_eol_s[0]); + fl_print_format(" }%q", main->output.to.stream, f_string_eol_s); // items. if (rule.items.used) { @@ -5738,10 +5738,10 @@ extern "C" { item = &rule.items.array[i]; - fl_print_format(" %[%s%] {%c", main->output.to.stream, main->context.set.important, controller_item_s, main->context.set.important, f_string_eol_s[0]); + fl_print_format(" %[%s%] {%q", main->output.to.stream, main->context.set.important, controller_item_s, main->context.set.important, f_string_eol_s); // type. - fl_print_format(" %[%s%] %Q%c", main->output.to.stream, main->context.set.important, controller_type_s, main->context.set.important, controller_rule_item_type_name(item->type), f_string_eol_s[0]); + fl_print_format(" %[%s%] %Q%q", main->output.to.stream, main->context.set.important, controller_type_s, main->context.set.important, controller_rule_item_type_name(item->type), f_string_eol_s); // pid_file. fl_print_format(" %[%s%]", main->output.to.stream, main->context.set.important, controller_pid_file_s, main->context.set.important); @@ -5768,11 +5768,11 @@ extern "C" { action = &item->actions.array[j]; - fl_print_format(" %[%s%] {%c", main->output.to.stream, main->context.set.important, controller_action_s, main->context.set.important, f_string_eol_s[0]); - fl_print_format(" %[%s%] %q%c", main->output.to.stream, main->context.set.important, controller_type_s, main->context.set.important, controller_rule_action_type_name(action->type), f_string_eol_s[0]); + fl_print_format(" %[%s%] {%q", main->output.to.stream, main->context.set.important, controller_action_s, main->context.set.important, f_string_eol_s); + fl_print_format(" %[%s%] %q%q", main->output.to.stream, main->context.set.important, controller_type_s, main->context.set.important, controller_rule_action_type_name(action->type), f_string_eol_s); if (item->type == controller_rule_item_type_script_e || item->type == controller_rule_item_type_utility_e) { - fl_print_format(" %[%s%] {%c", main->output.to.stream, main->context.set.important, controller_parameter_s, main->context.set.important, f_string_eol_s[0]); + fl_print_format(" %[%s%] {%q", main->output.to.stream, main->context.set.important, controller_parameter_s, main->context.set.important, f_string_eol_s); parameter = &action->parameters.array[0]; @@ -5781,7 +5781,7 @@ extern "C" { for (k = 0; k < parameter->used; ++k) { - if (parameter->string[k] == f_fss_eol_s[0]) { + if (parameter->string[k] == f_fss_eol_s.string[0]) { if (k + 1 < parameter->used) { f_print_terminated(f_string_eol_s, main->output.to.stream); f_print_terminated(" ", main->output.to.stream); @@ -5796,19 +5796,19 @@ extern "C" { f_print_terminated(f_string_eol_s, main->output.to.stream); } - fl_print_format(" }%c", main->output.to.stream, f_string_eol_s[0]); + fl_print_format(" }%q", main->output.to.stream, f_string_eol_s); } else { for (k = 0; k < action->parameters.used; ++k) { - fl_print_format(" %[%s%] %Q%c", main->output.to.stream, main->context.set.important, controller_parameter_s, main->context.set.important, action->parameters.array[k], f_string_eol_s[0]); + fl_print_format(" %[%s%] %Q%q", main->output.to.stream, main->context.set.important, controller_parameter_s, main->context.set.important, action->parameters.array[k], f_string_eol_s); } // for } - fl_print_format(" }%c", main->output.to.stream, f_string_eol_s[0]); + fl_print_format(" }%q", main->output.to.stream, f_string_eol_s); } // for // rerun. - fl_print_format(" %[%s%] {%c", main->output.to.stream, main->context.set.important, controller_rerun_s, main->context.set.important, f_string_eol_s[0]); + fl_print_format(" %[%s%] {%q", main->output.to.stream, main->context.set.important, controller_rerun_s, main->context.set.important, f_string_eol_s); for (j = 0; j < controller_rule_action_type_execute__enum_size_e; ++j) { for (k = 0; k < 2; ++k) { @@ -5875,13 +5875,13 @@ extern "C" { f_print_terminated(f_string_eol_s, main->output.to.stream); } // for } // for - fl_print_format(" }%c", main->output.to.stream, f_string_eol_s[0]); + fl_print_format(" }%q", main->output.to.stream, f_string_eol_s); - fl_print_format(" }%c", main->output.to.stream, f_string_eol_s[0]); + fl_print_format(" }%q", main->output.to.stream, f_string_eol_s); } // for } - fl_print_format("}%c", main->output.to.stream, f_string_eol_s[0]); + fl_print_format("}%q", main->output.to.stream, f_string_eol_s); controller_unlock_print_flush(main->output.to, global.thread); } diff --git a/level_3/controller/c/rule/private-rule_print.c b/level_3/controller/c/rule/private-rule_print.c index b15b961..5a79020 100644 --- a/level_3/controller/c/rule/private-rule_print.c +++ b/level_3/controller/c/rule/private-rule_print.c @@ -31,7 +31,7 @@ extern "C" { if (print.verbosity == f_console_verbosity_quiet_e) return; - fl_print_format("%c%[%SWhile processing ", print.to.stream, f_string_eol_s[0], print.context, print.prefix); + fl_print_format("%q%[%QWhile processing ", print.to.stream, f_string_eol_s, print.context, print.prefix); if (cache.name_action.used) { fl_print_format("%s '%]", print.to.stream, item ? controller_action_s : controller_value_s, print.context); @@ -53,7 +53,7 @@ extern "C" { fl_print_format("rule file '%]%[%Q%]%['", print.to.stream, print.context, print.notable, cache.name_file, print.notable, print.context); } - fl_print_format(".%]%c", print.to.stream, print.context, f_string_eol_s[0]); + fl_print_format(".%]%q", print.to.stream, print.context, f_string_eol_s); } #endif // _di_controller_rule_print_error_cache_ @@ -82,7 +82,7 @@ extern "C" { controller_lock_print(print->to, (controller_thread_t *) process->main_thread); - fl_print_format("%c%[%SThe %s '%]", print->to.stream, f_string_eol_s[0], print->context, print->prefix, script_is ? controller_script_s : controller_program_s, print->context); + fl_print_format("%q%[%SThe %s '%]", print->to.stream, f_string_eol_s, print->context, print->prefix, script_is ? controller_script_s : controller_program_s, print->context); fl_print_format("%[%Q%]", print->to.stream, print->notable, name, print->notable); if (status == F_control_group || status == F_limit || status == F_processor || status == F_schedule) { @@ -101,121 +101,121 @@ extern "C" { f_print_terminated(controller_scheduler_s, print->to.stream); } - fl_print_format("%]%['.%]%c", print->to.stream, print->notable, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%]%['.%]%q", print->to.stream, print->notable, print->context, print->context, f_string_eol_s); } else if (WIFEXITED(process->result) ? WEXITSTATUS(process->result) : 0) { const uint8_t code = WIFEXITED(process->result) ? WEXITSTATUS(process->result) : 0; if (code == F_execute_access) { - fl_print_format("%[' access denied.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' access denied.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_bad) { - fl_print_format("%[' cannot execute, unsupported format.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' cannot execute, unsupported format.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_buffer) { - fl_print_format("%[' invalid memory access in arguments buffer.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' invalid memory access in arguments buffer.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_busy) { - fl_print_format("%[' required resources are unavailable, too busy.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' required resources are unavailable, too busy.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_capability) { - fl_print_format("%[' failed to setup capabilities.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' failed to setup capabilities.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_control_group) { - fl_print_format("%[' failed to setup control group.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' failed to setup control group.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_child) { - fl_print_format("%[' failed to setup child process.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' failed to setup child process.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_directory_not) { - fl_print_format("%[' invalid path, part of the path is not a valid directory.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' invalid path, part of the path is not a valid directory.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_failure) { - fl_print_format("%[' failed during execution.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' failed during execution.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_file_found_not) { - fl_print_format("%[' could not be executed, unable to find file.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' could not be executed, unable to find file.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_file_type_directory) { - fl_print_format("%[' ELF interpreter is a directory.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' ELF interpreter is a directory.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_fork_not) { - fl_print_format("%[' fork failure.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' fork failure.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_format_not) { - fl_print_format("%[' could not be executed because the program has an invalid ELF header.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' could not be executed because the program has an invalid ELF header.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_group) { - fl_print_format("%[' failed to setup group.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' failed to setup group.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_input_output) { - fl_print_format("%[' I/O failure.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' I/O failure.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_limit) { - fl_print_format("%[' failed to setup resource limits.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' failed to setup resource limits.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_loop) { - fl_print_format("%[' max recursion reached.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' max recursion reached.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_memory_not) { - fl_print_format("%[' out of memory.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' out of memory.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_name_not) { - fl_print_format("%[' file name or path is too long.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' file name or path is too long.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_nice) { - fl_print_format("%[' failed to setup niceness.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' failed to setup niceness.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_parameter) { - fl_print_format("%[' invalid parameter.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' invalid parameter.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_pipe) { - fl_print_format("%[' pipe failed.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' pipe failed.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_processor) { - fl_print_format("%[' failed to setup processor affinity.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' failed to setup processor affinity.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_prohibited) { - fl_print_format("%[' access prohibited.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' access prohibited.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_resource_not) { - fl_print_format("%[' resource limit reached.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' resource limit reached.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_schedule) { - fl_print_format("%[' failed to setup scheduler.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' failed to setup scheduler.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_terminal) { - fl_print_format("%[' failed while processing the terminal.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' failed while processing the terminal.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_terminal_known_not) { - fl_print_format("%[' cannot process terminal, unknown terminal control command.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' cannot process terminal, unknown terminal control command.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_terminal_not) { - fl_print_format("%[' cannot process terminal, not a known terminal.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' cannot process terminal, not a known terminal.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_terminal_prohibited) { - fl_print_format("%[' insufficient permissions to process the terminal.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' insufficient permissions to process the terminal.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_terminal_valid_not) { - fl_print_format("%[' invalid parameter while processing the terminal.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' invalid parameter while processing the terminal.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_too_large) { - fl_print_format("%[' too many arguments or arguments are too large.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' too many arguments or arguments are too large.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_user) { - fl_print_format("%[' failed to setup user.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' failed to setup user.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else if (code == F_execute_valid_not) { - fl_print_format("%[' unknown ELF interpreter format.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' unknown ELF interpreter format.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } else { fl_print_format("%[' failed with the execute error code %]", print->to.stream, print->context, print->context); fl_print_format("%[%i%]", print->to.stream, print->notable, code, print->notable); - fl_print_format("%[.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } } else { - fl_print_format("%[' failed.%]%c", print->to.stream, print->context, print->context, f_string_eol_s[0]); + fl_print_format("%[' failed.%]%q", print->to.stream, print->context, print->context, f_string_eol_s); } controller_unlock_print_flush(print->to, (controller_thread_t *) process->main_thread); @@ -228,9 +228,9 @@ extern "C" { if (print.verbosity == f_console_verbosity_quiet_e) return; - fl_print_format("%c%[%SThe rule '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, print.context); + fl_print_format("%q%[%QThe rule '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, alias, print.notable); - fl_print_format("%[' is not designating a pid file.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%[' is not designating a pid file.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); } #endif // _di_controller_rule_action_print_error_missing_pid_ @@ -239,9 +239,9 @@ extern "C" { if (print.verbosity == f_console_verbosity_quiet_e) return; - fl_print_format("%c%[%SThe %s rule '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, need_want_wish, print.context); + fl_print_format("%q%[%QThe %s rule '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, need_want_wish, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, value, print.notable); - fl_print_format("%[' %S.%]%c", print.to.stream, print.context, why, print.context, f_string_eol_s[0]); + fl_print_format("%[' %S.%]%q", print.to.stream, print.context, why, print.context, f_string_eol_s); } #endif // _di_controller_rule_item_print_error_need_want_wish_ @@ -250,9 +250,9 @@ extern "C" { if (print.verbosity == f_console_verbosity_quiet_e) return; - fl_print_format("%c%[%SThe rule '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, print.context); + fl_print_format("%q%[%QThe rule '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, print.context); fl_print_format("%[%S%]", print.to.stream, print.notable, alias, print.notable); - fl_print_format("%[' is no longer loaded.%]%c", print.to.stream, print.context, print.context, f_string_eol_s[0]); + fl_print_format("%[' is no longer loaded.%]%q", print.to.stream, print.context, print.context, f_string_eol_s); } #endif // _di_controller_rule_item_print_error_rule_not_loaded_ @@ -269,7 +269,7 @@ extern "C" { controller_lock_print(print.to, thread); - fl_print_format("%c%[%SRule setting %S.%]%c", print.to.stream, f_string_eol_s[0], print.context, print.prefix, message, print.context, f_string_eol_s[0]); + fl_print_format("%q%[%QRule setting %S.%]%q", print.to.stream, f_string_eol_s, print.context, print.prefix, message, print.context, f_string_eol_s); controller_rule_print_error_cache(print, cache->action, F_false); @@ -290,9 +290,9 @@ extern "C" { controller_lock_print(print.to, thread); - fl_print_format("%c%[%SRule setting%S '%]", print.to.stream, f_string_eol_s[0], print.context, print.prefix, before, print.context); + fl_print_format("%q%[%QRule setting%S '%]", print.to.stream, f_string_eol_s, print.context, print.prefix, before, print.context); fl_print_format("%[%/Q%]", print.to.stream, print.notable, cache->buffer_item, range, print.notable); - fl_print_format("%['%S.%]%c", print.to.stream, print.context, after, print.context, f_string_eol_s[0]); + fl_print_format("%['%S.%]%q", print.to.stream, print.context, after, print.context, f_string_eol_s); controller_rule_print_error_cache(print, cache->action, F_false); @@ -309,7 +309,7 @@ extern "C" { controller_lock_print(global.main->output.to, global.thread); - fl_print_format("%cProcessing rule item action '%[%S%]' setting ", global.main->output.to.stream, f_string_eol_s[0], global.main->context.set.title, name, global.main->context.set.title); + fl_print_format("%qProcessing rule item action '%[%S%]' setting ", global.main->output.to.stream, f_string_eol_s, global.main->context.set.title, name, global.main->context.set.title); if (name_sub) { fl_print_format("'%[%S%]'", global.main->output.to.stream, global.main->context.set.notable, name_sub, global.main->context.set.notable); @@ -319,7 +319,7 @@ extern "C" { } fl_print_format(" to '%[%Q%]'", global.main->output.to.stream, global.main->context.set.important, value, global.main->context.set.important); - fl_print_format("%S.%c", global.main->output.to.stream, suffix, f_string_eol_s[0]); + fl_print_format("%S.%q", global.main->output.to.stream, suffix, f_string_eol_s); controller_unlock_print_flush(global.main->output.to, global.thread); } @@ -334,7 +334,7 @@ extern "C" { controller_lock_print(global.main->output.to, global.thread); - fl_print_format("%cProcessing rule item action '%[%S%]' setting value to", global.main->output.to.stream, f_string_eol_s[0], global.main->context.set.title, name, global.main->context.set.title); + fl_print_format("%qProcessing rule item action '%[%S%]' setting value to", global.main->output.to.stream, f_string_eol_s, global.main->context.set.title, name, global.main->context.set.title); for (f_array_length_t j = 0; j < cache->content_actions.array[index].used; ++j) { @@ -352,7 +352,7 @@ extern "C" { } } // for - fl_print_format(".%c", global.main->output.to.stream, f_string_eol_s[0]); + fl_print_format(".%q", global.main->output.to.stream, f_string_eol_s); controller_unlock_print_flush(global.main->output.to, global.thread); } diff --git a/level_3/controller/c/thread/private-thread.c b/level_3/controller/c/thread/private-thread.c index 62b8fee..98ff51f 100644 --- a/level_3/controller/c/thread/private-thread.c +++ b/level_3/controller/c/thread/private-thread.c @@ -222,9 +222,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(main->error.to, &thread); - fl_print_format("%c%[%SThe pid file '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix ? main->error.prefix : f_string_empty_s, main->error.context); + fl_print_format("%q%[%SThe pid file '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix ? main->error.prefix : f_string_empty_s, main->error.context); fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, setting->path_pid.string, main->error.notable); - fl_print_format("%[' must not already exist.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' must not already exist.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); controller_unlock_print_flush(main->error.to, &thread); } @@ -328,7 +328,7 @@ extern "C" { controller_print_signal_received(main, thread.signal); if (main->output.verbosity != f_console_verbosity_quiet_e) { - fll_print_terminated(f_string_eol_s, main->output.to.stream); + fll_print_dynamic(f_string_eol_s, main->output.to.stream); } return F_status_set_error(F_interrupt); diff --git a/level_3/controller/c/thread/private-thread_entry.c b/level_3/controller/c/thread/private-thread_entry.c index 09fc765..63a5517 100644 --- a/level_3/controller/c/thread/private-thread_entry.c +++ b/level_3/controller/c/thread/private-thread_entry.c @@ -42,9 +42,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(main->error.to, entry->global->thread); - fl_print_format("%c%[%SThe pid file '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix ? main->error.prefix : f_string_empty_s, main->error.context); + fl_print_format("%q%[%SThe pid file '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix ? main->error.prefix : f_string_empty_s, main->error.context); fl_print_format("%[%Q%]", main->error.to.stream, main->error.notable, entry->setting->path_pid, main->error.notable); - fl_print_format("%[' must not already exist.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' must not already exist.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); controller_unlock_print_flush(main->error.to, entry->global->thread); } @@ -81,9 +81,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(main->error.to, entry->global->thread); - fl_print_format("%c%[%SFailed while processing requested failsafe item '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix ? main->error.prefix : f_string_empty_s, main->error.context); + fl_print_format("%q%[%SFailed while processing requested failsafe item '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix ? main->error.prefix : f_string_empty_s, main->error.context); fl_print_format("%[%Q%]", main->error.to.stream, main->error.notable, entry->global->setting->entry.items.array[entry->global->setting->failsafe_enabled].name, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); controller_unlock_print_flush(main->error.to, entry->global->thread); } @@ -196,9 +196,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { controller_lock_print(main->error.to, entry->global->thread); - fl_print_format("%c%[%SFailed while processing requested failsafe item '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix ? main->error.prefix : f_string_empty_s, main->error.context); + fl_print_format("%q%[%SFailed while processing requested failsafe item '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix ? main->error.prefix : f_string_empty_s, main->error.context); fl_print_format("%[%Q%]", main->error.to.stream, main->error.notable, entry->global->setting->entry.items.array[entry->global->setting->failsafe_enabled].name, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); controller_unlock_print_flush(main->error.to, entry->global->thread); } diff --git a/level_3/controller/data/build/defines b/level_3/controller/data/build/defines index 5f948c4..1555c43 100644 --- a/level_3/controller/data/build/defines +++ b/level_3/controller/data/build/defines @@ -5,10 +5,14 @@ _libcap_legacy_only_ Disable functionality provided by later versions of libcap _controller_as_init_ Build the program to run as if it were "init" by default, including displaying the program name as "Init Program" or "Init". This changes the main.c file only, leaving the library shareable between both "controller" and "init". _override_controller_default_program_script_ Provide a custom script name string to execute (such as php). _override_controller_default_program_script_length_ The number of bytes representing the string in _override_controller_default_program_script_ (not including the terminating NULL). -_override_controller_name_socket_ Use this as the default custom file name representing the controller program socket. -_override_controller_name_socket_length_ The number of bytes representing the string in _override_controller_name_socket_ (not including the terminating NULL). +_override_controller_path_pid_ Use this as the default custom directory path representing the location of the controller program pid. _override_controller_path_pid_init_ Provide a custom init path for the pid file rather than the default. _override_controller_path_pid_init_length_ The number of bytes representing the string in _override_controller_path_pid_init_ (not including the terminating NULL). +_override_controller_path_pid_length_ The number of bytes representing the string in _override_controller_path_pid_ (not including the terminating NULL). +_override_controller_path_pid_prefix_ Use this as the default custom prefix prepended to the file name of the file representing the controller program pid. +_override_controller_path_pid_prefix_length_ The number of bytes representing the string in _override_controller_path_pid_prefix_ (not including the terminating NULL). +_override_controller_path_pid_suffix_ Use this as the default custom prefix prepended to the file name of the file representing the controller program pid. +_override_controller_path_pid_suffix_length_ The number of bytes representing the string in _override_controller_path_pid_suffix_ (not including the terminating NULL). _override_controller_path_settings_init_ Provide a custom init path for the settings file rather than the default. _override_controller_path_settings_init_length_ The number of bytes representing the string in _override_controller_path_settings_init_ (not including the terminating NULL). _override_controller_path_socket_ Use this as the default custom directory path representing the location of the controller program socket. diff --git a/level_3/fake/c/fake.c b/level_3/fake/c/fake.c index fb15612..7c9e893 100644 --- a/level_3/fake/c/fake.c +++ b/level_3/fake/c/fake.c @@ -20,41 +20,41 @@ extern "C" { fll_program_print_help_header(file, context, fake_program_name_long_s, fake_program_version_s); - fll_program_print_help_option(file, context, f_console_standard_short_help_s, f_console_standard_long_help_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print this help message."); - fll_program_print_help_option(file, context, f_console_standard_short_dark_s, f_console_standard_long_dark_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_light_s, f_console_standard_long_light_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, "Do not file in color."); - fll_program_print_help_option(file, context, f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Decrease verbosity, silencing most output."); - fll_program_print_help_option(file, context, f_console_standard_short_normal_s, f_console_standard_long_normal_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Set verbosity to normal file."); - fll_program_print_help_option(file, context, f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Increase verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_debug_s, f_console_standard_long_debug_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Enable debugging, significantly increasing verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_version_s, f_console_standard_long_version_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Print only the version number."); - - f_print_character(f_string_eol_s[0], file.stream); - - fll_program_print_help_option(file, context, fake_short_define_s, fake_long_define_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Append an additional define after defines from settings file."); - fll_program_print_help_option(file, context, fake_short_fakefile_s, fake_long_fakefile_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Use this fakefile."); - fll_program_print_help_option(file, context, fake_short_mode_s, fake_long_mode_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Use this mode when processing the build settings."); - fll_program_print_help_option(file, context, fake_short_process_s, fake_long_process_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Process name for storing build states."); - fll_program_print_help_option(file, context, fake_short_settings_s, fake_long_settings_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Use this settings file."); - - f_print_character(f_string_eol_s[0], file.stream); - - fll_program_print_help_option(file, context, fake_short_path_build_s, fake_long_path_build_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Specify a custom build directory."); - fll_program_print_help_option(file, context, fake_short_path_data_s, fake_long_path_data_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Specify a custom path to the data files."); - fll_program_print_help_option(file, context, fake_short_path_sources_s, fake_long_path_sources_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Specify a custom path to the source files."); - fll_program_print_help_option(file, context, fake_short_path_work_s, fake_long_path_work_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Use includes/libraries/programs from this directory instead of system."); - - fl_print_format("%c%c %[Special Options:%] ", file.stream, f_string_eol_s[0], f_string_eol_s[0], context.set.important, context.set.important); - - fll_program_print_help_option_long(file, context, fake_long_documents_disabled_s, f_console_symbol_long_enable_s, " Forcibly do not build documents files."); - fll_program_print_help_option_long(file, context, fake_long_documents_enabled_s, f_console_symbol_long_enable_s, " Forcibly do build documents files."); - fll_program_print_help_option_long(file, context, fake_long_shared_disabled_s, f_console_symbol_long_enable_s, "Forcibly do not build shared files."); - fll_program_print_help_option_long(file, context, fake_long_shared_enabled_s, f_console_symbol_long_enable_s, " Forcibly do build shared files."); - fll_program_print_help_option_long(file, context, fake_long_static_disabled_s, f_console_symbol_long_enable_s, "Forcibly do not build static files."); - fll_program_print_help_option_long(file, context, fake_long_static_enabled_s, f_console_symbol_long_enable_s, " Forcibly do build static files."); - - fl_print_format("%c%c %[Operations:%] ", file.stream, f_string_eol_s[0], f_string_eol_s[0], context.set.important, context.set.important); + fll_program_print_help_option(file, context, f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print this help message."); + fll_program_print_help_option(file, context, f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, "Do not file in color."); + fll_program_print_help_option(file, context, f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Decrease verbosity, silencing most output."); + fll_program_print_help_option(file, context, f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Set verbosity to normal file."); + fll_program_print_help_option(file, context, f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Increase verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Enable debugging, significantly increasing verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Print only the version number."); + + f_print_dynamic(f_string_eol_s, file.stream); + + fll_program_print_help_option(file, context, fake_short_define_s, fake_long_define_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Append an additional define after defines from settings file."); + fll_program_print_help_option(file, context, fake_short_fakefile_s, fake_long_fakefile_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "Use this fakefile."); + fll_program_print_help_option(file, context, fake_short_mode_s, fake_long_mode_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Use this mode when processing the build settings."); + fll_program_print_help_option(file, context, fake_short_process_s, fake_long_process_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Process name for storing build states."); + fll_program_print_help_option(file, context, fake_short_settings_s, fake_long_settings_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "Use this settings file."); + + f_print_dynamic(f_string_eol_s, file.stream); + + fll_program_print_help_option(file, context, fake_short_path_build_s, fake_long_path_build_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Specify a custom build directory."); + fll_program_print_help_option(file, context, fake_short_path_data_s, fake_long_path_data_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Specify a custom path to the data files."); + fll_program_print_help_option(file, context, fake_short_path_sources_s, fake_long_path_sources_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "Specify a custom path to the source files."); + fll_program_print_help_option(file, context, fake_short_path_work_s, fake_long_path_work_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Use includes/libraries/programs from this directory instead of system."); + + fl_print_format("%q%q %[Special Options:%] ", file.stream, f_string_eol_s, f_string_eol_s, context.set.important, context.set.important); + + fll_program_print_help_option_long(file, context, fake_long_documents_disabled_s, f_console_symbol_long_enable_s.string, " Forcibly do not build documents files."); + fll_program_print_help_option_long(file, context, fake_long_documents_enabled_s, f_console_symbol_long_enable_s.string, " Forcibly do build documents files."); + fll_program_print_help_option_long(file, context, fake_long_shared_disabled_s, f_console_symbol_long_enable_s.string, "Forcibly do not build shared files."); + fll_program_print_help_option_long(file, context, fake_long_shared_enabled_s, f_console_symbol_long_enable_s.string, " Forcibly do build shared files."); + fll_program_print_help_option_long(file, context, fake_long_static_disabled_s, f_console_symbol_long_enable_s.string, "Forcibly do not build static files."); + fll_program_print_help_option_long(file, context, fake_long_static_enabled_s, f_console_symbol_long_enable_s.string, " Forcibly do build static files."); + + fl_print_format("%q%q %[Operations:%] ", file.stream, f_string_eol_s, f_string_eol_s, context.set.important, context.set.important); fll_program_print_help_option_other(file, context, fake_other_operation_build_s, " Build or compile the code based on build settings file."); fll_program_print_help_option_other(file, context, fake_other_operation_clean_s, " Delete all build files."); @@ -64,18 +64,18 @@ extern "C" { fll_program_print_help_usage(file, context, fake_program_name_s, "operation"); fl_print_format(" When performing the %[%s%] operation, the", file.stream, context.set.notable, fake_other_operation_build_s, context.set.notable); - fl_print_format(" %[%s%s%] parameter specifies a name (limited to alpha-numeric, underscore, and dash) to be used in addition to the global.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fake_long_mode_s, context.set.notable, f_string_eol_s[0]); + fl_print_format(" %[%q%s%] parameter specifies a name (limited to alpha-numeric, underscore, and dash) to be used in addition to the global.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fake_long_mode_s, context.set.notable, f_string_eol_s); fl_print_format(" For example, when a %[%s%]", file.stream, context.set.notable, fake_make_parameter_variable_mode_s, context.set.notable); - fl_print_format(" of 'fll_monolithic' is specified, build libraries from both 'build_libraries' and 'build_libraries-fll_monolithic' are used (but not 'build_libraries-fll_level').%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" of 'fll_monolithic' is specified, build libraries from both 'build_libraries' and 'build_libraries-fll_monolithic' are used (but not 'build_libraries-fll_level').%q%q", file.stream, f_string_eol_s, f_string_eol_s); fl_print_format(" When specifying the %[%s%] or the %[%s%]", file.stream, context.set.notable, fake_make_parameter_variable_fakefile_s, context.set.notable, context.set.notable, fake_make_parameter_variable_settings_s, context.set.notable); - fl_print_format(" parameters, the filenames are relative to the data build directory, unless a path is used.%c", file.stream, f_string_eol_s[0]); + fl_print_format(" parameters, the filenames are relative to the data build directory, unless a path is used.%q", file.stream, f_string_eol_s); - fl_print_format(" For example, with '%[%s%s my_fakefile%]' the fakefile at", file.stream, context.set.notable, f_console_symbol_long_enable_s, fake_long_fakefile_s, context.set.notable); + fl_print_format(" For example, with '%[%q%s my_fakefile%]' the fakefile at", file.stream, context.set.notable, f_console_symbol_long_enable_s, fake_long_fakefile_s, context.set.notable); fl_print_format(" '%[./%s%smy_fakefile%]' would be used, however with", file.stream, context.set.notable, fake_default_path_data_s, fake_default_path_build_s, context.set.notable); - fl_print_format(" '%[%s%s ./my_fakefile%]' the fakefile at", file.stream, context.set.notable, f_console_symbol_long_enable_s, fake_long_fakefile_s, context.set.notable); - fl_print_format(" '%[./my_fakefile%]' would be used.%c%c", file.stream, context.set.notable, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" '%[%q%s ./my_fakefile%]' the fakefile at", file.stream, context.set.notable, f_console_symbol_long_enable_s, fake_long_fakefile_s, context.set.notable); + fl_print_format(" '%[./my_fakefile%]' would be used.%q%q", file.stream, context.set.notable, context.set.notable, f_string_eol_s, f_string_eol_s); funlockfile(file.stream); @@ -348,9 +348,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SThe operation '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%SThe operation '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%s%]", main->error.to.stream, main->error.notable, operations_name, main->error.notable); - fl_print_format("%[' failed.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' failed.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -365,16 +365,16 @@ extern "C" { fflush(main->output.to.stream); } - fll_print_terminated(f_string_eol_s, main->output.to.stream); + fll_print_dynamic(f_string_eol_s, main->output.to.stream); } else if (status != F_child) { - fll_print_format("%cAll operations complete.%c%c", main->output.to.stream, f_string_eol_s[0], f_string_eol_s[0], f_string_eol_s[0]); + fll_print_format("%qAll operations complete.%q%q", main->output.to.stream, f_string_eol_s, f_string_eol_s, f_string_eol_s); } } } else { if (main->error.verbosity != f_console_verbosity_quiet_e) { - fll_print_format("%c%[%SYou failed to specify an operation.%]%c%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context, f_string_eol_s[0], f_string_eol_s[0]); + fll_print_format("%q%[%SYou failed to specify an operation.%]%q%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context, f_string_eol_s, f_string_eol_s); } status = F_status_set_error(F_parameter); diff --git a/level_3/fake/c/fake.h b/level_3/fake/c/fake.h index 69a16a9..949fb11 100644 --- a/level_3/fake/c/fake.h +++ b/level_3/fake/c/fake.h @@ -354,15 +354,15 @@ extern "C" { #define fake_console_parameter_t_initialize \ { \ - macro_f_console_parameter_t_initialize(f_console_standard_short_help_s, f_console_standard_long_help_s, 0, 0, f_console_type_normal_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_light_s, f_console_standard_long_light_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s, f_console_standard_long_dark_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s, f_console_standard_long_normal_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s, f_console_standard_long_debug_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_version_s, f_console_standard_long_version_s, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, 0, 0, f_console_type_normal_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, 0, 0, f_console_type_inverse_e), \ macro_f_console_parameter_t_initialize(fake_short_define_s, fake_long_define_s, 0, 1, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(fake_short_fakefile_s, fake_long_fakefile_s, 0, 1, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(fake_short_mode_s, fake_long_mode_s, 0, 1, f_console_type_normal_e), \ diff --git a/level_3/fake/c/private-build-library.c b/level_3/fake/c/private-build-library.c index 9612e34..9c1e968 100644 --- a/level_3/fake/c/private-build-library.c +++ b/level_3/fake/c/private-build-library.c @@ -28,7 +28,7 @@ extern "C" { if (!data_build.setting.build_sources_library.used) return 0; if (main->output.verbosity != f_console_verbosity_quiet_e) { - fll_print_format("%c%[Compiling shared library.%]%c", main->output.to.stream, f_string_eol_s[0], main->context.set.important, main->context.set.important, f_string_eol_s[0]); + fll_print_format("%q%[Compiling shared library.%]%q", main->output.to.stream, f_string_eol_s, main->context.set.important, main->context.set.important, f_string_eol_s); } f_string_dynamics_t arguments = f_string_dynamics_t_initialize; @@ -374,7 +374,7 @@ extern "C" { *status = f_file_link(parameter_file_name_major, parameter_file_path); if (F_status_is_error_not(*status) && main->error.verbosity == f_console_verbosity_verbose_e) { - fll_print_format("Linked file '%S' to '%S'.%c", main->output.to.stream, parameter_file_path, parameter_file_name_major, f_string_eol_s[0]); + fll_print_format("Linked file '%S' to '%S'.%q", main->output.to.stream, parameter_file_path, parameter_file_name_major, f_string_eol_s); } else if (F_status_is_error(*status)) { if (F_status_set_fine(*status) == F_file_found) { @@ -403,7 +403,7 @@ extern "C" { *status = f_file_link(parameter_file_name_minor, parameter_file_path); if (F_status_is_error_not(*status) && main->error.verbosity == f_console_verbosity_verbose_e) { - fll_print_format("Linked file '%S' to '%S'.%c", main->output.to.stream, parameter_file_path, parameter_file_name_minor, f_string_eol_s[0]); + fll_print_format("Linked file '%S' to '%S'.%q", main->output.to.stream, parameter_file_path, parameter_file_name_minor, f_string_eol_s); } else if (F_status_is_error(*status)) { if (F_status_set_fine(*status) == F_file_found) { @@ -431,7 +431,7 @@ extern "C" { *status = f_file_link(parameter_file_name_micro, parameter_file_path); if (F_status_is_error_not(*status) && main->error.verbosity == f_console_verbosity_verbose_e) { - fll_print_format("Linked file '%S' to '%S'.%c", main->output.to.stream, parameter_file_path, parameter_file_name_micro, f_string_eol_s[0]); + fll_print_format("Linked file '%S' to '%S'.%q", main->output.to.stream, parameter_file_path, parameter_file_name_micro, f_string_eol_s); } else if (F_status_is_error(*status)) { if (F_status_set_fine(*status) == F_file_found) { @@ -459,7 +459,7 @@ extern "C" { *status = f_file_link(parameter_file_name_nano, parameter_file_path); if (F_status_is_error_not(*status) && main->error.verbosity == f_console_verbosity_verbose_e) { - fll_print_format("Linked file '%S' to '%S'.%c", main->output.to.stream, parameter_file_path, parameter_file_name_nano, f_string_eol_s[0]); + fll_print_format("Linked file '%S' to '%S'.%q", main->output.to.stream, parameter_file_path, parameter_file_name_nano, f_string_eol_s); } else if (F_status_is_error(*status)) { if (F_status_set_fine(*status) == F_file_found) { @@ -489,7 +489,7 @@ extern "C" { if (!data_build.setting.build_sources_library.used) return 0; if (main->output.verbosity != f_console_verbosity_quiet_e) { - fll_print_format("%c%[Compiling static library.%]%c", main->output.to.stream, f_string_eol_s[0], main->context.set.important, main->context.set.important, f_string_eol_s[0]); + fll_print_format("%q%[Compiling static library.%]%q", main->output.to.stream, f_string_eol_s, main->context.set.important, main->context.set.important, f_string_eol_s); } f_string_dynamic_t file_name = f_string_dynamic_t_initialize; @@ -571,10 +571,10 @@ extern "C" { break; } - *status = f_string_append_assure(f_path_separator_s, F_path_separator_s_length, &source_path); + *status = f_string_dynamic_append_assure(f_path_separator_s, &source_path); if (F_status_is_error(*status)) { - fll_error_print(main->error, F_status_set_fine(*status), "f_string_append_assure", F_true); + fll_error_print(main->error, F_status_set_fine(*status), "f_string_dynamic_append_assure", F_true); break; } diff --git a/level_3/fake/c/private-build-load.c b/level_3/fake/c/private-build-load.c index a6f703f..56f975e 100644 --- a/level_3/fake/c/private-build-load.c +++ b/level_3/fake/c/private-build-load.c @@ -25,19 +25,14 @@ extern "C" { { // Add the guaranteed environment variables. - const f_string_t variables_name[] = { + const f_string_static_t variables[] = { f_path_environment_s, f_path_present_working_s }; - const f_array_length_t variables_length[] = { - F_path_environment_s_length, - F_path_present_working_s_length - }; - for (uint8_t i = 0; i < 2; ++i) { - *status = fl_environment_load_name(variables_name[i], variables_length[i], environment); + *status = fl_environment_load_name(variables[i].string, variables[i].used, environment); if (F_status_is_error(*status)) { fll_error_print(main->error, F_status_set_fine(*status), "fl_environment_load_name", F_true); @@ -55,11 +50,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SThe values for the setting '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%SThe values for the setting '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%s%]", main->error.to.stream, main->error.notable, fake_build_setting_name_environment_s, main->error.notable); fl_print_format("%[' of setting file '%]", main->error.to.stream, main->error.context, main->error.context); fl_print_format("%[%s%]", main->error.to.stream, main->error.notable, fake_build_setting_name_environment_s, main->error.notable); - fl_print_format("%[' is too large.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' is too large.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); flockfile(main->error.to.stream); } @@ -158,11 +153,11 @@ extern "C" { if (!settings[i]->used) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SThe setting '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%SThe setting '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, names[i], main->error.notable); fl_print_format("%[' is required but is not specified in the settings file '%]", main->error.to.stream, main->error.context, main->error.context); fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, setting_file.used ? path_file : main->file_data_build_settings.string, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -555,11 +550,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SThe specified mode '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%SThe specified mode '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%Q%]", main->error.to.stream, main->error.notable, modes->array[i], main->error.notable); fl_print_format("%[' is not a valid mode, according to '%]", main->error.to.stream, main->error.context, main->error.context); fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, path_file, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -640,9 +635,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { funlockfile(main->error.to.stream); - fl_print_format("%c%[%SA setting in the file '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%SA setting in the file '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, path_file, main->error.notable); - fl_print_format("%[' is too long.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' is too long.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -944,13 +939,13 @@ extern "C" { if (main->warning.verbosity == f_console_verbosity_verbose_e) { flockfile(main->warning.to.stream); - fl_print_format("%c%[%SThe setting '%]", main->warning.to.stream, f_string_eol_s[0], main->warning.context, main->warning.prefix, main->warning.context); + fl_print_format("%q%[%SThe setting '%]", main->warning.to.stream, f_string_eol_s, main->warning.context, main->warning.prefix, main->warning.context); fl_print_format("%[%S%]", main->warning.to.stream, main->warning.notable, settings_single_name[i], main->warning.notable); fl_print_format("%[' in the file '%]", main->warning.to.stream, main->warning.context, main->warning.context); fl_print_format("%[%S%]", main->warning.to.stream, main->warning.notable, path_file, main->warning.notable); fl_print_format("%[' may only have a single property, only using the first: '%]", main->warning.to.stream, main->warning.context, main->warning.context); fl_print_format("%[%Q%]", main->warning.to.stream, main->warning.notable, settings_single_source[i]->array[0], main->warning.notable); - fl_print_format("%['.%]%c", main->warning.to.stream, main->warning.context, main->warning.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->warning.to.stream, main->warning.context, main->warning.context, f_string_eol_s); funlockfile(main->warning.to.stream); } @@ -969,7 +964,7 @@ extern "C" { if (main->warning.verbosity == f_console_verbosity_verbose_e) { flockfile(main->warning.to.stream); - fl_print_format("%c%[%SThe setting '%]", main->warning.to.stream, f_string_eol_s[0], main->warning.context, main->warning.prefix, main->warning.context); + fl_print_format("%q%[%SThe setting '%]", main->warning.to.stream, f_string_eol_s, main->warning.context, main->warning.prefix, main->warning.context); fl_print_format("%[%S%]", main->warning.to.stream, main->warning.notable, settings_single_name[i], main->warning.notable); fl_print_format("%[' in the file '%]", main->warning.to.stream, main->warning.context, main->warning.context); fl_print_format("%[%S%]", main->warning.to.stream, main->warning.notable, path_file, main->warning.notable); @@ -979,7 +974,7 @@ extern "C" { fl_print_format("%[%s%]", main->warning.to.stream, main->warning.notable, fake_common_setting_bool_no_s, main->warning.notable); fl_print_format("%[', defaulting to '%]", main->warning.to.stream, main->warning.context, main->warning.context); fl_print_format("%[%s%]", main->warning.to.stream, main->warning.notable, fake_common_setting_bool_yes_s, main->warning.notable); - fl_print_format("%['.%]%c", main->warning.to.stream, main->warning.context, main->warning.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->warning.to.stream, main->warning.context, main->warning.context, f_string_eol_s); funlockfile(main->warning.to.stream); } @@ -1001,7 +996,7 @@ extern "C" { if (main->warning.verbosity == f_console_verbosity_verbose_e) { flockfile(main->warning.to.stream); - fl_print_format("%c%[%SThe setting '%]", main->warning.to.stream, f_string_eol_s[0], main->warning.context, main->warning.prefix, main->warning.context); + fl_print_format("%q%[%SThe setting '%]", main->warning.to.stream, f_string_eol_s, main->warning.context, main->warning.prefix, main->warning.context); fl_print_format("%[%S%]", main->warning.to.stream, main->warning.notable, settings_single_name[i], main->warning.notable); fl_print_format("%[' in the file '%]", main->warning.to.stream, main->warning.context, main->warning.context); fl_print_format("%[%S%]", main->warning.to.stream, main->warning.notable, path_file, main->warning.notable); @@ -1013,7 +1008,7 @@ extern "C" { fl_print_format("%[%s%]", main->warning.to.stream, main->warning.notable, fake_build_language_cpp_s, main->warning.notable); fl_print_format("%[', defaulting to '%]", main->warning.to.stream, main->warning.context, main->warning.context); fl_print_format("%[%s%]", main->warning.to.stream, main->warning.notable, fake_build_language_c_s, main->warning.notable); - fl_print_format("%['.%]%c", main->warning.to.stream, main->warning.context, main->warning.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->warning.to.stream, main->warning.context, main->warning.context, f_string_eol_s); funlockfile(main->warning.to.stream); } @@ -1038,7 +1033,7 @@ extern "C" { if (main->warning.verbosity == f_console_verbosity_verbose_e) { flockfile(main->warning.to.stream); - fl_print_format("%c%[%SThe setting '%]", main->warning.to.stream, f_string_eol_s[0], main->warning.context, main->warning.prefix, main->warning.context); + fl_print_format("%q%[%SThe setting '%]", main->warning.to.stream, f_string_eol_s, main->warning.context, main->warning.prefix, main->warning.context); fl_print_format("%[%S%]", main->warning.to.stream, main->warning.notable, settings_single_name[i], main->warning.notable); fl_print_format("%[' in the file '%]", main->warning.to.stream, main->warning.context, main->warning.context); fl_print_format("%[%S%]", main->warning.to.stream, main->warning.notable, path_file, main->warning.notable); @@ -1052,7 +1047,7 @@ extern "C" { fl_print_format("%[%s%]", main->warning.to.stream, main->warning.notable, fake_build_version_nano_s, main->warning.notable); fl_print_format("%[', defaulting to '%]", main->warning.to.stream, main->warning.context, main->warning.context); fl_print_format("%[%s%]", main->warning.to.stream, main->warning.notable, settings_single_version_default_name[i], main->warning.notable); - fl_print_format("%['.%]%c", main->warning.to.stream, main->warning.context, main->warning.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->warning.to.stream, main->warning.context, main->warning.context, f_string_eol_s); funlockfile(main->warning.to.stream); } @@ -1072,10 +1067,10 @@ extern "C" { } if (settings_single_type[i] == 2) { - *status = f_string_append_assure(f_path_separator_s, F_path_separator_s_length, settings_single_destination[i]); + *status = f_string_dynamic_append_assure(f_path_separator_s, settings_single_destination[i]); if (F_status_is_error(*status)) { - fll_error_print(main->error, F_status_set_fine(*status), "f_string_append_assure", F_true); + fll_error_print(main->error, F_status_set_fine(*status), "f_string_dynamic_append_assure", F_true); break; } @@ -1097,13 +1092,13 @@ extern "C" { if (main->warning.verbosity == f_console_verbosity_verbose_e) { flockfile(main->warning.to.stream); - fl_print_format("%c%[%SThe setting '%]", main->warning.to.stream, f_string_eol_s[0], main->warning.context, main->warning.prefix, main->warning.context); + fl_print_format("%q%[%SThe setting '%]", main->warning.to.stream, f_string_eol_s, main->warning.context, main->warning.prefix, main->warning.context); fl_print_format("%[%S%]", main->warning.to.stream, main->warning.notable, fake_build_setting_name_version_file_s, main->warning.notable); fl_print_format("%[' in the file '%]", main->warning.to.stream, main->warning.context, main->warning.context); fl_print_format("%[%S%]", main->warning.to.stream, main->warning.notable, path_file, main->warning.notable); fl_print_format("%[' is required, defaulting to '%]", main->warning.to.stream, main->warning.context, main->warning.context); fl_print_format("%[%s%]", main->warning.to.stream, main->warning.notable, fake_build_version_micro_s, main->warning.notable); - fl_print_format("%['.%]%c", main->warning.to.stream, main->warning.context, main->warning.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->warning.to.stream, main->warning.context, main->warning.context, f_string_eol_s); funlockfile(main->warning.to.stream); } @@ -1115,13 +1110,13 @@ extern "C" { if (main->warning.verbosity == f_console_verbosity_verbose_e) { flockfile(main->warning.to.stream); - fl_print_format("%c%[%SThe setting '%]", main->warning.to.stream, f_string_eol_s[0], main->warning.context, main->warning.prefix, main->warning.context); + fl_print_format("%q%[%SThe setting '%]", main->warning.to.stream, f_string_eol_s, main->warning.context, main->warning.prefix, main->warning.context); fl_print_format("%[%S%]", main->warning.to.stream, main->warning.notable, fake_build_setting_name_version_target_s, main->warning.notable); fl_print_format("%[' in the file '%]", main->warning.to.stream, main->warning.context, main->warning.context); fl_print_format("%[%S%]", main->warning.to.stream, main->warning.notable, path_file, main->warning.notable); fl_print_format("%[' is required, defaulting to '%]", main->warning.to.stream, main->warning.context, main->warning.context); fl_print_format("%[%s%]", main->warning.to.stream, main->warning.notable, fake_build_version_major_s, main->warning.notable); - fl_print_format("%['.%]%c", main->warning.to.stream, main->warning.context, main->warning.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->warning.to.stream, main->warning.context, main->warning.context, f_string_eol_s); funlockfile(main->warning.to.stream); } @@ -1202,13 +1197,13 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SWhen the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%SWhen the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, setting_name[j], main->error.notable); fl_print_format("%[' is set to '%]", main->error.to.stream, main->error.context, main->error.context); fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, name_target[setting_target[j] - 1], main->error.notable); fl_print_format("%[' then the '%]", main->error.to.stream, main->error.context, main->error.context); fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, name_object[i], main->error.notable); - fl_print_format("%[' Object must have Content.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' Object must have Content.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -1327,13 +1322,13 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SThe parameters '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fake_long_shared_disabled_s, main->error.notable); + fl_print_format("%q%[%SThe parameters '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fake_long_shared_disabled_s, main->error.notable); fl_print_format("%[' and '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fake_long_shared_enabled_s, main->error.notable); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fake_long_shared_enabled_s, main->error.notable); fl_print_format("%[' contradict, defaulting to '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, setting->build_shared ? fake_long_shared_enabled_s : fake_long_shared_disabled_s, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, setting->build_shared ? fake_long_shared_enabled_s : fake_long_shared_disabled_s, main->error.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -1362,13 +1357,13 @@ extern "C" { if (main->error.verbosity == f_console_verbosity_verbose_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SThe parameters '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fake_long_static_disabled_s, main->error.notable); + fl_print_format("%q%[%SThe parameters '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fake_long_static_disabled_s, main->error.notable); fl_print_format("%[' and '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fake_long_static_enabled_s, main->error.notable); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fake_long_static_enabled_s, main->error.notable); fl_print_format("%[' contradict, defaulting to '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, setting->build_static ? fake_long_static_enabled_s : fake_long_static_disabled_s, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, setting->build_static ? fake_long_static_enabled_s : fake_long_static_disabled_s, main->error.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -1388,13 +1383,13 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SThe build settings '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%SThe build settings '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%s%]", main->error.to.stream, main->error.notable, fake_build_setting_name_build_shared_s, main->error.notable); fl_print_format("%[' and '%]", main->error.to.stream, main->error.context, main->error.context); fl_print_format("%[%s%]", main->error.to.stream, main->error.notable, fake_build_setting_name_build_static_s, main->error.notable); fl_print_format("%[' cannot both be false when using the language '%]", main->error.to.stream, main->error.context, main->error.context); fl_print_format("%[%s%]", main->error.to.stream, main->error.notable, setting->build_language == fake_build_language_type_c_e ? fake_build_language_c_s : fake_build_language_cpp_s, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } diff --git a/level_3/fake/c/private-build-objects.c b/level_3/fake/c/private-build-objects.c index b75bd2a..04dc8d6 100644 --- a/level_3/fake/c/private-build-objects.c +++ b/level_3/fake/c/private-build-objects.c @@ -17,7 +17,7 @@ extern "C" { if (!data_build.setting.build_sources_library.used) return 0; if (main->output.verbosity != f_console_verbosity_quiet_e) { - fll_print_format("%c%[Compiling static objects.%]%c", main->output.to.stream, f_string_eol_s[0], main->context.set.important, main->context.set.important, f_string_eol_s[0]); + fll_print_format("%q%[Compiling static objects.%]%q", main->output.to.stream, f_string_eol_s, main->context.set.important, main->context.set.important, f_string_eol_s); } f_string_dynamic_t file_name = f_string_dynamic_t_initialize; @@ -90,10 +90,10 @@ extern "C" { break; } - *status = f_string_append_assure(f_path_separator_s, F_path_separator_s_length, &destination_path); + *status = f_string_dynamic_append_assure(f_path_separator_s, &destination_path); if (F_status_is_error(*status)) { - fll_error_print(main->error, F_status_set_fine(*status), "f_string_append_assure", F_true); + fll_error_print(main->error, F_status_set_fine(*status), "f_string_dynamic_append_assure", F_true); break; } @@ -111,9 +111,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SThe path '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%SThe path '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%Q%]", main->error.to.stream, main->error.notable, destination_path, main->error.notable); - fl_print_format("%[' exists but is not a directory.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' exists but is not a directory.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -129,9 +129,9 @@ extern "C" { if (F_status_set_fine(*status) == F_file_found_not) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SThe path '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%SThe path '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%Q%]", main->error.to.stream, main->error.notable, destination_path, main->error.notable); - fl_print_format("%[' could not be created, a parent directory does not exist.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' could not be created, a parent directory does not exist.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -143,7 +143,7 @@ extern "C" { } if (main->error.verbosity == f_console_verbosity_verbose_e) { - fll_print_format("Directory '%Q' created.%c", main->output.to.stream, destination_path, f_string_eol_s[0]); + fll_print_format("Directory '%Q' created.%q", main->output.to.stream, destination_path, f_string_eol_s); } } else if (F_status_is_error(*status)) { diff --git a/level_3/fake/c/private-build-program.c b/level_3/fake/c/private-build-program.c index aa8ae1a..b5e690f 100644 --- a/level_3/fake/c/private-build-program.c +++ b/level_3/fake/c/private-build-program.c @@ -28,7 +28,7 @@ extern "C" { if (!data_build.setting.build_sources_program.used) return 0; if (main->output.verbosity != f_console_verbosity_quiet_e) { - fll_print_format("%c%[Compiling shared program.%]%c", main->output.to.stream, f_string_eol_s[0], main->context.set.important, main->context.set.important, f_string_eol_s[0]); + fll_print_format("%q%[Compiling shared program.%]%q", main->output.to.stream, f_string_eol_s, main->context.set.important, main->context.set.important, f_string_eol_s); } f_string_dynamics_t arguments = f_string_dynamics_t_initialize; @@ -146,7 +146,7 @@ extern "C" { if (!data_build.setting.build_sources_program.used) return 0; if (main->output.verbosity != f_console_verbosity_quiet_e) { - fll_print_format("%c%[Compiling static program.%]%c", main->output.to.stream, f_string_eol_s[0], main->context.set.important, main->context.set.important, f_string_eol_s[0]); + fll_print_format("%q%[Compiling static program.%]%q", main->output.to.stream, f_string_eol_s, main->context.set.important, main->context.set.important, f_string_eol_s); } f_string_dynamics_t arguments = f_string_dynamics_t_initialize; diff --git a/level_3/fake/c/private-build-skeleton.c b/level_3/fake/c/private-build-skeleton.c index 9dba183..ffc009e 100644 --- a/level_3/fake/c/private-build-skeleton.c +++ b/level_3/fake/c/private-build-skeleton.c @@ -57,7 +57,7 @@ extern "C" { }; if (main->output.verbosity != f_console_verbosity_quiet_e) { - fll_print_format("%c%[Creating base build directories.%]%c", main->output.to.stream, f_string_eol_s[0], main->context.set.important, main->context.set.important, f_string_eol_s[0]); + fll_print_format("%q%[Creating base build directories.%]%q", main->output.to.stream, f_string_eol_s, main->context.set.important, main->context.set.important, f_string_eol_s); } for (uint8_t i = 0; i < 15; ++i) { @@ -67,14 +67,14 @@ extern "C" { // @todo implement this in a common function and use across project for creating parent directories. for (f_array_length_t j = 0; j < directorys[i]->used; ++j) { - if (directorys[i]->string[j] != f_path_separator_s[0]) continue; + if (directorys[i]->string[j] != f_path_separator_s.string[0]) continue; directorys[i]->string[j] = 0; *status = f_directory_exists(directorys[i]->string); if (F_status_is_error(*status) || *status == F_false) { - directorys[i]->string[j] = f_path_separator_s[0]; + directorys[i]->string[j] = f_path_separator_s.string[0]; break; } @@ -83,7 +83,7 @@ extern "C" { *status = f_directory_create(directorys[i]->string, mode); } - directorys[i]->string[j] = f_path_separator_s[0]; + directorys[i]->string[j] = f_path_separator_s.string[0]; if (F_status_is_error(*status)) break; } // for @@ -103,7 +103,7 @@ extern "C" { } if (main->error.verbosity == f_console_verbosity_verbose_e) { - fll_print_format("Created directory '%Q'.%c", main->output.to.stream, directorys[i], f_string_eol_s[0]); + fll_print_format("Created directory '%Q'.%q", main->output.to.stream, directorys[i], f_string_eol_s); } } // for diff --git a/level_3/fake/c/private-build.c b/level_3/fake/c/private-build.c index 5afdddb..7674159 100644 --- a/level_3/fake/c/private-build.c +++ b/level_3/fake/c/private-build.c @@ -304,7 +304,7 @@ extern "C" { f_string_dynamic_t destination_directory = f_string_dynamic_t_initialize; if (main->output.verbosity != f_console_verbosity_quiet_e) { - fll_print_format("%c%[Copying %S.%]%c", main->output.to.stream, f_string_eol_s[0], main->context.set.important, label, main->context.set.important, f_string_eol_s[0]); + fll_print_format("%q%[Copying %S.%]%q", main->output.to.stream, f_string_eol_s, main->context.set.important, label, main->context.set.important, f_string_eol_s); } macro_f_string_dynamic_t_resize(*status, path_source, source.used); @@ -474,7 +474,7 @@ extern "C" { } if (main->error.verbosity == f_console_verbosity_verbose_e) { - fll_print_format("Copied file '%Q' to '%Q'.%c", main->output.to.stream, path_source, destination_file, f_string_eol_s[0]); + fll_print_format("Copied file '%Q' to '%Q'.%q", main->output.to.stream, path_source, destination_file, f_string_eol_s); } } else if (F_status_is_error(*status)) { @@ -508,16 +508,16 @@ extern "C" { // Ensure console color mode is passed to the scripts so that they can also react to color mode. if (F_status_is_error_not(*status) && main->context.mode != F_color_mode_none_d) { - char argument[3] = { f_console_symbol_short_disable_s[0], 0, 0 }; + char argument[3] = { f_console_symbol_short_disable_s.string[0], 0, 0 }; if (main->context.mode == F_color_mode_dark_d) { - argument[1] = f_console_standard_short_dark_s[0]; + argument[1] = f_console_standard_short_dark_s.string[0]; } else if (main->context.mode == F_color_mode_light_d) { - argument[1] = f_console_standard_short_light_s[0]; + argument[1] = f_console_standard_short_light_s.string[0]; } else if (main->context.mode == F_color_mode_no_color_d) { - argument[1] = f_console_standard_short_no_color_s[0]; + argument[1] = f_console_standard_short_no_color_s.string[0]; } *status = fll_execute_arguments_add(argument, 2, &arguments); @@ -525,16 +525,16 @@ extern "C" { // Ensure verbosity level is passed to the scripts so that they can also react to requested verbosity. if (F_status_is_error_not(*status) && main->error.verbosity != f_console_verbosity_normal_e) { - char argument[3] = { f_console_symbol_short_disable_s[0], 0, 0 }; + char argument[3] = { f_console_symbol_short_disable_s.string[0], 0, 0 }; if (main->error.verbosity == f_console_verbosity_quiet_e) { - argument[1] = f_console_standard_short_quiet_s[0]; + argument[1] = f_console_standard_short_quiet_s.string[0]; } else if (main->error.verbosity == f_console_verbosity_verbose_e) { - argument[1] = f_console_standard_short_verbose_s[0]; + argument[1] = f_console_standard_short_verbose_s.string[0]; } else if (main->error.verbosity == f_console_verbosity_debug_e) { - argument[1] = f_console_standard_short_debug_s[0]; + argument[1] = f_console_standard_short_debug_s.string[0]; } *status = fll_execute_arguments_add(argument, 2, &arguments); @@ -553,7 +553,7 @@ extern "C" { if (main->define.used) { for (f_array_length_t i = 0; i < main->define.used; ++i) { - *status = f_string_dynamic_mash(f_string_space_s, 1, main->define.array[i], &defines); + *status = f_string_dynamic_mash(f_string_space_s, main->define.array[i], &defines); if (F_status_is_error(*status)) { break; @@ -580,23 +580,23 @@ extern "C" { } const f_string_t parameters_prefix[] = { - f_console_symbol_short_enable_s, - f_console_symbol_short_enable_s, - f_console_symbol_short_enable_s, - f_console_symbol_short_enable_s, - f_console_symbol_short_enable_s, - f_console_symbol_short_enable_s, - f_console_symbol_short_enable_s, + f_console_symbol_short_enable_s.string, + f_console_symbol_short_enable_s.string, + f_console_symbol_short_enable_s.string, + f_console_symbol_short_enable_s.string, + f_console_symbol_short_enable_s.string, + f_console_symbol_short_enable_s.string, + f_console_symbol_short_enable_s.string, }; const f_array_length_t parameters_prefix_length[] = { - F_console_symbol_short_enable_s_length, - F_console_symbol_short_enable_s_length, - F_console_symbol_short_enable_s_length, - F_console_symbol_short_enable_s_length, - F_console_symbol_short_enable_s_length, - F_console_symbol_short_enable_s_length, - F_console_symbol_short_enable_s_length, + f_console_symbol_short_enable_s.used, + f_console_symbol_short_enable_s.used, + f_console_symbol_short_enable_s.used, + f_console_symbol_short_enable_s.used, + f_console_symbol_short_enable_s.used, + f_console_symbol_short_enable_s.used, + f_console_symbol_short_enable_s.used, }; const f_string_t parameters_name[] = { @@ -701,9 +701,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SFailed to execute script: '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%SFailed to execute script: '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%Q%]", main->error.to.stream, main->error.notable, path, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -742,7 +742,7 @@ extern "C" { for (; i > 0; --i) { - if (name->string[i] == F_path_extension_separator_s[0]) { + if (name->string[i] == f_path_extension_separator_s.string[0]) { name->used = i; break; } @@ -781,9 +781,9 @@ extern "C" { if (main->output.verbosity != f_console_verbosity_quiet_e) { flockfile(main->output.to.stream); - fl_print_format("%c%[Building project%] ", main->output.to.stream, f_string_eol_s[0], main->context.set.important, main->context.set.important); + fl_print_format("%q%[Building project%] ", main->output.to.stream, f_string_eol_s, main->context.set.important, main->context.set.important); fl_print_format("%[%Q%]", main->output.to.stream, main->context.set.notable, data_build.setting.project_name, main->context.set.notable); - fl_print_format("%[.%]%c", main->output.to.stream, main->context.set.important, main->context.set.important, f_string_eol_s[0]); + fl_print_format("%[.%]%q", main->output.to.stream, main->context.set.important, main->context.set.important, f_string_eol_s); funlockfile(main->output.to.stream); } diff --git a/level_3/fake/c/private-clean.c b/level_3/fake/c/private-clean.c index a5c743f..39ddb69 100644 --- a/level_3/fake/c/private-clean.c +++ b/level_3/fake/c/private-clean.c @@ -18,9 +18,9 @@ extern "C" { if (main->output.verbosity != f_console_verbosity_quiet_e) { flockfile(main->output.to.stream); - fl_print_format("%c%[Deleting all files within build directory '%]", main->output.to.stream, f_string_eol_s[0], main->context.set.important, main->context.set.important); + fl_print_format("%q%[Deleting all files within build directory '%]", main->output.to.stream, f_string_eol_s, main->context.set.important, main->context.set.important); fl_print_format("%[%Q%]", main->output.to.stream, main->context.set.notable, main->path_build, main->context.set.notable); - fl_print_format("%[.%]%c", main->output.to.stream, main->context.set.important, main->context.set.important, f_string_eol_s[0]); + fl_print_format("%[.%]%q", main->output.to.stream, main->context.set.important, main->context.set.important, f_string_eol_s); funlockfile(main->output.to.stream); } @@ -42,7 +42,7 @@ extern "C" { f_print_terminated("The build directory '", main->output.to.stream); fl_print_format("%[%Q%]", main->output.to.stream, main->context.set.notable, main->path_build, main->context.set.notable); - fl_print_format("' does not exist.%c", main->output.to.stream, f_string_eol_s[0]); + fl_print_format("' does not exist.%q", main->output.to.stream, f_string_eol_s); funlockfile(main->output.to.stream); } @@ -70,7 +70,7 @@ extern "C" { if (!result) { // @todo in order to get this working, the recursive function that calls this needs to be rewritten with more flexibility or provide a higher-level equivalent function. - fll_print_format("Removed '%S'.%c", stdout, path, f_string_eol_s[0]); + fll_print_format("Removed '%S'.%q", stdout, path, f_string_eol_s); } return result; diff --git a/level_3/fake/c/private-fake.c b/level_3/fake/c/private-fake.c index 527928b..3331ee0 100644 --- a/level_3/fake/c/private-fake.c +++ b/level_3/fake/c/private-fake.c @@ -27,7 +27,7 @@ extern "C" { fl_print_format(" %Q", main->output.to.stream, arguments.array[i]); } // for - f_print_character(f_string_eol_s[0], main->output.to.stream); + f_print_dynamic(f_string_eol_s, main->output.to.stream); funlockfile(main->output.to.stream); @@ -72,9 +72,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SFailed to find program '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%SFailed to find program '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%Q%]", main->error.to.stream, main->error.notable, program, main->error.notable); - fl_print_format("%[' for executing.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' for executing.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -227,9 +227,9 @@ extern "C" { if (fll_error_print(main->error, F_status_set_fine(status), "f_utf_is_word_dash_plus", F_false) == F_known_not && main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SFailed to process the parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fake_long_process_s, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%SFailed to process the parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fake_long_process_s, main->error.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -241,11 +241,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SThe '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fake_long_process_s, main->error.notable); - fl_print_format("%[' parameters value '%]", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%SThe '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fake_long_process_s, main->error.notable); + fl_print_format("%[' parameters value '%]", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, arguments->argv[location], main->error.notable); - fl_print_format("%[' contains non-word, non-dash, and non-plus characters.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' contains non-word, non-dash, and non-plus characters.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -262,9 +262,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%S%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, parameters_name[i], main->error.notable); - fl_print_format("%[' is too long.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%SThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%S%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, parameters_name[i], main->error.notable); + fl_print_format("%[' is too long.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -284,9 +284,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%S%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, parameters_name[i], main->error.notable); - fl_print_format("%[' must not be empty and must not contain only whitespace.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%SThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%S%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, parameters_name[i], main->error.notable); + fl_print_format("%[' must not be empty and must not contain only whitespace.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -369,9 +369,9 @@ extern "C" { if (fll_error_print(main->error, F_status_set_fine(status), "fl_console_parameter_to_string_dynamic_directory", F_false) == F_known_not && main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SFailed to process parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%S%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, parameters_name[i], main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%SFailed to process parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%S%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, parameters_name[i], main->error.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -386,9 +386,9 @@ extern "C" { if (fll_error_print(main->error, F_status_set_fine(status), " macro_f_string_dynamic_t_resize", F_false) == F_known_not && main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SFailed to load default for the parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%S%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, parameters_name[i], main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%SFailed to load default for the parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%S%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, parameters_name[i], main->error.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -409,9 +409,9 @@ extern "C" { if (fll_error_print(main->error, F_status_set_fine(status), "fll_program_parameter_additional_rip", F_false) == F_known_not && main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SFailed to process the parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fake_long_define_s, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%SFailed to process the parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fake_long_define_s, main->error.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -431,9 +431,9 @@ extern "C" { if (fll_error_print(main->error, F_status_set_fine(status), "fll_program_parameter_additional_rip", F_false) == F_known_not && main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SFailed to process the parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fake_long_mode_s, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%SFailed to process the parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fake_long_mode_s, main->error.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -457,9 +457,9 @@ extern "C" { if (fll_error_print(main->error, F_status_set_fine(status), "f_utf_is_word_dash_plus", F_false) == F_known_not && main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SFailed to process the parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fake_long_mode_s, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%SFailed to process the parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fake_long_mode_s, main->error.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -471,11 +471,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SThe '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fake_long_mode_s, main->error.notable); + fl_print_format("%q%[%SThe '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fake_long_mode_s, main->error.notable); fl_print_format("%[' parameters value '%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fake_long_mode_s, main->error.notable); fl_print_format("%[%Q%]", main->error.to.stream, main->error.notable, main->mode.array[i], main->error.notable); - fl_print_format("%[' contains non-word, non-dash, and non-plus characters.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' contains non-word, non-dash, and non-plus characters.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -604,9 +604,9 @@ extern "C" { else if (parameters_required[i]) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SNo valid path for the (required) directory parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, parameters_name[i], main->error.notable); - fl_print_format("%[' was found.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%SNo valid path for the (required) directory parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, parameters_name[i], main->error.notable); + fl_print_format("%[' was found.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -620,19 +620,19 @@ extern "C" { #ifndef _di_fake_verbose_print_clone_ void fake_verbose_print_clone(const f_file_t output, const f_string_t source, const f_string_t destination) { - fll_print_format("Cloned '%S' to '%S'.%c", output.stream, source, destination, f_string_eol_s[0]); + fll_print_format("Cloned '%S' to '%S'.%q", output.stream, source, destination, f_string_eol_s); } #endif // _di_fake_verbose_print_clone_ #ifndef _di_fake_verbose_print_copy_ void fake_verbose_print_copy(const f_file_t output, const f_string_t source, const f_string_t destination) { - fll_print_format("Copied '%S' to '%S'.%c", output.stream, source, destination, f_string_eol_s[0]); + fll_print_format("Copied '%S' to '%S'.%q", output.stream, source, destination, f_string_eol_s); } #endif // _di_fake_verbose_print_copy_ #ifndef _di_fake_verbose_print_move_ void fake_verbose_print_move(const f_file_t output, const f_string_t source, const f_string_t destination) { - fll_print_format("Moved '%S' to '%S'.%c", output.stream, source, destination, f_string_eol_s[0]); + fll_print_format("Moved '%S' to '%S'.%q", output.stream, source, destination, f_string_eol_s); } #endif // _di_fake_verbose_print_move_ diff --git a/level_3/fake/c/private-make-load_fakefile.c b/level_3/fake/c/private-make-load_fakefile.c index 73f6416..9bc158c 100644 --- a/level_3/fake/c/private-make-load_fakefile.c +++ b/level_3/fake/c/private-make-load_fakefile.c @@ -34,9 +34,9 @@ extern "C" { if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { flockfile(data_make->main->warning.to.stream); - fl_print_format("%c%[%SThe fakefile '%]", data_make->main->warning.to.stream, f_string_eol_s[0], data_make->main->warning.context, data_make->main->warning.prefix, data_make->main->warning.context); + fl_print_format("%q%[%SThe fakefile '%]", data_make->main->warning.to.stream, f_string_eol_s, data_make->main->warning.context, data_make->main->warning.prefix, data_make->main->warning.context); fl_print_format("%[%Q%]", data_make->main->warning.to.stream, data_make->main->warning.notable, data_make->main->file_data_build_fakefile, data_make->main->warning.notable); - fl_print_format("%[' is empty.%]%c", data_make->main->warning.to.stream, data_make->main->warning.context, data_make->main->warning.context, f_string_eol_s[0]); + fl_print_format("%[' is empty.%]%q", data_make->main->warning.to.stream, data_make->main->warning.context, data_make->main->warning.context, f_string_eol_s); funlockfile(data_make->main->warning.to.stream); } @@ -201,11 +201,11 @@ extern "C" { if (data_make->main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(data_make->main->error.to.stream); - fl_print_format("%c%[%SThe fakefile '%]", data_make->main->error.to.stream, f_string_eol_s[0], data_make->main->error.context, data_make->main->error.prefix, data_make->main->error.context); + fl_print_format("%q%[%SThe fakefile '%]", data_make->main->error.to.stream, f_string_eol_s, data_make->main->error.context, data_make->main->error.prefix, data_make->main->error.context); fl_print_format("%[%Q%]", data_make->main->error.to.stream, data_make->main->error.notable, data_make->main->file_data_build_fakefile, data_make->main->error.notable); fl_print_format("%[' is missing the required '%]", data_make->main->error.to.stream, data_make->main->error.context, data_make->main->error.context); fl_print_format("%[%s%]", data_make->main->error.to.stream, data_make->main->error.notable, fake_make_section_main_s, data_make->main->error.notable); - fl_print_format("%[' object.%]%c", data_make->main->error.to.stream, data_make->main->error.context, data_make->main->error.context, f_string_eol_s[0]); + fl_print_format("%[' object.%]%q", data_make->main->error.to.stream, data_make->main->error.context, data_make->main->error.context, f_string_eol_s); funlockfile(data_make->main->error.to.stream); } @@ -448,10 +448,10 @@ extern "C" { for (j = 0; j < define.array[i].value.used; ++j) { - status = f_string_dynamic_mash(f_string_space_s, 1, define.array[i].value.array[j], &combined); + status = f_string_dynamic_mash(f_string_space_s, define.array[i].value.array[j], &combined); if (F_status_is_error(status)) { - fll_error_print(main->error, F_status_set_fine(status), "f_string_dynamic_mash_nulless", F_true); + fll_error_print(main->error, F_status_set_fine(status), "f_string_dynamic_mash", F_true); break; } @@ -479,9 +479,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SInvalid characters in the define setting name '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%SInvalid characters in the define setting name '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%Q%]", main->error.to.stream, main->error.notable, define.array[i].name, main->error.notable); - fl_print_format("%[', only alpha-numeric ASCII characters and underscore (without a leading digit) are allowed.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[', only alpha-numeric ASCII characters and underscore (without a leading digit) are allowed.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -563,9 +563,9 @@ extern "C" { else if (data_make->main->warning.verbosity == f_console_verbosity_verbose_e) { flockfile(data_make->main->warning.to.stream); - fl_print_format("%c%[%SThe environment name '%]", data_make->main->warning.to.stream, f_string_eol_s[0], data_make->main->warning.context, data_make->main->warning.prefix, data_make->main->warning.context); + fl_print_format("%q%[%SThe environment name '%]", data_make->main->warning.to.stream, f_string_eol_s, data_make->main->warning.context, data_make->main->warning.prefix, data_make->main->warning.context); fl_print_format("%[%Q%]", data_make->main->warning.to.stream, data_make->main->warning.notable, name_define, data_make->main->warning.notable); - fl_print_format("%[' is already added.%]%c", data_make->main->warning.to.stream, data_make->main->warning.context, data_make->main->warning.context, f_string_eol_s[0]); + fl_print_format("%[' is already added.%]%q", data_make->main->warning.to.stream, data_make->main->warning.context, data_make->main->warning.context, f_string_eol_s); funlockfile(data_make->main->warning.to.stream); } @@ -573,9 +573,9 @@ extern "C" { else if (data_make->main->warning.verbosity == f_console_verbosity_verbose_e) { flockfile(data_make->main->warning.to.stream); - fl_print_format("%c%[%SThe environment name '%]", data_make->main->warning.to.stream, f_string_eol_s[0], data_make->main->warning.context, data_make->main->warning.prefix, data_make->main->warning.context); + fl_print_format("%q%[%SThe environment name '%]", data_make->main->warning.to.stream, f_string_eol_s, data_make->main->warning.context, data_make->main->warning.prefix, data_make->main->warning.context); fl_print_format("%[%Q%]", data_make->main->warning.to.stream, data_make->main->warning.notable, name_define, data_make->main->warning.notable); - fl_print_format("%[' is invalid, ignoring.%]%c", data_make->main->warning.to.stream, data_make->main->warning.context, data_make->main->warning.context, f_string_eol_s[0]); + fl_print_format("%[' is invalid, ignoring.%]%q", data_make->main->warning.to.stream, data_make->main->warning.context, data_make->main->warning.context, f_string_eol_s); funlockfile(data_make->main->warning.to.stream); } @@ -678,10 +678,10 @@ extern "C" { break; } - status = f_string_append_assure(f_string_space_s, 1, &data_make->setting_make.parameter.array[0].value.array[0]); + status = f_string_dynamic_append_assure(f_string_space_s, &data_make->setting_make.parameter.array[0].value.array[0]); if (F_status_is_error(status)) { - fll_error_print(data_make->main->error, F_status_set_fine(status), "f_string_append_assure", F_true); + fll_error_print(data_make->main->error, F_status_set_fine(status), "f_string_dynamic_append_assure", F_true); break; } diff --git a/level_3/fake/c/private-make-load_parameters.c b/level_3/fake/c/private-make-load_parameters.c index 5b2927c..2caf0d8 100644 --- a/level_3/fake/c/private-make-load_parameters.c +++ b/level_3/fake/c/private-make-load_parameters.c @@ -32,49 +32,45 @@ extern "C" { if (data_make->main->context.mode == F_color_mode_no_color_d) { if (data_make->main->parameters[fake_parameter_no_color_e].type == f_console_type_normal_e) { - *status = f_string_append(f_console_symbol_short_enable_s, 1, &data_make->parameter.color.array[data_make->parameter.color.used]); + *status = f_string_dynamic_append(f_console_symbol_short_enable_s, &data_make->parameter.color.array[data_make->parameter.color.used]); } else if (data_make->main->parameters[fake_parameter_no_color_e].type == f_console_type_inverse_e) { - *status = f_string_append(f_console_symbol_short_disable_s, 1, &data_make->parameter.color.array[data_make->parameter.color.used]); + *status = f_string_dynamic_append(f_console_symbol_short_disable_s, &data_make->parameter.color.array[data_make->parameter.color.used]); } if (F_status_is_error_not(*status)) { - *status = f_string_append(f_console_standard_short_no_color_s, 1, &data_make->parameter.color.array[data_make->parameter.color.used]); + *status = f_string_dynamic_append(f_console_standard_short_no_color_s, &data_make->parameter.color.array[data_make->parameter.color.used]); } } else if (data_make->main->context.mode == F_color_mode_dark_d) { if (data_make->main->parameters[fake_parameter_dark_e].type == f_console_type_normal_e) { - *status = f_string_append(f_console_symbol_short_enable_s, 1, &data_make->parameter.color.array[data_make->parameter.color.used]); + *status = f_string_dynamic_append(f_console_symbol_short_enable_s, &data_make->parameter.color.array[data_make->parameter.color.used]); } else if (data_make->main->parameters[fake_parameter_dark_e].type == f_console_type_inverse_e) { - *status = f_string_append(f_console_symbol_short_disable_s, 1, &data_make->parameter.color.array[data_make->parameter.color.used]); + *status = f_string_dynamic_append(f_console_symbol_short_disable_s, &data_make->parameter.color.array[data_make->parameter.color.used]); } if (F_status_is_error_not(*status)) { - *status = f_string_append(f_console_standard_short_dark_s, 1, &data_make->parameter.color.array[data_make->parameter.color.used]); + *status = f_string_dynamic_append(f_console_standard_short_dark_s, &data_make->parameter.color.array[data_make->parameter.color.used]); } } else { if (data_make->main->parameters[fake_parameter_light_e].type == f_console_type_normal_e) { - *status = f_string_append(f_console_symbol_short_enable_s, 1, &data_make->parameter.color.array[data_make->parameter.color.used]); + *status = f_string_dynamic_append(f_console_symbol_short_enable_s, &data_make->parameter.color.array[data_make->parameter.color.used]); } else if (data_make->main->parameters[fake_parameter_light_e].type == f_console_type_inverse_e) { - *status = f_string_append(f_console_symbol_short_disable_s, 1, &data_make->parameter.color.array[data_make->parameter.color.used]); + *status = f_string_dynamic_append(f_console_symbol_short_disable_s, &data_make->parameter.color.array[data_make->parameter.color.used]); } if (F_status_is_error_not(*status)) { - *status = f_string_append(f_console_standard_short_light_s, 1, &data_make->parameter.color.array[data_make->parameter.color.used]); + *status = f_string_dynamic_append(f_console_standard_short_light_s, &data_make->parameter.color.array[data_make->parameter.color.used]); } } - if (F_status_is_error(*status)) { - fll_error_print(data_make->main->error, F_status_set_fine(*status), "f_string_append", F_true); - - return; + if (F_status_is_error_not(*status)) { + *status = f_string_dynamic_append(data_make->parameter.color.array[data_make->parameter.color.used], &data_make->parameter_option.color.array[data_make->parameter_option.color.used]); } - *status = f_string_dynamic_append(data_make->parameter.color.array[data_make->parameter.color.used], &data_make->parameter_option.color.array[data_make->parameter_option.color.used]); - if (F_status_is_error(*status)) { fll_error_print(data_make->main->error, F_status_set_fine(*status), "f_string_dynamic_append", F_true); @@ -100,49 +96,45 @@ extern "C" { if (data_make->main->error.verbosity == f_console_verbosity_quiet_e) { if (data_make->main->parameters[fake_parameter_verbosity_quiet_e].type == f_console_type_normal_e) { - *status = f_string_append(f_console_symbol_short_enable_s, 1, &data_make->parameter.verbosity.array[data_make->parameter.verbosity.used]); + *status = f_string_dynamic_append(f_console_symbol_short_enable_s, &data_make->parameter.verbosity.array[data_make->parameter.verbosity.used]); } else if (data_make->main->parameters[fake_parameter_verbosity_quiet_e].type == f_console_type_inverse_e) { - *status = f_string_append(f_console_symbol_short_disable_s, 1, &data_make->parameter.verbosity.array[data_make->parameter.verbosity.used]); + *status = f_string_dynamic_append(f_console_symbol_short_disable_s, &data_make->parameter.verbosity.array[data_make->parameter.verbosity.used]); } if (F_status_is_error_not(*status)) { - *status = f_string_append(f_console_standard_short_quiet_s, 1, &data_make->parameter.verbosity.array[data_make->parameter.verbosity.used]); + *status = f_string_dynamic_append(f_console_standard_short_quiet_s, &data_make->parameter.verbosity.array[data_make->parameter.verbosity.used]); } } else if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { if (data_make->main->parameters[fake_parameter_verbosity_verbose_e].type == f_console_type_normal_e) { - *status = f_string_append(f_console_symbol_short_enable_s, 1, &data_make->parameter.verbosity.array[data_make->parameter.verbosity.used]); + *status = f_string_dynamic_append(f_console_symbol_short_enable_s, &data_make->parameter.verbosity.array[data_make->parameter.verbosity.used]); } else if (data_make->main->parameters[fake_parameter_verbosity_verbose_e].type == f_console_type_inverse_e) { - *status = f_string_append(f_console_symbol_short_disable_s, 1, &data_make->parameter.verbosity.array[data_make->parameter.verbosity.used]); + *status = f_string_dynamic_append(f_console_symbol_short_disable_s, &data_make->parameter.verbosity.array[data_make->parameter.verbosity.used]); } if (F_status_is_error_not(*status)) { - *status = f_string_append(f_console_standard_short_verbose_s, 1, &data_make->parameter.verbosity.array[data_make->parameter.verbosity.used]); + *status = f_string_dynamic_append(f_console_standard_short_verbose_s, &data_make->parameter.verbosity.array[data_make->parameter.verbosity.used]); } } else { if (data_make->main->parameters[fake_parameter_verbosity_debug_e].type == f_console_type_normal_e) { - *status = f_string_append(f_console_symbol_short_enable_s, 1, &data_make->parameter.verbosity.array[data_make->parameter.verbosity.used]); + *status = f_string_dynamic_append(f_console_symbol_short_enable_s, &data_make->parameter.verbosity.array[data_make->parameter.verbosity.used]); } else if (data_make->main->parameters[fake_parameter_verbosity_debug_e].type == f_console_type_inverse_e) { - *status = f_string_append(f_console_symbol_short_disable_s, 1, &data_make->parameter.verbosity.array[data_make->parameter.verbosity.used]); + *status = f_string_dynamic_append(f_console_symbol_short_disable_s, &data_make->parameter.verbosity.array[data_make->parameter.verbosity.used]); } if (F_status_is_error_not(*status)) { - *status = f_string_append(f_console_standard_short_debug_s, 1, &data_make->parameter.verbosity.array[data_make->parameter.verbosity.used]); + *status = f_string_dynamic_append(f_console_standard_short_debug_s, &data_make->parameter.verbosity.array[data_make->parameter.verbosity.used]); } } - if (F_status_is_error(*status)) { - fll_error_print(data_make->main->error, F_status_set_fine(*status), "f_string_append", F_true); - - return; + if (F_status_is_error_not(*status)) { + *status = f_string_dynamic_append(data_make->parameter.verbosity.array[data_make->parameter.verbosity.used], &data_make->parameter_option.verbosity.array[data_make->parameter_option.verbosity.used]); } - *status = f_string_dynamic_append(data_make->parameter.verbosity.array[data_make->parameter.verbosity.used], &data_make->parameter_option.verbosity.array[data_make->parameter_option.verbosity.used]); - if (F_status_is_error(*status)) { fll_error_print(data_make->main->error, F_status_set_fine(*status), "f_string_dynamic_append", F_true); @@ -218,10 +210,10 @@ extern "C" { } if (console[i]->type == f_console_type_normal_e) { - *status = f_string_append(f_console_symbol_short_enable_s, 1, &destination[i]->array[destination[i]->used]); + *status = f_string_dynamic_append(f_console_symbol_short_enable_s, &destination[i]->array[destination[i]->used]); } else if (console[i]->type == f_console_type_inverse_e) { - *status = f_string_append(f_console_symbol_short_disable_s, 1, &destination[i]->array[destination[i]->used]); + *status = f_string_dynamic_append(f_console_symbol_short_disable_s, &destination[i]->array[destination[i]->used]); } if (F_status_is_error_not(*status)) { @@ -361,10 +353,10 @@ extern "C" { } if (console[i]->type == f_console_type_normal_e) { - *status = f_string_append(f_console_symbol_short_enable_s, 1, &destination[i]->array[destination[i]->used]); + *status = f_string_dynamic_append(f_console_symbol_short_enable_s, &destination[i]->array[destination[i]->used]); } else if (console[i]->type == f_console_type_inverse_e) { - *status = f_string_append(f_console_symbol_short_disable_s, 1, &destination[i]->array[destination[i]->used]); + *status = f_string_dynamic_append(f_console_symbol_short_disable_s, &destination[i]->array[destination[i]->used]); } if (F_status_is_error_not(*status)) { diff --git a/level_3/fake/c/private-make-operate.c b/level_3/fake/c/private-make-operate.c index 2b78cf9..53aa306 100644 --- a/level_3/fake/c/private-make-operate.c +++ b/level_3/fake/c/private-make-operate.c @@ -25,7 +25,7 @@ extern "C" { } if (main->output.verbosity != f_console_verbosity_quiet_e) { - fll_print_format("%c%[Making project.%]%c", main->output.to.stream, f_string_eol_s[0], main->context.set.important, main->context.set.important, f_string_eol_s[0]); + fll_print_format("%q%[Making project.%]%q", main->output.to.stream, f_string_eol_s, main->context.set.important, main->context.set.important, f_string_eol_s); } f_status_t status = F_none; @@ -80,7 +80,7 @@ extern "C" { if (data_make.setting_make.fail == fake_make_operation_fail_type_exit_e) { data_make.error.prefix = fl_print_error_s; - data_make.error.suffix = 0; + data_make.error.suffix = f_string_empty_s; data_make.error.context = main->context.set.error; data_make.error.notable = main->context.set.notable; data_make.error.to.stream = F_type_error_d; @@ -89,7 +89,7 @@ extern "C" { } else if (data_make.setting_make.fail == fake_make_operation_fail_type_warn_e) { data_make.error.prefix = fl_print_warning_s; - data_make.error.suffix = 0; + data_make.error.suffix = f_string_empty_s; data_make.error.context = main->context.set.warning; data_make.error.notable = main->context.set.notable; data_make.error.to.stream = F_type_warning_d; @@ -98,8 +98,8 @@ extern "C" { } else { data_make.error.to.stream = 0; - data_make.error.prefix = 0; - data_make.error.suffix = 0; + data_make.error.prefix = f_string_empty_s; + data_make.error.suffix = f_string_empty_s; data_make.error.to.id = -1; data_make.error.set = &main->context.set; } @@ -118,11 +118,11 @@ extern "C" { if (F_status_is_error(status_path) && main->warning.verbosity == f_console_verbosity_verbose_e) { flockfile(main->warning.to.stream); - fl_print_format("%c%[%SFailed change back to orignal path '%]", main->warning.to.stream, f_string_eol_s[0], main->warning.context, main->warning.prefix, main->warning.context); + fl_print_format("%q%[%SFailed change back to orignal path '%]", main->warning.to.stream, f_string_eol_s, main->warning.context, main->warning.prefix, main->warning.context); fl_print_format("%[%Q%]", main->warning.to.stream, main->warning.notable, data_make.path.stack.array[0], main->warning.notable); fl_print_format("%[', status code =%] ", main->warning.to.stream, main->warning.context, main->warning.context); fl_print_format("%[%ui%]", main->warning.to.stream, main->warning.notable, F_status_set_fine(status_path), main->warning.notable); - fl_print_format("%['.%]%c", main->warning.to.stream, main->warning.context, main->warning.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->warning.to.stream, main->warning.context, main->warning.context, f_string_eol_s); funlockfile(main->warning.to.stream); } @@ -308,7 +308,7 @@ extern "C" { // Apply the IKI delimits to the buffer. for (j = 0; j < iki_delimits.used; ++j) { - data_make->buffer.string[iki_delimits.array[j]] = f_iki_syntax_placeholder_s[0]; + data_make->buffer.string[iki_delimits.array[j]] = f_iki_syntax_placeholder_s.string[0]; } // for if (iki_variable.used) { @@ -406,10 +406,10 @@ extern "C" { if (!reserved_value[k]->array[l].used) continue; if (l) { - *status = f_string_append(f_string_space_s, 1, &arguments->array[arguments->used]); + *status = f_string_dynamic_append(f_string_space_s, &arguments->array[arguments->used]); if (F_status_is_error(*status)) { - fll_error_print(data_make->error, F_status_set_fine(*status), "f_string_append", F_true); + fll_error_print(data_make->error, F_status_set_fine(*status), "f_string_dynamic_append", F_true); break; } @@ -444,10 +444,10 @@ extern "C" { for (l = 0; l < parameter->array[k].value.used; ++l) { if (l > 0) { - *status = f_string_append(f_string_space_s, 1, &arguments->array[arguments->used]); + *status = f_string_dynamic_append(f_string_space_s, &arguments->array[arguments->used]); if (F_status_is_error(*status)) { - fll_error_print(data_make->error, F_status_set_fine(*status), "f_string_append", F_true); + fll_error_print(data_make->error, F_status_set_fine(*status), "f_string_dynamic_append", F_true); break; } @@ -892,11 +892,8 @@ extern "C" { for (f_array_length_t j = 0; j < dynamics_value[i].used; ++j) { - status = f_string_dynamic_mash(f_string_space_s, 1, dynamics_value[i].array[j], &value); - - if (F_status_is_error(status)) { - break; - } + status = f_string_dynamic_mash(f_string_space_s, dynamics_value[i].array[j], &value); + if (F_status_is_error(status)) break; } // for break; @@ -1107,9 +1104,9 @@ extern "C" { if (data_make->main->output.verbosity != f_console_verbosity_quiet_e) { flockfile(data_make->main->output.to.stream); - fl_print_format("%c%[Processing Section '%]", data_make->main->output.to.stream, f_string_eol_s[0], data_make->main->context.set.important, data_make->main->context.set.important); + fl_print_format("%q%[Processing Section '%]", data_make->main->output.to.stream, f_string_eol_s, data_make->main->context.set.important, data_make->main->context.set.important); fl_print_format("%[%/Q%]", data_make->main->output.to.stream, data_make->main->context.set.notable, data_make->buffer, section->name, data_make->main->context.set.notable); - fl_print_format("%['.%]%c", data_make->main->output.to.stream, data_make->main->context.set.important, data_make->main->context.set.important, f_string_eol_s[0]); + fl_print_format("%['.%]%q", data_make->main->output.to.stream, data_make->main->context.set.important, data_make->main->context.set.important, f_string_eol_s); funlockfile(data_make->main->output.to.stream); } @@ -1435,7 +1432,7 @@ extern "C" { if (F_status_set_fine(*status) == F_signal_abort && !section_stack->used) { data_make->setting_make.fail = fake_make_operation_fail_type_exit_e; data_make->error.prefix = fl_print_error_s; - data_make->error.suffix = 0; + data_make->error.suffix = f_string_empty_s; data_make->error.context = data_make->main->context.set.error; data_make->error.notable = data_make->main->context.set.notable; data_make->error.to.stream = F_type_error_d; @@ -1499,7 +1496,7 @@ extern "C" { if (data_make->main->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SIncomplete '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SIncomplete '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); if (state_process.block == fake_state_process_block_else_e) { fl_print_format("%[%s%]", data_make->error.to.stream, data_make->error.notable, fake_make_operation_else_s, data_make->error.notable); @@ -1508,7 +1505,7 @@ extern "C" { fl_print_format("%[%s%]", data_make->error.to.stream, data_make->error.notable, fake_make_operation_if_s, data_make->error.notable); } - fl_print_format("%[' at end of section.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%[' at end of section.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } diff --git a/level_3/fake/c/private-make-operate_process.c b/level_3/fake/c/private-make-operate_process.c index 1ca107b..43c6325 100644 --- a/level_3/fake/c/private-make-operate_process.c +++ b/level_3/fake/c/private-make-operate_process.c @@ -88,9 +88,9 @@ extern "C" { if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { flockfile(data_make->main->output.to.stream); - fl_print_format("%cBreaking as '", data_make->main->output.to.stream, f_string_eol_s[0]); + fl_print_format("%qBreaking as '", data_make->main->output.to.stream, f_string_eol_s); fl_print_format("%[%S%]", data_make->main->output.to.stream, data_make->main->context.set.notable, arguments.used ? arguments.array[0].string : fake_make_operation_argument_success_s, data_make->main->context.set.notable); - fl_print_format("'.%c", data_make->main->output.to.stream, f_string_eol_s[0]); + fl_print_format("'.%q", data_make->main->output.to.stream, f_string_eol_s); funlockfile(data_make->main->output.to.stream); } @@ -158,14 +158,14 @@ extern "C" { *status = f_environment_set(arguments.array[0].string, arguments.array[1].string, F_true); } else { - *status = f_environment_set(arguments.array[0].string, f_string_empty_s, F_true); + *status = f_environment_set(arguments.array[0].string, f_string_empty_s.string, F_true); } if (F_status_is_error(*status)) { fll_error_print(data_make->error, F_status_set_fine(*status), "f_environment_set", F_true); } else if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { - fll_print_format("%cDefined environment variable '%[%Q%]'.%c", data_make->main->output.to.stream, f_string_eol_s[0], data_make->main->context.set.notable, arguments.array[0], data_make->main->context.set.notable, f_string_eol_s[0]); + fll_print_format("%qDefined environment variable '%[%Q%]'.%q", data_make->main->output.to.stream, f_string_eol_s, data_make->main->context.set.notable, arguments.array[0], data_make->main->context.set.notable, f_string_eol_s); } return 0; @@ -199,7 +199,7 @@ extern "C" { // Forcing exit forces fail mode. data_make->setting_make.fail = fake_make_operation_fail_type_exit_e; data_make->error.prefix = fl_print_error_s; - data_make->error.suffix = 0; + data_make->error.suffix = f_string_empty_s; data_make->error.context = data_make->main->context.set.error; data_make->error.notable = data_make->main->context.set.notable; data_make->error.to.stream = F_type_error_d; @@ -211,7 +211,7 @@ extern "C" { } if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { - fll_print_format("%cExiting as '%[%S%]'.%c", data_make->main->output.to.stream, f_string_eol_s[0], data_make->main->context.set.notable, arguments.used ? arguments.array[0].string : fake_make_operation_argument_success_s, data_make->main->context.set.notable, f_string_eol_s[0]); + fll_print_format("%qExiting as '%[%S%]'.%q", data_make->main->output.to.stream, f_string_eol_s, data_make->main->context.set.notable, arguments.used ? arguments.array[0].string : fake_make_operation_argument_success_s, data_make->main->context.set.notable, f_string_eol_s); } return 0; @@ -363,7 +363,7 @@ extern "C" { flockfile(data_make->main->output.to.stream); fl_print_format("Created symbolic link from '%[%Q%]", data_make->main->output.to.stream, data_make->main->context.set.notable, arguments.array[1], data_make->main->context.set.notable); - fl_print_format("' to %[%Q%].%c", data_make->main->output.to.stream, data_make->main->context.set.notable, arguments.array[0], data_make->main->context.set.notable, f_string_eol_s[0]); + fl_print_format("' to %[%Q%].%q", data_make->main->output.to.stream, data_make->main->context.set.notable, arguments.array[0], data_make->main->context.set.notable, f_string_eol_s); funlockfile(data_make->main->output.to.stream); } @@ -448,12 +448,12 @@ extern "C" { f_print_dynamic(arguments.array[i], data_make->main->output.to.stream); if (i + 1 < arguments.used) { - f_print_character(f_string_space_s[0], data_make->main->output.to.stream); + f_print_dynamic(f_string_space_s, data_make->main->output.to.stream); } } // for - f_print_character(f_string_space_s[0], data_make->main->output.to.stream); - f_print_character(f_string_eol_s[0], data_make->main->output.to.stream); + f_print_dynamic(f_string_space_s, data_make->main->output.to.stream); + f_print_dynamic(f_string_eol_s, data_make->main->output.to.stream); funlockfile(data_make->main->output.to.stream); @@ -542,7 +542,7 @@ extern "C" { } } // for - f_print_character(f_string_eol_s[0], data_make->main->output.to.stream); + f_print_dynamic(f_string_eol_s, data_make->main->output.to.stream); funlockfile(data_make->main->output.to.stream); @@ -574,9 +574,9 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SFailed to find program '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SFailed to find program '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to.stream, data_make->error.notable, program, data_make->error.notable); - fl_print_format("%[' for executing.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%[' for executing.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } @@ -650,9 +650,9 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SFailed with return code %]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SFailed with return code %]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%i%]", data_make->error.to.stream, data_make->error.notable, return_code, data_make->error.notable); - fl_print_format("%[.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%[.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } diff --git a/level_3/fake/c/private-make-operate_process_type.c b/level_3/fake/c/private-make-operate_process_type.c index da72bf2..5864314 100644 --- a/level_3/fake/c/private-make-operate_process_type.c +++ b/level_3/fake/c/private-make-operate_process_type.c @@ -71,7 +71,7 @@ extern "C" { if (existing) { memcpy(destination + arguments.array[total].used + 1, arguments.array[i].string, arguments.array[i].used); - destination[arguments.array[total].used] = f_path_separator_s[0]; + destination[arguments.array[total].used] = f_path_separator_s.string[0]; } destination[destination_length] = 0; @@ -108,8 +108,8 @@ extern "C" { else if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { flockfile(data_make->main->output.to.stream); - fl_print_format("%c%s '%[%Q%]' to '", data_make->main->output.to.stream, f_string_eol_s[0], clone ? "Cloned" : "Copied", data_make->main->context.set.notable, arguments.array[i], data_make->main->context.set.notable); - fl_print_format("%[%S%]'.%c", data_make->main->output.to.stream, f_string_eol_s[0], data_make->main->context.set.notable, destination, data_make->main->context.set.notable, f_string_eol_s[0]); + fl_print_format("%q%s '%[%Q%]' to '", data_make->main->output.to.stream, f_string_eol_s, clone ? "Cloned" : "Copied", data_make->main->context.set.notable, arguments.array[i], data_make->main->context.set.notable); + fl_print_format("%[%S%]'.%q", data_make->main->output.to.stream, f_string_eol_s, data_make->main->context.set.notable, destination, data_make->main->context.set.notable, f_string_eol_s); funlockfile(data_make->main->output.to.stream); } @@ -146,9 +146,9 @@ extern "C" { if (data_make->main->warning.verbosity == f_console_verbosity_verbose_e) { flockfile(data_make->main->warning.to.stream); - fl_print_format("%c%[%SThe file '%]", data_make->main->warning.to.stream, data_make->main->warning.prefix, f_string_eol_s[0]); + fl_print_format("%q%[%SThe file '%]", data_make->main->warning.to.stream, data_make->main->warning.prefix, f_string_eol_s); fl_print_format("%[%Q%]", data_make->main->warning.to.stream, data_make->main->warning.notable, arguments.array[i], data_make->main->warning.notable); - fl_print_format("%[' cannot be found.%]%c", data_make->main->warning.to.stream, f_string_eol_s[0]); + fl_print_format("%[' cannot be found.%]%q", data_make->main->warning.to.stream, f_string_eol_s); funlockfile(data_make->main->warning.to.stream); } @@ -171,7 +171,7 @@ extern "C" { if (F_status_set_fine(status) == F_file_found_not) { if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { - fll_print_format("%cThe directory '%[%Q%]' does not exist.%c", data_make->main->output.to.stream, f_string_eol_s[0], data_make->main->context.set.notable, arguments.array[i], data_make->main->context.set.notable, f_string_eol_s[0]); + fll_print_format("%qThe directory '%[%Q%]' does not exist.%q", data_make->main->output.to.stream, f_string_eol_s, data_make->main->context.set.notable, arguments.array[i], data_make->main->context.set.notable, f_string_eol_s); } status = F_none; @@ -183,7 +183,7 @@ extern "C" { return status; } else if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { - fll_print_format("%cRemoved '%[%Q%]'.%c", data_make->main->output.to.stream, f_string_eol_s[0], data_make->main->context.set.notable, arguments.array[i], data_make->main->context.set.notable, f_string_eol_s[0]); + fll_print_format("%qRemoved '%[%Q%]'.%q", data_make->main->output.to.stream, f_string_eol_s, data_make->main->context.set.notable, arguments.array[i], data_make->main->context.set.notable, f_string_eol_s); } } else { @@ -191,7 +191,7 @@ extern "C" { if (F_status_set_fine(status) == F_file_found_not) { if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { - fll_print_format("%cThe file '%[%Q%]' does not exist.%c", data_make->main->output.to.stream, f_string_eol_s[0], data_make->main->context.set.notable, arguments.array[i], data_make->main->context.set.notable, f_string_eol_s[0]); + fll_print_format("%qThe file '%[%Q%]' does not exist.%q", data_make->main->output.to.stream, f_string_eol_s, data_make->main->context.set.notable, arguments.array[i], data_make->main->context.set.notable, f_string_eol_s); } status = F_none; @@ -204,7 +204,7 @@ extern "C" { } if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { - fll_print_format("%cRemoved '%[%Q%]'.%c", data_make->main->output.to.stream, f_string_eol_s[0], data_make->main->context.set.notable, arguments.array[i], data_make->main->context.set.notable, f_string_eol_s[0]); + fll_print_format("%qRemoved '%[%Q%]'.%q", data_make->main->output.to.stream, f_string_eol_s, data_make->main->context.set.notable, arguments.array[i], data_make->main->context.set.notable, f_string_eol_s); } } } // for @@ -219,7 +219,7 @@ extern "C" { if (fl_string_dynamic_compare_string(fake_make_operation_argument_exit_s, arguments.array[0], fake_make_operation_argument_exit_s_length) == F_equal_to) { data_make->setting_make.fail = fake_make_operation_fail_type_exit_e; data_make->error.prefix = fl_print_error_s; - data_make->error.suffix = 0; + data_make->error.suffix = f_string_empty_s; data_make->error.context = data_make->main->context.set.error; data_make->error.notable = data_make->main->context.set.notable; data_make->error.to.stream = F_type_error_d; @@ -229,7 +229,7 @@ extern "C" { else if (fl_string_dynamic_compare_string(fake_make_operation_argument_warn_s, arguments.array[0], fake_make_operation_argument_warn_s_length) == F_equal_to) { data_make->setting_make.fail = fake_make_operation_fail_type_warn_e; data_make->error.prefix = fl_print_warning_s; - data_make->error.suffix = 0; + data_make->error.suffix = f_string_empty_s; data_make->error.context = data_make->main->context.set.warning; data_make->error.notable = data_make->main->context.set.notable; data_make->error.to.stream = F_type_warning_d; @@ -257,7 +257,7 @@ extern "C" { fl_print_format("%[%s%]", data_make->main->output.to.stream, data_make->main->context.set.notable, fake_make_operation_argument_ignore_s, data_make->main->context.set.notable); } - fl_print_format("'.%c", data_make->main->output.to.stream, f_string_eol_s[0]); + fl_print_format("'.%q", data_make->main->output.to.stream, f_string_eol_s); funlockfile(data_make->main->output.to.stream); } @@ -303,7 +303,7 @@ extern "C" { flockfile(data_make->main->output.to.stream); fl_print_format("%s group of '%[%s%]", data_make->main->output.to.stream, all ? "Recursively changed" : "Changed", data_make->main->context.set.notable, arguments.array[i], data_make->main->context.set.notable); - fl_print_format("' to %[%ul%].%c", data_make->main->output.to.stream, data_make->main->context.set.notable, id, data_make->main->context.set.notable, f_string_eol_s[0]); + fl_print_format("' to %[%ul%].%q", data_make->main->output.to.stream, data_make->main->context.set.notable, id, data_make->main->context.set.notable, f_string_eol_s); funlockfile(data_make->main->output.to.stream); } @@ -792,14 +792,14 @@ extern "C" { flockfile(data_make->error.to.stream); if ((i == 1 && number_left > F_number_t_size_unsigned_d) || (i > 1 && number_right > F_number_t_size_unsigned_d)) { - fl_print_format("%c%[%SThe number '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SThe number '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to.stream, data_make->error.notable, arguments.array[i], data_make->error.notable); - fl_print_format("%[' may only be between the ranges -%un to %un.%]%c", data_make->error.to.stream, data_make->error.context, F_number_t_size_unsigned_d, F_number_t_size_unsigned_d, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%[' may only be between the ranges -%un to %un.%]%q", data_make->error.to.stream, data_make->error.context, F_number_t_size_unsigned_d, F_number_t_size_unsigned_d, data_make->error.context, f_string_eol_s); } else { - fl_print_format("%c%[%SInvalid or unsupported number provided '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SInvalid or unsupported number provided '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to.stream, data_make->error.notable, arguments.array[i], data_make->error.notable); - fl_print_format("%['.%]%c", data_make->error.to.stream, data_make->error.context, F_number_t_size_unsigned_d, F_number_t_size_unsigned_d, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", data_make->error.to.stream, data_make->error.context, F_number_t_size_unsigned_d, F_number_t_size_unsigned_d, data_make->error.context, f_string_eol_s); } funlockfile(data_make->error.to.stream); @@ -1040,7 +1040,7 @@ extern "C" { } if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { - fll_print_format("Changed mode of '%Q' to %#@u.%c", data_make->main->output.to.stream, arguments.array[i], mode, f_string_eol_s[0]); + fll_print_format("Changed mode of '%Q' to %#@u.%q", data_make->main->output.to.stream, arguments.array[i], mode, f_string_eol_s); } } // for @@ -1098,7 +1098,7 @@ extern "C" { if (existing) { memcpy(destination + arguments.array[total].used + 1, arguments.array[i].string, arguments.array[i].used); - destination[arguments.array[total].used] = f_path_separator_s[0]; + destination[arguments.array[total].used] = f_path_separator_s.string[0]; } destination[destination_length] = 0; @@ -1154,7 +1154,7 @@ extern "C" { fll_error_file_print(data_make->error, F_status_set_fine(status), all ? "fll_file_role_change_all" : "f_file_role_change", F_true, arguments.array[i].string, "change owner of", fll_error_file_type_file_e); } else if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { - fll_print_format("%s owner of '%Q' to %u.%c", data_make->main->output.to.stream, all ? "Recursively changed" : "Changed", arguments.array[i], id, f_string_eol_s[0]); + fll_print_format("%s owner of '%Q' to %u.%q", data_make->main->output.to.stream, all ? "Recursively changed" : "Changed", arguments.array[i], id, f_string_eol_s); } } // for @@ -1283,10 +1283,10 @@ extern "C" { // The created relative path is for verbosity purposes and as such its failure to be processed should not be treated as a failure of the function. if (F_status_is_error(status)) { fll_error_print(data_make->error, F_status_set_fine(status), "fake_make_path_relative", F_true); - fll_print_format("Changed to project path '%[%Q%]'.%c", data_make->main->output.to.stream, data_make->main->context.set.notable, data_make->path.stack.array[data_make->path.stack.used - 1], data_make->main->context.set.notable, f_string_eol_s[0]); + fll_print_format("Changed to project path '%[%Q%]'.%q", data_make->main->output.to.stream, data_make->main->context.set.notable, data_make->path.stack.array[data_make->path.stack.used - 1], data_make->main->context.set.notable, f_string_eol_s); } else { - fll_print_format("Changed to project path '%[%Q%]'.%c", data_make->main->output.to.stream, data_make->main->context.set.notable, data_make->path_cache, data_make->main->context.set.notable, f_string_eol_s[0]); + fll_print_format("Changed to project path '%[%Q%]'.%q", data_make->main->output.to.stream, data_make->main->context.set.notable, data_make->path_cache, data_make->main->context.set.notable, f_string_eol_s); } } @@ -1348,10 +1348,10 @@ extern "C" { // The created relative path is for verbosity purposes and as such its failure to be processed should not be treated as a failure of the function. if (F_status_is_error(status)) { fll_error_print(data_make->error, F_status_set_fine(status), "fake_make_path_relative", F_true); - fll_print_format("Changed to project path '%[%Q%]'.%c", data_make->main->output.to.stream, data_make->main->context.set.notable, data_make->path.stack.array[data_make->path.stack.used], data_make->main->context.set.notable, f_string_eol_s[0]); + fll_print_format("Changed to project path '%[%Q%]'.%q", data_make->main->output.to.stream, data_make->main->context.set.notable, data_make->path.stack.array[data_make->path.stack.used], data_make->main->context.set.notable, f_string_eol_s); } else { - fll_print_format("Changed to project path '%[%Q%]'.%c", data_make->main->output.to.stream, data_make->main->context.set.notable, data_make->path_cache, data_make->main->context.set.notable, f_string_eol_s[0]); + fll_print_format("Changed to project path '%[%Q%]'.%q", data_make->main->output.to.stream, data_make->main->context.set.notable, data_make->path_cache, data_make->main->context.set.notable, f_string_eol_s); } } @@ -1378,7 +1378,7 @@ extern "C" { } if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { - fll_print_format("Changed to project path ''.%c", data_make->main->output.to.stream, f_string_eol_s[0]); + fll_print_format("Changed to project path ''.%q", data_make->main->output.to.stream, f_string_eol_s); } // Clear stack, except for the project root. @@ -1432,7 +1432,7 @@ extern "C" { } if (data_make->main->error.verbosity == f_console_verbosity_verbose_e) { - fll_print_format("Touched '%[%Q%]'.%c", data_make->main->output.to.stream, data_make->main->context.set.notable, arguments.array[i], data_make->main->context.set.notable, f_string_eol_s[0]); + fll_print_format("Touched '%[%Q%]'.%q", data_make->main->output.to.stream, data_make->main->context.set.notable, arguments.array[i], data_make->main->context.set.notable, f_string_eol_s); } } // for diff --git a/level_3/fake/c/private-make-operate_validate.c b/level_3/fake/c/private-make-operate_validate.c index 8dbe21e..22bf69e 100644 --- a/level_3/fake/c/private-make-operate_validate.c +++ b/level_3/fake/c/private-make-operate_validate.c @@ -29,9 +29,9 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SNo indexer has been specified, cannot perform '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SNo indexer has been specified, cannot perform '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%s%]", data_make->error.to.stream, data_make->error.notable, fake_make_operation_index_s, data_make->error.notable); - fl_print_format("%[' section operation.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%[' section operation.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } @@ -56,9 +56,9 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SUnsupported break type '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SUnsupported break type '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to.stream, data_make->error.notable, arguments.array[0], data_make->error.notable); - fl_print_format("%['.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } @@ -92,9 +92,9 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SFailed to find file '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SFailed to find file '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%S%]", data_make->error.to.stream, data_make->error.notable, path_file, data_make->error.notable); - fl_print_format("%['.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } @@ -109,9 +109,9 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SThe file '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SThe file '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%s%]", data_make->error.to.stream, data_make->error.notable, path_file, data_make->error.notable); - fl_print_format("%[' must be a regular file.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%[' must be a regular file.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } @@ -121,7 +121,7 @@ extern "C" { } else { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { - fll_print_format("%c%[%SFilename argument must not be an empty string.%]%c", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%SFilename argument must not be an empty string.%]%q", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context, f_string_eol_s); } *status = F_status_set_error(F_failure); @@ -141,7 +141,7 @@ extern "C" { if (data_make->path.stack.used == 1) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { - fll_print_format("%c%[%SMust not attempt to pop project root off of path stack.%]%c", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%SMust not attempt to pop project root off of path stack.%]%q", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context, f_string_eol_s); } *status = F_status_set_error(F_failure); @@ -172,9 +172,9 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SFailed to find file '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SFailed to find file '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to.stream, data_make->error.notable, arguments.array[i], data_make->error.notable); - fl_print_format("%['.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } @@ -192,9 +192,9 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SThe last file '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SThe last file '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to.stream, data_make->error.notable, arguments.array[arguments.used - 1], data_make->error.notable); - fl_print_format("%[' must be a valid directory.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%[' must be a valid directory.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } @@ -218,9 +218,9 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SThe last file '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SThe last file '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to.stream, data_make->error.notable, arguments.array[1], data_make->error.notable); - fl_print_format("%[' must be a valid directory.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%[' must be a valid directory.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } @@ -249,9 +249,9 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SNo compiler has been specified, cannot perform '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SNo compiler has been specified, cannot perform '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%s%]", data_make->error.to.stream, data_make->error.notable, fake_make_operation_compile_s, data_make->error.notable); - fl_print_format("%[' section operation.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%[' section operation.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } @@ -283,9 +283,9 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SFailed to find file '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SFailed to find file '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to.stream, data_make->error.notable, arguments.array[i], data_make->error.notable); - fl_print_format("%['.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } @@ -303,9 +303,9 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SThe last file '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SThe last file '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to.stream, data_make->error.notable, arguments.array[arguments.used - 1], data_make->error.notable); - fl_print_format("%[' must be a valid directory.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%[' must be a valid directory.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } @@ -329,9 +329,9 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SThe last file '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SThe last file '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to.stream, data_make->error.notable, arguments.array[1], data_make->error.notable); - fl_print_format("%[' must be a valid directory.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%[' must be a valid directory.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } @@ -356,7 +356,7 @@ extern "C" { if (*status == F_none) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { - fll_print_format("%c%[%SDefine name must not be an empty string.%]%c", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%SDefine name must not be an empty string.%]%q", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context, f_string_eol_s); } *status = F_status_set_error(F_failure); @@ -365,9 +365,9 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SInvalid characters in the define setting name '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SInvalid characters in the define setting name '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to.stream, data_make->error.notable, arguments.array[0], data_make->error.notable); - fl_print_format("%[', only alpha-numeric ASCII characters and underscore (without a leading digit) is allowed.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%[', only alpha-numeric ASCII characters and underscore (without a leading digit) is allowed.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } @@ -413,9 +413,9 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SMust not be used immediately after another '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SMust not be used immediately after another '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%s%]", data_make->error.to.stream, data_make->error.notable, fake_make_operation_else_s, data_make->error.notable); - fl_print_format("%[' section operation.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%[' section operation.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } @@ -429,13 +429,13 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SMust not be used immediately after an '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SMust not be used immediately after an '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%s%]", data_make->error.to.stream, data_make->error.notable, fake_make_operation_if_s, data_make->error.notable); fl_print_format("%[', '%]", data_make->error.to.stream, data_make->error.context, data_make->error.context); fl_print_format("%[%s%]", data_make->error.to.stream, data_make->error.notable, fake_make_operation_and_s, data_make->error.notable); fl_print_format("%[', or '%]", data_make->error.to.stream, data_make->error.context, data_make->error.context); fl_print_format("%[%s%]", data_make->error.to.stream, data_make->error.notable, fake_make_operation_or_s, data_make->error.notable); - fl_print_format("%[' section operation.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%[' section operation.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } @@ -447,13 +447,13 @@ extern "C" { if (!state_process->block) { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { - fl_print_format("%c%[%SHas no preceding '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SHas no preceding '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%s%]", data_make->error.to.stream, data_make->error.notable, fake_make_operation_if_s, data_make->error.notable); fl_print_format("%[', '%]", data_make->error.to.stream, data_make->error.context, data_make->error.context); fl_print_format("%[%s%]", data_make->error.to.stream, data_make->error.notable, fake_make_operation_and_s, data_make->error.notable); fl_print_format("%[', or '%]", data_make->error.to.stream, data_make->error.context, data_make->error.context); fl_print_format("%[%s%]", data_make->error.to.stream, data_make->error.notable, fake_make_operation_or_s, data_make->error.notable); - fl_print_format("%[' section operation.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%[' section operation.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); } *status = F_status_set_error(F_failure); @@ -482,9 +482,9 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SUnsupported exit type '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SUnsupported exit type '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to.stream, data_make->error.notable, arguments.array[0], data_make->error.notable); - fl_print_format("%['.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } @@ -505,9 +505,9 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SUnsupported fail type '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SUnsupported fail type '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to.stream, data_make->error.notable, arguments.array[0], data_make->error.notable); - fl_print_format("%['.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } @@ -538,9 +538,9 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SFailed to find file '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SFailed to find file '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to.stream, data_make->error.notable, arguments.array[i], data_make->error.notable); - fl_print_format("%['.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } @@ -572,13 +572,13 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SMust not be used immediately after another '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SMust not be used immediately after another '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%s%]", data_make->error.to.stream, data_make->error.notable, fake_make_operation_if_s, data_make->error.notable); fl_print_format("%[', '%]", data_make->error.to.stream, data_make->error.context, data_make->error.context); fl_print_format("%[%s%]", data_make->error.to.stream, data_make->error.notable, fake_make_operation_and_s, data_make->error.notable); fl_print_format("%[', or '%]", data_make->error.to.stream, data_make->error.context, data_make->error.context); fl_print_format("%[%s%]", data_make->error.to.stream, data_make->error.notable, fake_make_operation_or_s, data_make->error.notable); - fl_print_format("%[' section operation.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%[' section operation.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } @@ -593,13 +593,13 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SMay only be used immediately after another '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SMay only be used immediately after another '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%s%]", data_make->error.to.stream, data_make->error.notable, fake_make_operation_if_s, data_make->error.notable); fl_print_format("%[', '%]", data_make->error.to.stream, data_make->error.context, data_make->error.context); fl_print_format("%[%s%]", data_make->error.to.stream, data_make->error.notable, fake_make_operation_and_s, data_make->error.notable); fl_print_format("%[', or '%]", data_make->error.to.stream, data_make->error.context, data_make->error.context); fl_print_format("%[%s%]", data_make->error.to.stream, data_make->error.notable, fake_make_operation_or_s, data_make->error.notable); - fl_print_format("%[' section operation.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%[' section operation.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } @@ -773,11 +773,11 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SUnsupported '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SUnsupported '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%s%]", data_make->error.to.stream, data_make->error.notable, if_and_or, data_make->error.notable); fl_print_format("%[' type '%]", data_make->error.to.stream, data_make->error.context, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to.stream, data_make->error.notable, arguments.array[0], data_make->error.notable); - fl_print_format("%['.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } @@ -810,11 +810,11 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SUnsupported '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SUnsupported '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%s%]", data_make->error.to.stream, data_make->error.notable, if_and_or, data_make->error.notable); fl_print_format("%[' not type '%]", data_make->error.to.stream, data_make->error.context, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to.stream, data_make->error.notable, arguments.array[1], data_make->error.notable); - fl_print_format("%['.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } @@ -847,9 +847,9 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SUnsupported define type '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SUnsupported define type '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to.stream, data_make->error.notable, j == 6 ? arguments.array[1] : arguments.array[2], data_make->error.notable); - fl_print_format("%['.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } @@ -880,9 +880,9 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SUnsupported %smode type '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, j == 6 ? "" : "not ", data_make->error.context); + fl_print_format("%q%[%SUnsupported %smode type '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, j == 6 ? "" : "not ", data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to.stream, data_make->error.notable, arguments.array[1], data_make->error.notable); - fl_print_format("%['.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } @@ -950,9 +950,9 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SUnsupported file type '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SUnsupported file type '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to.stream, data_make->error.notable, arguments.array[i], data_make->error.notable); - fl_print_format("%['.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } @@ -1060,14 +1060,14 @@ extern "C" { flockfile(data_make->error.to.stream); if (number > F_number_t_size_unsigned_d) { - fl_print_format("%c%[%SThe number '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SThe number '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to.stream, data_make->error.notable, arguments.array[i], data_make->error.notable); - fl_print_format("%[' may only be between the ranges -%un to %un.%]%c", data_make->error.to.stream, data_make->error.context, F_number_t_size_unsigned_d, F_number_t_size_unsigned_d, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%[' may only be between the ranges -%un to %un.%]%q", data_make->error.to.stream, data_make->error.context, F_number_t_size_unsigned_d, F_number_t_size_unsigned_d, data_make->error.context, f_string_eol_s); } else { - fl_print_format("%c%[%SInvalid or unsupported number provided '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SInvalid or unsupported number provided '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to.stream, data_make->error.notable, arguments.array[i], data_make->error.notable); - fl_print_format("%['.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); } funlockfile(data_make->error.to.stream); @@ -1144,9 +1144,9 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SFailed to find file '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SFailed to find file '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to.stream, data_make->error.notable, arguments.array[i], data_make->error.notable); - fl_print_format("%['.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } @@ -1164,9 +1164,9 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SThe last file '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SThe last file '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to.stream, data_make->error.notable, arguments.array[arguments.used - 1], data_make->error.notable); - fl_print_format("%[' must be a valid directory.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%[' must be a valid directory.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } @@ -1190,9 +1190,9 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SThe last file '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SThe last file '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to.stream, data_make->error.notable, arguments.array[arguments.used - 1], data_make->error.notable); - fl_print_format("%[' must be a valid directory.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%[' must be a valid directory.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } @@ -1230,9 +1230,9 @@ extern "C" { if (id_section == data_make->fakefile.used) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SNo operation section named '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SNo operation section named '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to.stream, data_make->error.notable, arguments.array[0], data_make->error.notable); - fl_print_format("%[' was found.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%[' was found.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } @@ -1243,9 +1243,9 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SThe section operation '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SThe section operation '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to.stream, data_make->error.notable, data_make->fakefile.array[id_section].name, data_make->error.notable); - fl_print_format("%[' is already in the operation stack, recursion is not allowed.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%[' is already in the operation stack, recursion is not allowed.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } @@ -1342,7 +1342,7 @@ extern "C" { for (f_array_length_t i = 0; i < 33; ++i) { if (fl_string_dynamic_compare_string(reserved_name[i], arguments.array[0], reserved_length[i]) == F_equal_to) { - fll_print_format("%c%[%SCannot assign a value to the parameter name '%s' because it is a reserved parameter name.%]%c", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%SCannot assign a value to the parameter name '%s' because it is a reserved parameter name.%]%q", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context, f_string_eol_s); *status = F_status_set_error(F_failure); @@ -1373,9 +1373,9 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SFailed to find file '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SFailed to find file '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to.stream, data_make->error.notable, arguments.array[0], data_make->error.notable); - fl_print_format("%['.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } @@ -1393,9 +1393,9 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SThe file '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SThe file '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to.stream, data_make->error.notable, arguments.array[0], data_make->error.notable); - fl_print_format("%[' must be a directory file.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%[' must be a directory file.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } @@ -1405,7 +1405,7 @@ extern "C" { } else { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { - fll_print_format("%c%[%SFilename argument must not be an empty string.%]%c", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%SFilename argument must not be an empty string.%]%q", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context, f_string_eol_s); } } } @@ -1426,9 +1426,9 @@ extern "C" { if (data_make->error.verbosity != f_console_verbosity_quiet_e && data_make->error.to.stream) { flockfile(data_make->error.to.stream); - fl_print_format("%c%[%SUnsupported file type '%]", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context); + fl_print_format("%q%[%SUnsupported file type '%]", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context); fl_print_format("%[%Q%]", data_make->error.to.stream, data_make->error.notable, arguments.array[0], data_make->error.notable); - fl_print_format("%['.%]%c", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", data_make->error.to.stream, data_make->error.context, data_make->error.context, f_string_eol_s); funlockfile(data_make->error.to.stream); } diff --git a/level_3/fake/c/private-make.c b/level_3/fake/c/private-make.c index 537b4cc..7178c52 100644 --- a/level_3/fake/c/private-make.c +++ b/level_3/fake/c/private-make.c @@ -37,7 +37,7 @@ extern "C" { return F_true; } - if (data_make->path_cache.string[data_make->path.stack.array[0].used] == f_path_separator_s[0]) { + if (data_make->path_cache.string[data_make->path.stack.array[0].used] == f_path_separator_s.string[0]) { return F_true; } } @@ -71,9 +71,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SThe group name '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%SThe group name '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%Q%]", main->error.to.stream, main->error.notable, buffer, main->error.notable); - fl_print_format("%[' was not found.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' was not found.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -91,9 +91,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SThe number '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%SThe number '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%un%]", main->error.to.stream, main->error.notable, number, main->error.notable); - fl_print_format("%[' is too large.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' is too large.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -120,9 +120,9 @@ extern "C" { if (F_status_set_fine(status) == F_syntax) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SThe mode '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%SThe mode '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%Q%]", main->error.to.stream, main->error.notable, buffer, main->error.notable); - fl_print_format("%[' is invalid.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' is invalid.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -162,9 +162,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SThe user '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%SThe user '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%Q%]", main->error.to.stream, main->error.notable, buffer, main->error.notable); - fl_print_format("%[' was not found.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' was not found.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -182,9 +182,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SThe number '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%SThe number '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%un%]", main->error.to.stream, main->error.notable, number, main->error.notable); - fl_print_format("%[' is too large.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' is too large.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } diff --git a/level_3/fake/c/private-print.c b/level_3/fake/c/private-print.c index 9acf588..0975689 100644 --- a/level_3/fake/c/private-print.c +++ b/level_3/fake/c/private-print.c @@ -17,7 +17,7 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SFailed to find '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%SFailed to find '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%Q%]", main->error.to.stream, main->error.notable, f_file_exists(source) == F_true ? destination : source, main->error.notable); fl_print_format("%[while trying to %S '%]", main->error.to.stream, main->error.context, operation, main->error.context); fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, source, main->error.notable); @@ -27,7 +27,7 @@ extern "C" { fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, destination, main->error.notable); } - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -39,7 +39,7 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SInvalid parameter when calling '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%SInvalid parameter when calling '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, function, main->error.notable); fl_print_format("%[() to %s '%]", main->error.to.stream, main->error.context, operation, main->error.context); fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, source, main->error.notable); @@ -49,7 +49,7 @@ extern "C" { fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, destination, main->error.notable); } - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -61,7 +61,7 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SInvalid name for '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%SInvalid name for '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, source, main->error.notable); if (destination) { @@ -69,7 +69,7 @@ extern "C" { fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, destination, main->error.notable); } - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -81,7 +81,7 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SUnable to allocate memory, while trying to %S '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, operation, main->error.context); + fl_print_format("%q%[%SUnable to allocate memory, while trying to %S '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, operation, main->error.context); fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, source, main->error.notable); if (destination) { @@ -89,7 +89,7 @@ extern "C" { fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, destination, main->error.notable); } - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -101,7 +101,7 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SOverflow while trying to %S '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, operation, main->error.context); + fl_print_format("%q%[%SOverflow while trying to %S '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, operation, main->error.context); fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, source, main->error.notable); if (destination) { @@ -109,7 +109,7 @@ extern "C" { fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, destination, main->error.notable); } - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -121,7 +121,7 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SInvalid directory while trying to %S '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, operation, main->error.context); + fl_print_format("%q%[%SInvalid directory while trying to %S '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, operation, main->error.context); fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, source, main->error.notable); if (destination) { @@ -129,7 +129,7 @@ extern "C" { fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, destination, main->error.notable); } - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -141,7 +141,7 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SAccess denied while trying to %S '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, operation, main->error.context); + fl_print_format("%q%[%SAccess denied while trying to %S '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, operation, main->error.context); fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, source, main->error.notable); if (destination) { @@ -149,7 +149,7 @@ extern "C" { fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, destination, main->error.notable); } - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -161,7 +161,7 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SLoop while trying to %S '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, operation, main->error.context); + fl_print_format("%q%[%SLoop while trying to %S '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, operation, main->error.context); fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, source, main->error.notable); if (destination) { @@ -169,7 +169,7 @@ extern "C" { fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, destination, main->error.notable); } - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -181,7 +181,7 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SProhibited by system while trying to %S '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, operation, main->error.context); + fl_print_format("%q%[%SProhibited by system while trying to %S '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, operation, main->error.context); fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, source, main->error.notable); if (destination) { @@ -189,7 +189,7 @@ extern "C" { fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, destination, main->error.notable); } - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -201,7 +201,7 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SFailed to %S '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, operation, main->error.context); + fl_print_format("%q%[%SFailed to %S '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, operation, main->error.context); fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, source, main->error.notable); if (destination) { @@ -209,7 +209,7 @@ extern "C" { fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, destination, main->error.notable); } - fl_print_format("%[' due to an invalid directory in the path.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' due to an invalid directory in the path.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -221,7 +221,7 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SFailed to %S '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, operation, main->error.context); + fl_print_format("%q%[%SFailed to %S '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, operation, main->error.context); fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, source, main->error.notable); if (destination) { @@ -229,7 +229,7 @@ extern "C" { fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, destination, main->error.notable); } - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -240,7 +240,7 @@ extern "C" { if (fll_error_print(main->error, status, function, F_false) == F_known_not && fallback && main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[UNKNOWN %s(%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, operation, main->error.context); + fl_print_format("%q%[UNKNOWN %s(%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, operation, main->error.context); fl_print_format("%[%ui%]", main->error.to.stream, main->error.notable, status, main->error.notable); fl_print_format("%[) occurred while trying to %S '%]", main->error.to.stream, main->error.context, operation, main->error.context); fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, source, main->error.notable); @@ -250,7 +250,7 @@ extern "C" { fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, destination, main->error.notable); } - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -266,11 +266,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SOccurred on invalid UTF-8 character at stop position (at '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%SOccurred on invalid UTF-8 character at stop position (at '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%un%]", main->error.to.stream, main->error.notable, range.start, main->error.notable); fl_print_format("%[ of setting file '%]", main->error.to.stream, main->error.context, main->error.context); fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, path_file, main->error.notable); - fl_print_format("%[').%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[').%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -282,11 +282,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SOccurred on invalid UTF-8 character at %s (at '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, status == F_complete_not_utf_eos ? "end of string" : "stop point of string", main->error.context); + fl_print_format("%q%[%SOccurred on invalid UTF-8 character at %s (at '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, status == F_complete_not_utf_eos ? "end of string" : "stop point of string", main->error.context); fl_print_format("%[%un%]", main->error.to.stream, main->error.notable, range.start, main->error.notable); fl_print_format("%[ of setting file '%]", main->error.to.stream, main->error.context, main->error.context); fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, path_file, main->error.notable); - fl_print_format("%[').%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[').%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -298,11 +298,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SOccurred on invalid UTF-8 character at stop point of string (at '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%SOccurred on invalid UTF-8 character at stop point of string (at '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%un%]", main->error.to.stream, main->error.notable, range.start, main->error.notable); fl_print_format("%[ of setting file '%]", main->error.to.stream, main->error.context, main->error.context); fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, path_file, main->error.notable); - fl_print_format("%[').%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[').%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -313,11 +313,11 @@ extern "C" { if (fll_error_print(main->error, status, function, F_false) == F_known_not && fallback && main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[UNKNOWN %s(%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[UNKNOWN %s(%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%ui%]", main->error.to.stream, main->error.notable, status, main->error.notable); fl_print_format("%[) in function '%]", main->error.to.stream, main->error.context, main->error.context); fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, function, main->error.notable); - fl_print_format("%[().%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[().%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -333,9 +333,9 @@ extern "C" { flockfile(main->error.to.stream); - fl_print_format("%c%[%SThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%SThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%S%S%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, parameter, main->error.notable); - fl_print_format("%[' is specified, but no value is given.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' is specified, but no value is given.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -348,9 +348,9 @@ extern "C" { flockfile(main->error.to.stream); - fl_print_format("%c%[%SThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%SThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%S%S%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, parameter, main->error.notable); - fl_print_format("%[' was specified too many times.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' was specified too many times.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -362,7 +362,7 @@ extern "C" { if (data_make->error.verbosity == f_console_verbosity_quiet_e) return; if (!data_make->error.to.stream) return; - fll_print_format("%c%[%SRequires more arguments.%]%c", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%SRequires more arguments.%]%q", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context, f_string_eol_s); } #endif // _di_fake_print_error_requires_more_arguments_ @@ -372,7 +372,7 @@ extern "C" { if (data_make->error.verbosity == f_console_verbosity_quiet_e) return; if (!data_make->error.to.stream) return; - fll_print_format("%c%[%SHas too many arguments.%]%c", data_make->error.to.stream, f_string_eol_s[0], data_make->error.context, data_make->error.prefix, data_make->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%SHas too many arguments.%]%q", data_make->error.to.stream, f_string_eol_s, data_make->error.context, data_make->error.prefix, data_make->error.context, f_string_eol_s); } #endif // _di_fake_print_error_too_many_arguments_ @@ -387,13 +387,13 @@ extern "C" { flockfile(main->error.to.stream); - fl_print_format("%c%[%SThe section operation '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%SThe section operation '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%/Q%]", main->error.to.stream, main->error.notable, buffer, operation_name, main->error.notable); fl_print_format("%[' from section '%]", main->error.to.stream, main->error.context, main->error.context); fl_print_format("%[%/Q%]", main->error.to.stream, main->error.notable, buffer, section_name, main->error.notable); fl_print_format("%[' on line%] ", main->error.to.stream, main->error.context, main->error.context); fl_print_format("%[%un%]", main->error.to.stream, main->error.notable, line, main->error.notable); - fl_print_format(" %[failed.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format(" %[failed.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -407,9 +407,9 @@ extern "C" { flockfile(main->error.to.stream); if (F_status_set_fine(status) == F_false) { - fl_print_format("%c%[%SThe path '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%SThe path '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, path, main->error.notable); - fl_print_format("%[' is outside the project root.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' is outside the project root.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); } else { fll_error_file_print(main->error, F_status_set_fine(status), function, F_true, path, "determine real path of", fll_error_file_type_file_e); @@ -427,7 +427,7 @@ extern "C" { if (status == F_array_too_large) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SMaximum stack size reached while processing path '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%SMaximum stack size reached while processing path '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, path, main->error.notable); fl_print_format("%['", main->error.to.stream, main->error.context); @@ -436,7 +436,7 @@ extern "C" { fl_print_format("%[()", main->error.to.stream, main->error.context); } - fl_print_format(".%]%c", main->error.to.stream, main->error.context, f_string_eol_s[0]); + fl_print_format(".%]%q", main->error.to.stream, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -457,7 +457,7 @@ extern "C" { flockfile(main->error.to.stream); - fl_print_format("%c%[%SThe section operation '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%SThe section operation '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%/Q%]", main->error.to.stream, main->error.notable, buffer, operation_name, main->error.notable); fl_print_format("%[' from section '%]", main->error.to.stream, main->error.context, buffer, main->error.context); fl_print_format("%[%/Q%]", main->error.to.stream, main->error.notable, buffer, section_name, main->error.notable); @@ -465,7 +465,7 @@ extern "C" { fl_print_format("%[%ul%]", main->error.to.stream, main->error.notable, line, main->error.notable); fl_print_format("%[' cannot be processed because the max stack depth of%] ", main->error.to.stream, main->error.context, main->error.context); fl_print_format("%[%ul%]", main->error.to.stream, main->error.notable, stack_max, main->error.notable); - fl_print_format(" %[has been reached.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format(" %[has been reached.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -482,13 +482,13 @@ extern "C" { flockfile(main->error.to.stream); - fl_print_format("%c%[%SThe section operation '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%SThe section operation '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%/Q%]", main->error.to.stream, main->error.notable, buffer, operation_name, main->error.notable); fl_print_format("%[' from section '%]", main->error.to.stream, main->error.context, buffer, main->error.context); fl_print_format("%[%/Q%]", main->error.to.stream, main->error.notable, buffer, section_name, main->error.notable); fl_print_format("%[' on line%] ", main->error.to.stream, main->error.context, main->error.context); fl_print_format("%[%ul%]", main->error.to.stream, main->error.notable, line, main->error.notable); - fl_print_format(" %[is not a known operation name.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format(" %[is not a known operation name.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -504,9 +504,9 @@ extern "C" { flockfile(main->warning.to.stream); - fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s[0], f_string_eol_s[0], main->context.set.warning, main->context.set.warning); + fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s, f_string_eol_s, main->context.set.warning, main->context.set.warning); fl_print_format("%[%i%]", main->warning.to.stream, main->context.set.notable, signal, main->context.set.notable); - fl_print_format("%[.%]%c", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s[0]); + fl_print_format("%[.%]%q", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s); funlockfile(main->warning.to.stream); } @@ -519,13 +519,13 @@ extern "C" { flockfile(main->warning.to.stream); - fl_print_format("%c%[%SThe fakefile '%]", main->warning.to.stream, f_string_eol_s[0], main->warning.context, main->warning.prefix, main->warning.context); + fl_print_format("%q%[%SThe fakefile '%]", main->warning.to.stream, f_string_eol_s, main->warning.context, main->warning.prefix, main->warning.context); fl_print_format("%[%S%]", main->warning.to.stream, main->warning.notable, path_file, main->warning.notable); fl_print_format("%[' has empty content for the '%]", main->warning.to.stream, main->warning.context, main->warning.context); fl_print_format("%[%S%]", main->warning.to.stream, main->warning.notable, settings_name, main->warning.notable); fl_print_format("%[' object '%]", main->warning.to.stream, main->warning.context, main->warning.context); fl_print_format("%[%/Q%]", main->warning.to.stream, main->warning.notable, buffer, range_object, main->warning.notable); - fl_print_format("%['.%]%c", main->warning.to.stream, main->warning.context, main->warning.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->warning.to.stream, main->warning.context, main->warning.context, f_string_eol_s); funlockfile(main->warning.to.stream); } @@ -538,7 +538,7 @@ extern "C" { flockfile(main->warning.to.stream); - fl_print_format("%c%[%SThe fakefile '%]", main->warning.to.stream, f_string_eol_s[0], main->warning.context, main->warning.prefix, main->warning.context); + fl_print_format("%q%[%SThe fakefile '%]", main->warning.to.stream, f_string_eol_s, main->warning.context, main->warning.prefix, main->warning.context); fl_print_format("%[%S%]", main->warning.to.stream, main->warning.notable, path_file, main->warning.notable); fl_print_format("%[' has invalid content '%]", main->warning.to.stream, main->warning.context, main->warning.context); fl_print_format("%[%/Q%]", main->warning.to.stream, main->warning.notable, buffer, range_content, main->warning.notable); @@ -546,7 +546,7 @@ extern "C" { fl_print_format("%[%S%]", main->warning.to.stream, main->warning.notable, settings_name, main->warning.notable); fl_print_format("%[' object '%]", main->warning.to.stream, main->warning.context, main->warning.context); fl_print_format("%[%/Q%]", main->warning.to.stream, main->warning.notable, buffer, range_object, main->warning.notable); - fl_print_format("%['.%]%c", main->warning.to.stream, main->warning.context, main->warning.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->warning.to.stream, main->warning.context, main->warning.context, f_string_eol_s); funlockfile(main->warning.to.stream); } @@ -559,11 +559,11 @@ extern "C" { flockfile(main->warning.to.stream); - fl_print_format("%c%[%SThe fakefile '%]", main->warning.to.stream, f_string_eol_s[0], main->warning.context, main->warning.prefix, main->warning.context); + fl_print_format("%q%[%SThe fakefile '%]", main->warning.to.stream, f_string_eol_s, main->warning.context, main->warning.prefix, main->warning.context); fl_print_format("%[%S%]", main->warning.to.stream, main->warning.notable, name_object, main->warning.notable); fl_print_format("%[' in the file '%]", main->warning.to.stream, main->warning.context, main->warning.context); fl_print_format("%[%S%]", main->warning.to.stream, main->warning.notable, path_file, main->warning.notable); - fl_print_format("%[' may only have a single property, only using the first.%]%c", main->warning.to.stream, main->warning.context, main->warning.context, f_string_eol_s[0]); + fl_print_format("%[' may only have a single property, only using the first.%]%q", main->warning.to.stream, main->warning.context, main->warning.context, f_string_eol_s); funlockfile(main->warning.to.stream); } @@ -576,11 +576,11 @@ extern "C" { flockfile(main->warning.to.stream); - fl_print_format("%c%[%SThe object '%]", main->warning.to.stream, f_string_eol_s[0], main->warning.context, main->warning.prefix, main->warning.context); + fl_print_format("%q%[%SThe object '%]", main->warning.to.stream, f_string_eol_s, main->warning.context, main->warning.prefix, main->warning.context); fl_print_format("%[%S%]", main->warning.to.stream, main->warning.notable, name_object, main->warning.notable); fl_print_format("%[' in the file '%]", main->warning.to.stream, main->warning.context, main->warning.context); fl_print_format("%[%S%]", main->warning.to.stream, main->warning.notable, path_file, main->warning.notable); - fl_print_format("%[' may only be specified once, only using the first.%]%c", main->warning.to.stream, main->warning.context, main->warning.context, f_string_eol_s[0]); + fl_print_format("%[' may only be specified once, only using the first.%]%q", main->warning.to.stream, main->warning.context, main->warning.context, f_string_eol_s); funlockfile(main->warning.to.stream); } diff --git a/level_3/fake/c/private-skeleton.c b/level_3/fake/c/private-skeleton.c index ff9be63..636b730 100644 --- a/level_3/fake/c/private-skeleton.c +++ b/level_3/fake/c/private-skeleton.c @@ -16,7 +16,7 @@ extern "C" { f_status_t status = F_none; if (main->output.verbosity != f_console_verbosity_quiet_e) { - fll_print_format("%cGenerating skeleton structure.%c", main->output.to.stream, f_string_eol_s[0], f_string_eol_s[0]); + fll_print_format("%qGenerating skeleton structure.%q", main->output.to.stream, f_string_eol_s, f_string_eol_s); } { @@ -133,7 +133,7 @@ extern "C" { if (status == F_true) { if (main->error.verbosity == f_console_verbosity_verbose_e) { - fll_print_format("Directory '%Q' already exists.%c", main->output.to.stream, path, f_string_eol_s[0]); + fll_print_format("Directory '%Q' already exists.%q", main->output.to.stream, path, f_string_eol_s); } return F_none; @@ -143,9 +143,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SThe path '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%SThe path '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%Q%]", main->error.to.stream, main->error.notable, path, main->error.notable); - fl_print_format("%[' exists but is not a directory.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' exists but is not a directory.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -159,9 +159,9 @@ extern "C" { if (F_status_set_fine(status) == F_file_found_not) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SThe path '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%SThe path '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%Q%]", main->error.to.stream, main->error.notable, path, main->error.notable); - fl_print_format("%[' could not be created, a parent directory does not exist.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' could not be created, a parent directory does not exist.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -173,7 +173,7 @@ extern "C" { } if (main->error.verbosity == f_console_verbosity_verbose_e) { - fll_print_format("Directory '%Q' created.%c", main->output.to.stream, path, f_string_eol_s[0]); + fll_print_format("Directory '%Q' created.%q", main->output.to.stream, path, f_string_eol_s); } } else if (F_status_is_error(status)) { @@ -197,7 +197,7 @@ extern "C" { if (status == F_true) { if (main->error.verbosity == f_console_verbosity_verbose_e) { - fll_print_format("File '%Q' already exists.%c", main->output.to.stream, path, f_string_eol_s[0]); + fll_print_format("File '%Q' already exists.%q", main->output.to.stream, path, f_string_eol_s); } return F_none; @@ -209,7 +209,7 @@ extern "C" { if (status == F_true) { if (main->error.verbosity == f_console_verbosity_verbose_e) { - fll_print_format("File '%Q' already exists (as a symbolic link).%c", main->output.to.stream, path, f_string_eol_s[0]); + fll_print_format("File '%Q' already exists (as a symbolic link).%q", main->output.to.stream, path, f_string_eol_s); } return F_none; @@ -218,7 +218,7 @@ extern "C" { if (status == F_false) { if (main->error.verbosity == f_console_verbosity_verbose_e) { - fll_print_format("File '%Q' already exists but is not a regular file (or symbolic link).%c", main->output.to.stream, path, f_string_eol_s[0]); + fll_print_format("File '%Q' already exists but is not a regular file (or symbolic link).%q", main->output.to.stream, path, f_string_eol_s); } return F_status_set_warning(F_none); @@ -236,9 +236,9 @@ extern "C" { if (F_status_set_fine(status) == F_file_found_not) { flockfile(main->error.to.stream); - fl_print_format("%c%[%SThe file '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%SThe file '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%Q%]", main->error.to.stream, main->error.notable, path, main->error.notable); - fl_print_format("%[' could not be created, a parent directory does not exist.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' could not be created, a parent directory does not exist.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -250,7 +250,7 @@ extern "C" { } if (main->error.verbosity == f_console_verbosity_verbose_e) { - fll_print_format("File '%Q' created.%c", main->output.to.stream, path, f_string_eol_s[0]); + fll_print_format("File '%Q' created.%q", main->output.to.stream, path, f_string_eol_s); } if (content.used) { @@ -277,7 +277,7 @@ extern "C" { } if (main->error.verbosity == f_console_verbosity_verbose_e) { - fll_print_format("File '%Q' pre-populated.%c", main->output.to.stream, path, f_string_eol_s[0]); + fll_print_format("File '%Q' pre-populated.%q", main->output.to.stream, path, f_string_eol_s); } f_file_stream_close(F_true, &file); diff --git a/level_3/firewall/c/firewall.c b/level_3/firewall/c/firewall.c index fb49aea..a50c2ae 100644 --- a/level_3/firewall/c/firewall.c +++ b/level_3/firewall/c/firewall.c @@ -19,22 +19,22 @@ extern "C" { fll_program_print_help_header(file, context, firewall_program_name_long_s, firewall_version_s); - fll_program_print_help_option(file, context, f_console_standard_short_help_s, f_console_standard_long_help_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print this help message."); - fll_program_print_help_option(file, context, f_console_standard_short_dark_s, f_console_standard_long_dark_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_light_s, f_console_standard_long_light_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, "Do not file in color."); - fll_program_print_help_option(file, context, f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Decrease verbosity, silencing most output."); - fll_program_print_help_option(file, context, f_console_standard_short_normal_s, f_console_standard_long_normal_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Set verbosity to normal file."); - fll_program_print_help_option(file, context, f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Increase verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_debug_s, f_console_standard_long_debug_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Enable debugging, significantly increasing verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_version_s, f_console_standard_long_version_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Print only the version number."); - - fl_print_format("%c%c %[Available Commands:%] ", file.stream, f_string_eol_s[0], f_string_eol_s[0], context.set.important, context.set.important); - fl_print_format("%c %[%s%] Turn on the firewall.", file.stream, f_string_eol_s[0], context.set.standout, firewall_command_start_s, context.set.standout); - fl_print_format("%c %[%s%] Turn off the firewall.", file.stream, f_string_eol_s[0], context.set.standout, firewall_command_stop_s, context.set.standout); - fl_print_format("%c %[%s%] Turn off and then turn on the firewall.", file.stream, f_string_eol_s[0], context.set.standout, firewall_command_restart_s, context.set.standout); - fl_print_format("%c %[%s%] Prevent all communication.", file.stream, f_string_eol_s[0], context.set.standout, firewall_command_lock_s, context.set.standout); - fl_print_format("%c %[%s%] Show active firewall settings.", file.stream, f_string_eol_s[0], context.set.standout, firewall_command_show_s, context.set.standout); + fll_program_print_help_option(file, context, f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print this help message."); + fll_program_print_help_option(file, context, f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, "Do not file in color."); + fll_program_print_help_option(file, context, f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Decrease verbosity, silencing most output."); + fll_program_print_help_option(file, context, f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Set verbosity to normal file."); + fll_program_print_help_option(file, context, f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Increase verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Enable debugging, significantly increasing verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Print only the version number."); + + fl_print_format("%q%q %[Available Commands:%] ", file.stream, f_string_eol_s, f_string_eol_s, context.set.important, context.set.important); + fl_print_format("%q %[%s%] Turn on the firewall.", file.stream, f_string_eol_s, context.set.standout, firewall_command_start_s, context.set.standout); + fl_print_format("%q %[%s%] Turn off the firewall.", file.stream, f_string_eol_s, context.set.standout, firewall_command_stop_s, context.set.standout); + fl_print_format("%q %[%s%] Turn off and then turn on the firewall.", file.stream, f_string_eol_s, context.set.standout, firewall_command_restart_s, context.set.standout); + fl_print_format("%q %[%s%] Prevent all communication.", file.stream, f_string_eol_s, context.set.standout, firewall_command_lock_s, context.set.standout); + fl_print_format("%q %[%s%] Show active firewall settings.", file.stream, f_string_eol_s, context.set.standout, firewall_command_show_s, context.set.standout); fll_program_print_help_usage(file, context, firewall_program_name_s, "command"); @@ -226,9 +226,9 @@ extern "C" { if (strncmp("ports", arguments->argv[main->remaining.array[counter]], 6) != 0) { flockfile(main->warning.to.stream); - fl_print_format("%c%[%S'%]", main->warning.to.stream, f_string_eol_s[0], main->warning.context, main->warning.prefix, main->warning.context); + fl_print_format("%q%[%S'%]", main->warning.to.stream, f_string_eol_s, main->warning.context, main->warning.prefix, main->warning.context); fl_print_format("%[%S%]", main->warning.to.stream, main->warning.notable, arguments->argv[main->remaining.array[counter]], main->warning.notable); - fl_print_format("%[' is not a valid show option.%]%c", main->warning.to.stream, main->warning.context, main->warning.context, f_string_eol_s[0]); + fl_print_format("%[' is not a valid show option.%]%q", main->warning.to.stream, main->warning.context, main->warning.context, f_string_eol_s); funlockfile(main->warning.to.stream); fflush(main->warning.to.stream); @@ -259,7 +259,7 @@ extern "C" { } if (show_nat) { - fll_print_format("%[===========================%] %[NAT%] %[============================%]%c", main->output.to.stream, main->context.set.standout, main->context.set.standout, main->context.set.title, main->context.set.title, main->context.set.standout, main->context.set.standout, f_string_eol_s[0]); + fll_print_format("%[===========================%] %[NAT%] %[============================%]%q", main->output.to.stream, main->context.set.standout, main->context.set.standout, main->context.set.title, main->context.set.title, main->context.set.standout, main->context.set.standout, f_string_eol_s); fflush(main->output.to.stream); parameters.used = 6; @@ -285,12 +285,12 @@ extern "C" { exit(return_code); } - fll_print_character(f_string_eol_s[0], main->output.to.stream); + fll_print_dynamic(f_string_eol_s, main->output.to.stream); fflush(main->output.to.stream); } if (F_status_is_error_not(status) && show_mangle) { - fll_print_format("%[==========================%] %[MANGLE%] %[==========================%]%c", main->output.to.stream, main->context.set.standout, main->context.set.standout, main->context.set.title, main->context.set.title, main->context.set.standout, main->context.set.standout, f_string_eol_s[0]); + fll_print_format("%[==========================%] %[MANGLE%] %[==========================%]%q", main->output.to.stream, main->context.set.standout, main->context.set.standout, main->context.set.title, main->context.set.title, main->context.set.standout, main->context.set.standout, f_string_eol_s); fflush(main->output.to.stream); parameters.used = 6; @@ -316,12 +316,12 @@ extern "C" { exit(return_code); } - fll_print_character(f_string_eol_s[0], main->output.to.stream); + fll_print_dynamic(f_string_eol_s, main->output.to.stream); fflush(main->output.to.stream); } if (F_status_is_error_not(status) && show_ports) { - fll_print_format("%[==========================%] %[FILTER%] %[==========================%]%c", main->output.to.stream, main->context.set.standout, main->context.set.standout, main->context.set.title, main->context.set.title, main->context.set.standout, main->context.set.standout, f_string_eol_s[0]); + fll_print_format("%[==========================%] %[FILTER%] %[==========================%]%q", main->output.to.stream, main->context.set.standout, main->context.set.standout, main->context.set.title, main->context.set.title, main->context.set.standout, main->context.set.standout, f_string_eol_s); fflush(main->output.to.stream); parameters.used = 4; @@ -343,7 +343,7 @@ extern "C" { exit(return_code); } - fll_print_character(f_string_eol_s[0], main->output.to.stream); + fll_print_dynamic(f_string_eol_s, main->output.to.stream); fflush(main->output.to.stream); } @@ -393,10 +393,10 @@ extern "C" { firewall_print_error_on_allocation_failure(main->error); } else if (status == F_data_not) { - fll_print_format("%c%[%sCould not find any network devices.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sCould not find any network devices.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context, f_string_eol_s); } else if (status == F_failure) { - fll_print_format("%c%[%sFailed to read the device directory '%s'.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, network_devices_s, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sFailed to read the device directory '%s'.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, network_devices_s, main->error.context, f_string_eol_s); } } @@ -486,7 +486,7 @@ extern "C" { } else { if (main->error.verbosity != f_console_verbosity_quiet_e) { - fll_print_format("%c%[%sFailed to perform lock request because the lock instructions are missing from: %s.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, network_path_s firewall_file_other_s, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sFailed to perform lock request because the lock instructions are missing from: %s.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, network_path_s firewall_file_other_s, main->error.context, f_string_eol_s); } firewall_delete_local_data(&local); @@ -531,7 +531,7 @@ extern "C" { } else { if (main->error.verbosity != f_console_verbosity_quiet_e) { - fll_print_format("%c%[%sFailed to perform stop request because the lock instructions are missing from: %s.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, network_path_s firewall_file_other_s, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sFailed to perform stop request because the lock instructions are missing from: %s.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, network_path_s firewall_file_other_s, main->error.context, f_string_eol_s); } firewall_delete_local_data(&local); @@ -738,7 +738,7 @@ extern "C" { } else { if (main->error.verbosity != f_console_verbosity_quiet_e) { - fll_print_format("%c%[%sYou did not pass a command.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sYou did not pass a command.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context, f_string_eol_s); } status = F_status_set_error(F_parameter); @@ -748,7 +748,7 @@ extern "C" { if (F_status_set_fine(status) == F_interrupt) { fflush(main->output.to.stream); - fll_print_terminated(f_string_eol_s, main->output.to.stream); + fll_print_dynamic(f_string_eol_s, main->output.to.stream); } } diff --git a/level_3/firewall/c/firewall.h b/level_3/firewall/c/firewall.h index cf4eb61..682323e 100644 --- a/level_3/firewall/c/firewall.h +++ b/level_3/firewall/c/firewall.h @@ -264,15 +264,15 @@ extern "C" { #define firewall_console_parameter_t_initialize \ { \ - macro_f_console_parameter_t_initialize(f_console_standard_short_help_s, f_console_standard_long_help_s, 0, 0, f_console_type_normal_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_light_s, f_console_standard_long_light_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s, f_console_standard_long_dark_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s, f_console_standard_long_normal_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s, f_console_standard_long_debug_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_version_s, f_console_standard_long_version_s, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, 0, 0, f_console_type_normal_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, 0, 0, f_console_type_inverse_e), \ macro_f_console_parameter_t_initialize(0, 0, firewall_command_start_s, F_false, f_console_type_other_e), \ macro_f_console_parameter_t_initialize(0, 0, firewall_command_stop_s, F_false, f_console_type_other_e), \ macro_f_console_parameter_t_initialize(0, 0, firewall_command_restart_s, F_false, f_console_type_other_e), \ diff --git a/level_3/firewall/c/private-common.c b/level_3/firewall/c/private-common.c index 47f2582..0dc0bb6 100644 --- a/level_3/firewall/c/private-common.c +++ b/level_3/firewall/c/private-common.c @@ -17,7 +17,7 @@ void firewall_print_debug_tool(const fl_print_t output, const f_string_t tool, c fl_print_format(" %Q", output.to.stream, arguments.array[i]); } // for - fl_print_format("%]%c", output.to.stream, output.context, f_string_eol_s[0]); + fl_print_format("%]%q", output.to.stream, output.context, f_string_eol_s); funlockfile(output.to.stream); } @@ -26,21 +26,21 @@ void firewall_print_error_on_allocation_failure(const fl_print_t output) { if (output.verbosity == f_console_verbosity_quiet_e) return; - fll_print_format("%c%[%sUnable to allocate memory.%]%c", output.to.stream, f_string_eol_s[0], output.context, output.prefix, output.context, f_string_eol_s[0]); + fll_print_format("%q%[%sUnable to allocate memory.%]%q", output.to.stream, f_string_eol_s, output.context, output.prefix, output.context, f_string_eol_s); } void firewall_print_error_on_invalid_parameter(const fl_print_t output, const f_string_t function) { if (output.verbosity == f_console_verbosity_quiet_e) return; - fll_print_format("%c%[%sInvalid parameter when calling %S().%]%c", output.to.stream, f_string_eol_s[0], output.context, output.prefix, function, output.context, f_string_eol_s[0]); + fll_print_format("%q%[%sInvalid parameter when calling %S().%]%q", output.to.stream, f_string_eol_s, output.context, output.prefix, function, output.context, f_string_eol_s); } void firewall_print_error_on_invalid_parameter_for_file(const fl_print_t output, const f_string_t function, const f_string_t filename) { if (output.verbosity == f_console_verbosity_quiet_e) return; - fll_print_format("%c%[%sInvalid parameter when calling %S() for the file '%S'.%]%c", output.to.stream, f_string_eol_s[0], output.context, output.prefix, function, filename, output.context, f_string_eol_s[0]); + fll_print_format("%q%[%sInvalid parameter when calling %S() for the file '%S'.%]%q", output.to.stream, f_string_eol_s, output.context, output.prefix, function, filename, output.context, f_string_eol_s); } void firewall_print_error_on_operation(const fl_print_t output, const f_string_t tool, const f_string_dynamics_t arguments) { @@ -49,14 +49,14 @@ void firewall_print_error_on_operation(const fl_print_t output, const f_string_t flockfile(output.to.stream); - fl_print_format("%c%[%sFailed to perform requested %s operation:%]", output.to.stream, f_string_eol_s[0], output.context, output.prefix, tool, output.context); - fl_print_format("%c %[%s", output.to.stream, f_string_eol_s[0], output.context, tool); + fl_print_format("%q%[%sFailed to perform requested %s operation:%]", output.to.stream, f_string_eol_s, output.context, output.prefix, tool, output.context); + fl_print_format("%q %[%s", output.to.stream, f_string_eol_s, output.context, tool); for (f_array_length_t i = 0; i < arguments.used; ++i) { fl_print_format(" %Q", output.to.stream, arguments.array[i]); } // for - fl_print_format("%]%c", output.to.stream, output.context, f_string_eol_s[0]); + fl_print_format("%]%q", output.to.stream, output.context, f_string_eol_s); funlockfile(output.to.stream); } @@ -65,14 +65,14 @@ void firewall_print_error_on_unhandled(const fl_print_t output, const f_string_t if (output.verbosity == f_console_verbosity_quiet_e) return; - fll_print_format("%c%[%sAn unhandled error (%ui) has occurred while calling %S().%]%c", output.to.stream, f_string_eol_s[0], output.context, output.prefix, status, function, output.context, f_string_eol_s[0]); + fll_print_format("%q%[%sAn unhandled error (%ui) has occurred while calling %S().%]%q", output.to.stream, f_string_eol_s, output.context, output.prefix, status, function, output.context, f_string_eol_s); } void firewall_print_error_on_unhandled_for_file(const fl_print_t output, const f_string_t function, const f_status_t status, const f_string_t filename) { if (output.verbosity == f_console_verbosity_quiet_e) return; - fll_print_format("%c%[%sAn unhandled error (%ui) has occurred while calling %S() for the file '%S'.%]%c", output.to.stream, f_string_eol_s[0], output.context, output.prefix, status, function, filename, output.context, f_string_eol_s[0]); + fll_print_format("%q%[%sAn unhandled error (%ui) has occurred while calling %S() for the file '%S'.%]%q", output.to.stream, f_string_eol_s, output.context, output.prefix, status, function, filename, output.context, f_string_eol_s); } #ifndef _di_firewall_print_signal_received_ @@ -85,9 +85,9 @@ void firewall_print_error_on_unhandled_for_file(const fl_print_t output, const f flockfile(main->warning.to.stream); - fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s[0], f_string_eol_s[0], main->context.set.warning, main->context.set.warning); + fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s, f_string_eol_s, main->context.set.warning, main->context.set.warning); fl_print_format("%[%i%]", main->warning.to.stream, main->context.set.notable, signal, main->context.set.notable); - fl_print_format("%[.%]%c", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s[0]); + fl_print_format("%[.%]%q", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s); funlockfile(main->warning.to.stream); } diff --git a/level_3/firewall/c/private-firewall.c b/level_3/firewall/c/private-firewall.c index 2708bb6..b0b2928 100644 --- a/level_3/firewall/c/private-firewall.c +++ b/level_3/firewall/c/private-firewall.c @@ -90,7 +90,7 @@ f_status_t firewall_perform_commands(firewall_main_t * const main, const firewal if (chain == firewall_chain_custom_id_e) { // custom chains can only apply to themselves, so silently ignore chain commands specified within a custom chain. - fll_print_format("%c%[%sAt line %ul, the chain option is meaningless inside of a custom chain.%]%c", main->warning.to.stream, f_string_eol_s[0], main->warning.context, main->warning.prefix, i, main->warning.context, f_string_eol_s[0]); + fll_print_format("%q%[%sAt line %ul, the chain option is meaningless inside of a custom chain.%]%q", main->warning.to.stream, f_string_eol_s, main->warning.context, main->warning.prefix, i, main->warning.context, f_string_eol_s); continue; } @@ -302,14 +302,14 @@ f_status_t firewall_perform_commands(firewall_main_t * const main, const firewal if (length) { flockfile(main->warning.to.stream); - fl_print_format("%c%[%sAt line %ul, the object '%]%[", main->warning.to.stream, f_string_eol_s[0], main->warning.context, main->warning.prefix, i, main->warning.context, main->warning.notable); + fl_print_format("%q%[%sAt line %ul, the object '%]%[", main->warning.to.stream, f_string_eol_s, main->warning.context, main->warning.prefix, i, main->warning.context, main->warning.notable); f_print(local.buffer.string + local.rule_objects.array[i].start, length, main->warning.to.stream); - fl_print_format("%]%[' is invalid.%]%c", main->warning.to.stream, main->warning.notable, main->warning.context, main->warning.context, f_string_eol_s[0]); + fl_print_format("%]%[' is invalid.%]%q", main->warning.to.stream, main->warning.notable, main->warning.context, main->warning.context, f_string_eol_s); funlockfile(main->warning.to.stream); } else { - fll_print_format("%c%[%sAt line %ul, the object is missing.%]%c", main->warning.to.stream, f_string_eol_s[0], main->warning.context, main->warning.prefix, i, main->warning.context, f_string_eol_s[0]); + fll_print_format("%q%[%sAt line %ul, the object is missing.%]%q", main->warning.to.stream, f_string_eol_s, main->warning.context, main->warning.prefix, i, main->warning.context, f_string_eol_s); } continue; @@ -321,16 +321,16 @@ f_status_t firewall_perform_commands(firewall_main_t * const main, const firewal if (length) { flockfile(main->warning.to.stream); - fl_print_format("%c%[%sAt line %ul, the object '%]%[", main->warning.to.stream, f_string_eol_s[0], main->warning.context, main->warning.prefix, i, main->warning.context, main->warning.notable); + fl_print_format("%q%[%sAt line %ul, the object '%]%[", main->warning.to.stream, f_string_eol_s, main->warning.context, main->warning.prefix, i, main->warning.context, main->warning.notable); f_print(local.buffer.string + local.rule_objects.array[i].start, length, main->warning.to.stream); fl_print_format("%]%[' has invalid content '%]%[", main->warning.to.stream, main->warning.notable, main->warning.context, main->warning.context, main->warning.notable); f_print(local.buffer.string + local.rule_contents.array[i].array[0].start, macro_firewall_structure_size(local.rule_contents.array[i], 0), main->warning.to.stream); - fl_print_format("%]%['.%]%c", main->warning.to.stream, main->warning.notable, main->warning.context, main->warning.context, f_string_eol_s[0]); + fl_print_format("%]%['.%]%q", main->warning.to.stream, main->warning.notable, main->warning.context, main->warning.context, f_string_eol_s); funlockfile(main->warning.to.stream); } else { - fll_print_format("%c%[%sAt line %ul, the object has no content.%]%c", main->warning.to.stream, f_string_eol_s[0], main->warning.context, main->warning.prefix, i, main->warning.context, f_string_eol_s[0]); + fll_print_format("%q%[%sAt line %ul, the object has no content.%]%q", main->warning.to.stream, f_string_eol_s, main->warning.context, main->warning.prefix, i, main->warning.context, f_string_eol_s); } continue; @@ -575,9 +575,9 @@ f_status_t firewall_perform_commands(firewall_main_t * const main, const firewal flockfile(main->warning.to.stream); - fl_print_format("%c%[%sAt line %ul, the object '%]%[", main->warning.to.stream, f_string_eol_s[0], main->warning.context, main->warning.prefix, i, main->warning.context, main->warning.notable); + fl_print_format("%q%[%sAt line %ul, the object '%]%[", main->warning.to.stream, f_string_eol_s, main->warning.context, main->warning.prefix, i, main->warning.context, main->warning.notable); f_print(local.buffer.string + local.rule_objects.array[i].start, length, main->warning.to.stream); - fl_print_format("%]%[' has no content.%]%c", main->warning.to.stream, main->warning.notable, main->warning.context, main->warning.context, f_string_eol_s[0]); + fl_print_format("%]%[' has no content.%]%q", main->warning.to.stream, main->warning.notable, main->warning.context, main->warning.context, f_string_eol_s); funlockfile(main->warning.to.stream); @@ -617,19 +617,19 @@ f_status_t firewall_perform_commands(firewall_main_t * const main, const firewal // the file does not have to exist if (main->error.verbosity != f_console_verbosity_verbose_e || main->error.verbosity == f_console_verbosity_debug_e) { - fll_print_format("%c%[%sCannot find the file '%Q'.%]%c", main->warning.to.stream, f_string_eol_s[0], main->warning.context, main->warning.prefix, file_path, main->warning.context, f_string_eol_s[0]); + fll_print_format("%q%[%sCannot find the file '%Q'.%]%q", main->warning.to.stream, f_string_eol_s, main->warning.context, main->warning.prefix, file_path, main->warning.context, f_string_eol_s); } status = F_none; } else if (status == F_file_open) { if (main->error.verbosity != f_console_verbosity_quiet_e) { - fll_print_format("%c%[%sUnable to open the file '%Q'.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, file_path, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sUnable to open the file '%Q'.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, file_path, main->error.context, f_string_eol_s); } } else if (status == F_file_descriptor) { if (main->error.verbosity != f_console_verbosity_quiet_e) { - fll_print_format("%c%[%sFile descriptor error while trying to open the file '%Q'.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, file_path, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sFile descriptor error while trying to open the file '%Q'.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, file_path, main->error.context, f_string_eol_s); } } else if (status == F_memory_not) { @@ -658,16 +658,16 @@ f_status_t firewall_perform_commands(firewall_main_t * const main, const firewal firewall_print_error_on_invalid_parameter(main->error, "f_file_read"); } else if (status == F_number_overflow) { - fll_print_format("%c%[%sInteger overflow while trying to buffer the file '%Q'.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, file_path, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sInteger overflow while trying to buffer the file '%Q'.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, file_path, main->error.context, f_string_eol_s); } else if (status == F_file_closed) { - fll_print_format("%c%[%sThe file '%Q' is no longer open.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, file_path, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sThe file '%Q' is no longer open.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, file_path, main->error.context, f_string_eol_s); } else if (status == F_file_seek) { - fll_print_format("%c%[%sA seek error occurred while accessing the file '%Q'.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, file_path, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sA seek error occurred while accessing the file '%Q'.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, file_path, main->error.context, f_string_eol_s); } else if (status == F_file_read) { - fll_print_format("%c%[%sA read error occurred while accessing the file '%Q'.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, file_path, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sA read error occurred while accessing the file '%Q'.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, file_path, main->error.context, f_string_eol_s); } else if (status == F_memory_not) { firewall_print_error_on_allocation_failure(main->error); @@ -1043,7 +1043,7 @@ f_status_t firewall_create_custom_chains(firewall_main_t * const main, firewall_ // copy the string character by character, ignoring placeholders. while (j <= local->chain_objects.array[i].stop) { - if (local->buffer.string[j] == F_fss_delimit_placeholder_s) { + if (local->buffer.string[j] == f_fss_delimit_placeholder_s.string[0]) { ++j; continue; } @@ -1324,13 +1324,13 @@ f_status_t firewall_buffer_rules(firewall_main_t * const main, const f_string_t firewall_print_error_on_invalid_parameter(main->error, "f_file_open"); } else if (status == F_file_found_not) { - fll_print_format("%c%[%sUnable to find the file '%S'.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, filename, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sUnable to find the file '%S'.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, filename, main->error.context, f_string_eol_s); } else if (status == F_file_open) { - fll_print_format("%c%[%sUnable to open the file '%S'.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, filename, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sUnable to open the file '%S'.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, filename, main->error.context, f_string_eol_s); } else if (status == F_file_descriptor) { - fll_print_format("%c%[%sFile descriptor error while trying to open the file '%S'.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, filename, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sFile descriptor error while trying to open the file '%S'.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, filename, main->error.context, f_string_eol_s); } else { firewall_print_error_on_unhandled(main->error, "f_file_open", status); @@ -1353,16 +1353,16 @@ f_status_t firewall_buffer_rules(firewall_main_t * const main, const f_string_t firewall_print_error_on_invalid_parameter(main->error, "f_file_read"); } else if (status == F_number_overflow) { - fll_print_format("%c%[%sInteger overflow while trying to buffer the file '%S'.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, filename, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sInteger overflow while trying to buffer the file '%S'.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, filename, main->error.context, f_string_eol_s); } else if (status == F_file_closed) { - fll_print_format("%c%[%sThe file '%S' is no longer open.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, filename, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sThe file '%S' is no longer open.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, filename, main->error.context, f_string_eol_s); } else if (status == F_file_seek) { - fll_print_format("%c%[%sA seek error occurred while accessing the file '%S'.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, filename, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sA seek error occurred while accessing the file '%S'.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, filename, main->error.context, f_string_eol_s); } else if (status == F_file_read) { - fll_print_format("%c%[%sA read error occurred while accessing the file '%S'.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, filename, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sA read error occurred while accessing the file '%S'.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, filename, main->error.context, f_string_eol_s); } else if (status == F_memory_not) { firewall_print_error_on_allocation_failure(main->error); @@ -1393,7 +1393,7 @@ f_status_t firewall_buffer_rules(firewall_main_t * const main, const f_string_t firewall_print_error_on_invalid_parameter_for_file(main->error, "fll_fss_basic_list_read", filename); } else if (status == F_data_not_eos || status == F_data_not || status == F_data_not_stop) { - fll_print_format("%c%[%sNo relevant main was found within the file '%s'.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, filename, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sNo relevant main was found within the file '%s'.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, filename, main->error.context, f_string_eol_s); } else if (status == F_memory_not) { firewall_print_error_on_allocation_failure(main->error); diff --git a/level_3/fss_basic_list_read/c/fss_basic_list_read.c b/level_3/fss_basic_list_read/c/fss_basic_list_read.c index fbb01b9..f12ebe3 100644 --- a/level_3/fss_basic_list_read/c/fss_basic_list_read.c +++ b/level_3/fss_basic_list_read/c/fss_basic_list_read.c @@ -14,102 +14,102 @@ extern "C" { fll_program_print_help_header(file, context, fss_basic_list_program_name_long_s, fss_basic_list_program_version_s); - fll_program_print_help_option(file, context, f_console_standard_short_help_s, f_console_standard_long_help_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print this help message."); - fll_program_print_help_option(file, context, f_console_standard_short_dark_s, f_console_standard_long_dark_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_light_s, f_console_standard_long_light_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, "Do not file in color."); - fll_program_print_help_option(file, context, f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Decrease verbosity, silencing most output."); - fll_program_print_help_option(file, context, f_console_standard_short_normal_s, f_console_standard_long_normal_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Set verbosity to normal file."); - fll_program_print_help_option(file, context, f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Increase verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_debug_s, f_console_standard_long_debug_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Enable debugging, significantly increasing verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_version_s, f_console_standard_long_version_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Print only the version number."); - - f_print_character(f_string_eol_s[0], file.stream); - - fll_program_print_help_option(file, context, fss_basic_list_read_short_at_s, fss_basic_list_read_long_at_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Select Object at this numeric index."); - fll_program_print_help_option(file, context, fss_basic_list_read_short_content_s, fss_basic_list_read_long_content_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print the Content (default)."); - fll_program_print_help_option(file, context, fss_basic_list_read_short_columns_s, fss_basic_list_read_long_columns_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print the total number of columns."); - fll_program_print_help_option(file, context, fss_basic_list_read_short_delimit_s, fss_basic_list_read_long_delimit_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Designate how to handle applying delimits."); - fll_program_print_help_option(file, context, fss_basic_list_read_short_depth_s, fss_basic_list_read_long_depth_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Select Object at this numeric depth."); - fll_program_print_help_option(file, context, fss_basic_list_read_short_empty_s, fss_basic_list_read_long_empty_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Include empty Content when processing."); - fll_program_print_help_option(file, context, fss_basic_list_read_short_line_s, fss_basic_list_read_long_line_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print only the Content at the given line."); - fll_program_print_help_option(file, context, fss_basic_list_read_short_name_s, fss_basic_list_read_long_name_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Select Object with this name."); - fll_program_print_help_option(file, context, fss_basic_list_read_short_object_s, fss_basic_list_read_long_object_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print the Object."); - fll_program_print_help_option(file, context, fss_basic_list_read_short_pipe_s, fss_basic_list_read_long_pipe_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print using the special pipe format."); - fll_program_print_help_option(file, context, fss_basic_list_read_short_raw_s, fss_basic_list_read_long_raw_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print with the original quotes and escapes."); - fll_program_print_help_option(file, context, fss_basic_list_read_short_select_s, fss_basic_list_read_long_select_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Select sub-Content at this index."); - fll_program_print_help_option(file, context, fss_basic_list_read_short_total_s, fss_basic_list_read_long_total_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print the total number of lines."); - fll_program_print_help_option(file, context, fss_basic_list_read_short_trim_s, fss_basic_list_read_long_trim_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Trim Object names on select or print."); + fll_program_print_help_option(file, context, f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print this help message."); + fll_program_print_help_option(file, context, f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, "Do not file in color."); + fll_program_print_help_option(file, context, f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Decrease verbosity, silencing most output."); + fll_program_print_help_option(file, context, f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Set verbosity to normal file."); + fll_program_print_help_option(file, context, f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Increase verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Enable debugging, significantly increasing verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Print only the version number."); + + f_print_dynamic(f_string_eol_s, file.stream); + + fll_program_print_help_option(file, context, fss_basic_list_read_short_at_s, fss_basic_list_read_long_at_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Select Object at this numeric index."); + fll_program_print_help_option(file, context, fss_basic_list_read_short_content_s, fss_basic_list_read_long_content_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print the Content (default)."); + fll_program_print_help_option(file, context, fss_basic_list_read_short_columns_s, fss_basic_list_read_long_columns_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print the total number of columns."); + fll_program_print_help_option(file, context, fss_basic_list_read_short_delimit_s, fss_basic_list_read_long_delimit_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Designate how to handle applying delimits."); + fll_program_print_help_option(file, context, fss_basic_list_read_short_depth_s, fss_basic_list_read_long_depth_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Select Object at this numeric depth."); + fll_program_print_help_option(file, context, fss_basic_list_read_short_empty_s, fss_basic_list_read_long_empty_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Include empty Content when processing."); + fll_program_print_help_option(file, context, fss_basic_list_read_short_line_s, fss_basic_list_read_long_line_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print only the Content at the given line."); + fll_program_print_help_option(file, context, fss_basic_list_read_short_name_s, fss_basic_list_read_long_name_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Select Object with this name."); + fll_program_print_help_option(file, context, fss_basic_list_read_short_object_s, fss_basic_list_read_long_object_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print the Object."); + fll_program_print_help_option(file, context, fss_basic_list_read_short_pipe_s, fss_basic_list_read_long_pipe_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print using the special pipe format."); + fll_program_print_help_option(file, context, fss_basic_list_read_short_raw_s, fss_basic_list_read_long_raw_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print with the original quotes and escapes."); + fll_program_print_help_option(file, context, fss_basic_list_read_short_select_s, fss_basic_list_read_long_select_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Select sub-Content at this index."); + fll_program_print_help_option(file, context, fss_basic_list_read_short_total_s, fss_basic_list_read_long_total_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print the total number of lines."); + fll_program_print_help_option(file, context, fss_basic_list_read_short_trim_s, fss_basic_list_read_long_trim_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Trim Object names on select or print."); fll_program_print_help_usage(file, context, fss_basic_list_program_name_s, "filename(s)"); - fl_print_format(" %[Notes:%]%c", file.stream, context.set.important, context.set.important, f_string_eol_s[0]); + fl_print_format(" %[Notes:%]%q", file.stream, context.set.important, context.set.important, f_string_eol_s); - fl_print_format(" This program will print the Content associated with the given Object and Content main based on the FSS-0002 Basic List standard.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" This program will print the Content associated with the given Object and Content main based on the FSS-0002 Basic List standard.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" All numeric positions (indexes) start at 0 instead of 1.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" For example, a file of 17 lines would range from 0 to 16.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" All numeric positions (indexes) start at 0 instead of 1.%q", file.stream, f_string_eol_s); + fl_print_format(" For example, a file of 17 lines would range from 0 to 16.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" When using the %[%s%s%] option, an order of operations is enforced on the parameters.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_depth_s, context.set.notable, f_string_eol_s[0]); + fl_print_format(" When using the %[%q%s%] option, an order of operations is enforced on the parameters.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_depth_s, context.set.notable, f_string_eol_s); - fl_print_format(" When this order of operations is in effect, parameters to the right of a depth parameter are influenced by that depth parameter:%c", file.stream, f_string_eol_s[0]); + fl_print_format(" When this order of operations is in effect, parameters to the right of a depth parameter are influenced by that depth parameter:%q", file.stream, f_string_eol_s); - fl_print_format(" %[%s%s%]: An Object index at the specified depth.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_at_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" %[%s%s%]: A new depth within the specified depth, indexed from the root.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_depth_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" %[%s%s%]: An Object name at the specified depth.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_name_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" %[%q%s%]: An Object index at the specified depth.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_at_s, context.set.notable, f_string_eol_s); + fl_print_format(" %[%q%s%]: A new depth within the specified depth, indexed from the root.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_depth_s, context.set.notable, f_string_eol_s); + fl_print_format(" %[%q%s%]: An Object name at the specified depth.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_name_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" The parameter %[%s%s%] must be in numeric order, but values in between may be skipped.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_depth_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" ('-d 0 -a 1 -d 2 -a 2' would specify index 1 at depth 0, any index at depth 1, and index 2 at depth 2.)%c", file.stream, f_string_eol_s[0]); - fl_print_format(" ('-d 2 -a 1 -d 0 -a 2' would be invalid because depth 2 is before depth 1.)%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The parameter %[%q%s%] must be in numeric order, but values in between may be skipped.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_depth_s, context.set.notable, f_string_eol_s); + fl_print_format(" ('-d 0 -a 1 -d 2 -a 2' would specify index 1 at depth 0, any index at depth 1, and index 2 at depth 2.)%q", file.stream, f_string_eol_s); + fl_print_format(" ('-d 2 -a 1 -d 0 -a 2' would be invalid because depth 2 is before depth 1.)%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" The parameter %[%s%s%] selects a Content column.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_select_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The parameter %[%q%s%] selects a Content column.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_select_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" Specify both %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_object_s, context.set.notable); - fl_print_format(" and the %[%s%s%] parameters to get the total objects.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_total_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" Specify both %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_object_s, context.set.notable); + fl_print_format(" and the %[%q%s%] parameters to get the total objects.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_total_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" When both %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_at_s, context.set.notable); - fl_print_format(" and %[%s%s%] parameters are specified (at the same depth),", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_name_s, context.set.notable); - fl_print_format(" the %[%s%s%] parameter value will be treated as a position relative to the specified", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_at_s, context.set.notable); - fl_print_format(" %[%s%s%] parameter value.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_name_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" When both %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_at_s, context.set.notable); + fl_print_format(" and %[%q%s%] parameters are specified (at the same depth),", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_name_s, context.set.notable); + fl_print_format(" the %[%q%s%] parameter value will be treated as a position relative to the specified", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_at_s, context.set.notable); + fl_print_format(" %[%s%s%] parameter value.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_name_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" This program may support parameters, such as %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_depth_s, context.set.notable); - fl_print_format(" or %[%s%s%], even if not supported by the standard.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_select_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" This is done to help ensure consistency for scripting.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" This program may support parameters, such as %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_depth_s, context.set.notable); + fl_print_format(" or %[%q%s%], even if not supported by the standard.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_select_s, context.set.notable, f_string_eol_s); + fl_print_format(" This is done to help ensure consistency for scripting.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" For parameters like %[%s%s%],", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_depth_s, context.set.notable); - fl_print_format(" if the standard doesn't support nested Content, then only a depth of 0 would be valid.%c", file.stream, f_string_eol_s[0]); + fl_print_format(" For parameters like %[%q%s%],", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_depth_s, context.set.notable); + fl_print_format(" if the standard doesn't support nested Content, then only a depth of 0 would be valid.%q", file.stream, f_string_eol_s); - fl_print_format(" For parameters like %[%s%s%],", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_select_s, context.set.notable); - fl_print_format(" if the standard doesn't support multiple Content groups, then only a select of 0 would be valid.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" For parameters like %[%q%s%],", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_select_s, context.set.notable); + fl_print_format(" if the standard doesn't support multiple Content groups, then only a select of 0 would be valid.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" The parameter %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_trim_s, context.set.notable); - fl_print_format(" will remove leading and trailing whitespaces when selecting objects or when printing objects.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The parameter %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_trim_s, context.set.notable); + fl_print_format(" will remove leading and trailing whitespaces when selecting objects or when printing objects.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" When specifying both the %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_object_s, context.set.notable); - fl_print_format(" parameter and the %[%s%s%] parameter, the entire Object and Content are printed, including the formatting.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_content_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" Both the Object and Content printed are already escaped.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" Both the Object and Content are separated by an EOL.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" When specifying both the %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_object_s, context.set.notable); + fl_print_format(" parameter and the %[%q%s%] parameter, the entire Object and Content are printed, including the formatting.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_content_s, context.set.notable, f_string_eol_s); + fl_print_format(" Both the Object and Content printed are already escaped.%q", file.stream, f_string_eol_s); + fl_print_format(" Both the Object and Content are separated by an EOL.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" The parameter %[%s%s%] accepts the following:%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_delimit_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" - %[%s%]: Do not apply delimits.%c", file.stream, context.set.notable, fss_basic_list_read_delimit_mode_name_none_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" - %[%s%]: (default) Apply all delimits.%c", file.stream, context.set.notable, fss_basic_list_read_delimit_mode_name_all_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" - %[%s%]: Apply delimits for Objects.%c", file.stream, context.set.notable, fss_basic_list_read_delimit_mode_name_object_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" - A number, 0 or greater: apply delimits for Content at the specified depth.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" - A number, 0 or greater, followed by a %[%s%]: (such as '1+') apply delimits for Content at the specified depth and any greater depth (numerically).%c", file.stream, context.set.notable, fss_basic_list_read_delimit_mode_name_greater_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); - fl_print_format(" - A number, 0 or lesser, followed by a %[%s%]: (such as '1-') apply delimits for Content at the specified depth and any lesser depth (numerically).%c%c", file.stream, context.set.notable, fss_basic_list_read_delimit_mode_name_lesser_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The parameter %[%q%s%] accepts the following:%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_delimit_s, context.set.notable, f_string_eol_s); + fl_print_format(" - %[%s%]: Do not apply delimits.%q", file.stream, context.set.notable, fss_basic_list_read_delimit_mode_name_none_s, context.set.notable, f_string_eol_s); + fl_print_format(" - %[%s%]: (default) Apply all delimits.%q", file.stream, context.set.notable, fss_basic_list_read_delimit_mode_name_all_s, context.set.notable, f_string_eol_s); + fl_print_format(" - %[%s%]: Apply delimits for Objects.%q", file.stream, context.set.notable, fss_basic_list_read_delimit_mode_name_object_s, context.set.notable, f_string_eol_s); + fl_print_format(" - A number, 0 or greater: apply delimits for Content at the specified depth.%q", file.stream, f_string_eol_s); + fl_print_format(" - A number, 0 or greater, followed by a %[%s%]: (such as '1+') apply delimits for Content at the specified depth and any greater depth (numerically).%q", file.stream, context.set.notable, fss_basic_list_read_delimit_mode_name_greater_s, context.set.notable, f_string_eol_s, f_string_eol_s); + fl_print_format(" - A number, 0 or lesser, followed by a %[%s%]: (such as '1-') apply delimits for Content at the specified depth and any lesser depth (numerically).%q%q", file.stream, context.set.notable, fss_basic_list_read_delimit_mode_name_lesser_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" The %[%s%s%] parameter may be specified multiple times to customize the delimit behavior.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_delimit_s, context.set.notable, f_string_eol_s[0]); + fl_print_format(" The %[%q%s%] parameter may be specified multiple times to customize the delimit behavior.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_delimit_s, context.set.notable, f_string_eol_s); - fl_print_format(" The %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_delimit_s, context.set.notable); + fl_print_format(" The %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_delimit_s, context.set.notable); fl_print_format(" values %[%s%]", file.stream, context.set.notable, fss_basic_list_read_delimit_mode_name_none_s, context.set.notable); fl_print_format(" and %[%s%],", file.stream, context.set.notable, fss_basic_list_read_delimit_mode_name_all_s, context.set.notable); - fl_print_format(" overrule all other delimit values.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" overrule all other delimit values.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" The parameters %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_columns_s, context.set.notable); - fl_print_format(" and %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_select_s, context.set.notable); - fl_print_format(" refer to a Content column.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" The word \"column\" is being loosely defined to refer to a specific Content.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" This is not to be confused with a depth.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The parameters %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_columns_s, context.set.notable); + fl_print_format(" and %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_select_s, context.set.notable); + fl_print_format(" refer to a Content column.%q", file.stream, f_string_eol_s); + fl_print_format(" The word \"column\" is being loosely defined to refer to a specific Content.%q", file.stream, f_string_eol_s); + fl_print_format(" This is not to be confused with a depth.%q%q", file.stream, f_string_eol_s, f_string_eol_s); funlockfile(file.stream); @@ -262,9 +262,9 @@ extern "C" { if (main->parameters[parameter_code[i]].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, parameter_name[i], main->error.notable); - fl_print_format("%[' requires a %s.%]%c", main->error.to.stream, main->error.context, parameter_message[i], main->error.context, f_string_eol_s[0]); + fl_print_format("%[' requires a %s.%]%q", main->error.to.stream, main->error.context, parameter_message[i], main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -305,11 +305,11 @@ extern "C" { if (main->parameters[parameter_code[i]].result == parameter_match[i]) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_columns_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, parameter_name[i], main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -324,11 +324,11 @@ extern "C" { if (main->parameters[fss_basic_list_read_parameter_total_e].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_pipe_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_total_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -337,11 +337,11 @@ extern "C" { else if (main->parameters[fss_basic_list_read_parameter_line_e].result == f_console_result_additional_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_pipe_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_line_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -375,9 +375,9 @@ extern "C" { if (!length) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_delimit_s, main->error.notable); - fl_print_format("%[' must not be empty.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' must not be empty.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -428,7 +428,7 @@ extern "C" { data.delimit_mode = fss_basic_list_read_delimit_mode_content_object_e; } - if (arguments->argv[location][length - 1] == fss_basic_list_read_delimit_mode_name_greater_s[0]) { + if (arguments->argv[location][length - 1] == fss_basic_list_read_delimit_mode_name_greater_s.string[0]) { if (!(data.delimit_mode == fss_basic_list_read_delimit_mode_none_e || data.delimit_mode == fss_basic_list_read_delimit_mode_all_e)) { if (data.delimit_mode == fss_basic_list_read_delimit_mode_content_object_e) { data.delimit_mode = fss_basic_list_read_delimit_mode_content_greater_object_e; @@ -441,7 +441,7 @@ extern "C" { // Shorten the length to better convert the remainder to a number. --length; } - else if (arguments->argv[location][length - 1] == fss_basic_list_read_delimit_mode_name_lesser_s[0]) { + else if (arguments->argv[location][length - 1] == fss_basic_list_read_delimit_mode_name_lesser_s.string[0]) { if (!(data.delimit_mode == fss_basic_list_read_delimit_mode_none_e || data.delimit_mode == fss_basic_list_read_delimit_mode_all_e)) { if (data.delimit_mode == fss_basic_list_read_delimit_mode_content_object_e) { data.delimit_mode = fss_basic_list_read_delimit_mode_content_lesser_object_e; @@ -509,9 +509,9 @@ extern "C" { if (F_status_is_error_not(status) && main->parameters[fss_basic_list_read_parameter_select_e].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%sThe '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_select_s, main->error.notable); - fl_print_format("%[' parameter requires a positive number.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' parameter requires a positive number.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -639,7 +639,7 @@ extern "C" { fss_basic_list_read_data_delete_simple(&data); } else { - fll_print_format("%c%[%sYou failed to specify one or more files.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sYou failed to specify one or more files.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context, f_string_eol_s); status = F_status_set_error(F_parameter); } @@ -647,7 +647,7 @@ extern "C" { if (F_status_set_fine(status) == F_interrupt) { fflush(main->output.to.stream); - fll_print_terminated(f_string_eol_s, main->output.to.stream); + fll_print_dynamic(f_string_eol_s, main->output.to.stream); } } 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 7a35839..8963960 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 @@ -138,15 +138,15 @@ extern "C" { #define fss_basic_list_read_console_parameter_t_initialize \ { \ - macro_f_console_parameter_t_initialize(f_console_standard_short_help_s, f_console_standard_long_help_s, 0, 0, f_console_type_normal_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_light_s, f_console_standard_long_light_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s, f_console_standard_long_dark_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, 0, F_false, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s, f_console_standard_long_normal_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s, f_console_standard_long_debug_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_version_s, f_console_standard_long_version_s, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, 0, 0, f_console_type_normal_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, 0, F_false, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, 0, 0, f_console_type_inverse_e), \ macro_f_console_parameter_t_initialize(fss_basic_list_read_short_at_s, fss_basic_list_read_long_at_s, 0, 1, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(fss_basic_list_read_short_content_s, fss_basic_list_read_long_content_s, 0, 0, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(fss_basic_list_read_short_columns_s, fss_basic_list_read_long_columns_s, 0, 0, f_console_type_normal_e), \ diff --git a/level_3/fss_basic_list_read/c/private-common.c b/level_3/fss_basic_list_read/c/private-common.c index 3574e47..739b0ea 100644 --- a/level_3/fss_basic_list_read/c/private-common.c +++ b/level_3/fss_basic_list_read/c/private-common.c @@ -67,9 +67,9 @@ extern "C" { flockfile(main->warning.to.stream); - fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s[0], f_string_eol_s[0], main->context.set.warning, main->context.set.warning); + fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s, f_string_eol_s, main->context.set.warning, main->context.set.warning); fl_print_format("%[%i%]", main->warning.to.stream, main->context.set.notable, signal, main->context.set.notable); - fl_print_format("%[.%]%c", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s[0]); + fl_print_format("%[.%]%q", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s); funlockfile(main->warning.to.stream); } diff --git a/level_3/fss_basic_list_read/c/private-print.c b/level_3/fss_basic_list_read/c/private-print.c index 921bdd6..a4d533e 100644 --- a/level_3/fss_basic_list_read/c/private-print.c +++ b/level_3/fss_basic_list_read/c/private-print.c @@ -79,11 +79,11 @@ extern "C" { } else { if (main->parameters[fss_basic_list_read_parameter_content_e].result == f_console_result_found_e) { - f_print_character(f_fss_basic_list_open_s[0], main->output.to.stream); - f_print_character(f_fss_basic_list_open_end_s[0], main->output.to.stream); + f_print_character(f_fss_basic_list_open_s.string[0], main->output.to.stream); + f_print_character(f_fss_basic_list_open_end_s.string[0], main->output.to.stream); } else { - f_print_character(f_fss_eol_s[0], main->output.to.stream); + f_print_character(f_fss_eol_s.string[0], main->output.to.stream); } } } @@ -101,16 +101,16 @@ extern "C" { #ifndef _di_fss_basic_list_read_print_one_ void fss_basic_list_read_print_one(fss_basic_list_read_main_t * const main) { - f_print_character(f_string_ascii_1_s[0], main->output.to.stream); - f_print_character(f_string_eol_s[0], main->output.to.stream); + f_print_character(f_string_ascii_1_s.string[0], main->output.to.stream); + f_print_dynamic(f_string_eol_s, main->output.to.stream); } #endif // _di_fss_basic_list_read_print_one_ #ifndef _di_fss_basic_list_read_print_zero_ void fss_basic_list_read_print_zero(fss_basic_list_read_main_t * const main) { - f_print_character(f_string_ascii_0_s[0], main->output.to.stream); - f_print_character(f_string_eol_s[0], main->output.to.stream); + f_print_character(f_string_ascii_0_s.string[0], main->output.to.stream); + f_print_dynamic(f_string_eol_s, main->output.to.stream); } #endif // _di_fss_basic_list_read_print_zero_ diff --git a/level_3/fss_basic_list_read/c/private-read.c b/level_3/fss_basic_list_read/c/private-read.c index 512c530..376c2f4 100644 --- a/level_3/fss_basic_list_read/c/private-read.c +++ b/level_3/fss_basic_list_read/c/private-read.c @@ -189,11 +189,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe value '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%sThe value '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%ul%]", main->error.to.stream, main->error.notable, data->depths.array[i].depth, main->error.notable); fl_print_format("%[' may only be specified once for the parameter '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_depth_s, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_depth_s, main->error.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -204,13 +204,13 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_depth_s, main->error.notable); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_read_long_depth_s, main->error.notable); fl_print_format("%[' may not have the value '%]", main->error.to.stream, main->error.context, main->error.context); fl_print_format("%[%ul%]", main->error.to.stream, main->error.notable, data->depths.array[i].depth, main->error.notable); fl_print_format("%[' before the value '%]", main->error.to.stream, main->error.context, main->error.context); fl_print_format("%[%ul%]", main->error.to.stream, main->error.notable, data->depths.array[j].depth, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -422,7 +422,7 @@ extern "C" { if (status == F_success) return F_none; } else if (data->option & fss_basic_list_read_data_option_columns_d) { - fll_print_format("%ul%c", main->output.to.stream, data->contents.array[i].used, f_string_eol_s[0]); + fll_print_format("%ul%q", main->output.to.stream, data->contents.array[i].used, f_string_eol_s); } else if (data->option & fss_basic_list_read_data_option_total_d) { flockfile(main->output.to.stream); @@ -508,7 +508,7 @@ extern "C" { signal_check = 0; } - if (data->buffer.string[i] == f_string_eol_s[0]) { + if (data->buffer.string[i] == f_string_eol_s.string[0]) { if (*line == data->line) { range.stop = i; @@ -535,7 +535,7 @@ extern "C" { } // for // If Content does not end with a newline, it still must be treated as the last line. - if (data->buffer.string[range.stop] != f_string_eol_s[0]) { + if (data->buffer.string[range.stop] != f_string_eol_s.string[0]) { ++(*line); if (*line == data->line) { @@ -548,7 +548,7 @@ extern "C" { range.stop = data->contents.array[at].array[0].stop; f_print_except_in_dynamic_partial(data->buffer, range, delimits_content, data->comments, main->output.to.stream); - f_print_character(f_string_eol_s[0], main->output.to.stream); + f_print_dynamic(f_string_eol_s, main->output.to.stream); } funlockfile(main->output.to.stream); @@ -595,7 +595,7 @@ extern "C" { } } // for - fll_print_format("%ul%c", main->output.to.stream, max, f_string_eol_s[0]); + fll_print_format("%ul%q", main->output.to.stream, max, f_string_eol_s); return F_none; } @@ -766,7 +766,7 @@ extern "C" { for (i = range.start; i <= range.stop; ++i) { - if (data->buffer.string[i] == f_string_eol_s[0]) { + if (data->buffer.string[i] == f_string_eol_s.string[0]) { range.start = i + 1; if (i <= range.stop) { @@ -776,7 +776,7 @@ extern "C" { } // for // If Content does not end with a newline, it still must be treated as the last line. - if (data->buffer.string[range.stop] != f_string_eol_s[0]) { + if (data->buffer.string[range.stop] != f_string_eol_s.string[0]) { ++total; } } @@ -793,7 +793,7 @@ extern "C" { } } else { - fl_print_format("%ul%c", main->output.to.stream, total, f_string_eol_s[0]); + fl_print_format("%ul%q", main->output.to.stream, total, f_string_eol_s); } funlockfile(main->output.to.stream); diff --git a/level_3/fss_basic_list_write/c/fss_basic_list_write.c b/level_3/fss_basic_list_write/c/fss_basic_list_write.c index b9baf78..81436a7 100644 --- a/level_3/fss_basic_list_write/c/fss_basic_list_write.c +++ b/level_3/fss_basic_list_write/c/fss_basic_list_write.c @@ -13,42 +13,42 @@ extern "C" { fll_program_print_help_header(file, context, fss_basic_list_write_program_name_long_s, fss_basic_list_write_program_version_s); - fll_program_print_help_option(file, context, f_console_standard_short_help_s, f_console_standard_long_help_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print this help message."); - fll_program_print_help_option(file, context, f_console_standard_short_dark_s, f_console_standard_long_dark_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_light_s, f_console_standard_long_light_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, "Do not file in color."); - fll_program_print_help_option(file, context, f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Decrease verbosity, silencing most output."); - fll_program_print_help_option(file, context, f_console_standard_short_normal_s, f_console_standard_long_normal_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Set verbosity to normal file."); - fll_program_print_help_option(file, context, f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Increase verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_debug_s, f_console_standard_long_debug_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Enable debugging, significantly increasing verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_version_s, f_console_standard_long_version_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Print only the version number."); - - f_print_character(f_string_eol_s[0], file.stream); - - fll_program_print_help_option(file, context, fss_basic_list_write_short_file_s, fss_basic_list_write_long_file_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Specify a file to send data to."); - fll_program_print_help_option(file, context, fss_basic_list_write_short_content_s, fss_basic_list_write_long_content_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "The Content to file."); - fll_program_print_help_option(file, context, fss_basic_list_write_short_double_s, fss_basic_list_write_long_double_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Use double quotes (default)."); - fll_program_print_help_option(file, context, fss_basic_list_write_short_ignore_s, fss_basic_list_write_long_ignore_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Ignore a given range within a Content."); - fll_program_print_help_option(file, context, fss_basic_list_write_short_object_s, fss_basic_list_write_long_object_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " The Object to file."); - fll_program_print_help_option(file, context, fss_basic_list_write_short_partial_s, fss_basic_list_write_long_partial_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Do not file end of Object/Content character."); - fll_program_print_help_option(file, context, fss_basic_list_write_short_prepend_s, fss_basic_list_write_long_prepend_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Prepend the given whitespace characters to the start of each multi-line Content."); - fll_program_print_help_option(file, context, fss_basic_list_write_short_single_s, fss_basic_list_write_long_single_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Use single quotes."); - fll_program_print_help_option(file, context, fss_basic_list_write_short_trim_s, fss_basic_list_write_long_trim_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Trim Object names."); + fll_program_print_help_option(file, context, f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print this help message."); + fll_program_print_help_option(file, context, f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, "Do not file in color."); + fll_program_print_help_option(file, context, f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Decrease verbosity, silencing most output."); + fll_program_print_help_option(file, context, f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Set verbosity to normal file."); + fll_program_print_help_option(file, context, f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Increase verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Enable debugging, significantly increasing verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Print only the version number."); + + f_print_dynamic(f_string_eol_s, file.stream); + + fll_program_print_help_option(file, context, fss_basic_list_write_short_file_s, fss_basic_list_write_long_file_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Specify a file to send data to."); + fll_program_print_help_option(file, context, fss_basic_list_write_short_content_s, fss_basic_list_write_long_content_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "The Content to file."); + fll_program_print_help_option(file, context, fss_basic_list_write_short_double_s, fss_basic_list_write_long_double_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Use double quotes (default)."); + fll_program_print_help_option(file, context, fss_basic_list_write_short_ignore_s, fss_basic_list_write_long_ignore_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Ignore a given range within a Content."); + fll_program_print_help_option(file, context, fss_basic_list_write_short_object_s, fss_basic_list_write_long_object_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " The Object to file."); + fll_program_print_help_option(file, context, fss_basic_list_write_short_partial_s, fss_basic_list_write_long_partial_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "Do not file end of Object/Content character."); + fll_program_print_help_option(file, context, fss_basic_list_write_short_prepend_s, fss_basic_list_write_long_prepend_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "Prepend the given whitespace characters to the start of each multi-line Content."); + fll_program_print_help_option(file, context, fss_basic_list_write_short_single_s, fss_basic_list_write_long_single_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Use single quotes."); + fll_program_print_help_option(file, context, fss_basic_list_write_short_trim_s, fss_basic_list_write_long_trim_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Trim Object names."); fll_program_print_help_usage(file, context, fss_basic_list_write_program_name_s, f_string_empty_s); - fl_print_format(" The pipe uses the Backspace character '%[\\b%]' (%[U+0008%]) to designate the start of a Content.%c", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s[0]); - fl_print_format(" The pipe uses the Form Feed character '%[\\f%]' (%[U+000C%]) to designate the end of the last Content.%c", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s[0]); - fl_print_format(" The pipe uses the Vertical Line character '%[\\v%]' (%[U+000B%]) is used to ignore a Content range, which does nothing in this program.%c", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s[0]); + fl_print_format(" The pipe uses the Backspace character '%[\\b%]' (%[U+0008%]) to designate the start of a Content.%q", file.stream, context.set.notable, context.set.notable, context.set.notable, context.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.%q", file.stream, context.set.notable, context.set.notable, context.set.notable, context.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, which does nothing in this program.%q", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s); fl_print_format(" For the pipe, an Object is terminated by either a Backspace character '%[\\b%]' (%[U+0008%])", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable); - fl_print_format(" or a Form Feed character '%[\\f%]' (%[U+000C%]).%c", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s[0]); - fl_print_format(" The end of the pipe represents the end of any Object or Content.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" or a Form Feed character '%[\\f%]' (%[U+000C%]).%q", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s); + fl_print_format(" The end of the pipe represents the end of any Object or Content.%q%q", file.stream, f_string_eol_s, f_string_eol_s); fl_print_format(" The FSS-0002 (Basic List) specification does not support quoted names, therefore the parameters '%[%s%s%]'", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_single_s, context.set.notable); - fl_print_format(" and '%[%s%s%]' do nothing.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_double_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" and '%[%q%s%]' do nothing.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_double_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" This program does not use the parameter '%[%s%s%]', which therefore does nothing.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_ignore_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" This parameter requires two values.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" This program does not use the parameter '%[%q%s%]', which therefore does nothing.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_ignore_s, context.set.notable, f_string_eol_s); + fl_print_format(" This parameter requires two values.%q%q", file.stream, f_string_eol_s, f_string_eol_s); funlockfile(file.stream); @@ -166,9 +166,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_file_s, main->error.notable); - fl_print_format("%[' may only be specified once.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_file_s, main->error.notable); + fl_print_format("%[' may only be specified once.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -188,7 +188,7 @@ extern "C" { } } else if (main->parameters[fss_basic_list_write_parameter_file_e].result == f_console_result_found_e) { - fss_basic_list_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s, fss_basic_list_write_long_file_s); + fss_basic_list_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s.string, fss_basic_list_write_long_file_s); status = F_status_set_error(F_parameter); } } @@ -197,11 +197,11 @@ extern "C" { if (main->parameters[fss_basic_list_write_parameter_object_e].locations.used || main->parameters[fss_basic_list_write_parameter_content_e].locations.used) { if (main->parameters[fss_basic_list_write_parameter_object_e].locations.used) { if (main->parameters[fss_basic_list_write_parameter_object_e].locations.used != main->parameters[fss_basic_list_write_parameter_object_e].values.used) { - fss_basic_list_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s, fss_basic_list_write_long_object_s); + fss_basic_list_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s.string, fss_basic_list_write_long_object_s); status = F_status_set_error(F_parameter); } else if (main->parameters[fss_basic_list_write_parameter_content_e].locations.used != main->parameters[fss_basic_list_write_parameter_content_e].values.used) { - fss_basic_list_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s, fss_basic_list_write_long_content_s); + fss_basic_list_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s.string, fss_basic_list_write_long_content_s); status = F_status_set_error(F_parameter); } else if (main->parameters[fss_basic_list_write_parameter_object_e].locations.used != main->parameters[fss_basic_list_write_parameter_content_e].locations.used && main->parameters[fss_basic_list_write_parameter_partial_e].result == f_console_result_none_e) { @@ -213,13 +213,13 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_partial_s, main->error.notable); + fl_print_format("%q%[%sThe '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_partial_s, main->error.notable); fl_print_format("%[' parameter only allows either the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_object_s, main->error.notable); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_object_s, main->error.notable); fl_print_format("%[' parameter or the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_content_s, main->error.notable); - fl_print_format("%[' parameter, but not both.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_content_s, main->error.notable); + fl_print_format("%[' parameter, but not both.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -245,11 +245,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sEach '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_object_s, main->error.notable); + fl_print_format("%q%[%sEach '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_object_s, main->error.notable); fl_print_format("%[' parameter must be specified before a '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_content_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_content_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -264,7 +264,7 @@ extern "C" { } else if (main->parameters[fss_basic_list_write_parameter_content_e].locations.used) { if (main->parameters[fss_basic_list_write_parameter_content_e].locations.used != main->parameters[fss_basic_list_write_parameter_content_e].values.used) { - fss_basic_list_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s, fss_basic_list_write_long_content_s); + fss_basic_list_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s.string, fss_basic_list_write_long_content_s); status = F_status_set_error(F_parameter); } else if (!main->parameters[fss_basic_list_write_parameter_partial_e].locations.used) { @@ -277,11 +277,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThis requires either piped data or the use of the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%sThis requires either piped data or the use of the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_object_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_content_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -294,9 +294,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThis '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_partial_s, main->error.notable); - fl_print_format("%[' parameter cannot be used when processing a pipe.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThis '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_partial_s, main->error.notable); + fl_print_format("%[' parameter cannot be used when processing a pipe.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -311,9 +311,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_prepend_s, main->error.notable); - fl_print_format("%[' is specified, but no value is given.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_prepend_s, main->error.notable); + fl_print_format("%[' is specified, but no value is given.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -340,9 +340,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_prepend_s, main->error.notable); - fl_print_format("%[' must only contain whitespace.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_prepend_s, main->error.notable); + fl_print_format("%[' must only contain whitespace.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -357,9 +357,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_prepend_s, main->error.notable); - fl_print_format("%[' must not be an empty string.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_prepend_s, main->error.notable); + fl_print_format("%[' must not be an empty string.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -374,9 +374,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_ignore_s, main->error.notable); - fl_print_format("%[' was specified, but no values were given.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_ignore_s, main->error.notable); + fl_print_format("%[' was specified, but no values were given.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -390,9 +390,9 @@ extern "C" { if (total_locations * 2 > total_arguments) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_ignore_s, main->error.notable); - fl_print_format("%[' requires two values.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_ignore_s, main->error.notable); + fl_print_format("%[' requires two values.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -430,8 +430,8 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sWhile processing the '%]%[input pipe%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context, main->error.notable, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sWhile processing the '%]%[input pipe%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context, main->error.notable, main->error.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -502,8 +502,8 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sWhile processing the '%]%[input arguments%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context, main->error.notable, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sWhile processing the '%]%[input arguments%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context, main->error.notable, main->error.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -511,7 +511,7 @@ extern "C" { else if (main->error.verbosity != f_console_verbosity_quiet_e && main->parameters[fss_basic_list_write_parameter_file_e].result == f_console_result_none_e) { // Ensure there is always a newline at the end, unless in quiet mode. - fll_print_character(f_string_eol_s[0], main->output.to.stream); + fll_print_dynamic(f_string_eol_s, main->output.to.stream); } } @@ -536,7 +536,7 @@ extern "C" { // Ensure a newline is always put at the end of the program execution, unless in quiet mode. if (main->error.verbosity != f_console_verbosity_quiet_e) { if (F_status_is_error(status)) { - fll_print_character(f_string_eol_s[0], main->error.to.stream); + fll_print_dynamic(f_string_eol_s, main->error.to.stream); } } 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 dd8e041..5d9a12f 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 @@ -115,15 +115,15 @@ extern "C" { #define fss_basic_list_write_console_parameter_t_initialize \ { \ - macro_f_console_parameter_t_initialize(f_console_standard_short_help_s, f_console_standard_long_help_s, 0, 0, f_console_type_normal_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_light_s, f_console_standard_long_light_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s, f_console_standard_long_dark_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, 0, F_false, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s, f_console_standard_long_normal_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s, f_console_standard_long_debug_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_version_s, f_console_standard_long_version_s, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, 0, 0, f_console_type_normal_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, 0, F_false, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, 0, 0, f_console_type_inverse_e), \ macro_f_console_parameter_t_initialize(fss_basic_list_write_short_file_s, fss_basic_list_write_long_file_s, 0, 1, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(fss_basic_list_write_short_content_s, fss_basic_list_write_long_content_s, 0, 1, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(fss_basic_list_write_short_double_s, fss_basic_list_write_long_double_s, 0, 0, f_console_type_normal_e), \ diff --git a/level_3/fss_basic_list_write/c/private-common.c b/level_3/fss_basic_list_write/c/private-common.c index 3922a7b..82f8ad1 100644 --- a/level_3/fss_basic_list_write/c/private-common.c +++ b/level_3/fss_basic_list_write/c/private-common.c @@ -15,9 +15,9 @@ extern "C" { flockfile(main->warning.to.stream); - fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s[0], f_string_eol_s[0], main->context.set.warning, main->context.set.warning); + fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s, f_string_eol_s, main->context.set.warning, main->context.set.warning); fl_print_format("%[%i%]", main->warning.to.stream, main->context.set.notable, signal, main->context.set.notable); - fl_print_format("%[.%]%c", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s[0]); + fl_print_format("%[.%]%q", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s); funlockfile(main->warning.to.stream); } diff --git a/level_3/fss_basic_list_write/c/private-write.c b/level_3/fss_basic_list_write/c/private-write.c index ebcfcb0..f1b12f9 100644 --- a/level_3/fss_basic_list_write/c/private-write.c +++ b/level_3/fss_basic_list_write/c/private-write.c @@ -15,13 +15,13 @@ extern "C" { flockfile(main->error.to.stream); - fl_print_format("%c%[%sMust specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_object_s, main->error.notable); + fl_print_format("%q%[%sMust specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_object_s, main->error.notable); fl_print_format("%[' parameter and the '%]", main->error.to.stream, main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_content_s, main->error.notable); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_content_s, main->error.notable); fl_print_format("%[' parameter the same number of times when not specifying the '%]", main->error.to.stream, main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_partial_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_list_write_long_partial_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -36,9 +36,9 @@ extern "C" { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThis standard does not support end of line character '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%sThis standard does not support end of line character '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[\\n%]", main->error.to.stream, main->error.notable, main->error.notable); - fl_print_format("%[' in objects.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' in objects.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -53,9 +53,9 @@ extern "C" { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%S%S%]", main->error.to.stream, main->error.notable, symbol, parameter, main->error.notable); - fl_print_format("%[' is specified, but no value is given.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' is specified, but no value is given.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -257,7 +257,7 @@ extern "C" { if (block.string[range.start] == fss_basic_list_write_pipe_content_start_s) { if (main->error.verbosity != f_console_verbosity_quiet_e) { - fll_print_format("%c%[%sThis standard only supports one content per object.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sThis standard only supports one content per object.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context, f_string_eol_s); } status = F_status_set_error(F_supported_not); diff --git a/level_3/fss_basic_read/c/fss_basic_read.c b/level_3/fss_basic_read/c/fss_basic_read.c index 563f4d0..b9469f2 100644 --- a/level_3/fss_basic_read/c/fss_basic_read.c +++ b/level_3/fss_basic_read/c/fss_basic_read.c @@ -14,102 +14,102 @@ extern "C" { fll_program_print_help_header(file, context, fss_basic_read_program_name_long_s, fss_basic_read_program_version_s); - fll_program_print_help_option(file, context, f_console_standard_short_help_s, f_console_standard_long_help_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print this help message."); - fll_program_print_help_option(file, context, f_console_standard_short_dark_s, f_console_standard_long_dark_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_light_s, f_console_standard_long_light_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, "Do not file in color."); - fll_program_print_help_option(file, context, f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Decrease verbosity, silencing most output."); - fll_program_print_help_option(file, context, f_console_standard_short_normal_s, f_console_standard_long_normal_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Set verbosity to normal file."); - fll_program_print_help_option(file, context, f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Increase verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_debug_s, f_console_standard_long_debug_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Enable debugging, significantly increasing verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_version_s, f_console_standard_long_version_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Print only the version number."); - - f_print_character(f_string_eol_s[0], file.stream); - - fll_program_print_help_option(file, context, fss_basic_read_short_at_s, fss_basic_read_long_at_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Select Object at this numeric index."); - fll_program_print_help_option(file, context, fss_basic_read_short_content_s, fss_basic_read_long_content_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print the Content (default)."); - fll_program_print_help_option(file, context, fss_basic_read_short_columns_s, fss_basic_read_long_columns_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print the total number of columns."); - fll_program_print_help_option(file, context, fss_basic_read_short_delimit_s, fss_basic_read_long_delimit_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Designate how to handle applying delimits."); - fll_program_print_help_option(file, context, fss_basic_read_short_depth_s, fss_basic_read_long_depth_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Select Object at this numeric depth."); - fll_program_print_help_option(file, context, fss_basic_read_short_empty_s, fss_basic_read_long_empty_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Include empty Content when processing."); - fll_program_print_help_option(file, context, fss_basic_read_short_line_s, fss_basic_read_long_line_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print only the Content at the given line."); - fll_program_print_help_option(file, context, fss_basic_read_short_name_s, fss_basic_read_long_name_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Select Object with this name."); - fll_program_print_help_option(file, context, fss_basic_read_short_object_s, fss_basic_read_long_object_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print the Object."); - fll_program_print_help_option(file, context, fss_basic_read_short_pipe_s, fss_basic_read_long_pipe_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print using the special pipe format."); - fll_program_print_help_option(file, context, fss_basic_read_short_raw_s, fss_basic_read_long_raw_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print with the original quotes and escapes."); - fll_program_print_help_option(file, context, fss_basic_read_short_select_s, fss_basic_read_long_select_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Select sub-Content at this index."); - fll_program_print_help_option(file, context, fss_basic_read_short_total_s, fss_basic_read_long_total_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print the total number of lines."); - fll_program_print_help_option(file, context, fss_basic_read_short_trim_s, fss_basic_read_long_trim_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Trim Object names on select or print."); + fll_program_print_help_option(file, context, f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print this help message."); + fll_program_print_help_option(file, context, f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, "Do not file in color."); + fll_program_print_help_option(file, context, f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Decrease verbosity, silencing most output."); + fll_program_print_help_option(file, context, f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Set verbosity to normal file."); + fll_program_print_help_option(file, context, f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Increase verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Enable debugging, significantly increasing verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Print only the version number."); + + f_print_dynamic(f_string_eol_s, file.stream); + + fll_program_print_help_option(file, context, fss_basic_read_short_at_s, fss_basic_read_long_at_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Select Object at this numeric index."); + fll_program_print_help_option(file, context, fss_basic_read_short_content_s, fss_basic_read_long_content_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print the Content (default)."); + fll_program_print_help_option(file, context, fss_basic_read_short_columns_s, fss_basic_read_long_columns_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print the total number of columns."); + fll_program_print_help_option(file, context, fss_basic_read_short_delimit_s, fss_basic_read_long_delimit_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Designate how to handle applying delimits."); + fll_program_print_help_option(file, context, fss_basic_read_short_depth_s, fss_basic_read_long_depth_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Select Object at this numeric depth."); + fll_program_print_help_option(file, context, fss_basic_read_short_empty_s, fss_basic_read_long_empty_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Include empty Content when processing."); + fll_program_print_help_option(file, context, fss_basic_read_short_line_s, fss_basic_read_long_line_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print only the Content at the given line."); + fll_program_print_help_option(file, context, fss_basic_read_short_name_s, fss_basic_read_long_name_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Select Object with this name."); + fll_program_print_help_option(file, context, fss_basic_read_short_object_s, fss_basic_read_long_object_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print the Object."); + fll_program_print_help_option(file, context, fss_basic_read_short_pipe_s, fss_basic_read_long_pipe_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print using the special pipe format."); + fll_program_print_help_option(file, context, fss_basic_read_short_raw_s, fss_basic_read_long_raw_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print with the original quotes and escapes."); + fll_program_print_help_option(file, context, fss_basic_read_short_select_s, fss_basic_read_long_select_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Select sub-Content at this index."); + fll_program_print_help_option(file, context, fss_basic_read_short_total_s, fss_basic_read_long_total_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print the total number of lines."); + fll_program_print_help_option(file, context, fss_basic_read_short_trim_s, fss_basic_read_long_trim_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Trim Object names on select or print."); fll_program_print_help_usage(file, context, fss_basic_read_program_name_s, "filename(s)"); - fl_print_format(" %[Notes:%]%c", file.stream, context.set.important, context.set.important, f_string_eol_s[0]); + fl_print_format(" %[Notes:%]%q", file.stream, context.set.important, context.set.important, f_string_eol_s); - fl_print_format(" This program will print the Content associated with the given Object and Content main based on the FSS-0000 Basic standard.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" This program will print the Content associated with the given Object and Content main based on the FSS-0000 Basic standard.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" All numeric positions (indexes) start at 0 instead of 1.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" For example, a file of 17 lines would range from 0 to 16.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" All numeric positions (indexes) start at 0 instead of 1.%q", file.stream, f_string_eol_s); + fl_print_format(" For example, a file of 17 lines would range from 0 to 16.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" When using the %[%s%s%] option, an order of operations is enforced on the parameters.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_depth_s, context.set.notable, f_string_eol_s[0]); + fl_print_format(" When using the %[%q%s%] option, an order of operations is enforced on the parameters.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_depth_s, context.set.notable, f_string_eol_s); - fl_print_format(" When this order of operations is in effect, parameters to the right of a depth parameter are influenced by that depth parameter:%c", file.stream, f_string_eol_s[0]); + fl_print_format(" When this order of operations is in effect, parameters to the right of a depth parameter are influenced by that depth parameter:%q", file.stream, f_string_eol_s); - fl_print_format(" %[%s%s%]: An Object index at the specified depth.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_at_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" %[%s%s%]: A new depth within the specified depth, indexed from the root.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_depth_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" %[%s%s%]: An Object name at the specified depth.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_name_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" %[%q%s%]: An Object index at the specified depth.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_at_s, context.set.notable, f_string_eol_s); + fl_print_format(" %[%q%s%]: A new depth within the specified depth, indexed from the root.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_depth_s, context.set.notable, f_string_eol_s); + fl_print_format(" %[%q%s%]: An Object name at the specified depth.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_name_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" The parameter %[%s%s%] must be in numeric order, but values in between may be skipped.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_depth_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" ('-d 0 -a 1 -d 2 -a 2' would specify index 1 at depth 0, any index at depth 1, and index 2 at depth 2.)%c", file.stream, f_string_eol_s[0]); - fl_print_format(" ('-d 2 -a 1 -d 0 -a 2' would be invalid because depth 2 is before depth 1.)%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The parameter %[%q%s%] must be in numeric order, but values in between may be skipped.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_depth_s, context.set.notable, f_string_eol_s); + fl_print_format(" ('-d 0 -a 1 -d 2 -a 2' would specify index 1 at depth 0, any index at depth 1, and index 2 at depth 2.)%q", file.stream, f_string_eol_s); + fl_print_format(" ('-d 2 -a 1 -d 0 -a 2' would be invalid because depth 2 is before depth 1.)%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" The parameter %[%s%s%] selects a Content column.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_select_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The parameter %[%q%s%] selects a Content column.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_select_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" Specify both %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_object_s, context.set.notable); - fl_print_format(" and the %[%s%s%] parameters to get the total objects.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_total_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" Specify both %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_object_s, context.set.notable); + fl_print_format(" and the %[%q%s%] parameters to get the total objects.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_total_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" When both %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_at_s, context.set.notable); - fl_print_format(" and %[%s%s%] parameters are specified (at the same depth),", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_name_s, context.set.notable); - fl_print_format(" the %[%s%s%] parameter value will be treated as a position relative to the specified", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_at_s, context.set.notable); - fl_print_format(" %[%s%s%] parameter value.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_name_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" When both %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_at_s, context.set.notable); + fl_print_format(" and %[%q%s%] parameters are specified (at the same depth),", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_name_s, context.set.notable); + fl_print_format(" the %[%q%s%] parameter value will be treated as a position relative to the specified", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_at_s, context.set.notable); + fl_print_format(" %[%q%s%] parameter value.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_name_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" This program may support parameters, such as %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_depth_s, context.set.notable); - fl_print_format(" or %[%s%s%], even if not supported by the standard.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_select_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" This is done to help ensure consistency for scripting.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" This program may support parameters, such as %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_depth_s, context.set.notable); + fl_print_format(" or %[%q%s%], even if not supported by the standard.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_select_s, context.set.notable, f_string_eol_s); + fl_print_format(" This is done to help ensure consistency for scripting.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" For parameters like %[%s%s%],", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_depth_s, context.set.notable); - fl_print_format(" if the standard doesn't support nested Content, then only a depth of 0 would be valid.%c", file.stream, f_string_eol_s[0]); + fl_print_format(" For parameters like %[%q%s%],", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_depth_s, context.set.notable); + fl_print_format(" if the standard doesn't support nested Content, then only a depth of 0 would be valid.%q", file.stream, f_string_eol_s); - fl_print_format(" For parameters like %[%s%s%],", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_select_s, context.set.notable); - fl_print_format(" if the standard doesn't support multiple Content groups, then only a select of 0 would be valid.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" For parameters like %[%q%s%],", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_select_s, context.set.notable); + fl_print_format(" if the standard doesn't support multiple Content groups, then only a select of 0 would be valid.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" The parameter %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_trim_s, context.set.notable); - fl_print_format(" will remove leading and trailing whitespaces when selecting objects or when printing objects.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The parameter %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_trim_s, context.set.notable); + fl_print_format(" will remove leading and trailing whitespaces when selecting objects or when printing objects.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" When specifying both the %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_object_s, context.set.notable); - fl_print_format(" parameter and the %[%s%s%] parameter, the entire Object and Content are printed, including the formatting.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_content_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" Both the Object and Content printed are already escaped.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" Both the Object and Content are separated by a space.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" When specifying both the %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_object_s, context.set.notable); + fl_print_format(" parameter and the %[%q%s%] parameter, the entire Object and Content are printed, including the formatting.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_content_s, context.set.notable, f_string_eol_s); + fl_print_format(" Both the Object and Content printed are already escaped.%q", file.stream, f_string_eol_s); + fl_print_format(" Both the Object and Content are separated by a space.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" The parameter %[%s%s%] accepts the following:%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_delimit_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" - %[%s%]: Do not apply delimits.%c", file.stream, context.set.notable, fss_basic_read_delimit_mode_name_none_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" - %[%s%]: (default) Apply all delimits.%c", file.stream, context.set.notable, fss_basic_read_delimit_mode_name_all_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" - %[%s%]: Apply delimits for Objects.%c", file.stream, context.set.notable, fss_basic_read_delimit_mode_name_object_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" - A number, 0 or greater: apply delimits for Content at the specified depth.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" - A number, 0 or greater, followed by a %[%s%]: (such as '1+') apply delimits for Content at the specified depth and any greater depth (numerically).%c", file.stream, context.set.notable, fss_basic_read_delimit_mode_name_greater_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); - fl_print_format(" - A number, 0 or lesser, followed by a %[%s%]: (such as '1-') apply delimits for Content at the specified depth and any lesser depth (numerically).%c%c", file.stream, context.set.notable, fss_basic_read_delimit_mode_name_lesser_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The parameter %[%q%s%] accepts the following:%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_delimit_s, context.set.notable, f_string_eol_s); + fl_print_format(" - %[%s%]: Do not apply delimits.%q", file.stream, context.set.notable, fss_basic_read_delimit_mode_name_none_s, context.set.notable, f_string_eol_s); + fl_print_format(" - %[%s%]: (default) Apply all delimits.%q", file.stream, context.set.notable, fss_basic_read_delimit_mode_name_all_s, context.set.notable, f_string_eol_s); + fl_print_format(" - %[%s%]: Apply delimits for Objects.%q", file.stream, context.set.notable, fss_basic_read_delimit_mode_name_object_s, context.set.notable, f_string_eol_s); + fl_print_format(" - A number, 0 or greater: apply delimits for Content at the specified depth.%q", file.stream, f_string_eol_s); + fl_print_format(" - A number, 0 or greater, followed by a %[%s%]: (such as '1+') apply delimits for Content at the specified depth and any greater depth (numerically).%q", file.stream, context.set.notable, fss_basic_read_delimit_mode_name_greater_s, context.set.notable, f_string_eol_s, f_string_eol_s); + fl_print_format(" - A number, 0 or lesser, followed by a %[%s%]: (such as '1-') apply delimits for Content at the specified depth and any lesser depth (numerically).%q%q", file.stream, context.set.notable, fss_basic_read_delimit_mode_name_lesser_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" The %[%s%s%] parameter may be specified multiple times to customize the delimit behavior.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_delimit_s, context.set.notable, f_string_eol_s[0]); + fl_print_format(" The %[%q%s%] parameter may be specified multiple times to customize the delimit behavior.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_delimit_s, context.set.notable, f_string_eol_s); - fl_print_format(" The %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_delimit_s, context.set.notable); + fl_print_format(" The %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_delimit_s, context.set.notable); fl_print_format(" values %[%s%]", file.stream, context.set.notable, fss_basic_read_delimit_mode_name_none_s, context.set.notable); fl_print_format(" and %[%s%],", file.stream, context.set.notable, fss_basic_read_delimit_mode_name_all_s, context.set.notable); - fl_print_format(" overrule all other delimit values.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" overrule all other delimit values.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" The parameters %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_columns_s, context.set.notable); - fl_print_format(" and %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_select_s, context.set.notable); - fl_print_format(" refer to a Content column.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" The word \"column\" is being loosely defined to refer to a specific Content.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" This is not to be confused with a depth.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The parameters %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_columns_s, context.set.notable); + fl_print_format(" and %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_read_long_select_s, context.set.notable); + fl_print_format(" refer to a Content column.%q", file.stream, f_string_eol_s); + fl_print_format(" The word \"column\" is being loosely defined to refer to a specific Content.%q", file.stream, f_string_eol_s); + fl_print_format(" This is not to be confused with a depth.%q%q", file.stream, f_string_eol_s, f_string_eol_s); funlockfile(file.stream); @@ -262,9 +262,9 @@ extern "C" { if (main->parameters[parameter_code[i]].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, parameter_name[i], main->error.notable); - fl_print_format("%[' requires a %s.%]%c", main->error.to.stream, main->error.context, parameter_message[i], main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, parameter_name[i], main->error.notable); + fl_print_format("%[' requires a %s.%]%q", main->error.to.stream, main->error.context, parameter_message[i], main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -305,11 +305,11 @@ extern "C" { if (main->parameters[parameter_code[i]].result == parameter_match[i]) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_read_long_columns_s, main->error.notable); + fl_print_format("%q%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_read_long_columns_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, parameter_name[i], main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, parameter_name[i], main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -324,11 +324,11 @@ extern "C" { if (main->parameters[fss_basic_read_parameter_total_e].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_read_long_pipe_s, main->error.notable); + fl_print_format("%q%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_read_long_pipe_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_read_long_total_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_read_long_total_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -337,11 +337,11 @@ extern "C" { else if (main->parameters[fss_basic_read_parameter_line_e].result == f_console_result_additional_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_read_long_pipe_s, main->error.notable); + fl_print_format("%q%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_read_long_pipe_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_read_long_line_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_read_long_line_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -370,9 +370,9 @@ extern "C" { if (!length) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_read_long_delimit_s, main->error.notable); - fl_print_format("%[' must not be empty.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_read_long_delimit_s, main->error.notable); + fl_print_format("%[' must not be empty.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -423,7 +423,7 @@ extern "C" { data.delimit_mode = fss_basic_read_delimit_mode_content_object_e; } - if (arguments->argv[location][length - 1] == fss_basic_read_delimit_mode_name_greater_s[0]) { + if (arguments->argv[location][length - 1] == fss_basic_read_delimit_mode_name_greater_s.string[0]) { if (!(data.delimit_mode == fss_basic_read_delimit_mode_none_e || data.delimit_mode == fss_basic_read_delimit_mode_all_e)) { if (data.delimit_mode == fss_basic_read_delimit_mode_content_object_e) { data.delimit_mode = fss_basic_read_delimit_mode_content_greater_object_e; @@ -436,7 +436,7 @@ extern "C" { // Shorten the length to better convert the remainder to a number. --length; } - else if (arguments->argv[location][length - 1] == fss_basic_read_delimit_mode_name_lesser_s[0]) { + else if (arguments->argv[location][length - 1] == fss_basic_read_delimit_mode_name_lesser_s.string[0]) { if (!(data.delimit_mode == fss_basic_read_delimit_mode_none_e || data.delimit_mode == fss_basic_read_delimit_mode_all_e)) { if (data.delimit_mode == fss_basic_read_delimit_mode_content_object_e) { data.delimit_mode = fss_basic_read_delimit_mode_content_lesser_object_e; @@ -504,9 +504,9 @@ extern "C" { if (F_status_is_error_not(status) && main->parameters[fss_basic_read_parameter_select_e].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_read_long_select_s, main->error.notable); - fl_print_format("%[' parameter requires a positive number.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_read_long_select_s, main->error.notable); + fl_print_format("%[' parameter requires a positive number.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -629,7 +629,7 @@ extern "C" { fss_basic_read_data_delete_simple(&data); } else { - fll_print_format("%c%[%sYou failed to specify one or more files.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sYou failed to specify one or more files.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context, f_string_eol_s); status = F_status_set_error(F_parameter); } @@ -637,7 +637,7 @@ extern "C" { if (F_status_set_fine(status) == F_interrupt) { fflush(main->output.to.stream); - fll_print_terminated(f_string_eol_s, main->output.to.stream); + fll_print_dynamic(f_string_eol_s, main->output.to.stream); } } 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 af54f8b..25afb88 100644 --- a/level_3/fss_basic_read/c/fss_basic_read.h +++ b/level_3/fss_basic_read/c/fss_basic_read.h @@ -138,15 +138,15 @@ extern "C" { #define fss_basic_read_console_parameter_t_initialize \ { \ - macro_f_console_parameter_t_initialize(f_console_standard_short_help_s, f_console_standard_long_help_s, 0, 0, f_console_type_normal_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_light_s, f_console_standard_long_light_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s, f_console_standard_long_dark_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s, f_console_standard_long_normal_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s, f_console_standard_long_debug_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_version_s, f_console_standard_long_version_s, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, 0, 0, f_console_type_normal_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, 0, 0, f_console_type_inverse_e), \ macro_f_console_parameter_t_initialize(fss_basic_read_short_at_s, fss_basic_read_long_at_s, 0, 1, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(fss_basic_read_short_content_s, fss_basic_read_long_content_s, 0, 0, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(fss_basic_read_short_columns_s, fss_basic_read_long_columns_s, 0, 0, f_console_type_normal_e), \ diff --git a/level_3/fss_basic_read/c/private-common.c b/level_3/fss_basic_read/c/private-common.c index 54fe016..7ba14e9 100644 --- a/level_3/fss_basic_read/c/private-common.c +++ b/level_3/fss_basic_read/c/private-common.c @@ -66,9 +66,9 @@ extern "C" { flockfile(main->warning.to.stream); - fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s[0], f_string_eol_s[0], main->context.set.warning, main->context.set.warning); + fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s, f_string_eol_s, main->context.set.warning, main->context.set.warning); fl_print_format("%[%i%]", main->warning.to.stream, main->context.set.notable, signal, main->context.set.notable); - fl_print_format("%[.%]%c", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s[0]); + fl_print_format("%[.%]%q", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s); funlockfile(main->warning.to.stream); } diff --git a/level_3/fss_basic_read/c/private-print.c b/level_3/fss_basic_read/c/private-print.c index 1916e1d..a42a4db 100644 --- a/level_3/fss_basic_read/c/private-print.c +++ b/level_3/fss_basic_read/c/private-print.c @@ -20,13 +20,13 @@ extern "C" { if (data->option & fss_basic_read_data_option_trim_d) { if (data->option & fss_basic_read_data_option_raw_d) { if (data->quotes.array[at]) { - f_print_character_safely(data->quotes.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s[0] : f_fss_quote_double_s[0], main->output.to.stream); + f_print_character_safely(data->quotes.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream); } fl_print_trim_dynamic_partial(data->buffer, data->objects.array[at], main->output.to.stream); if (data->quotes.array[at]) { - f_print_character_safely(data->quotes.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s[0] : f_fss_quote_double_s[0], main->output.to.stream); + f_print_character_safely(data->quotes.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream); } } else { @@ -36,13 +36,13 @@ extern "C" { else { if (data->option & fss_basic_read_data_option_raw_d) { if (data->quotes.array[at]) { - f_print_character_safely(data->quotes.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s[0] : f_fss_quote_double_s[0], main->output.to.stream); + f_print_character_safely(data->quotes.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream); } f_print_dynamic_partial(data->buffer, data->objects.array[at], main->output.to.stream); if (data->quotes.array[at]) { - f_print_character_safely(data->quotes.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s[0] : f_fss_quote_double_s[0], main->output.to.stream); + f_print_character_safely(data->quotes.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream); } } else { @@ -78,7 +78,7 @@ extern "C" { f_print_character(fss_basic_read_pipe_content_start_s, main->output.to.stream); } else { - f_print_character(F_fss_space_s[0], main->output.to.stream); + f_print_character(f_fss_space_s.string[0], main->output.to.stream); } } #endif // _di_fss_basic_read_print_object_end_ @@ -86,8 +86,8 @@ extern "C" { #ifndef _di_fss_basic_read_print_one_ void fss_basic_read_print_one(fss_basic_read_main_t * const main) { - f_print_character(f_string_ascii_1_s[0], main->output.to.stream); - f_print_character(f_string_eol_s[0], main->output.to.stream); + f_print_character(f_string_ascii_1_s.string[0], main->output.to.stream); + f_print_dynamic(f_string_eol_s, main->output.to.stream); } #endif // _di_fss_basic_read_print_one_ @@ -98,7 +98,7 @@ extern "C" { f_print_character(fss_basic_read_pipe_content_end_s, main->output.to.stream); } else { - f_print_character(f_string_eol_s[0], main->output.to.stream); + f_print_dynamic(f_string_eol_s, main->output.to.stream); } } #endif // _di_fss_basic_read_print_set_end_ @@ -106,8 +106,8 @@ extern "C" { #ifndef _di_fss_basic_read_print_zero_ void fss_basic_read_print_zero(fss_basic_read_main_t * const main) { - f_print_character(f_string_ascii_0_s[0], main->output.to.stream); - f_print_character(f_string_eol_s[0], main->output.to.stream); + f_print_character(f_string_ascii_0_s.string[0], main->output.to.stream); + f_print_dynamic(f_string_eol_s, main->output.to.stream); } #endif // _di_fss_basic_read_print_zero_ diff --git a/level_3/fss_basic_read/c/private-read.c b/level_3/fss_basic_read/c/private-read.c index 9e20132..7ced122 100644 --- a/level_3/fss_basic_read/c/private-read.c +++ b/level_3/fss_basic_read/c/private-read.c @@ -157,11 +157,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe value '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%sThe value '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%ul%]", main->error.to.stream, main->error.notable, data->depths.array[i].depth, main->error.notable); fl_print_format("%[' may only be specified once for the parameter '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_read_long_depth_s, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_read_long_depth_s, main->error.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -173,13 +173,13 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_read_long_depth_s, main->error.notable); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_read_long_depth_s, main->error.notable); fl_print_format("%[' may not have the value '%]", main->error.to.stream, main->error.context, main->error.context); fl_print_format("%[%ul%]", main->error.to.stream, main->error.notable, data->depths.array[i].depth, main->error.notable); fl_print_format("%[' before the value '%]", main->error.to.stream, main->error.context, main->error.context); fl_print_format("%[%ul%]", main->error.to.stream, main->error.notable, data->depths.array[j].depth, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -385,7 +385,7 @@ extern "C" { } } else if (data->option & fss_basic_read_data_option_columns_d) { - fll_print_format("%ul%c", main->output.to.stream, data->contents.array[i].used, f_string_eol_s[0]); + fll_print_format("%ul%q", main->output.to.stream, data->contents.array[i].used, f_string_eol_s); } else if (data->option & fss_basic_read_data_option_total_d) { flockfile(main->output.to.stream); @@ -449,7 +449,7 @@ extern "C" { } } // for - fll_print_format("%ul%c", main->output.to.stream, max, f_string_eol_s[0]); + fll_print_format("%ul%q", main->output.to.stream, max, f_string_eol_s); return F_none; } @@ -636,7 +636,7 @@ extern "C" { } } else { - fl_print_format("%ul%c", main->output.to.stream, total, f_string_eol_s[0]); + fl_print_format("%ul%q", main->output.to.stream, total, f_string_eol_s); } funlockfile(main->output.to.stream); diff --git a/level_3/fss_basic_write/c/fss_basic_write.c b/level_3/fss_basic_write/c/fss_basic_write.c index 298af88..a58a4f8 100644 --- a/level_3/fss_basic_write/c/fss_basic_write.c +++ b/level_3/fss_basic_write/c/fss_basic_write.c @@ -13,42 +13,42 @@ extern "C" { fll_program_print_help_header(file, context, fss_basic_write_program_name_long_s, fss_basic_write_program_version_s); - fll_program_print_help_option(file, context, f_console_standard_short_help_s, f_console_standard_long_help_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print this help message."); - fll_program_print_help_option(file, context, f_console_standard_short_dark_s, f_console_standard_long_dark_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_light_s, f_console_standard_long_light_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, "Do not file in color."); - fll_program_print_help_option(file, context, f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Decrease verbosity, silencing most output."); - fll_program_print_help_option(file, context, f_console_standard_short_normal_s, f_console_standard_long_normal_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Set verbosity to normal file."); - fll_program_print_help_option(file, context, f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Increase verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_debug_s, f_console_standard_long_debug_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Enable debugging, significantly increasing verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_version_s, f_console_standard_long_version_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Print only the version number."); - - f_print_character(f_string_eol_s[0], file.stream); - - fll_program_print_help_option(file, context, fss_basic_write_short_file_s, fss_basic_write_long_file_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Specify a file to send data to."); - fll_program_print_help_option(file, context, fss_basic_write_short_content_s, fss_basic_write_long_content_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "The Content to file."); - fll_program_print_help_option(file, context, fss_basic_write_short_double_s, fss_basic_write_long_double_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Use double quotes (default)."); - fll_program_print_help_option(file, context, fss_basic_write_short_ignore_s, fss_basic_write_long_ignore_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Ignore a given range within a Content."); - fll_program_print_help_option(file, context, fss_basic_write_short_object_s, fss_basic_write_long_object_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " The Object to file."); - fll_program_print_help_option(file, context, fss_basic_write_short_partial_s, fss_basic_write_long_partial_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Do not file end of Object/Content character."); - fll_program_print_help_option(file, context, fss_basic_write_short_prepend_s, fss_basic_write_long_prepend_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Prepend the given whitespace characters to the start of each multi-line Content."); - fll_program_print_help_option(file, context, fss_basic_write_short_single_s, fss_basic_write_long_single_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Use single quotes."); - fll_program_print_help_option(file, context, fss_basic_write_short_trim_s, fss_basic_write_long_trim_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Trim Object names."); + fll_program_print_help_option(file, context, f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print this help message."); + fll_program_print_help_option(file, context, f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, "Do not file in color."); + fll_program_print_help_option(file, context, f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Decrease verbosity, silencing most output."); + fll_program_print_help_option(file, context, f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Set verbosity to normal file."); + fll_program_print_help_option(file, context, f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Increase verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Enable debugging, significantly increasing verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Print only the version number."); + + f_print_dynamic(f_string_eol_s, file.stream); + + fll_program_print_help_option(file, context, fss_basic_write_short_file_s, fss_basic_write_long_file_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Specify a file to send data to."); + fll_program_print_help_option(file, context, fss_basic_write_short_content_s, fss_basic_write_long_content_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "The Content to file."); + fll_program_print_help_option(file, context, fss_basic_write_short_double_s, fss_basic_write_long_double_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Use double quotes (default)."); + fll_program_print_help_option(file, context, fss_basic_write_short_ignore_s, fss_basic_write_long_ignore_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Ignore a given range within a Content."); + fll_program_print_help_option(file, context, fss_basic_write_short_object_s, fss_basic_write_long_object_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " The Object to file."); + fll_program_print_help_option(file, context, fss_basic_write_short_partial_s, fss_basic_write_long_partial_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "Do not file end of Object/Content character."); + fll_program_print_help_option(file, context, fss_basic_write_short_prepend_s, fss_basic_write_long_prepend_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "Prepend the given whitespace characters to the start of each multi-line Content."); + fll_program_print_help_option(file, context, fss_basic_write_short_single_s, fss_basic_write_long_single_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Use single quotes."); + fll_program_print_help_option(file, context, fss_basic_write_short_trim_s, fss_basic_write_long_trim_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Trim Object names."); fll_program_print_help_usage(file, context, fss_basic_write_program_name_s, f_string_empty_s); - fl_print_format(" The pipe uses the Backspace character '%[\\b%]' (%[U+0008%]) to designate the start of a Content.%c", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s[0]); - fl_print_format(" The pipe uses the Form Feed character '%[\\f%]' (%[U+000C%]) to designate the end of the last Content.%c", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s[0]); - fl_print_format(" The pipe uses the Vertical Line character '%[\\v%]' (%[U+000B%]) is used to ignore a Content range, which does nothing in this program.%c", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s[0]); + fl_print_format(" The pipe uses the Backspace character '%[\\b%]' (%[U+0008%]) to designate the start of a Content.%q", file.stream, context.set.notable, context.set.notable, context.set.notable, context.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.%q", file.stream, context.set.notable, context.set.notable, context.set.notable, context.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, which does nothing in this program.%q", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s); fl_print_format(" For the pipe, an Object is terminated by either a Backspace character '%[\\b%]' (%[U+0008%])", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable); - fl_print_format(" or a Form Feed character '%[\\f%]' (%[U+000C%]).%c", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s[0]); - fl_print_format(" The end of the pipe represents the end of any Object or Content.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" or a Form Feed character '%[\\f%]' (%[U+000C%]).%q", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s); + fl_print_format(" The end of the pipe represents the end of any Object or Content.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" The FSS-0000 (Basic) specification does not support multi-line Content, therefore the parameter '%[%s%s%]'", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_write_long_prepend_s, context.set.notable); - fl_print_format(" does nothing.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The FSS-0000 (Basic) specification does not support multi-line Content, therefore the parameter '%[%q%s%]'", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_write_long_prepend_s, context.set.notable); + fl_print_format(" does nothing.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" This program does not use the parameter '%[%s%s%]', which therefore does nothing.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_write_long_ignore_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" This parameter requires two values.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" This program does not use the parameter '%[%q%s%]', which therefore does nothing.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_write_long_ignore_s, context.set.notable, f_string_eol_s); + fl_print_format(" This parameter requires two values.%q%q", file.stream, f_string_eol_s, f_string_eol_s); funlockfile(file.stream); @@ -164,9 +164,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_file_s, main->error.notable); - fl_print_format("%[' may only be specified once.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_file_s, main->error.notable); + fl_print_format("%[' may only be specified once.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -186,7 +186,7 @@ extern "C" { } } else if (main->parameters[fss_basic_write_parameter_file_e].result == f_console_result_found_e) { - fss_basic_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s, fss_basic_write_long_file_s); + fss_basic_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s.string, fss_basic_write_long_file_s); status = F_status_set_error(F_parameter); } } @@ -195,11 +195,11 @@ extern "C" { if (main->parameters[fss_basic_write_parameter_object_e].locations.used || main->parameters[fss_basic_write_parameter_content_e].locations.used) { if (main->parameters[fss_basic_write_parameter_object_e].locations.used) { if (main->parameters[fss_basic_write_parameter_object_e].locations.used != main->parameters[fss_basic_write_parameter_object_e].values.used) { - fss_basic_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s, fss_basic_write_long_object_s); + fss_basic_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s.string, fss_basic_write_long_object_s); status = F_status_set_error(F_parameter); } else if (main->parameters[fss_basic_write_parameter_content_e].locations.used != main->parameters[fss_basic_write_parameter_content_e].values.used) { - fss_basic_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s, fss_basic_write_long_content_s); + fss_basic_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s.string, fss_basic_write_long_content_s); status = F_status_set_error(F_parameter); } else if (main->parameters[fss_basic_write_parameter_object_e].locations.used != main->parameters[fss_basic_write_parameter_content_e].locations.used && main->parameters[fss_basic_write_parameter_partial_e].result == f_console_result_none_e) { @@ -211,13 +211,13 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_partial_s, main->error.notable); + fl_print_format("%q%[%sThe '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_partial_s, main->error.notable); fl_print_format("%[' parameter only allows either the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_object_s, main->error.notable); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_object_s, main->error.notable); fl_print_format("%[' parameter or the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_content_s, main->error.notable); - fl_print_format("%[' parameter, but not both.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_content_s, main->error.notable); + fl_print_format("%[' parameter, but not both.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -243,11 +243,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sEach '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_object_s, main->error.notable); + fl_print_format("%q%[%sEach '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_object_s, main->error.notable); fl_print_format("%[' parameter must be specified before a '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_content_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_content_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -262,7 +262,7 @@ extern "C" { } else if (main->parameters[fss_basic_write_parameter_content_e].locations.used) { if (main->parameters[fss_basic_write_parameter_content_e].locations.used != main->parameters[fss_basic_write_parameter_content_e].values.used) { - fss_basic_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s, fss_basic_write_long_content_s); + fss_basic_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s.string, fss_basic_write_long_content_s); status = F_status_set_error(F_parameter); } else if (!main->parameters[fss_basic_write_parameter_partial_e].locations.used) { @@ -275,11 +275,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThis requires either piped data or the use of the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_object_s, main->error.notable); + fl_print_format("%q%[%sThis requires either piped data or the use of the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_object_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_content_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_content_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -292,9 +292,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThis '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_partial_s, main->error.notable); - fl_print_format("%[' parameter cannot be used when processing a pipe.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThis '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_partial_s, main->error.notable); + fl_print_format("%[' parameter cannot be used when processing a pipe.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -309,9 +309,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_prepend_s, main->error.notable); - fl_print_format("%[' is specified, but no value is given.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_prepend_s, main->error.notable); + fl_print_format("%[' is specified, but no value is given.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -336,9 +336,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_prepend_s, main->error.notable); - fl_print_format("%[' must only contain whitespace.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_prepend_s, main->error.notable); + fl_print_format("%[' must only contain whitespace.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -353,9 +353,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_prepend_s, main->error.notable); - fl_print_format("%[' must not be an empty string.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' must not be an empty string.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -370,9 +370,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_ignore_s, main->error.notable); - fl_print_format("%[' was specified, but no values were given.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_ignore_s, main->error.notable); + fl_print_format("%[' was specified, but no values were given.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -386,9 +386,9 @@ extern "C" { if (total_locations * 2 > total_arguments) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_ignore_s, main->error.notable); - fl_print_format("%[' requires two values.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_ignore_s, main->error.notable); + fl_print_format("%[' requires two values.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -426,8 +426,8 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sWhile processing the '%]%[input pipe%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context, main->error.notable, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sWhile processing the '%]%[input pipe%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context, main->error.notable, main->error.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -500,8 +500,8 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sWhile processing the '%]%[input arguments%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context, main->error.notable, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sWhile processing the '%]%[input arguments%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context, main->error.notable, main->error.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -509,7 +509,7 @@ extern "C" { else if (main->error.verbosity != f_console_verbosity_quiet_e && main->parameters[fss_basic_write_parameter_file_e].result == f_console_result_none_e) { // Ensure there is always a newline at the end, unless in quiet mode. - fll_print_character(f_string_eol_s[0], main->output.to.stream); + fll_print_dynamic(f_string_eol_s, main->output.to.stream); } } @@ -534,7 +534,7 @@ extern "C" { // Ensure a newline is always put at the end of the program execution, unless in quiet mode. if (main->error.verbosity != f_console_verbosity_quiet_e) { if (F_status_is_error(status)) { - fll_print_character(f_string_eol_s[0], main->error.to.stream); + fll_print_dynamic(f_string_eol_s, main->error.to.stream); } } 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 d0c57a0..a17d328 100644 --- a/level_3/fss_basic_write/c/fss_basic_write.h +++ b/level_3/fss_basic_write/c/fss_basic_write.h @@ -116,15 +116,15 @@ extern "C" { #define fss_basic_write_console_parameter_t_initialize \ { \ - macro_f_console_parameter_t_initialize(f_console_standard_short_help_s, f_console_standard_long_help_s, 0, 0, f_console_type_normal_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_light_s, f_console_standard_long_light_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s, f_console_standard_long_dark_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s, f_console_standard_long_normal_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s, f_console_standard_long_debug_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_version_s, f_console_standard_long_version_s, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, 0, 0, f_console_type_normal_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, 0, 0, f_console_type_inverse_e), \ macro_f_console_parameter_t_initialize(fss_basic_write_short_file_s, fss_basic_write_long_file_s, 0, 1, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(fss_basic_write_short_content_s, fss_basic_write_long_content_s, 0, 1, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(fss_basic_write_short_double_s, fss_basic_write_long_double_s, 0, 0, f_console_type_normal_e), \ diff --git a/level_3/fss_basic_write/c/private-common.c b/level_3/fss_basic_write/c/private-common.c index 421d460..33c5829 100644 --- a/level_3/fss_basic_write/c/private-common.c +++ b/level_3/fss_basic_write/c/private-common.c @@ -15,9 +15,9 @@ extern "C" { flockfile(main->warning.to.stream); - fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s[0], f_string_eol_s[0], main->context.set.warning, main->context.set.warning); + fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s, f_string_eol_s, main->context.set.warning, main->context.set.warning); fl_print_format("%[%i%]", main->warning.to.stream, main->context.set.notable, signal, main->context.set.notable); - fl_print_format("%[.%]%c", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s[0]); + fl_print_format("%[.%]%q", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s); funlockfile(main->warning.to.stream); } diff --git a/level_3/fss_basic_write/c/private-write.c b/level_3/fss_basic_write/c/private-write.c index 077f4c5..582ba1e 100644 --- a/level_3/fss_basic_write/c/private-write.c +++ b/level_3/fss_basic_write/c/private-write.c @@ -15,13 +15,13 @@ extern "C" { flockfile(main->error.to.stream); - fl_print_format("%c%[%sMust specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_object_s, main->error.notable); + fl_print_format("%q%[%sMust specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_object_s, main->error.notable); fl_print_format("%[' parameter and the '%]", main->error.to.stream, main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_content_s, main->error.notable); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_content_s, main->error.notable); fl_print_format("%[' parameter the same number of times when not specifying the '%]", main->error.to.stream, main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_partial_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_basic_write_long_partial_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -36,9 +36,9 @@ extern "C" { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%S%S%]", main->error.to.stream, main->error.notable, symbol, parameter, main->error.notable); - fl_print_format("%[' is specified, but no value is given.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' is specified, but no value is given.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -53,9 +53,9 @@ extern "C" { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThis standard does not support end of line character '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%sThis standard does not support end of line character '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[\\n%]", main->error.to.stream, main->error.notable, main->error.notable); - fl_print_format("%[' in objects.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' in objects.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -269,7 +269,7 @@ extern "C" { if (block.string[range.start] == fss_basic_write_pipe_content_start_s) { if (main->error.verbosity != f_console_verbosity_quiet_e) { - fll_print_format("%c%[%sThis standard only supports one content per object.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sThis standard only supports one content per object.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context, f_string_eol_s); } status = F_status_set_error(F_supported_not); diff --git a/level_3/fss_embedded_list_read/c/fss_embedded_list_read.c b/level_3/fss_embedded_list_read/c/fss_embedded_list_read.c index 04142a2..d586353 100644 --- a/level_3/fss_embedded_list_read/c/fss_embedded_list_read.c +++ b/level_3/fss_embedded_list_read/c/fss_embedded_list_read.c @@ -14,103 +14,103 @@ extern "C" { fll_program_print_help_header(file, context, fss_embedded_list_read_program_name_long_s, fss_embedded_list_read_program_version_s); - fll_program_print_help_option(file, context, f_console_standard_short_help_s, f_console_standard_long_help_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print this help message."); - fll_program_print_help_option(file, context, f_console_standard_short_dark_s, f_console_standard_long_dark_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_light_s, f_console_standard_long_light_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, "Do not file in color."); - fll_program_print_help_option(file, context, f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Decrease verbosity, silencing most output."); - fll_program_print_help_option(file, context, f_console_standard_short_normal_s, f_console_standard_long_normal_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Set verbosity to normal file."); - fll_program_print_help_option(file, context, f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Increase verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_debug_s, f_console_standard_long_debug_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Enable debugging, significantly increasing verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_version_s, f_console_standard_long_version_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Print only the version number."); - - f_print_character(f_string_eol_s[0], file.stream); - - fll_program_print_help_option(file, context, fss_embedded_list_read_short_at_s, fss_embedded_list_read_long_at_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Select Object at this numeric index."); - fll_program_print_help_option(file, context, fss_embedded_list_read_short_content_s, fss_embedded_list_read_long_content_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print the Content (default)."); - fll_program_print_help_option(file, context, fss_embedded_list_read_short_columns_s, fss_embedded_list_read_long_columns_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print the total number of columns."); - fll_program_print_help_option(file, context, fss_embedded_list_read_short_delimit_s, fss_embedded_list_read_long_delimit_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Designate how to handle applying delimits."); - fll_program_print_help_option(file, context, fss_embedded_list_read_short_depth_s, fss_embedded_list_read_long_depth_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Select Object at this numeric depth."); - fll_program_print_help_option(file, context, fss_embedded_list_read_short_empty_s, fss_embedded_list_read_long_empty_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Include empty Content when processing."); - fll_program_print_help_option(file, context, fss_embedded_list_read_short_line_s, fss_embedded_list_read_long_line_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print only the Content at the given line."); - fll_program_print_help_option(file, context, fss_embedded_list_read_short_name_s, fss_embedded_list_read_long_name_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Select Object with this name."); - fll_program_print_help_option(file, context, fss_embedded_list_read_short_object_s, fss_embedded_list_read_long_object_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print the Object."); - fll_program_print_help_option(file, context, fss_embedded_list_read_short_pipe_s, fss_embedded_list_read_long_pipe_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print using the special pipe format."); - fll_program_print_help_option(file, context, fss_embedded_list_read_short_raw_s, fss_embedded_list_read_long_raw_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print with the original quotes and escapes."); - fll_program_print_help_option(file, context, fss_embedded_list_read_short_select_s, fss_embedded_list_read_long_select_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Select sub-Content at this index."); - fll_program_print_help_option(file, context, fss_embedded_list_read_short_total_s, fss_embedded_list_read_long_total_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print the total number of lines."); - fll_program_print_help_option(file, context, fss_embedded_list_read_short_trim_s, fss_embedded_list_read_long_trim_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Trim Object names on select or print."); + fll_program_print_help_option(file, context, f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print this help message."); + fll_program_print_help_option(file, context, f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, "Do not file in color."); + fll_program_print_help_option(file, context, f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Decrease verbosity, silencing most output."); + fll_program_print_help_option(file, context, f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Set verbosity to normal file."); + fll_program_print_help_option(file, context, f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Increase verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Enable debugging, significantly increasing verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Print only the version number."); + + f_print_dynamic(f_string_eol_s, file.stream); + + fll_program_print_help_option(file, context, fss_embedded_list_read_short_at_s, fss_embedded_list_read_long_at_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Select Object at this numeric index."); + fll_program_print_help_option(file, context, fss_embedded_list_read_short_content_s, fss_embedded_list_read_long_content_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print the Content (default)."); + fll_program_print_help_option(file, context, fss_embedded_list_read_short_columns_s, fss_embedded_list_read_long_columns_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print the total number of columns."); + fll_program_print_help_option(file, context, fss_embedded_list_read_short_delimit_s, fss_embedded_list_read_long_delimit_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Designate how to handle applying delimits."); + fll_program_print_help_option(file, context, fss_embedded_list_read_short_depth_s, fss_embedded_list_read_long_depth_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Select Object at this numeric depth."); + fll_program_print_help_option(file, context, fss_embedded_list_read_short_empty_s, fss_embedded_list_read_long_empty_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Include empty Content when processing."); + fll_program_print_help_option(file, context, fss_embedded_list_read_short_line_s, fss_embedded_list_read_long_line_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print only the Content at the given line."); + fll_program_print_help_option(file, context, fss_embedded_list_read_short_name_s, fss_embedded_list_read_long_name_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Select Object with this name."); + fll_program_print_help_option(file, context, fss_embedded_list_read_short_object_s, fss_embedded_list_read_long_object_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print the Object."); + fll_program_print_help_option(file, context, fss_embedded_list_read_short_pipe_s, fss_embedded_list_read_long_pipe_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print using the special pipe format."); + fll_program_print_help_option(file, context, fss_embedded_list_read_short_raw_s, fss_embedded_list_read_long_raw_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print with the original quotes and escapes."); + fll_program_print_help_option(file, context, fss_embedded_list_read_short_select_s, fss_embedded_list_read_long_select_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Select sub-Content at this index."); + fll_program_print_help_option(file, context, fss_embedded_list_read_short_total_s, fss_embedded_list_read_long_total_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print the total number of lines."); + fll_program_print_help_option(file, context, fss_embedded_list_read_short_trim_s, fss_embedded_list_read_long_trim_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Trim Object names on select or print."); fll_program_print_help_usage(file, context, fss_embedded_list_read_program_name_s, "filename(s)"); - fl_print_format(" %[Notes:%]%c", file.stream, context.set.important, context.set.important, f_string_eol_s[0]); + fl_print_format(" %[Notes:%]%q", file.stream, context.set.important, context.set.important, f_string_eol_s); - fl_print_format(" This program will print the Content associated with the given Object and Content main based on the FSS-0008 Embedded List standard.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" This program will print the Content associated with the given Object and Content main based on the FSS-0008 Embedded List standard.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" All numeric positions (indexes) start at 0 instead of 1.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" For example, a file of 17 lines would range from 0 to 16.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" All numeric positions (indexes) start at 0 instead of 1.%q", file.stream, f_string_eol_s); + fl_print_format(" For example, a file of 17 lines would range from 0 to 16.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" When using the %[%s%s%] option, an order of operations is enforced on the parameters.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth_s, context.set.notable, f_string_eol_s[0]); + fl_print_format(" When using the %[%q%s%] option, an order of operations is enforced on the parameters.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth_s, context.set.notable, f_string_eol_s); - fl_print_format(" When this order of operations is in effect, parameters to the right of a depth parameter are influenced by that depth parameter:%c", file.stream, f_string_eol_s[0]); + fl_print_format(" When this order of operations is in effect, parameters to the right of a depth parameter are influenced by that depth parameter:%q", file.stream, f_string_eol_s); - fl_print_format(" %[%s%s%]: An Object index at the specified depth.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_at_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" %[%s%s%]: A new depth within the specified depth, indexed from the root.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" %[%s%s%]: An Object name at the specified depth.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_name_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" %[%q%s%]: An Object index at the specified depth.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_at_s, context.set.notable, f_string_eol_s); + fl_print_format(" %[%q%s%]: A new depth within the specified depth, indexed from the root.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth_s, context.set.notable, f_string_eol_s); + fl_print_format(" %[%q%s%]: An Object name at the specified depth.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_name_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" The parameter %[%s%s%] must be in numeric order, but values in between may be skipped.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" ('-d 0 -a 1 -d 2 -a 2' would specify index 1 at depth 0, any index at depth 1, and index 2 at depth 2.)%c", file.stream, f_string_eol_s[0]); - fl_print_format(" ('-d 2 -a 1 -d 0 -a 2' would be invalid because depth 2 is before depth 1.)%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The parameter %[%q%s%] must be in numeric order, but values in between may be skipped.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth_s, context.set.notable, f_string_eol_s); + fl_print_format(" ('-d 0 -a 1 -d 2 -a 2' would specify index 1 at depth 0, any index at depth 1, and index 2 at depth 2.)%q", file.stream, f_string_eol_s); + fl_print_format(" ('-d 2 -a 1 -d 0 -a 2' would be invalid because depth 2 is before depth 1.)%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" The parameter %[%s%s%] selects a Content column.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_select_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The parameter %[%q%s%] selects a Content column.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_select_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" Specify both %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_object_s, context.set.notable); - fl_print_format(" and the %[%s%s%] parameters to get the total objects.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_total_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" Specify both %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_object_s, context.set.notable); + fl_print_format(" and the %[%q%s%] parameters to get the total objects.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_total_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" When both %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_at_s, context.set.notable); - fl_print_format(" and %[%s%s%] parameters are specified (at the same depth),", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_name_s, context.set.notable); - fl_print_format(" the %[%s%s%] parameter value will be treated as a position relative to the specified", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_at_s, context.set.notable); - fl_print_format(" %[%s%s%] parameter value.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_name_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" When both %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_at_s, context.set.notable); + fl_print_format(" and %[%q%s%] parameters are specified (at the same depth),", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_name_s, context.set.notable); + fl_print_format(" the %[%q%s%] parameter value will be treated as a position relative to the specified", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_at_s, context.set.notable); + fl_print_format(" %[%q%s%] parameter value.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_name_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" This program may support parameters, such as %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth_s, context.set.notable); - fl_print_format(" or %[%s%s%], even if not supported by the standard.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_select_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" This is done to help ensure consistency for scripting.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" This program may support parameters, such as %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth_s, context.set.notable); + fl_print_format(" or %[%q%s%], even if not supported by the standard.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_select_s, context.set.notable, f_string_eol_s); + fl_print_format(" This is done to help ensure consistency for scripting.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" For parameters like %[%s%s%],", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth_s, context.set.notable); - fl_print_format(" if the standard doesn't support nested Content, then only a depth of 0 would be valid.%c", file.stream, f_string_eol_s[0]); + fl_print_format(" For parameters like %[%q%s%],", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth_s, context.set.notable); + fl_print_format(" if the standard doesn't support nested Content, then only a depth of 0 would be valid.%q", file.stream, f_string_eol_s); - fl_print_format(" For parameters like %[%s%s%],", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_select_s, context.set.notable); - fl_print_format(" if the standard doesn't support multiple Content groups, then only a select of 0 would be valid.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" For parameters like %[%q%s%],", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_select_s, context.set.notable); + fl_print_format(" if the standard doesn't support multiple Content groups, then only a select of 0 would be valid.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" The parameter %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_trim_s, context.set.notable); - fl_print_format(" will remove leading and trailing whitespaces when selecting objects or when printing objects.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The parameter %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_trim_s, context.set.notable); + fl_print_format(" will remove leading and trailing whitespaces when selecting objects or when printing objects.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" When specifying both the %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_object_s, context.set.notable); - fl_print_format(" parameter and the %[%s%s%] parameter, the entire Object and Content are printed, including the formatting.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_content_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" Both the Object and Content printed are already escaped.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" Both the Object and Content are separated by an EOL.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" When specifying both the %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_object_s, context.set.notable); + fl_print_format(" parameter and the %[%q%s%] parameter, the entire Object and Content are printed, including the formatting.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_content_s, context.set.notable, f_string_eol_s); + fl_print_format(" Both the Object and Content printed are already escaped.%q", file.stream, f_string_eol_s); + fl_print_format(" Both the Object and Content are separated by an EOL.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" The parameter %[%s%s%] accepts the following:%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_delimit_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" - %[%s%]: Do not apply delimits.%c", file.stream, context.set.notable, fss_embedded_list_read_delimit_mode_name_none_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" - %[%s%]: (default) Apply all delimits.%c", file.stream, context.set.notable, fss_embedded_list_read_delimit_mode_name_all_s, context.set.notable, f_string_eol_s[0]); + fl_print_format(" The parameter %[%q%s%] accepts the following:%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_delimit_s, context.set.notable, f_string_eol_s); + fl_print_format(" - %[%s%]: Do not apply delimits.%q", file.stream, context.set.notable, fss_embedded_list_read_delimit_mode_name_none_s, context.set.notable, f_string_eol_s); + fl_print_format(" - %[%s%]: (default) Apply all delimits.%q", file.stream, context.set.notable, fss_embedded_list_read_delimit_mode_name_all_s, context.set.notable, f_string_eol_s); // @todo - //fl_print_format(" - %[%s%]: Apply delimits for Objects.%c", file.stream, context.set.notable, fss_embedded_list_read_delimit_mode_name_object, context.set.notable, f_string_eol_s[0]); - fl_print_format(" - A number, 0 or greater: apply delimits for Content at the specified depth.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" - A number, 0 or greater, followed by a %[%s%]: (such as '1+') apply delimits for Content at the specified depth and any greater depth (numerically).%c", file.stream, context.set.notable, fss_embedded_list_read_delimit_mode_name_greater_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); - fl_print_format(" - A number, 0 or lesser, followed by a %[%s%]: (such as '1-') apply delimits for Content at the specified depth and any lesser depth (numerically).%c%c", file.stream, context.set.notable, fss_embedded_list_read_delimit_mode_name_lesser_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + //fl_print_format(" - %[%s%]: Apply delimits for Objects.%q", file.stream, context.set.notable, fss_embedded_list_read_delimit_mode_name_object, context.set.notable, f_string_eol_s); + fl_print_format(" - A number, 0 or greater: apply delimits for Content at the specified depth.%q", file.stream, f_string_eol_s); + fl_print_format(" - A number, 0 or greater, followed by a %[%s%]: (such as '1+') apply delimits for Content at the specified depth and any greater depth (numerically).%q", file.stream, context.set.notable, fss_embedded_list_read_delimit_mode_name_greater_s, context.set.notable, f_string_eol_s, f_string_eol_s); + fl_print_format(" - A number, 0 or lesser, followed by a %[%s%]: (such as '1-') apply delimits for Content at the specified depth and any lesser depth (numerically).%q%q", file.stream, context.set.notable, fss_embedded_list_read_delimit_mode_name_lesser_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" The %[%s%s%] parameter may be specified multiple times to customize the delimit behavior.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_delimit_s, context.set.notable, f_string_eol_s[0]); + fl_print_format(" The %[%q%s%] parameter may be specified multiple times to customize the delimit behavior.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_delimit_s, context.set.notable, f_string_eol_s); - fl_print_format(" The %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_delimit_s, context.set.notable); + fl_print_format(" The %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_delimit_s, context.set.notable); fl_print_format(" values %[%s%]", file.stream, context.set.notable, fss_embedded_list_read_delimit_mode_name_none_s, context.set.notable); fl_print_format(" and %[%s%],", file.stream, context.set.notable, fss_embedded_list_read_delimit_mode_name_all_s, context.set.notable); - fl_print_format(" overrule all other delimit values.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" overrule all other delimit values.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" The parameters %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_columns_s, context.set.notable); - fl_print_format(" and %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_select_s, context.set.notable); - fl_print_format(" refer to a Content column.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" The word \"column\" is being loosely defined to refer to a specific Content.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" This is not to be confused with a depth.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The parameters %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_columns_s, context.set.notable); + fl_print_format(" and %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_select_s, context.set.notable); + fl_print_format(" refer to a Content column.%q", file.stream, f_string_eol_s); + fl_print_format(" The word \"column\" is being loosely defined to refer to a specific Content.%q", file.stream, f_string_eol_s); + fl_print_format(" This is not to be confused with a depth.%q%q", file.stream, f_string_eol_s, f_string_eol_s); funlockfile(file.stream); @@ -217,11 +217,11 @@ extern "C" { if (main->parameters[fss_embedded_list_read_parameter_columns_e].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_total_s, main->error.notable); + fl_print_format("%q%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_total_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_columns_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_columns_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -233,9 +233,9 @@ extern "C" { if (main->parameters[fss_embedded_list_read_parameter_at_e].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_at_s, main->error.notable); - fl_print_format("%[' requires a positive number.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_at_s, main->error.notable); + fl_print_format("%[' requires a positive number.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -245,9 +245,9 @@ extern "C" { if (F_status_is_error_not(status) && main->parameters[fss_embedded_list_read_parameter_depth_e].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth_s, main->error.notable); - fl_print_format("%[' requires a positive number.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth_s, main->error.notable); + fl_print_format("%[' requires a positive number.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -257,9 +257,9 @@ extern "C" { if (F_status_is_error_not(status) && main->parameters[fss_embedded_list_read_parameter_line_e].result == f_console_result_additional_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_line_s, main->error.notable); - fl_print_format("%[' requires a positive number.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_line_s, main->error.notable); + fl_print_format("%[' requires a positive number.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -269,9 +269,9 @@ extern "C" { if (F_status_is_error_not(status) && main->parameters[fss_embedded_list_read_parameter_name_e].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_name_s, main->error.notable); - fl_print_format("%[' requires a string.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_name_s, main->error.notable); + fl_print_format("%[' requires a string.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -281,9 +281,9 @@ extern "C" { if (F_status_is_error_not(status) && main->parameters[fss_embedded_list_read_parameter_select_e].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_select_s, main->error.notable); - fl_print_format("%[' requires a positive number.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_select_s, main->error.notable); + fl_print_format("%[' requires a positive number.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -294,11 +294,11 @@ extern "C" { if (F_status_is_error_not(status) && main->parameters[fss_embedded_list_read_parameter_total_e].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_line_s, main->error.notable); + fl_print_format("%q%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_line_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_total_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_total_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -310,11 +310,11 @@ extern "C" { if (F_status_is_error_not(status) && main->parameters[fss_embedded_list_read_parameter_total_e].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_pipe_s, main->error.notable); + fl_print_format("%q%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_pipe_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_total_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_total_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -326,9 +326,9 @@ extern "C" { if (main->parameters[fss_embedded_list_read_parameter_delimit_e].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_delimit_s, main->error.notable); - fl_print_format("%[' requires a value.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_delimit_s, main->error.notable); + fl_print_format("%[' requires a value.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -341,9 +341,9 @@ extern "C" { if (length == 0) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_delimit_s, main->error.notable); - fl_print_format("%[' must not be empty.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_delimit_s, main->error.notable); + fl_print_format("%[' must not be empty.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -358,13 +358,13 @@ extern "C" { else { main->delimit_mode = fss_embedded_list_read_delimit_mode_depth_e; - if (arguments->argv[location][length - 1] == fss_embedded_list_read_delimit_mode_name_greater_s[0]) { + if (arguments->argv[location][length - 1] == fss_embedded_list_read_delimit_mode_name_greater_s.string[0]) { main->delimit_mode = fss_embedded_list_read_delimit_mode_depth_greater_e; // shorten the length to better convert the remainder to a number. --length; } - else if (arguments->argv[location][length - 1] == fss_embedded_list_read_delimit_mode_name_lesser_s[0]) { + else if (arguments->argv[location][length - 1] == fss_embedded_list_read_delimit_mode_name_lesser_s.string[0]) { main->delimit_mode = fss_embedded_list_read_delimit_mode_depth_lesser_e; // shorten the length to better convert the remainder to a number. @@ -406,9 +406,9 @@ extern "C" { if (F_status_is_error_not(status) && main->parameters[fss_embedded_list_read_parameter_select_e].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_select_s, main->error.notable); - fl_print_format("%[' parameter requires a positive number.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_select_s, main->error.notable); + fl_print_format("%[' parameter requires a positive number.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -471,7 +471,7 @@ extern "C" { // Skip past empty files. if (!main->quantity.total) { if (main->parameters[fss_embedded_list_read_parameter_total_e].result == f_console_result_found_e) { - fll_print_format("0%c", main->output.to.stream, f_string_eol_s[0]); + fll_print_format("0%q", main->output.to.stream, f_string_eol_s); } f_file_stream_close(F_true, &file); @@ -515,7 +515,7 @@ extern "C" { macro_f_fss_comments_t_delete_simple(comments); } else { - fll_print_format("%c%[%sYou failed to specify one or more files.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sYou failed to specify one or more files.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context, f_string_eol_s); status = F_status_set_error(F_parameter); } @@ -523,7 +523,7 @@ extern "C" { if (F_status_set_fine(status) == F_interrupt) { fflush(main->output.to.stream); - fll_print_terminated(f_string_eol_s, main->output.to.stream); + fll_print_dynamic(f_string_eol_s, main->output.to.stream); } } 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 0731745..1c37af0 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 @@ -138,15 +138,15 @@ extern "C" { #define fss_embedded_list_read_console_parameter_t_initialize \ { \ - macro_f_console_parameter_t_initialize(f_console_standard_short_help_s, f_console_standard_long_help_s, 0, 0, f_console_type_normal_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_light_s, f_console_standard_long_light_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s, f_console_standard_long_dark_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s, f_console_standard_long_normal_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s, f_console_standard_long_debug_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_version_s, f_console_standard_long_version_s, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, 0, 0, f_console_type_normal_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, 0, 0, f_console_type_inverse_e), \ macro_f_console_parameter_t_initialize(fss_embedded_list_read_short_at_s, fss_embedded_list_read_long_at_s, 0, 1, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(fss_embedded_list_read_short_content_s, fss_embedded_list_read_long_content_s, 0, 0, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(fss_embedded_list_read_short_columns_s, fss_embedded_list_read_long_columns_s, 0, 0, f_console_type_normal_e), \ diff --git a/level_3/fss_embedded_list_read/c/private-common.c b/level_3/fss_embedded_list_read/c/private-common.c index 42bb9c4..e9ae811 100644 --- a/level_3/fss_embedded_list_read/c/private-common.c +++ b/level_3/fss_embedded_list_read/c/private-common.c @@ -15,9 +15,9 @@ extern "C" { flockfile(main->warning.to.stream); - fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s[0], f_string_eol_s[0], main->context.set.warning, main->context.set.warning); + fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s, f_string_eol_s, main->context.set.warning, main->context.set.warning); fl_print_format("%[%i%]", main->warning.to.stream, main->context.set.notable, signal, main->context.set.notable); - fl_print_format("%[.%]%c", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s[0]); + fl_print_format("%[.%]%q", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s); funlockfile(main->warning.to.stream); } diff --git a/level_3/fss_embedded_list_read/c/private-print.c b/level_3/fss_embedded_list_read/c/private-print.c index 9279cfd..8bfedeb 100644 --- a/level_3/fss_embedded_list_read/c/private-print.c +++ b/level_3/fss_embedded_list_read/c/private-print.c @@ -14,11 +14,11 @@ extern "C" { } else { if (main->parameters[fss_embedded_list_read_parameter_object_e].result == f_console_result_found_e && main->parameters[fss_embedded_list_read_parameter_content_e].result == f_console_result_found_e) { - f_print_character(f_fss_embedded_list_open_s[0], main->output.to.stream); - f_print_character(f_fss_embedded_list_open_end_s[0], main->output.to.stream); + f_print_character(f_fss_embedded_list_open_s.string[0], main->output.to.stream); + f_print_character(f_fss_embedded_list_open_end_s.string[0], main->output.to.stream); } else { - f_print_character(f_fss_eol_s[0], main->output.to.stream); + f_print_character(f_fss_eol_s.string[0], main->output.to.stream); } } } @@ -41,11 +41,11 @@ extern "C" { } else { if (main->parameters[fss_embedded_list_read_parameter_object_e].result == f_console_result_found_e && main->parameters[fss_embedded_list_read_parameter_content_e].result == f_console_result_found_e) { - f_print_character(f_fss_embedded_list_close_s[0], main->output.to.stream); - f_print_character(f_fss_embedded_list_close_end_s[0], main->output.to.stream); + f_print_character(f_fss_embedded_list_close_s.string[0], main->output.to.stream); + f_print_character(f_fss_embedded_list_close_end_s.string[0], main->output.to.stream); } else { - f_print_character(f_fss_eol_s[0], main->output.to.stream); + f_print_character(f_fss_eol_s.string[0], main->output.to.stream); } } } diff --git a/level_3/fss_embedded_list_read/c/private-read.c b/level_3/fss_embedded_list_read/c/private-read.c index 02de6c8..c5adf99 100644 --- a/level_3/fss_embedded_list_read/c/private-read.c +++ b/level_3/fss_embedded_list_read/c/private-read.c @@ -202,11 +202,11 @@ extern "C" { if (depths->array[i].depth == depths->array[j].depth) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe value '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%sThe value '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%ul%]", main->error.to.stream, main->error.notable, depths->array[i].depth, main->error.notable); fl_print_format("%[' may only be specified once for the parameter '%]", main->error.to.stream, main->error.notable, main->error.notable); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth_s, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth_s, main->error.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -215,13 +215,13 @@ extern "C" { else if (depths->array[i].depth > depths->array[j].depth) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth_s, main->error.notable); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth_s, main->error.notable); fl_print_format("%[' may not have the value '%]", main->error.to.stream, main->error.notable, main->error.notable); fl_print_format("%[%ul%]", main->error.to.stream, main->error.notable, depths->array[i].depth, main->error.notable); fl_print_format("%[' before the value '%]", main->error.to.stream, main->error.notable, main->error.notable); fl_print_format("%[%ul%]", main->error.to.stream, main->error.notable, depths->array[j].depth, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -258,7 +258,7 @@ extern "C" { macro_f_string_dynamic_t_delete_simple(main->buffer); if (main->parameters[fss_embedded_list_read_parameter_total_e].result == f_console_result_found_e) { - fll_print_format("0%c", main->output.to.stream, f_string_eol_s[0]); + fll_print_format("0%q", main->output.to.stream, f_string_eol_s); return F_none; } @@ -280,7 +280,7 @@ extern "C" { for (; i < comments->used; ++i) { for (j = comments->array[i].start; j <= comments->array[i].stop; ++j) { - main->buffer.string[j] = F_fss_delimit_placeholder_s; + main->buffer.string[j] = f_fss_delimit_placeholder_s.string[0]; } // for } // for } @@ -288,7 +288,7 @@ extern "C" { // Requested depths cannot be greater than contents depth. if (depths.used > main->nest.used) { if (main->parameters[fss_embedded_list_read_parameter_total_e].result == f_console_result_found_e) { - fll_print_format("0%c", main->output.to.stream, f_string_eol_s[0]); + fll_print_format("0%q", main->output.to.stream, f_string_eol_s); return F_none; } @@ -508,7 +508,7 @@ extern "C" { ++total; } // for - fll_print_format("%lu%c", main->output.to.stream, total, f_string_eol_s[0]); + fll_print_format("%lu%q", main->output.to.stream, total, f_string_eol_s); return F_none; } @@ -573,13 +573,13 @@ extern "C" { if (!main->buffer.string[j]) continue; - if (main->buffer.string[j] == f_string_eol_s[0]) { + if (main->buffer.string[j] == f_string_eol_s.string[0]) { ++total; } } // for } // for - fll_print_format("%lu%c", main->output.to.stream, total, f_string_eol_s[0]); + fll_print_format("%lu%q", main->output.to.stream, total, f_string_eol_s); return F_none; } @@ -612,7 +612,7 @@ extern "C" { if (line_current != line) { for (; j <= items->array[i].content.array[0].stop; ++j) { - if (main->buffer.string[j] == f_string_eol_s[0]) { + if (main->buffer.string[j] == f_string_eol_s.string[0]) { ++line_current; if (line_current == line) { @@ -631,8 +631,8 @@ extern "C" { if (!main->buffer.string[j]) continue; - if (main->buffer.string[j] == f_string_eol_s[0]) { - f_print_character(f_string_eol_s[0], main->output.to.stream); + if (main->buffer.string[j] == f_string_eol_s.string[0]) { + f_print_dynamic(f_string_eol_s, main->output.to.stream); break; } diff --git a/level_3/fss_embedded_list_write/c/fss_embedded_list_write.c b/level_3/fss_embedded_list_write/c/fss_embedded_list_write.c index 2c6dba5..bbe48bb 100644 --- a/level_3/fss_embedded_list_write/c/fss_embedded_list_write.c +++ b/level_3/fss_embedded_list_write/c/fss_embedded_list_write.c @@ -13,45 +13,45 @@ extern "C" { fll_program_print_help_header(file, context, fss_embedded_list_write_program_name_long_s, fss_embedded_list_write_program_version_s); - fll_program_print_help_option(file, context, f_console_standard_short_help_s, f_console_standard_long_help_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print this help message."); - fll_program_print_help_option(file, context, f_console_standard_short_dark_s, f_console_standard_long_dark_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_light_s, f_console_standard_long_light_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, "Do not file in color."); - fll_program_print_help_option(file, context, f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Decrease verbosity, silencing most output."); - fll_program_print_help_option(file, context, f_console_standard_short_normal_s, f_console_standard_long_normal_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Set verbosity to normal file."); - fll_program_print_help_option(file, context, f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Increase verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_debug_s, f_console_standard_long_debug_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Enable debugging, significantly increasing verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_version_s, f_console_standard_long_version_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Print only the version number."); - - f_print_character(f_string_eol_s[0], file.stream); - - fll_program_print_help_option(file, context, fss_embedded_list_write_short_file_s, fss_embedded_list_write_long_file_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Specify a file to send data to."); - fll_program_print_help_option(file, context, fss_embedded_list_write_short_content_s, fss_embedded_list_write_long_content_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "The Content to file."); - fll_program_print_help_option(file, context, fss_embedded_list_write_short_double_s, fss_embedded_list_write_long_double_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Use double quotes (default)."); - fll_program_print_help_option(file, context, fss_embedded_list_write_short_ignore_s, fss_embedded_list_write_long_ignore_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Ignore a given range within a Content."); - fll_program_print_help_option(file, context, fss_embedded_list_write_short_object_s, fss_embedded_list_write_long_object_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " The Object to file."); - fll_program_print_help_option(file, context, fss_embedded_list_write_short_partial_s, fss_embedded_list_write_long_partial_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Do not file end of Object/Content character."); - fll_program_print_help_option(file, context, fss_embedded_list_write_short_prepend_s, fss_embedded_list_write_long_prepend_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Prepend the given whitespace characters to the start of each multi-line Content."); - fll_program_print_help_option(file, context, fss_embedded_list_write_short_single_s, fss_embedded_list_write_long_single_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Use single quotes."); - fll_program_print_help_option(file, context, fss_embedded_list_write_short_trim_s, fss_embedded_list_write_long_trim_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Trim Object names."); + fll_program_print_help_option(file, context, f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print this help message."); + fll_program_print_help_option(file, context, f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, "Do not file in color."); + fll_program_print_help_option(file, context, f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Decrease verbosity, silencing most output."); + fll_program_print_help_option(file, context, f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Set verbosity to normal file."); + fll_program_print_help_option(file, context, f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Increase verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Enable debugging, significantly increasing verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Print only the version number."); + + f_print_dynamic(f_string_eol_s, file.stream); + + fll_program_print_help_option(file, context, fss_embedded_list_write_short_file_s, fss_embedded_list_write_long_file_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Specify a file to send data to."); + fll_program_print_help_option(file, context, fss_embedded_list_write_short_content_s, fss_embedded_list_write_long_content_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "The Content to file."); + fll_program_print_help_option(file, context, fss_embedded_list_write_short_double_s, fss_embedded_list_write_long_double_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Use double quotes (default)."); + fll_program_print_help_option(file, context, fss_embedded_list_write_short_ignore_s, fss_embedded_list_write_long_ignore_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Ignore a given range within a Content."); + fll_program_print_help_option(file, context, fss_embedded_list_write_short_object_s, fss_embedded_list_write_long_object_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " The Object to file."); + fll_program_print_help_option(file, context, fss_embedded_list_write_short_partial_s, fss_embedded_list_write_long_partial_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "Do not file end of Object/Content character."); + fll_program_print_help_option(file, context, fss_embedded_list_write_short_prepend_s, fss_embedded_list_write_long_prepend_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "Prepend the given whitespace characters to the start of each multi-line Content."); + fll_program_print_help_option(file, context, fss_embedded_list_write_short_single_s, fss_embedded_list_write_long_single_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Use single quotes."); + fll_program_print_help_option(file, context, fss_embedded_list_write_short_trim_s, fss_embedded_list_write_long_trim_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Trim Object names."); fll_program_print_help_usage(file, context, fss_embedded_list_write_program_name_s, f_string_empty_s); - fl_print_format(" The pipe uses the Backspace character '%[\\b%]' (%[U+0008%]) to designate the start of a Content.%c", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s[0]); - fl_print_format(" The pipe uses the Form Feed character '%[\\f%]' (%[U+000C%]) to designate the end of the last Content.%c", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s[0]); - 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).%c", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s[0]); + fl_print_format(" The pipe uses the Backspace character '%[\\b%]' (%[U+0008%]) to designate the start of a Content.%q", file.stream, context.set.notable, context.set.notable, context.set.notable, context.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.%q", file.stream, context.set.notable, context.set.notable, context.set.notable, context.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).%q", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s); fl_print_format(" For the pipe, an Object is terminated by either a Backspace character '%[\\b%]' (%[U+0008%])", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable); - fl_print_format(" or a Form Feed character '%[\\f%]' (%[U+000C%]).%c", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s[0]); - fl_print_format(" The end of the pipe represents the end of any Object or Content.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" or a Form Feed character '%[\\f%]' (%[U+000C%]).%q", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s); + fl_print_format(" The end of the pipe represents the end of any Object or Content.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" The FSS-0008 (Embedded List) specification does not support quoted names, therefore the parameters '%[%s%s%]'", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_single_s, context.set.notable); - fl_print_format(" and '%[%s%s%]' do nothing.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_double_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The FSS-0008 (Embedded List) specification does not support quoted names, therefore the parameters '%[%q%s%]'", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_single_s, context.set.notable); + fl_print_format(" and '%[%q%s%]' do nothing.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_double_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" The parameter '%[%s%s%]' designates to not escape any valid nested Object or Content within some Content.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_ignore_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" This parameter requires two values.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" This parameter is not used for ignoring anything from the input pipe.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" This parameter must be specified after a '%[%s%s%]'", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_content_s, context.set.notable); - fl_print_format(" parameter and this applies only to the Content represented by that specific '%[%s%s%]' parameter.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_content_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The parameter '%[%q%s%]' designates to not escape any valid nested Object or Content within some Content.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_ignore_s, context.set.notable, f_string_eol_s); + fl_print_format(" This parameter requires two values.%q", file.stream, f_string_eol_s); + fl_print_format(" This parameter is not used for ignoring anything from the input pipe.%q", file.stream, f_string_eol_s); + fl_print_format(" This parameter must be specified after a '%[%q%s%]'", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_content_s, context.set.notable); + fl_print_format(" parameter and this applies only to the Content represented by that specific '%[%q%s%]' parameter.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_content_s, context.set.notable, f_string_eol_s, f_string_eol_s); funlockfile(file.stream); @@ -167,9 +167,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_file_s, main->error.notable); - fl_print_format("%[' may only be specified once.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_file_s, main->error.notable); + fl_print_format("%[' may only be specified once.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -189,7 +189,7 @@ extern "C" { } } else if (main->parameters[fss_embedded_list_write_parameter_file_e].result == f_console_result_found_e) { - fss_embedded_list_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s, fss_embedded_list_write_long_file_s); + fss_embedded_list_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s.string.string, fss_embedded_list_write_long_file_s); status = F_status_set_error(F_parameter); } } @@ -198,11 +198,11 @@ extern "C" { if (main->parameters[fss_embedded_list_write_parameter_object_e].locations.used || main->parameters[fss_embedded_list_write_parameter_content_e].locations.used) { if (main->parameters[fss_embedded_list_write_parameter_object_e].locations.used) { if (main->parameters[fss_embedded_list_write_parameter_object_e].locations.used != main->parameters[fss_embedded_list_write_parameter_object_e].values.used) { - fss_embedded_list_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s, fss_embedded_list_write_long_object_s); + fss_embedded_list_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s.string, fss_embedded_list_write_long_object_s); status = F_status_set_error(F_parameter); } else if (main->parameters[fss_embedded_list_write_parameter_content_e].locations.used != main->parameters[fss_embedded_list_write_parameter_content_e].values.used) { - fss_embedded_list_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s, fss_embedded_list_write_long_content_s); + fss_embedded_list_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s.string, fss_embedded_list_write_long_content_s); status = F_status_set_error(F_parameter); } else if (main->parameters[fss_embedded_list_write_parameter_object_e].locations.used != main->parameters[fss_embedded_list_write_parameter_content_e].locations.used && main->parameters[fss_embedded_list_write_parameter_partial_e].result == f_console_result_none_e) { @@ -214,13 +214,13 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_partial_s, main->error.notable); + fl_print_format("%q%[%sThe '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_partial_s, main->error.notable); fl_print_format("%[' parameter only allows either the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_object_s, main->error.notable); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_object_s, main->error.notable); fl_print_format("%[' parameter or the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_content_s, main->error.notable); - fl_print_format("%[' parameter, but not both.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_content_s, main->error.notable); + fl_print_format("%[' parameter, but not both.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -246,11 +246,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sEach '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_object_s, main->error.notable); + fl_print_format("%q%[%sEach '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_object_s, main->error.notable); fl_print_format("%[' parameter must be specified before a '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_content_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_content_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -265,7 +265,7 @@ extern "C" { } else if (main->parameters[fss_embedded_list_write_parameter_content_e].locations.used) { if (main->parameters[fss_embedded_list_write_parameter_content_e].locations.used != main->parameters[fss_embedded_list_write_parameter_content_e].values.used) { - fss_embedded_list_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s, fss_embedded_list_write_long_content_s); + fss_embedded_list_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s.string, fss_embedded_list_write_long_content_s); status = F_status_set_error(F_parameter); } else if (!main->parameters[fss_embedded_list_write_parameter_partial_e].locations.used) { @@ -278,11 +278,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThis requires either piped data or the use of the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_object_s, main->error.notable); + fl_print_format("%q%[%sThis requires either piped data or the use of the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_object_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_content_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_content_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -295,9 +295,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThis '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_partial_s, main->error.notable); - fl_print_format("%[' parameter cannot be used when processing a pipe.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThis '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_partial_s, main->error.notable); + fl_print_format("%[' parameter cannot be used when processing a pipe.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -312,9 +312,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_prepend_s, main->error.notable); - fl_print_format("%[' is specified, but no value is given.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_prepend_s, main->error.notable); + fl_print_format("%[' is specified, but no value is given.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -341,9 +341,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_prepend_s, main->error.notable); - fl_print_format("%[' must only contain whitespace.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_prepend_s, main->error.notable); + fl_print_format("%[' must only contain whitespace.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -358,9 +358,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_prepend_s, main->error.notable); - fl_print_format("%[' must not be an empty string.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_prepend_s, main->error.notable); + fl_print_format("%[' must not be an empty string.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -375,9 +375,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_ignore_s, main->error.notable); - fl_print_format("%[' was specified, but no values were given.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_ignore_s, main->error.notable); + fl_print_format("%[' was specified, but no values were given.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -391,9 +391,9 @@ extern "C" { if (total_locations * 2 > total_arguments) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_ignore_s, main->error.notable); - fl_print_format("%[' requires two values.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_ignore_s, main->error.notable); + fl_print_format("%[' requires two values.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -432,8 +432,8 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sWhile processing the '%]%[input pipe%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context, main->error.notable, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sWhile processing the '%]%[input pipe%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context, main->error.notable, main->error.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -512,8 +512,8 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sWhile processing the '%]%[input arguments%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context, main->error.notable, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sWhile processing the '%]%[input arguments%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context, main->error.notable, main->error.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -521,7 +521,7 @@ extern "C" { else if (main->error.verbosity != f_console_verbosity_quiet_e && main->parameters[fss_embedded_list_write_parameter_file_e].result == f_console_result_none_e) { // Ensure there is always a newline at the end, unless in quiet mode. - fll_print_character(f_string_eol_s[0], main->output.to.stream); + fll_print_dynamic(f_string_eol_s, main->output.to.stream); } } @@ -547,7 +547,7 @@ extern "C" { // Ensure a newline is always put at the end of the program execution, unless in quiet mode. if (main->error.verbosity != f_console_verbosity_quiet_e) { if (F_status_is_error(status)) { - fll_print_character(f_string_eol_s[0], main->error.to.stream); + fll_print_dynamic(f_string_eol_s, main->error.to.stream); } } 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 e03c492..2ddc235 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 @@ -116,15 +116,15 @@ extern "C" { #define fss_embedded_list_write_console_parameter_t_initialize \ { \ - macro_f_console_parameter_t_initialize(f_console_standard_short_help_s, f_console_standard_long_help_s, 0, 0, f_console_type_normal_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_light_s, f_console_standard_long_light_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s, f_console_standard_long_dark_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, 0, F_false, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s, f_console_standard_long_normal_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s, f_console_standard_long_debug_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_version_s, f_console_standard_long_version_s, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, 0, 0, f_console_type_normal_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, 0, F_false, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, 0, 0, f_console_type_inverse_e), \ macro_f_console_parameter_t_initialize(fss_embedded_list_write_short_file_s, fss_embedded_list_write_long_file_s, 0, 1, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(fss_embedded_list_write_short_content_s, fss_embedded_list_write_long_content_s, 0, 1, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(fss_embedded_list_write_short_double_s, fss_embedded_list_write_long_double_s, 0, 0, f_console_type_normal_e), \ diff --git a/level_3/fss_embedded_list_write/c/private-common.c b/level_3/fss_embedded_list_write/c/private-common.c index 5ae756a..cce3865 100644 --- a/level_3/fss_embedded_list_write/c/private-common.c +++ b/level_3/fss_embedded_list_write/c/private-common.c @@ -15,9 +15,9 @@ extern "C" { flockfile(main->warning.to.stream); - fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s[0], f_string_eol_s[0], main->context.set.warning, main->context.set.warning); + fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s, f_string_eol_s, main->context.set.warning, main->context.set.warning); fl_print_format("%[%i%]", main->warning.to.stream, main->context.set.notable, signal, main->context.set.notable); - fl_print_format("%[.%]%c", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s[0]); + fl_print_format("%[.%]%q", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s); funlockfile(main->warning.to.stream); } diff --git a/level_3/fss_embedded_list_write/c/private-write.c b/level_3/fss_embedded_list_write/c/private-write.c index 58f5cd0..737100f 100644 --- a/level_3/fss_embedded_list_write/c/private-write.c +++ b/level_3/fss_embedded_list_write/c/private-write.c @@ -15,13 +15,13 @@ extern "C" { flockfile(main->error.to.stream); - fl_print_format("%c%[%sMust specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_object_s, main->error.notable); + fl_print_format("%q%[%sMust specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_object_s, main->error.notable); fl_print_format("%[' parameter and the '%]", main->error.to.stream, main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_content_s, main->error.notable); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_content_s, main->error.notable); fl_print_format("%[' parameter the same number of times when not specifying the '%]", main->error.to.stream, main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_partial_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_embedded_list_write_long_partial_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -36,9 +36,9 @@ extern "C" { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThis standard does not support end of line character '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%sThis standard does not support end of line character '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[\\n%]", main->error.to.stream, main->error.notable, main->error.notable); - fl_print_format("%[' in objects.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' in objects.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -53,9 +53,9 @@ extern "C" { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%S%S%]", main->error.to.stream, main->error.notable, symbol, parameter, main->error.notable); - fl_print_format("%[' is specified, but no value is given.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' is specified, but no value is given.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -265,7 +265,7 @@ extern "C" { if (block.string[range.start] == fss_embedded_list_write_pipe_content_start_s) { if (main->error.verbosity != f_console_verbosity_quiet_e) { - fll_print_format("%c%[%sThis standard only supports one content per object.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sThis standard only supports one content per object.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context, f_string_eol_s); } status = F_status_set_error(F_supported_not); diff --git a/level_3/fss_extended_list_read/c/fss_extended_list_read.c b/level_3/fss_extended_list_read/c/fss_extended_list_read.c index 6090923..d4b97d0 100644 --- a/level_3/fss_extended_list_read/c/fss_extended_list_read.c +++ b/level_3/fss_extended_list_read/c/fss_extended_list_read.c @@ -14,102 +14,102 @@ extern "C" { fll_program_print_help_header(file, context, fss_extended_list_read_program_name_long_s, fss_extended_list_read_program_version_s); - fll_program_print_help_option(file, context, f_console_standard_short_help_s, f_console_standard_long_help_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print this help message."); - fll_program_print_help_option(file, context, f_console_standard_short_dark_s, f_console_standard_long_dark_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_light_s, f_console_standard_long_light_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, "Do not file in color."); - fll_program_print_help_option(file, context, f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Decrease verbosity, silencing most output."); - fll_program_print_help_option(file, context, f_console_standard_short_normal_s, f_console_standard_long_normal_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Set verbosity to normal file."); - fll_program_print_help_option(file, context, f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Increase verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_debug_s, f_console_standard_long_debug_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Enable debugging, significantly increasing verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_version_s, f_console_standard_long_version_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Print only the version number."); - - f_print_character(f_string_eol_s[0], file.stream); - - fll_program_print_help_option(file, context, fss_extended_list_read_short_at_s, fss_extended_list_read_long_at_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Select Object at this numeric index."); - fll_program_print_help_option(file, context, fss_extended_list_read_short_content_s, fss_extended_list_read_long_content_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print the Content (default)."); - fll_program_print_help_option(file, context, fss_extended_list_read_short_columns_s, fss_extended_list_read_long_columns_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print the total number of columns."); - fll_program_print_help_option(file, context, fss_extended_list_read_short_delimit_s, fss_extended_list_read_long_delimit_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Designate how to handle applying delimits."); - fll_program_print_help_option(file, context, fss_extended_list_read_short_depth_s, fss_extended_list_read_long_depth_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Select Object at this numeric depth."); - fll_program_print_help_option(file, context, fss_extended_list_read_short_empty_s, fss_extended_list_read_long_empty_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Include empty Content when processing."); - fll_program_print_help_option(file, context, fss_extended_list_read_short_line_s, fss_extended_list_read_long_line_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print only the Content at the given line."); - fll_program_print_help_option(file, context, fss_extended_list_read_short_name_s, fss_extended_list_read_long_name_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Select Object with this name."); - fll_program_print_help_option(file, context, fss_extended_list_read_short_object_s, fss_extended_list_read_long_object_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print the Object."); - fll_program_print_help_option(file, context, fss_extended_list_read_short_pipe_s, fss_extended_list_read_long_pipe_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print using the special pipe format."); - fll_program_print_help_option(file, context, fss_extended_list_read_short_raw_s, fss_extended_list_read_long_raw_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print with the original quotes and escapes."); - fll_program_print_help_option(file, context, fss_extended_list_read_short_select_s, fss_extended_list_read_long_select_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Select sub-Content at this index."); - fll_program_print_help_option(file, context, fss_extended_list_read_short_total_s, fss_extended_list_read_long_total_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print the total number of lines."); - fll_program_print_help_option(file, context, fss_extended_list_read_short_trim_s, fss_extended_list_read_long_trim_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Trim Object names on select or print."); + fll_program_print_help_option(file, context, f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print this help message."); + fll_program_print_help_option(file, context, f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, "Do not file in color."); + fll_program_print_help_option(file, context, f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Decrease verbosity, silencing most output."); + fll_program_print_help_option(file, context, f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Set verbosity to normal file."); + fll_program_print_help_option(file, context, f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Increase verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Enable debugging, significantly increasing verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Print only the version number."); + + f_print_dynamic(f_string_eol_s, file.stream); + + fll_program_print_help_option(file, context, fss_extended_list_read_short_at_s, fss_extended_list_read_long_at_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Select Object at this numeric index."); + fll_program_print_help_option(file, context, fss_extended_list_read_short_content_s, fss_extended_list_read_long_content_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print the Content (default)."); + fll_program_print_help_option(file, context, fss_extended_list_read_short_columns_s, fss_extended_list_read_long_columns_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print the total number of columns."); + fll_program_print_help_option(file, context, fss_extended_list_read_short_delimit_s, fss_extended_list_read_long_delimit_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Designate how to handle applying delimits."); + fll_program_print_help_option(file, context, fss_extended_list_read_short_depth_s, fss_extended_list_read_long_depth_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Select Object at this numeric depth."); + fll_program_print_help_option(file, context, fss_extended_list_read_short_empty_s, fss_extended_list_read_long_empty_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Include empty Content when processing."); + fll_program_print_help_option(file, context, fss_extended_list_read_short_line_s, fss_extended_list_read_long_line_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print only the Content at the given line."); + fll_program_print_help_option(file, context, fss_extended_list_read_short_name_s, fss_extended_list_read_long_name_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Select Object with this name."); + fll_program_print_help_option(file, context, fss_extended_list_read_short_object_s, fss_extended_list_read_long_object_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print the Object."); + fll_program_print_help_option(file, context, fss_extended_list_read_short_pipe_s, fss_extended_list_read_long_pipe_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print using the special pipe format."); + fll_program_print_help_option(file, context, fss_extended_list_read_short_raw_s, fss_extended_list_read_long_raw_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print with the original quotes and escapes."); + fll_program_print_help_option(file, context, fss_extended_list_read_short_select_s, fss_extended_list_read_long_select_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Select sub-Content at this index."); + fll_program_print_help_option(file, context, fss_extended_list_read_short_total_s, fss_extended_list_read_long_total_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print the total number of lines."); + fll_program_print_help_option(file, context, fss_extended_list_read_short_trim_s, fss_extended_list_read_long_trim_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Trim Object names on select or print."); fll_program_print_help_usage(file, context, fss_extended_list_read_program_name_s, "filename(s)"); - fl_print_format(" %[Notes:%]%c", file.stream, context.set.important, context.set.important, f_string_eol_s[0]); + fl_print_format(" %[Notes:%]%q", file.stream, context.set.important, context.set.important, f_string_eol_s); - fl_print_format(" This program will print the Content associated with the given Object and Content main based on the FSS-0003 Extended List standard.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" This program will print the Content associated with the given Object and Content main based on the FSS-0003 Extended List standard.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" All numeric positions (indexes) start at 0 instead of 1.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" For example, a file of 17 lines would range from 0 to 16.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" All numeric positions (indexes) start at 0 instead of 1.%q", file.stream, f_string_eol_s); + fl_print_format(" For example, a file of 17 lines would range from 0 to 16.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" When using the %[%s%s%] option, an order of operations is enforced on the parameters.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_depth_s, context.set.notable, f_string_eol_s[0]); + fl_print_format(" When using the %[%q%s%] option, an order of operations is enforced on the parameters.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_depth_s, context.set.notable, f_string_eol_s); - fl_print_format(" When this order of operations is in effect, parameters to the right of a depth parameter are influenced by that depth parameter:%c", file.stream, f_string_eol_s[0]); + fl_print_format(" When this order of operations is in effect, parameters to the right of a depth parameter are influenced by that depth parameter:%q", file.stream, f_string_eol_s); - fl_print_format(" %[%s%s%]: An Object index at the specified depth.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_at_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" %[%s%s%]: A new depth within the specified depth, indexed from the root.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_depth_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" %[%s%s%]: An Object name at the specified depth.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_name_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" %[%q%s%]: An Object index at the specified depth.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_at_s, context.set.notable, f_string_eol_s); + fl_print_format(" %[%q%s%]: A new depth within the specified depth, indexed from the root.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_depth_s, context.set.notable, f_string_eol_s); + fl_print_format(" %[%q%s%]: An Object name at the specified depth.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_name_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" The parameter %[%s%s%] must be in numeric order, but values in between may be skipped.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_depth_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" ('-d 0 -a 1 -d 2 -a 2' would specify index 1 at depth 0, any index at depth 1, and index 2 at depth 2.)%c", file.stream, f_string_eol_s[0]); - fl_print_format(" ('-d 2 -a 1 -d 0 -a 2' would be invalid because depth 2 is before depth 1.)%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The parameter %[%q%s%] must be in numeric order, but values in between may be skipped.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_depth_s, context.set.notable, f_string_eol_s); + fl_print_format(" ('-d 0 -a 1 -d 2 -a 2' would specify index 1 at depth 0, any index at depth 1, and index 2 at depth 2.)%q", file.stream, f_string_eol_s); + fl_print_format(" ('-d 2 -a 1 -d 0 -a 2' would be invalid because depth 2 is before depth 1.)%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" The parameter %[%s%s%] selects a Content column.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_select_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The parameter %[%q%s%] selects a Content column.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_select_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" Specify both %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_object_s, context.set.notable); - fl_print_format(" and the %[%s%s%] parameters to get the total objects.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_total_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" Specify both %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_object_s, context.set.notable); + fl_print_format(" and the %[%q%s%] parameters to get the total objects.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_total_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" When both %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_at_s, context.set.notable); - fl_print_format(" and %[%s%s%] parameters are specified (at the same depth),", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_name_s, context.set.notable); - fl_print_format(" the %[%s%s%] parameter value will be treated as a position relative to the specified", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_at_s, context.set.notable); - fl_print_format(" %[%s%s%] parameter value.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_name_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" When both %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_at_s, context.set.notable); + fl_print_format(" and %[%q%s%] parameters are specified (at the same depth),", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_name_s, context.set.notable); + fl_print_format(" the %[%q%s%] parameter value will be treated as a position relative to the specified", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_at_s, context.set.notable); + fl_print_format(" %[%q%s%] parameter value.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_name_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" This program may support parameters, such as %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_depth_s, context.set.notable); - fl_print_format(" or %[%s%s%], even if not supported by the standard.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_select_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" This is done to help ensure consistency for scripting.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" This program may support parameters, such as %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_depth_s, context.set.notable); + fl_print_format(" or %[%q%s%], even if not supported by the standard.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_select_s, context.set.notable, f_string_eol_s); + fl_print_format(" This is done to help ensure consistency for scripting.%q%q", file.stream, f_string_eol_s, f_string_eol_s); fl_print_format(" For parameters like %[%s%s%],", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_depth_s, context.set.notable); - fl_print_format(" if the standard doesn't support nested Content, then only a depth of 0 would be valid.%c", file.stream, f_string_eol_s[0]); + fl_print_format(" if the standard doesn't support nested Content, then only a depth of 0 would be valid.%q", file.stream, f_string_eol_s); - fl_print_format(" For parameters like %[%s%s%],", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_select_s, context.set.notable); - fl_print_format(" if the standard doesn't support multiple Content groups, then only a select of 0 would be valid.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" For parameters like %[%q%s%],", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_select_s, context.set.notable); + fl_print_format(" if the standard doesn't support multiple Content groups, then only a select of 0 would be valid.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" The parameter %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_trim_s, context.set.notable); - fl_print_format(" will remove leading and trailing whitespaces when selecting objects or when printing objects.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The parameter %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_trim_s, context.set.notable); + fl_print_format(" will remove leading and trailing whitespaces when selecting objects or when printing objects.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" When specifying both the %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_object_s, context.set.notable); - fl_print_format(" parameter and the %[%s%s%] parameter, the entire Object and Content are printed, including the formatting.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_content_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" Both the Object and Content printed are already escaped.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" Both the Object and Content are separated by an EOL.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" When specifying both the %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_object_s, context.set.notable); + fl_print_format(" parameter and the %[%q%s%] parameter, the entire Object and Content are printed, including the formatting.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_content_s, context.set.notable, f_string_eol_s); + fl_print_format(" Both the Object and Content printed are already escaped.%q", file.stream, f_string_eol_s); + fl_print_format(" Both the Object and Content are separated by an EOL.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" The parameter %[%s%s%] accepts the following:%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_delimit_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" - %[%s%]: Do not apply delimits.%c", file.stream, context.set.notable, fss_extended_list_read_delimit_mode_name_none_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" - %[%s%]: (default) Apply all delimits.%c", file.stream, context.set.notable, fss_extended_list_read_delimit_mode_name_all_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" - %[%s%]: Apply delimits for Objects.%c", file.stream, context.set.notable, fss_extended_list_read_delimit_mode_name_object_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" - A number, 0 or greater: apply delimits for Content at the specified depth.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" - A number, 0 or greater, followed by a %[%s%]: (such as '1+') apply delimits for Content at the specified depth and any greater depth (numerically).%c", file.stream, context.set.notable, fss_extended_list_read_delimit_mode_name_greater_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); - fl_print_format(" - A number, 0 or lesser, followed by a %[%s%]: (such as '1-') apply delimits for Content at the specified depth and any lesser depth (numerically).%c%c", file.stream, context.set.notable, fss_extended_list_read_delimit_mode_name_lesser_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The parameter %[%q%s%] accepts the following:%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_delimit_s, context.set.notable, f_string_eol_s); + fl_print_format(" - %[%s%]: Do not apply delimits.%q", file.stream, context.set.notable, fss_extended_list_read_delimit_mode_name_none_s, context.set.notable, f_string_eol_s); + fl_print_format(" - %[%s%]: (default) Apply all delimits.%q", file.stream, context.set.notable, fss_extended_list_read_delimit_mode_name_all_s, context.set.notable, f_string_eol_s); + fl_print_format(" - %[%s%]: Apply delimits for Objects.%q", file.stream, context.set.notable, fss_extended_list_read_delimit_mode_name_object_s, context.set.notable, f_string_eol_s); + fl_print_format(" - A number, 0 or greater: apply delimits for Content at the specified depth.%q", file.stream, f_string_eol_s); + fl_print_format(" - A number, 0 or greater, followed by a %[%s%]: (such as '1+') apply delimits for Content at the specified depth and any greater depth (numerically).%q", file.stream, context.set.notable, fss_extended_list_read_delimit_mode_name_greater_s, context.set.notable, f_string_eol_s, f_string_eol_s); + fl_print_format(" - A number, 0 or lesser, followed by a %[%s%]: (such as '1-') apply delimits for Content at the specified depth and any lesser depth (numerically).%q%q", file.stream, context.set.notable, fss_extended_list_read_delimit_mode_name_lesser_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" The %[%s%s%] parameter may be specified multiple times to customize the delimit behavior.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_delimit_s, context.set.notable, f_string_eol_s[0]); + fl_print_format(" The %[%s%s%] parameter may be specified multiple times to customize the delimit behavior.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_delimit_s, context.set.notable, f_string_eol_s); - fl_print_format(" The %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_delimit_s, context.set.notable); + fl_print_format(" The %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_delimit_s, context.set.notable); fl_print_format(" values %[%s%]", file.stream, context.set.notable, fss_extended_list_read_delimit_mode_name_none_s, context.set.notable); fl_print_format(" and %[%s%],", file.stream, context.set.notable, fss_extended_list_read_delimit_mode_name_all_s, context.set.notable); - fl_print_format(" overrule all other delimit values.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" overrule all other delimit values.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" The parameters %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_columns_s, context.set.notable); - fl_print_format(" and %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_select_s, context.set.notable); - fl_print_format(" refer to a Content column.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" The word \"column\" is being loosely defined to refer to a specific Content.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" This is not to be confused with a depth.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The parameters %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_columns_s, context.set.notable); + fl_print_format(" and %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_select_s, context.set.notable); + fl_print_format(" refer to a Content column.%q", file.stream, f_string_eol_s); + fl_print_format(" The word \"column\" is being loosely defined to refer to a specific Content.%q", file.stream, f_string_eol_s); + fl_print_format(" This is not to be confused with a depth.%q%q", file.stream, f_string_eol_s, f_string_eol_s); funlockfile(file.stream); @@ -262,9 +262,9 @@ extern "C" { if (main->parameters[parameter_code[i]].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, parameter_name[i], main->error.notable); - fl_print_format("%[' requires a %s.%]%c", main->error.to.stream, main->error.context, parameter_message[i], main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, parameter_name[i], main->error.notable); + fl_print_format("%[' requires a %s.%]%q", main->error.to.stream, main->error.context, parameter_message[i], main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -305,11 +305,11 @@ extern "C" { if (main->parameters[parameter_code[i]].result == parameter_match[i]) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_columns_s, main->error.notable); + fl_print_format("%q%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_columns_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, parameter_name[i], main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, parameter_name[i], main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -324,11 +324,11 @@ extern "C" { if (main->parameters[fss_extended_list_read_parameter_total_e].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_pipe_s, main->error.notable); + fl_print_format("%q%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_pipe_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_total_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_total_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -337,11 +337,11 @@ extern "C" { else if (main->parameters[fss_extended_list_read_parameter_line_e].result == f_console_result_additional_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_pipe_s, main->error.notable); + fl_print_format("%q%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_pipe_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_line_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_line_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -370,9 +370,9 @@ extern "C" { if (!length) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_delimit_s, main->error.notable); - fl_print_format("%[' must not be empty.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_delimit_s, main->error.notable); + fl_print_format("%[' must not be empty.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -423,7 +423,7 @@ extern "C" { data.delimit_mode = fss_extended_list_read_delimit_mode_content_object_e; } - if (arguments->argv[location][length - 1] == fss_extended_list_read_delimit_mode_name_greater_s[0]) { + if (arguments->argv[location][length - 1] == fss_extended_list_read_delimit_mode_name_greater_s.string[0]) { if (!(data.delimit_mode == fss_extended_list_read_delimit_mode_none_e || data.delimit_mode == fss_extended_list_read_delimit_mode_all_e)) { if (data.delimit_mode == fss_extended_list_read_delimit_mode_content_object_e) { data.delimit_mode = fss_extended_list_read_delimit_mode_content_greater_object_e; @@ -436,7 +436,7 @@ extern "C" { // Shorten the length to better convert the remainder to a number. --length; } - else if (arguments->argv[location][length - 1] == fss_extended_list_read_delimit_mode_name_lesser_s[0]) { + else if (arguments->argv[location][length - 1] == fss_extended_list_read_delimit_mode_name_lesser_s.string[0]) { if (!(data.delimit_mode == fss_extended_list_read_delimit_mode_none_e || data.delimit_mode == fss_extended_list_read_delimit_mode_all_e)) { if (data.delimit_mode == fss_extended_list_read_delimit_mode_content_object_e) { data.delimit_mode = fss_extended_list_read_delimit_mode_content_lesser_object_e; @@ -504,9 +504,9 @@ extern "C" { if (F_status_is_error_not(status) && main->parameters[fss_extended_list_read_parameter_select_e].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_select_s, main->error.notable); - fl_print_format("%[' parameter requires a positive number.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_select_s, main->error.notable); + fl_print_format("%[' parameter requires a positive number.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -629,7 +629,7 @@ extern "C" { fss_extended_list_read_data_delete_simple(&data); } else { - fll_print_format("%c%[%sYou failed to specify one or more files.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sYou failed to specify one or more files.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context, f_string_eol_s); status = F_status_set_error(F_parameter); } @@ -637,7 +637,7 @@ extern "C" { if (F_status_set_fine(status) == F_interrupt) { fflush(main->output.to.stream); - fll_print_terminated(f_string_eol_s, main->output.to.stream); + fll_print_dynamic(f_string_eol_s, main->output.to.stream); } } 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 1536bb2..0d0400c 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 @@ -138,15 +138,15 @@ extern "C" { #define fss_extended_list_read_console_parameter_t_initialize \ { \ - macro_f_console_parameter_t_initialize(f_console_standard_short_help_s, f_console_standard_long_help_s, 0, 0, f_console_type_normal_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_light_s, f_console_standard_long_light_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s, f_console_standard_long_dark_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, 0, F_false, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s, f_console_standard_long_normal_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s, f_console_standard_long_debug_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_version_s, f_console_standard_long_version_s, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, 0, 0, f_console_type_normal_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, 0, F_false, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, 0, 0, f_console_type_inverse_e), \ macro_f_console_parameter_t_initialize(fss_extended_list_read_short_at_s, fss_extended_list_read_long_at_s, 0, 1, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(fss_extended_list_read_short_content_s, fss_extended_list_read_long_content_s, 0, 0, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(fss_extended_list_read_short_columns_s, fss_extended_list_read_long_columns_s, 0, 0, f_console_type_normal_e), \ diff --git a/level_3/fss_extended_list_read/c/private-common.c b/level_3/fss_extended_list_read/c/private-common.c index ba608b1..f027a08 100644 --- a/level_3/fss_extended_list_read/c/private-common.c +++ b/level_3/fss_extended_list_read/c/private-common.c @@ -67,9 +67,9 @@ extern "C" { flockfile(main->warning.to.stream); - fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s[0], f_string_eol_s[0], main->context.set.warning, main->context.set.warning); + fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s, f_string_eol_s, main->context.set.warning, main->context.set.warning); fl_print_format("%[%i%]", main->warning.to.stream, main->context.set.notable, signal, main->context.set.notable); - fl_print_format("%[.%]%c", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s[0]); + fl_print_format("%[.%]%q", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s); funlockfile(main->warning.to.stream); } diff --git a/level_3/fss_extended_list_read/c/private-print.c b/level_3/fss_extended_list_read/c/private-print.c index 24de534..69c7098 100644 --- a/level_3/fss_extended_list_read/c/private-print.c +++ b/level_3/fss_extended_list_read/c/private-print.c @@ -81,8 +81,8 @@ extern "C" { } else { if ((data->option & fss_extended_list_read_data_option_object_d) && (data->option & fss_extended_list_read_data_option_content_d)) { - f_print_character(f_fss_extended_list_open_s[0], main->output.to.stream); - f_print_character(f_fss_extended_list_open_end_s[0], main->output.to.stream); + f_print_character(f_fss_extended_list_open_s.string[0], main->output.to.stream); + f_print_character(f_fss_extended_list_open_end_s.string[0], main->output.to.stream); } } } @@ -97,11 +97,11 @@ extern "C" { else { if (data->option & fss_extended_list_read_data_option_object_d) { if (data->option & fss_extended_list_read_data_option_content_d) { - f_print_character(f_fss_extended_list_close_s[0], main->output.to.stream); - f_print_character(f_fss_extended_list_close_end_s[0], main->output.to.stream); + f_print_character(f_fss_extended_list_close_s.string[0], main->output.to.stream); + f_print_character(f_fss_extended_list_close_end_s.string[0], main->output.to.stream); } else if (!(data->option & fss_extended_list_read_data_option_content_d)) { - f_print_character(f_fss_eol_s[0], main->output.to.stream); + f_print_character(f_fss_eol_s.string[0], main->output.to.stream); } } } @@ -111,16 +111,16 @@ extern "C" { #ifndef _di_fss_extended_list_read_print_one_ void fss_extended_list_read_print_one(fss_extended_list_read_main_t * const main) { - f_print_character(f_string_ascii_1_s[0], main->output.to.stream); - f_print_character(f_string_eol_s[0], main->output.to.stream); + f_print_character(f_string_ascii_1_s.string[0], main->output.to.stream); + f_print_dynamic(f_string_eol_s, main->output.to.stream); } #endif // _di_fss_extended_list_read_print_one_ #ifndef _di_fss_extended_list_read_print_zero_ void fss_extended_list_read_print_zero(fss_extended_list_read_main_t * const main) { - f_print_character(f_string_ascii_0_s[0], main->output.to.stream); - f_print_character(f_string_eol_s[0], main->output.to.stream); + f_print_character(f_string_ascii_0_s.string[0], main->output.to.stream); + f_print_dynamic(f_string_eol_s, main->output.to.stream); } #endif // _di_fss_extended_list_read_print_zero_ diff --git a/level_3/fss_extended_list_read/c/private-read.c b/level_3/fss_extended_list_read/c/private-read.c index 8983ae0..58fa3fb 100644 --- a/level_3/fss_extended_list_read/c/private-read.c +++ b/level_3/fss_extended_list_read/c/private-read.c @@ -180,11 +180,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe value '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%sThe value '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%ul%]", main->error.to.stream, main->error.notable, data->depths.array[i].depth, main->error.notable); fl_print_format("%[' may only be specified once for the parameter '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_depth_s, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_depth_s, main->error.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -195,13 +195,13 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_depth_s, main->error.notable); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_read_long_depth_s, main->error.notable); fl_print_format("%[' may not have the value '%]", main->error.to.stream, main->error.context, main->error.context); fl_print_format("%[%ul%]", main->error.to.stream, main->error.notable, data->depths.array[i].depth, main->error.notable); fl_print_format("%[' before the value '%]", main->error.to.stream, main->error.context, main->error.context); fl_print_format("%[%ul%]", main->error.to.stream, main->error.notable, data->depths.array[j].depth, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -387,7 +387,7 @@ extern "C" { if (status == F_success) return F_none; } else if (data->option & fss_extended_list_read_data_option_columns_d) { - fll_print_format("%ul%c", main->output.to.stream, data->contents.array[i].used, f_string_eol_s[0]); + fll_print_format("%ul%q", main->output.to.stream, data->contents.array[i].used, f_string_eol_s); } else if (data->option & fss_extended_list_read_data_option_total_d) { if ((data->option & fss_extended_list_read_data_option_object_d) && !(data->option & fss_extended_list_read_data_option_content_d)) { @@ -420,20 +420,20 @@ extern "C" { } for (k = data->contents.array[i].array[0].start; k <= data->contents.array[i].array[0].stop; ++k) { - if (data->buffer.string[k] == f_string_eol_s[0]) ++total; + if (data->buffer.string[k] == f_string_eol_s.string[0]) ++total; } // for k = data->contents.array[i].array[0].stop; while (k >= data->contents.array[i].array[0].start) { - if (data->buffer.string[k] == F_fss_delimit_placeholder_s) { + if (data->buffer.string[k] == f_fss_delimit_placeholder_s.string[0]) { --k; continue; } - if (data->buffer.string[k] != f_string_eol_s[0]) { + if (data->buffer.string[k] != f_string_eol_s.string[0]) { ++total; } @@ -442,7 +442,7 @@ extern "C" { } } // for - fll_print_format("%ul%c", main->output.to.stream, total, f_string_eol_s[0]); + fll_print_format("%ul%q", main->output.to.stream, total, f_string_eol_s); } } else { @@ -509,7 +509,7 @@ extern "C" { for (i = range.start; i <= range.stop; ++i) { - if (data->buffer.string[i] == f_string_eol_s[0]) { + if (data->buffer.string[i] == f_string_eol_s.string[0]) { if (*line == data->line) { range.stop = i; @@ -536,7 +536,7 @@ extern "C" { } // for // If Content does not end with a newline, it still must be treated as the last line. - if (data->buffer.string[range.stop] != f_string_eol_s[0]) { + if (data->buffer.string[range.stop] != f_string_eol_s.string[0]) { ++(*line); if (*line == data->line) { @@ -549,7 +549,7 @@ extern "C" { range.stop = data->contents.array[at].array[0].stop; f_print_except_in_dynamic_partial(data->buffer, range, delimits_content, data->comments, main->output.to.stream); - f_print_character(f_string_eol_s[0], main->output.to.stream); + f_print_dynamic(f_string_eol_s, main->output.to.stream); } funlockfile(main->output.to.stream); @@ -587,7 +587,7 @@ extern "C" { } } // for - fll_print_format("%ul%c", main->output.to.stream, max, f_string_eol_s[0]); + fll_print_format("%ul%q", main->output.to.stream, max, f_string_eol_s); return F_none; } @@ -743,7 +743,7 @@ extern "C" { for (i = range.start; i <= range.stop; ++i) { - if (data->buffer.string[i] == f_string_eol_s[0]) { + if (data->buffer.string[i] == f_string_eol_s.string[0]) { range.start = i + 1; if (i <= range.stop) { @@ -753,7 +753,7 @@ extern "C" { } // for // If Content does not end with a newline, it still must be treated as the last line. - if (data->buffer.string[range.stop] != f_string_eol_s[0]) { + if (data->buffer.string[range.stop] != f_string_eol_s.string[0]) { ++total; } } @@ -770,7 +770,7 @@ extern "C" { } } else { - fl_print_format("%ul%c", main->output.to.stream, total, f_string_eol_s[0]); + fl_print_format("%ul%q", main->output.to.stream, total, f_string_eol_s); } funlockfile(main->output.to.stream); diff --git a/level_3/fss_extended_list_write/c/fss_extended_list_write.c b/level_3/fss_extended_list_write/c/fss_extended_list_write.c index 7a60378..08cd0d3 100644 --- a/level_3/fss_extended_list_write/c/fss_extended_list_write.c +++ b/level_3/fss_extended_list_write/c/fss_extended_list_write.c @@ -13,45 +13,45 @@ extern "C" { fll_program_print_help_header(file, context, fss_extended_list_write_program_name_long_s, fss_extended_list_write_program_version_s); - fll_program_print_help_option(file, context, f_console_standard_short_help_s, f_console_standard_long_help_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print this help message."); - fll_program_print_help_option(file, context, f_console_standard_short_dark_s, f_console_standard_long_dark_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_light_s, f_console_standard_long_light_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, "Do not file in color."); - fll_program_print_help_option(file, context, f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Decrease verbosity, silencing most output."); - fll_program_print_help_option(file, context, f_console_standard_short_normal_s, f_console_standard_long_normal_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Set verbosity to normal file."); - fll_program_print_help_option(file, context, f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Increase verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_debug_s, f_console_standard_long_debug_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Enable debugging, significantly increasing verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_version_s, f_console_standard_long_version_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Print only the version number."); - - f_print_character(f_string_eol_s[0], file.stream); - - fll_program_print_help_option(file, context, fss_extended_list_write_short_file_s, fss_extended_list_write_long_file_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Specify a file to send data to."); - fll_program_print_help_option(file, context, fss_extended_list_write_short_content_s, fss_extended_list_write_long_content_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "The Content to file."); - fll_program_print_help_option(file, context, fss_extended_list_write_short_double_s, fss_extended_list_write_long_double_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Use double quotes (default)."); - fll_program_print_help_option(file, context, fss_extended_list_write_short_ignore_s, fss_extended_list_write_long_ignore_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Ignore a given range within a Content."); - fll_program_print_help_option(file, context, fss_extended_list_write_short_object_s, fss_extended_list_write_long_object_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " The Object to file."); - fll_program_print_help_option(file, context, fss_extended_list_write_short_partial_s, fss_extended_list_write_long_partial_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Do not file end of Object/Content character."); - fll_program_print_help_option(file, context, fss_extended_list_write_short_prepend_s, fss_extended_list_write_long_prepend_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Prepend the given whitespace characters to the start of each multi-line Content."); - fll_program_print_help_option(file, context, fss_extended_list_write_short_single_s, fss_extended_list_write_long_single_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Use single quotes."); - fll_program_print_help_option(file, context, fss_extended_list_write_short_trim_s, fss_extended_list_write_long_trim_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Trim Object names."); + fll_program_print_help_option(file, context, f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print this help message."); + fll_program_print_help_option(file, context, f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, "Do not file in color."); + fll_program_print_help_option(file, context, f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Decrease verbosity, silencing most output."); + fll_program_print_help_option(file, context, f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Set verbosity to normal file."); + fll_program_print_help_option(file, context, f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Increase verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Enable debugging, significantly increasing verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Print only the version number."); + + f_print_dynamic(f_string_eol_s, file.stream); + + fll_program_print_help_option(file, context, fss_extended_list_write_short_file_s, fss_extended_list_write_long_file_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Specify a file to send data to."); + fll_program_print_help_option(file, context, fss_extended_list_write_short_content_s, fss_extended_list_write_long_content_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "The Content to file."); + fll_program_print_help_option(file, context, fss_extended_list_write_short_double_s, fss_extended_list_write_long_double_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Use double quotes (default)."); + fll_program_print_help_option(file, context, fss_extended_list_write_short_ignore_s, fss_extended_list_write_long_ignore_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Ignore a given range within a Content."); + fll_program_print_help_option(file, context, fss_extended_list_write_short_object_s, fss_extended_list_write_long_object_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " The Object to file."); + fll_program_print_help_option(file, context, fss_extended_list_write_short_partial_s, fss_extended_list_write_long_partial_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "Do not file end of Object/Content character."); + fll_program_print_help_option(file, context, fss_extended_list_write_short_prepend_s, fss_extended_list_write_long_prepend_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "Prepend the given whitespace characters to the start of each multi-line Content."); + fll_program_print_help_option(file, context, fss_extended_list_write_short_single_s, fss_extended_list_write_long_single_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Use single quotes."); + fll_program_print_help_option(file, context, fss_extended_list_write_short_trim_s, fss_extended_list_write_long_trim_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Trim Object names."); fll_program_print_help_usage(file, context, fss_extended_list_write_program_name_s, f_string_empty_s); - fl_print_format(" The pipe uses the Backspace character '%[\\b%]' (%[U+0008%]) to designate the start of a Content.%c", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s[0]); - fl_print_format(" The pipe uses the Form Feed character '%[\\f%]' (%[U+000C%]) to designate the end of the last Content.%c", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s[0]); - 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).%c", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s[0]); + fl_print_format(" The pipe uses the Backspace character '%[\\b%]' (%[U+0008%]) to designate the start of a Content.%q", file.stream, context.set.notable, context.set.notable, context.set.notable, context.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.%q", file.stream, context.set.notable, context.set.notable, context.set.notable, context.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).%q", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s); fl_print_format(" For the pipe, an Object is terminated by either a Backspace character '%[\\b%]' (%[U+0008%])", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable); - fl_print_format(" or a Form Feed character '%[\\f%]' (%[U+000C%]).%c", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s[0]); - fl_print_format(" The end of the pipe represents the end of any Object or Content.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" or a Form Feed character '%[\\f%]' (%[U+000C%]).%q", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s); + fl_print_format(" The end of the pipe represents the end of any Object or Content.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" The FSS-0003 (Extended List) specification does not support quoted names, therefore the parameters '%[%s%s%]'", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_single_s, context.set.notable); - fl_print_format(" and '%[%s%s%]' do nothing.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_double_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The FSS-0003 (Extended List) specification does not support quoted names, therefore the parameters '%[%q%s%]'", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_single_s, context.set.notable); + fl_print_format(" and '%[%q%s%]' do nothing.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_double_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" The parameter '%[%s%s%]' designates to not escape any valid nested Object or Content within some Content.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_ignore_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" This parameter requires two values.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" This parameter is not used for ignoring anything from the input pipe.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" This parameter must be specified after a '%[%s%s%]'", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_content_s, context.set.notable); - fl_print_format(" parameter and this applies only to the Content represented by that specific '%[%s%s%]' parameter.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_content_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The parameter '%[%q%s%]' designates to not escape any valid nested Object or Content within some Content.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_ignore_s, context.set.notable, f_string_eol_s); + fl_print_format(" This parameter requires two values.%q", file.stream, f_string_eol_s); + fl_print_format(" This parameter is not used for ignoring anything from the input pipe.%q", file.stream, f_string_eol_s); + fl_print_format(" This parameter must be specified after a '%[%q%s%]'", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_content_s, context.set.notable); + fl_print_format(" parameter and this applies only to the Content represented by that specific '%[%q%s%]' parameter.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_content_s, context.set.notable, f_string_eol_s, f_string_eol_s); funlockfile(file.stream); @@ -167,9 +167,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_file_s, main->error.notable); - fl_print_format("%[' may only be specified once.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_file_s, main->error.notable); + fl_print_format("%[' may only be specified once.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -189,7 +189,7 @@ extern "C" { } } else if (main->parameters[fss_extended_list_write_parameter_file_e].result == f_console_result_found_e) { - fss_extended_list_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s, fss_extended_list_write_long_file_s); + fss_extended_list_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s.string, fss_extended_list_write_long_file_s); status = F_status_set_error(F_parameter); } } @@ -198,11 +198,11 @@ extern "C" { if (main->parameters[fss_extended_list_write_parameter_object_e].locations.used || main->parameters[fss_extended_list_write_parameter_content_e].locations.used) { if (main->parameters[fss_extended_list_write_parameter_object_e].locations.used) { if (main->parameters[fss_extended_list_write_parameter_object_e].locations.used != main->parameters[fss_extended_list_write_parameter_object_e].values.used) { - fss_extended_list_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s, fss_extended_list_write_long_object_s); + fss_extended_list_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s.string, fss_extended_list_write_long_object_s); status = F_status_set_error(F_parameter); } else if (main->parameters[fss_extended_list_write_parameter_content_e].locations.used != main->parameters[fss_extended_list_write_parameter_content_e].values.used) { - fss_extended_list_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s, fss_extended_list_write_long_content_s); + fss_extended_list_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s.string, fss_extended_list_write_long_content_s); status = F_status_set_error(F_parameter); } else if (main->parameters[fss_extended_list_write_parameter_object_e].locations.used != main->parameters[fss_extended_list_write_parameter_content_e].locations.used && main->parameters[fss_extended_list_write_parameter_partial_e].result == f_console_result_none_e) { @@ -214,13 +214,13 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_partial_s, main->error.notable); + fl_print_format("%q%[%sThe '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_partial_s, main->error.notable); fl_print_format("%[' parameter only allows either the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_object_s, main->error.notable); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_object_s, main->error.notable); fl_print_format("%[' parameter or the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_content_s, main->error.notable); - fl_print_format("%[' parameter, but not both.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_content_s, main->error.notable); + fl_print_format("%[' parameter, but not both.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -246,11 +246,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sEach '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_object_s, main->error.notable); + fl_print_format("%q%[%sEach '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_object_s, main->error.notable); fl_print_format("%[' parameter must be specified before a '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_content_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_content_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -264,7 +264,7 @@ extern "C" { } else if (main->parameters[fss_extended_list_write_parameter_content_e].locations.used) { if (main->parameters[fss_extended_list_write_parameter_content_e].locations.used != main->parameters[fss_extended_list_write_parameter_content_e].values.used) { - fss_extended_list_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s, fss_extended_list_write_long_content_s); + fss_extended_list_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s.string, fss_extended_list_write_long_content_s); status = F_status_set_error(F_parameter); } else if (!main->parameters[fss_extended_list_write_parameter_partial_e].locations.used) { @@ -277,11 +277,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThis requires either piped data or the use of the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_object_s, main->error.notable); + fl_print_format("%q%[%sThis requires either piped data or the use of the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_object_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_content_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_content_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -294,9 +294,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThis '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_partial_s, main->error.notable); - fl_print_format("%[' parameter cannot be used when processing a pipe.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThis '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_partial_s, main->error.notable); + fl_print_format("%[' parameter cannot be used when processing a pipe.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -311,9 +311,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_prepend_s, main->error.notable); - fl_print_format("%[' is specified, but no value is given.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_prepend_s, main->error.notable); + fl_print_format("%[' is specified, but no value is given.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -340,9 +340,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_prepend_s, main->error.notable); - fl_print_format("%[' must only contain whitespace.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_prepend_s, main->error.notable); + fl_print_format("%[' must only contain whitespace.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -357,9 +357,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_prepend_s, main->error.notable); - fl_print_format("%[' must not be an empty string.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_prepend_s, main->error.notable); + fl_print_format("%[' must not be an empty string.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -374,9 +374,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_ignore_s, main->error.notable); - fl_print_format("%[' was specified, but no values were given.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_ignore_s, main->error.notable); + fl_print_format("%[' was specified, but no values were given.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -390,9 +390,9 @@ extern "C" { if (total_locations * 2 > total_arguments) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_ignore_s, main->error.notable); - fl_print_format("%[' requires two values.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_ignore_s, main->error.notable); + fl_print_format("%[' requires two values.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -431,8 +431,8 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sWhile processing the '%]%[input pipe%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context, main->error.notable, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sWhile processing the '%]%[input pipe%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context, main->error.notable, main->error.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -511,8 +511,8 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sWhile processing the '%]%[input arguments%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context, main->error.notable, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sWhile processing the '%]%[input arguments%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context, main->error.notable, main->error.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -520,7 +520,7 @@ extern "C" { else if (main->error.verbosity != f_console_verbosity_quiet_e && main->parameters[fss_extended_list_write_parameter_file_e].result == f_console_result_none_e) { // Ensure there is always a newline at the end, unless in quiet mode. - fll_print_character(f_string_eol_s[0], main->output.to.stream); + fll_print_dynamic(f_string_eol_s, main->output.to.stream); } } @@ -546,7 +546,7 @@ extern "C" { // Ensure a newline is always put at the end of the program execution, unless in quiet mode. if (main->error.verbosity != f_console_verbosity_quiet_e) { if (F_status_is_error(status)) { - fll_print_character(f_string_eol_s[0], main->error.to.stream); + fll_print_dynamic(f_string_eol_s, main->error.to.stream); } } 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 d4c903f..8eda7fd 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 @@ -116,15 +116,15 @@ extern "C" { #define fss_extended_list_write_console_parameter_t_initialize \ { \ - macro_f_console_parameter_t_initialize(f_console_standard_short_help_s, f_console_standard_long_help_s, 0, 0, f_console_type_normal_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_light_s, f_console_standard_long_light_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s, f_console_standard_long_dark_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, 0, F_false, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s, f_console_standard_long_normal_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s, f_console_standard_long_debug_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_version_s, f_console_standard_long_version_s, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, 0, 0, f_console_type_normal_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, 0, F_false, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, 0, 0, f_console_type_inverse_e), \ macro_f_console_parameter_t_initialize(fss_extended_list_write_short_file_s, fss_extended_list_write_long_file_s, 0, 1, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(fss_extended_list_write_short_content_s, fss_extended_list_write_long_content_s, 0, 1, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(fss_extended_list_write_short_double_s, fss_extended_list_write_long_double_s, 0, 0, f_console_type_normal_e), \ diff --git a/level_3/fss_extended_list_write/c/private-common.c b/level_3/fss_extended_list_write/c/private-common.c index 2aeb205..3417754 100644 --- a/level_3/fss_extended_list_write/c/private-common.c +++ b/level_3/fss_extended_list_write/c/private-common.c @@ -15,9 +15,9 @@ extern "C" { flockfile(main->warning.to.stream); - fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s[0], f_string_eol_s[0], main->context.set.warning, main->context.set.warning); + fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s, f_string_eol_s, main->context.set.warning, main->context.set.warning); fl_print_format("%[%i%]", main->warning.to.stream, main->context.set.notable, signal, main->context.set.notable); - fl_print_format("%[.%]%c", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s[0]); + fl_print_format("%[.%]%q", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s); funlockfile(main->warning.to.stream); } diff --git a/level_3/fss_extended_list_write/c/private-write.c b/level_3/fss_extended_list_write/c/private-write.c index 4412f6b..c01c886 100644 --- a/level_3/fss_extended_list_write/c/private-write.c +++ b/level_3/fss_extended_list_write/c/private-write.c @@ -15,13 +15,13 @@ extern "C" { flockfile(main->error.to.stream); - fl_print_format("%c%[%sMust specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_object_s, main->error.notable); + fl_print_format("%q%[%sMust specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_object_s, main->error.notable); fl_print_format("%[' parameter and the '%]", main->error.to.stream, main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_content_s, main->error.notable); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_content_s, main->error.notable); fl_print_format("%[' parameter the same number of times when not specifying the '%]", main->error.to.stream, main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_partial_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_list_write_long_partial_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -36,9 +36,9 @@ extern "C" { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThis standard does not support end of line character '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%sThis standard does not support end of line character '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[\\n%]", main->error.to.stream, main->error.notable, main->error.notable); - fl_print_format("%[' in objects.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' in objects.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -53,9 +53,9 @@ extern "C" { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%S%S%]", main->error.to.stream, main->error.notable, symbol, parameter, main->error.notable); - fl_print_format("%[' is specified, but no value is given.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' is specified, but no value is given.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -262,7 +262,7 @@ extern "C" { if (block.string[range.start] == fss_extended_list_write_pipe_content_start_s) { if (main->error.verbosity != f_console_verbosity_quiet_e) { - fll_print_format("%c%[%sThis standard only supports one content per object.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sThis standard only supports one content per object.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context, f_string_eol_s); } status = F_status_set_error(F_supported_not); diff --git a/level_3/fss_extended_read/c/fss_extended_read.c b/level_3/fss_extended_read/c/fss_extended_read.c index af69169..08bf2c7 100644 --- a/level_3/fss_extended_read/c/fss_extended_read.c +++ b/level_3/fss_extended_read/c/fss_extended_read.c @@ -14,102 +14,102 @@ extern "C" { fll_program_print_help_header(file, context, fss_extended_read_program_name_long_s, fss_extended_read_program_version_s); - fll_program_print_help_option(file, context, f_console_standard_short_help_s, f_console_standard_long_help_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print this help message."); - fll_program_print_help_option(file, context, f_console_standard_short_dark_s, f_console_standard_long_dark_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_light_s, f_console_standard_long_light_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, "Do not file in color."); - fll_program_print_help_option(file, context, f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Decrease verbosity, silencing most output."); - fll_program_print_help_option(file, context, f_console_standard_short_normal_s, f_console_standard_long_normal_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Set verbosity to normal file."); - fll_program_print_help_option(file, context, f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Increase verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_debug_s, f_console_standard_long_debug_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Enable debugging, significantly increasing verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_version_s, f_console_standard_long_version_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Print only the version number."); - - f_print_character(f_string_eol_s[0], file.stream); - - fll_program_print_help_option(file, context, fss_extended_read_short_at_s, fss_extended_read_long_at_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Select Object at this numeric index."); - fll_program_print_help_option(file, context, fss_extended_read_short_content_s, fss_extended_read_long_content_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print the Content (default)."); - fll_program_print_help_option(file, context, fss_extended_read_short_columns_s, fss_extended_read_long_columns_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print the total number of columns."); - fll_program_print_help_option(file, context, fss_extended_read_short_delimit_s, fss_extended_read_long_delimit_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Designate how to handle applying delimits."); - fll_program_print_help_option(file, context, fss_extended_read_short_depth_s, fss_extended_read_long_depth_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Select Object at this numeric depth."); - fll_program_print_help_option(file, context, fss_extended_read_short_empty_s, fss_extended_read_long_empty_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Include empty Content when processing."); - fll_program_print_help_option(file, context, fss_extended_read_short_line_s, fss_extended_read_long_line_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print only the Content at the given line."); - fll_program_print_help_option(file, context, fss_extended_read_short_name_s, fss_extended_read_long_name_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Select Object with this name."); - fll_program_print_help_option(file, context, fss_extended_read_short_object_s, fss_extended_read_long_object_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print the Object."); - fll_program_print_help_option(file, context, fss_extended_read_short_pipe_s, fss_extended_read_long_pipe_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print using the special pipe format."); - fll_program_print_help_option(file, context, fss_extended_read_short_raw_s, fss_extended_read_long_raw_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print with the original quotes and escapes."); - fll_program_print_help_option(file, context, fss_extended_read_short_select_s, fss_extended_read_long_select_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Select sub-Content at this index."); - fll_program_print_help_option(file, context, fss_extended_read_short_total_s, fss_extended_read_long_total_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print the total number of lines."); - fll_program_print_help_option(file, context, fss_extended_read_short_trim_s, fss_extended_read_long_trim_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Trim Object names on select or print."); + fll_program_print_help_option(file, context, f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print this help message."); + fll_program_print_help_option(file, context, f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, "Do not file in color."); + fll_program_print_help_option(file, context, f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Decrease verbosity, silencing most output."); + fll_program_print_help_option(file, context, f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Set verbosity to normal file."); + fll_program_print_help_option(file, context, f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Increase verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Enable debugging, significantly increasing verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Print only the version number."); + + f_print_dynamic(f_string_eol_s, file.stream); + + fll_program_print_help_option(file, context, fss_extended_read_short_at_s, fss_extended_read_long_at_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Select Object at this numeric index."); + fll_program_print_help_option(file, context, fss_extended_read_short_content_s, fss_extended_read_long_content_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print the Content (default)."); + fll_program_print_help_option(file, context, fss_extended_read_short_columns_s, fss_extended_read_long_columns_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print the total number of columns."); + fll_program_print_help_option(file, context, fss_extended_read_short_delimit_s, fss_extended_read_long_delimit_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Designate how to handle applying delimits."); + fll_program_print_help_option(file, context, fss_extended_read_short_depth_s, fss_extended_read_long_depth_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Select Object at this numeric depth."); + fll_program_print_help_option(file, context, fss_extended_read_short_empty_s, fss_extended_read_long_empty_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Include empty Content when processing."); + fll_program_print_help_option(file, context, fss_extended_read_short_line_s, fss_extended_read_long_line_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print only the Content at the given line."); + fll_program_print_help_option(file, context, fss_extended_read_short_name_s, fss_extended_read_long_name_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Select Object with this name."); + fll_program_print_help_option(file, context, fss_extended_read_short_object_s, fss_extended_read_long_object_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print the Object."); + fll_program_print_help_option(file, context, fss_extended_read_short_pipe_s, fss_extended_read_long_pipe_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print using the special pipe format."); + fll_program_print_help_option(file, context, fss_extended_read_short_raw_s, fss_extended_read_long_raw_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print with the original quotes and escapes."); + fll_program_print_help_option(file, context, fss_extended_read_short_select_s, fss_extended_read_long_select_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Select sub-Content at this index."); + fll_program_print_help_option(file, context, fss_extended_read_short_total_s, fss_extended_read_long_total_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print the total number of lines."); + fll_program_print_help_option(file, context, fss_extended_read_short_trim_s, fss_extended_read_long_trim_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Trim Object names on select or print."); fll_program_print_help_usage(file, context, fss_extended_read_program_name_s, "filename(s)"); - fl_print_format(" %[Notes:%]%c", file.stream, context.set.important, context.set.important, f_string_eol_s[0]); + fl_print_format(" %[Notes:%]%q", file.stream, context.set.important, context.set.important, f_string_eol_s); - fl_print_format(" This program will print the Content associated with the given Object and Content main based on the FSS-0001 Extended standard.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" This program will print the Content associated with the given Object and Content main based on the FSS-0001 Extended standard.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" All numeric positions (indexes) start at 0 instead of 1.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" For example, a file of 17 lines would range from 0 to 16.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" All numeric positions (indexes) start at 0 instead of 1.%q", file.stream, f_string_eol_s); + fl_print_format(" For example, a file of 17 lines would range from 0 to 16.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" When using the %[%s%s%] option, an order of operations is enforced on the parameters.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_depth_s, context.set.notable, f_string_eol_s[0]); + fl_print_format(" When using the %[%q%s%] option, an order of operations is enforced on the parameters.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_depth_s, context.set.notable, f_string_eol_s); - fl_print_format(" When this order of operations is in effect, parameters to the right of a depth parameter are influenced by that depth parameter:%c", file.stream, f_string_eol_s[0]); + fl_print_format(" When this order of operations is in effect, parameters to the right of a depth parameter are influenced by that depth parameter:%q", file.stream, f_string_eol_s); - fl_print_format(" %[%s%s%]: An Object index at the specified depth.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_at_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" %[%s%s%]: A new depth within the specified depth, indexed from the root.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_depth_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" %[%s%s%]: An Object name at the specified depth.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_name_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" %[%q%s%]: An Object index at the specified depth.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_at_s, context.set.notable, f_string_eol_s); + fl_print_format(" %[%q%s%]: A new depth within the specified depth, indexed from the root.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_depth_s, context.set.notable, f_string_eol_s); + fl_print_format(" %[%q%s%]: An Object name at the specified depth.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_name_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" The parameter %[%s%s%] must be in numeric order, but values in between may be skipped.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_depth_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" ('-d 0 -a 1 -d 2 -a 2' would specify index 1 at depth 0, any index at depth 1, and index 2 at depth 2.)%c", file.stream, f_string_eol_s[0]); - fl_print_format(" ('-d 2 -a 1 -d 0 -a 2' would be invalid because depth 2 is before depth 1.)%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The parameter %[%q%s%] must be in numeric order, but values in between may be skipped.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_depth_s, context.set.notable, f_string_eol_s); + fl_print_format(" ('-d 0 -a 1 -d 2 -a 2' would specify index 1 at depth 0, any index at depth 1, and index 2 at depth 2.)%q", file.stream, f_string_eol_s); + fl_print_format(" ('-d 2 -a 1 -d 0 -a 2' would be invalid because depth 2 is before depth 1.)%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" The parameter %[%s%s%] selects a Content column.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_select_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The parameter %[%q%s%] selects a Content column.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_select_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" Specify both %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_object_s, context.set.notable); - fl_print_format(" and the %[%s%s%] parameters to get the total objects.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_total_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" Specify both %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_object_s, context.set.notable); + fl_print_format(" and the %[%q%s%] parameters to get the total objects.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_total_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" When both %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_at_s, context.set.notable); - fl_print_format(" and %[%s%s%] parameters are specified (at the same depth),", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_name_s, context.set.notable); - fl_print_format(" the %[%s%s%] parameter value will be treated as a position relative to the specified", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_at_s, context.set.notable); - fl_print_format(" %[%s%s%] parameter value.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_name_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" When both %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_at_s, context.set.notable); + fl_print_format(" and %[%q%s%] parameters are specified (at the same depth),", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_name_s, context.set.notable); + fl_print_format(" the %[%q%s%] parameter value will be treated as a position relative to the specified", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_at_s, context.set.notable); + fl_print_format(" %[%q%s%] parameter value.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_name_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" This program may support parameters, such as %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_depth_s, context.set.notable); - fl_print_format(" or %[%s%s%], even if not supported by the standard.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_select_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" This is done to help ensure consistency for scripting.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" This program may support parameters, such as %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_depth_s, context.set.notable); + fl_print_format(" or %[%q%s%], even if not supported by the standard.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_select_s, context.set.notable, f_string_eol_s); + fl_print_format(" This is done to help ensure consistency for scripting.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" For parameters like %[%s%s%],", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_depth_s, context.set.notable); - fl_print_format(" if the standard doesn't support nested Content, then only a depth of 0 would be valid.%c", file.stream, f_string_eol_s[0]); + fl_print_format(" For parameters like %[%q%s%],", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_depth_s, context.set.notable); + fl_print_format(" if the standard doesn't support nested Content, then only a depth of 0 would be valid.%q", file.stream, f_string_eol_s); - fl_print_format(" For parameters like %[%s%s%],", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_select_s, context.set.notable); - fl_print_format(" if the standard doesn't support multiple Content groups, then only a select of 0 would be valid.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" For parameters like %[%q%s%],", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_select_s, context.set.notable); + fl_print_format(" if the standard doesn't support multiple Content groups, then only a select of 0 would be valid.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" The parameter %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_trim_s, context.set.notable); - fl_print_format(" will remove leading and trailing whitespaces when selecting objects or when printing objects.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The parameter %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_trim_s, context.set.notable); + fl_print_format(" will remove leading and trailing whitespaces when selecting objects or when printing objects.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" When specifying both the %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_object_s, context.set.notable); - fl_print_format(" parameter and the %[%s%s%] parameter, the entire Object and Content are printed, including the formatting.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_content_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" Both the Object and Content printed are already escaped.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" Both the Object and Content are separated by a space.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" When specifying both the %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_object_s, context.set.notable); + fl_print_format(" parameter and the %[%q%s%] parameter, the entire Object and Content are printed, including the formatting.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_content_s, context.set.notable, f_string_eol_s); + fl_print_format(" Both the Object and Content printed are already escaped.%q", file.stream, f_string_eol_s); + fl_print_format(" Both the Object and Content are separated by a space.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" The parameter %[%s%s%] accepts the following:%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_delimit_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" - %[%s%]: Do not apply delimits.%c", file.stream, context.set.notable, fss_extended_read_delimit_mode_name_none, context.set.notable, f_string_eol_s[0]); - fl_print_format(" - %[%s%]: (default) Apply all delimits.%c", file.stream, context.set.notable, fss_extended_read_delimit_mode_name_all, context.set.notable, f_string_eol_s[0]); - fl_print_format(" - %[%s%]: Apply delimits for Objects.%c", file.stream, context.set.notable, fss_extended_read_delimit_mode_name_object, context.set.notable, f_string_eol_s[0]); - fl_print_format(" - A number, 0 or greater: apply delimits for Content at the specified depth.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" - A number, 0 or greater, followed by a %[%s%]: (such as '1+') apply delimits for Content at the specified depth and any greater depth (numerically).%c", file.stream, context.set.notable, fss_extended_read_delimit_mode_name_greater, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); - fl_print_format(" - A number, 0 or lesser, followed by a %[%s%]: (such as '1-') apply delimits for Content at the specified depth and any lesser depth (numerically).%c%c", file.stream, context.set.notable, fss_extended_read_delimit_mode_name_lesser, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The parameter %[%q%s%] accepts the following:%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_delimit_s, context.set.notable, f_string_eol_s); + fl_print_format(" - %[%s%]: Do not apply delimits.%q", file.stream, context.set.notable, fss_extended_read_delimit_mode_name_none, context.set.notable, f_string_eol_s); + fl_print_format(" - %[%s%]: (default) Apply all delimits.%q", file.stream, context.set.notable, fss_extended_read_delimit_mode_name_all, context.set.notable, f_string_eol_s); + fl_print_format(" - %[%s%]: Apply delimits for Objects.%q", file.stream, context.set.notable, fss_extended_read_delimit_mode_name_object, context.set.notable, f_string_eol_s); + fl_print_format(" - A number, 0 or greater: apply delimits for Content at the specified depth.%q", file.stream, f_string_eol_s); + fl_print_format(" - A number, 0 or greater, followed by a %[%s%]: (such as '1+') apply delimits for Content at the specified depth and any greater depth (numerically).%q", file.stream, context.set.notable, fss_extended_read_delimit_mode_name_greater, context.set.notable, f_string_eol_s, f_string_eol_s); + fl_print_format(" - A number, 0 or lesser, followed by a %[%s%]: (such as '1-') apply delimits for Content at the specified depth and any lesser depth (numerically).%q%q", file.stream, context.set.notable, fss_extended_read_delimit_mode_name_lesser, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" The %[%s%s%] parameter may be specified multiple times to customize the delimit behavior.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_delimit_s, context.set.notable, f_string_eol_s[0]); + fl_print_format(" The %[%q%s%] parameter may be specified multiple times to customize the delimit behavior.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_delimit_s, context.set.notable, f_string_eol_s); - fl_print_format(" The %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_delimit_s, context.set.notable); + fl_print_format(" The %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_delimit_s, context.set.notable); fl_print_format(" values %[%s%]", file.stream, context.set.notable, fss_extended_read_delimit_mode_name_none, context.set.notable); fl_print_format(" and %[%s%],", file.stream, context.set.notable, fss_extended_read_delimit_mode_name_all, context.set.notable); - fl_print_format(" overrule all other delimit values.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" overrule all other delimit values.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" The parameters %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_columns_s, context.set.notable); - fl_print_format(" and %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_select_s, context.set.notable); - fl_print_format(" refer to a Content column.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" The word \"column\" is being loosely defined to refer to a specific Content.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" This is not to be confused with a depth.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The parameters %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_columns_s, context.set.notable); + fl_print_format(" and %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_read_long_select_s, context.set.notable); + fl_print_format(" refer to a Content column.%q", file.stream, f_string_eol_s); + fl_print_format(" The word \"column\" is being loosely defined to refer to a specific Content.%q", file.stream, f_string_eol_s); + fl_print_format(" This is not to be confused with a depth.%q%q", file.stream, f_string_eol_s, f_string_eol_s); funlockfile(file.stream); @@ -262,9 +262,9 @@ extern "C" { if (main->parameters[parameter_code[i]].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, parameter_name[i], main->error.notable); - fl_print_format("%[' requires a %s.%]%c", main->error.to.stream, main->error.context, parameter_message[i], main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, parameter_name[i], main->error.notable); + fl_print_format("%[' requires a %s.%]%q", main->error.to.stream, main->error.context, parameter_message[i], main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -304,11 +304,11 @@ extern "C" { if (main->parameters[parameter_code[i]].result == parameter_match[i]) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_read_long_columns_s, main->error.notable); + fl_print_format("%q%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_read_long_columns_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, parameter_name[i], main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, parameter_name[i], main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -322,11 +322,11 @@ extern "C" { if (main->parameters[fss_extended_read_parameter_total_e].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_read_long_pipe_s, main->error.notable); + fl_print_format("%q%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_read_long_pipe_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_read_long_total_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_read_long_total_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -335,11 +335,11 @@ extern "C" { else if (main->parameters[fss_extended_read_parameter_line_e].result == f_console_result_additional_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_read_long_pipe_s, main->error.notable); + fl_print_format("%q%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_read_long_pipe_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_read_long_line_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_read_long_line_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -372,9 +372,9 @@ extern "C" { if (!length) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_read_long_delimit_s, main->error.notable); - fl_print_format("%[' must not be empty.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_read_long_delimit_s, main->error.notable); + fl_print_format("%[' must not be empty.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -506,9 +506,9 @@ extern "C" { if (F_status_is_error_not(status) && main->parameters[fss_extended_read_parameter_select_e].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_read_long_select_s, main->error.notable); - fl_print_format("%[' parameter requires a positive number.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_read_long_select_s, main->error.notable); + fl_print_format("%[' parameter requires a positive number.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -636,7 +636,7 @@ extern "C" { fss_extended_read_data_delete_simple(&data); } else { - fll_print_format("%c%[%sYou failed to specify one or more files.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sYou failed to specify one or more files.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context, f_string_eol_s); status = F_status_set_error(F_parameter); } @@ -644,7 +644,7 @@ extern "C" { if (F_status_set_fine(status) == F_interrupt) { fflush(main->output.to.stream); - fll_print_terminated(f_string_eol_s, main->output.to.stream); + fll_print_dynamic(f_string_eol_s, main->output.to.stream); } } 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 7dd9d1a..3077064 100644 --- a/level_3/fss_extended_read/c/fss_extended_read.h +++ b/level_3/fss_extended_read/c/fss_extended_read.h @@ -138,15 +138,15 @@ extern "C" { #define fss_extended_read_console_parameter_t_initialize \ { \ - macro_f_console_parameter_t_initialize(f_console_standard_short_help_s, f_console_standard_long_help_s, 0, 0, f_console_type_normal_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_light_s, f_console_standard_long_light_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s, f_console_standard_long_dark_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s, f_console_standard_long_normal_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s, f_console_standard_long_debug_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_version_s, f_console_standard_long_version_s, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, 0, 0, f_console_type_normal_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, 0, 0, f_console_type_inverse_e), \ macro_f_console_parameter_t_initialize(fss_extended_read_short_at_s, fss_extended_read_long_at_s, 0, 1, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(fss_extended_read_short_content_s, fss_extended_read_long_content_s, 0, 0, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(fss_extended_read_short_columns_s, fss_extended_read_long_columns_s, 0, 0, f_console_type_normal_e), \ diff --git a/level_3/fss_extended_read/c/private-common.c b/level_3/fss_extended_read/c/private-common.c index 387b3a6..bfe98dd 100644 --- a/level_3/fss_extended_read/c/private-common.c +++ b/level_3/fss_extended_read/c/private-common.c @@ -68,9 +68,9 @@ extern "C" { flockfile(main->warning.to.stream); - fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s[0], f_string_eol_s[0], main->context.set.warning, main->context.set.warning); + fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s, f_string_eol_s, main->context.set.warning, main->context.set.warning); fl_print_format("%[%i%]", main->warning.to.stream, main->context.set.notable, signal, main->context.set.notable); - fl_print_format("%[.%]%c", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s[0]); + fl_print_format("%[.%]%q", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s); funlockfile(main->warning.to.stream); } diff --git a/level_3/fss_extended_read/c/private-print.c b/level_3/fss_extended_read/c/private-print.c index 0ea91b1..c2e30da 100644 --- a/level_3/fss_extended_read/c/private-print.c +++ b/level_3/fss_extended_read/c/private-print.c @@ -20,24 +20,24 @@ extern "C" { if (data->option & fss_extended_read_data_option_object_d) { if (data->option & fss_extended_read_data_option_trim_d) { if ((data->option & fss_extended_read_data_option_raw_d) && data->quotes_object.array[at]) { - f_print_character_safely(data->quotes_object.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s[0] : f_fss_quote_double_s[0], main->output.to.stream); + f_print_character_safely(data->quotes_object.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream); } fl_print_trim_except_dynamic_partial(data->buffer, data->objects.array[at], delimits_object, main->output.to.stream); if ((data->option & fss_extended_read_data_option_raw_d) && data->quotes_object.array[at]) { - f_print_character_safely(data->quotes_object.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s[0] : f_fss_quote_double_s[0], main->output.to.stream); + f_print_character_safely(data->quotes_object.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream); } } else { if ((data->option & fss_extended_read_data_option_raw_d) && data->quotes_object.array[at]) { - f_print_character_safely(data->quotes_object.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s[0] : f_fss_quote_double_s[0], main->output.to.stream); + f_print_character_safely(data->quotes_object.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream); } f_print_except_dynamic_partial(data->buffer, data->objects.array[at], delimits_object, main->output.to.stream); if ((data->option & fss_extended_read_data_option_raw_d) && data->quotes_object.array[at]) { - f_print_character_safely(data->quotes_object.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s[0] : f_fss_quote_double_s[0], main->output.to.stream); + f_print_character_safely(data->quotes_object.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream); } } @@ -54,13 +54,13 @@ extern "C" { content_printed = F_true; if ((data->option & fss_extended_read_data_option_raw_d) && data->quotes_content.array[at].array[data->select]) { - f_print_character_safely(data->quotes_content.array[at].array[data->select] == f_fss_quote_type_single_e ? f_fss_quote_single_s[0] : f_fss_quote_double_s[0], main->output.to.stream); + f_print_character_safely(data->quotes_content.array[at].array[data->select] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream); } f_print_except_dynamic_partial(data->buffer, data->contents.array[at].array[data->select], delimits_content, main->output.to.stream); if ((data->option & fss_extended_read_data_option_raw_d) && data->quotes_content.array[at].array[data->select]) { - f_print_character_safely(data->quotes_content.array[at].array[data->select] == f_fss_quote_type_single_e ? f_fss_quote_single_s[0] : f_fss_quote_double_s[0], main->output.to.stream); + f_print_character_safely(data->quotes_content.array[at].array[data->select] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream); } } } @@ -74,13 +74,13 @@ extern "C" { content_printed = F_true; if ((data->option & fss_extended_read_data_option_raw_d) && data->quotes_content.array[at].array[i]) { - f_print_character_safely(data->quotes_content.array[at].array[i] == f_fss_quote_type_single_e ? f_fss_quote_single_s[0] : f_fss_quote_double_s[0], main->output.to.stream); + f_print_character_safely(data->quotes_content.array[at].array[i] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream); } f_print_except_dynamic_partial(data->buffer, data->contents.array[at].array[i], delimits_content, main->output.to.stream); if ((data->option & fss_extended_read_data_option_raw_d) && data->quotes_content.array[at].array[i]) { - f_print_character_safely(data->quotes_content.array[at].array[i] == f_fss_quote_type_single_e ? f_fss_quote_single_s[0] : f_fss_quote_double_s[0], main->output.to.stream); + f_print_character_safely(data->quotes_content.array[at].array[i] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream); } if (i + 1 < data->contents.array[at].used && data->contents.array[at].array[i + 1].start <= data->contents.array[at].array[i + 1].stop) { @@ -160,7 +160,7 @@ extern "C" { f_print_character(fss_extended_read_pipe_content_start_s, main->output.to.stream); } else { - f_print_character(F_fss_space_s[0], main->output.to.stream); + f_print_character(f_fss_space_s.string[0], main->output.to.stream); } } #endif // _di_fss_extended_read_print_content_end_ @@ -172,7 +172,7 @@ extern "C" { f_print_character(fss_extended_read_pipe_content_end_s, main->output.to.stream); } else { - f_print_character(F_fss_space_s[0], main->output.to.stream); + f_print_character(f_fss_space_s.string[0], main->output.to.stream); } } #endif // _di_fss_extended_read_print_object_end_ @@ -180,8 +180,8 @@ extern "C" { #ifndef _di_fss_extended_read_print_one_ void fss_extended_read_print_one(fss_extended_read_main_t * const main) { - f_print_character(f_string_ascii_1_s[0], main->output.to.stream); - f_print_character(f_string_eol_s[0], main->output.to.stream); + f_print_character(f_string_ascii_1_s.string[0], main->output.to.stream); + f_print_dynamic(f_string_eol_s, main->output.to.stream); } #endif // _di_fss_extended_read_print_one_ @@ -192,7 +192,7 @@ extern "C" { f_print_character(fss_extended_read_pipe_content_end_s, main->output.to.stream); } else { - f_print_character(f_fss_eol_s[0], main->output.to.stream); + f_print_character(f_fss_eol_s.string[0], main->output.to.stream); } } #endif // _di_fss_extended_read_print_set_end_ @@ -200,8 +200,8 @@ extern "C" { #ifndef _di_fss_extended_read_print_zero_ void fss_extended_read_print_zero(fss_extended_read_main_t * const main) { - f_print_character(f_string_ascii_0_s[0], main->output.to.stream); - f_print_character(f_string_eol_s[0], main->output.to.stream); + f_print_character(f_string_ascii_0_s.string[0], main->output.to.stream); + f_print_dynamic(f_string_eol_s, main->output.to.stream); } #endif // _di_fss_extended_read_print_zero_ diff --git a/level_3/fss_extended_read/c/private-read.c b/level_3/fss_extended_read/c/private-read.c index 20c595e..80b245e 100644 --- a/level_3/fss_extended_read/c/private-read.c +++ b/level_3/fss_extended_read/c/private-read.c @@ -193,11 +193,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe value '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%sThe value '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%ul%]", main->error.to.stream, main->error.notable, data->depths.array[i].depth, main->error.notable); fl_print_format("%[' may only be specified once for the parameter '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_read_long_depth_s, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_read_long_depth_s, main->error.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -208,13 +208,13 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_read_long_depth_s, main->error.notable); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_read_long_depth_s, main->error.notable); fl_print_format("%[' may not have the value '%]", main->error.to.stream, main->error.context, main->error.context); fl_print_format("%[%ul%]", main->error.to.stream, main->error.notable, data->depths.array[i].depth, main->error.notable); fl_print_format("%[' before the value '%]", main->error.to.stream, main->error.context, main->error.context); fl_print_format("%[%ul%]", main->error.to.stream, main->error.notable, data->depths.array[j].depth, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -412,18 +412,18 @@ extern "C" { } else { if ((data->option & fss_extended_read_data_option_raw_d) && data->quotes_object.array[at]) { - f_print_character_safely(data->quotes_object.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s[0] : f_fss_quote_double_s[0], main->output.to.stream); + f_print_character_safely(data->quotes_object.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream); } fss_extended_read_print_at(main, i, *delimits_object, *delimits_content, data); if ((data->option & fss_extended_read_data_option_raw_d) && data->quotes_object.array[at]) { - f_print_character_safely(data->quotes_object.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s[0] : f_fss_quote_double_s[0], main->output.to.stream); + f_print_character_safely(data->quotes_object.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream); } } } else if (data->option & fss_extended_read_data_option_columns_d) { - fll_print_format("%ul%c", main->output.to.stream, data->contents.array[i].used, f_string_eol_s[0]); + fll_print_format("%ul%q", main->output.to.stream, data->contents.array[i].used, f_string_eol_s); } else if (data->option & fss_extended_read_data_option_total_d) { if (fss_extended_read_print_at_total(main, i, data) == F_none) { @@ -432,13 +432,13 @@ extern "C" { } else { if ((data->option & fss_extended_read_data_option_raw_d) && data->quotes_content.array[at].array[i]) { - f_print_character_safely(data->quotes_content.array[at].array[i] == f_fss_quote_type_single_e ? f_fss_quote_single_s[0] : f_fss_quote_double_s[0], main->output.to.stream); + f_print_character_safely(data->quotes_content.array[at].array[i] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream); } fss_extended_read_print_at(main, i, *delimits_object, *delimits_content, data); if ((data->option & fss_extended_read_data_option_raw_d) && data->quotes_content.array[at].array[i]) { - f_print_character_safely(data->quotes_content.array[at].array[i] == f_fss_quote_type_single_e ? f_fss_quote_single_s[0] : f_fss_quote_double_s[0], main->output.to.stream); + f_print_character_safely(data->quotes_content.array[at].array[i] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream); } } @@ -484,7 +484,7 @@ extern "C" { } } // for - fll_print_format("%ul%c", main->output.to.stream, max, f_string_eol_s[0]); + fll_print_format("%ul%q", main->output.to.stream, max, f_string_eol_s); return F_none; } @@ -698,7 +698,7 @@ extern "C" { } } else { - fl_print_format("%ul%c", main->output.to.stream, total, f_string_eol_s[0]); + fl_print_format("%ul%q", main->output.to.stream, total, f_string_eol_s); } funlockfile(main->output.to.stream); diff --git a/level_3/fss_extended_write/c/fss_extended_write.c b/level_3/fss_extended_write/c/fss_extended_write.c index 3fbda4a..d1599c3 100644 --- a/level_3/fss_extended_write/c/fss_extended_write.c +++ b/level_3/fss_extended_write/c/fss_extended_write.c @@ -13,42 +13,42 @@ extern "C" { fll_program_print_help_header(file, context, fss_extended_write_program_name_long_s, fss_extended_write_program_version_s); - fll_program_print_help_option(file, context, f_console_standard_short_help_s, f_console_standard_long_help_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print this help message."); - fll_program_print_help_option(file, context, f_console_standard_short_dark_s, f_console_standard_long_dark_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_light_s, f_console_standard_long_light_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, "Do not file in color."); - fll_program_print_help_option(file, context, f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Decrease verbosity, silencing most output."); - fll_program_print_help_option(file, context, f_console_standard_short_normal_s, f_console_standard_long_normal_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Set verbosity to normal file."); - fll_program_print_help_option(file, context, f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Increase verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_debug_s, f_console_standard_long_debug_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Enable debugging, significantly increasing verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_version_s, f_console_standard_long_version_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Print only the version number."); - - f_print_character(f_string_eol_s[0], file.stream); - - fll_program_print_help_option(file, context, fss_extended_write_short_file_s, fss_extended_write_long_file_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Specify a file to send data to."); - fll_program_print_help_option(file, context, fss_extended_write_short_content_s, fss_extended_write_long_content_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "The Content to file."); - fll_program_print_help_option(file, context, fss_extended_write_short_double_s, fss_extended_write_long_double_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Use double quotes (default)."); - fll_program_print_help_option(file, context, fss_extended_write_short_ignore_s, fss_extended_write_long_ignore_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Ignore a given range within a Content."); - fll_program_print_help_option(file, context, fss_extended_write_short_object_s, fss_extended_write_long_object_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " The Object to file."); - fll_program_print_help_option(file, context, fss_extended_write_short_partial_s, fss_extended_write_long_partial_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Do not file end of Object/Content character."); - fll_program_print_help_option(file, context, fss_extended_write_short_prepend_s, fss_extended_write_long_prepend_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Prepend the given whitespace characters to the start of each multi-line Content."); - fll_program_print_help_option(file, context, fss_extended_write_short_single_s, fss_extended_write_long_single_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Use single quotes."); - fll_program_print_help_option(file, context, fss_extended_write_short_trim_s, fss_extended_write_long_trim_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Trim Object names."); + fll_program_print_help_option(file, context, f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print this help message."); + fll_program_print_help_option(file, context, f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, "Do not file in color."); + fll_program_print_help_option(file, context, f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Decrease verbosity, silencing most output."); + fll_program_print_help_option(file, context, f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Set verbosity to normal file."); + fll_program_print_help_option(file, context, f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Increase verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Enable debugging, significantly increasing verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Print only the version number."); + + f_print_dynamic(f_string_eol_s, file.stream); + + fll_program_print_help_option(file, context, fss_extended_write_short_file_s, fss_extended_write_long_file_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Specify a file to send data to."); + fll_program_print_help_option(file, context, fss_extended_write_short_content_s, fss_extended_write_long_content_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "The Content to file."); + fll_program_print_help_option(file, context, fss_extended_write_short_double_s, fss_extended_write_long_double_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Use double quotes (default)."); + fll_program_print_help_option(file, context, fss_extended_write_short_ignore_s, fss_extended_write_long_ignore_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Ignore a given range within a Content."); + fll_program_print_help_option(file, context, fss_extended_write_short_object_s, fss_extended_write_long_object_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " The Object to file."); + fll_program_print_help_option(file, context, fss_extended_write_short_partial_s, fss_extended_write_long_partial_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "Do not file end of Object/Content character."); + fll_program_print_help_option(file, context, fss_extended_write_short_prepend_s, fss_extended_write_long_prepend_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "Prepend the given whitespace characters to the start of each multi-line Content."); + fll_program_print_help_option(file, context, fss_extended_write_short_single_s, fss_extended_write_long_single_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Use single quotes."); + fll_program_print_help_option(file, context, fss_extended_write_short_trim_s, fss_extended_write_long_trim_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Trim Object names."); fll_program_print_help_usage(file, context, fss_extended_write_program_name_s, f_string_empty_s); - fl_print_format(" The pipe uses the Backspace character '%[\\b%]' (%[U+0008%]) to designate the start of a Content.%c", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s[0]); - fl_print_format(" The pipe uses the Form Feed character '%[\\f%]' (%[U+000C%]) to designate the end of the last Content.%c", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s[0]); - fl_print_format(" The pipe uses the Vertical Line character '%[\\v%]' (%[U+000B%]) is used to ignore a Content range, which does nothing in this program.%c", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s[0]); + fl_print_format(" The pipe uses the Backspace character '%[\\b%]' (%[U+0008%]) to designate the start of a Content.%q", file.stream, context.set.notable, context.set.notable, context.set.notable, context.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.%q", file.stream, context.set.notable, context.set.notable, context.set.notable, context.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, which does nothing in this program.%q", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s); fl_print_format(" For the pipe, an Object is terminated by either a Backspace character '%[\\b%]' (%[U+0008%])", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable); - fl_print_format(" or a Form Feed character '%[\\f%]' (%[U+000C%]).%c", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s[0]); - fl_print_format(" The end of the pipe represents the end of any Object or Content.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" or a Form Feed character '%[\\f%]' (%[U+000C%]).%q", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s); + fl_print_format(" The end of the pipe represents the end of any Object or Content.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" The FSS-0001 (Extended) specification does not support multi-line Content, therefore the parameter '%[%s%s%]'", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_write_long_prepend_s, context.set.notable); - fl_print_format(" does nothing.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The FSS-0001 (Extended) specification does not support multi-line Content, therefore the parameter '%[%q%s%]'", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_write_long_prepend_s, context.set.notable); + fl_print_format(" does nothing.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" This program does not use the parameter '%[%s%s%]', which therefore does nothing.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_write_long_ignore_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" This parameter requires two values.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" This program does not use the parameter '%[%q%s%]', which therefore does nothing.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_write_long_ignore_s, context.set.notable, f_string_eol_s); + fl_print_format(" This parameter requires two values.%q%q", file.stream, f_string_eol_s, f_string_eol_s); funlockfile(file.stream); @@ -163,9 +163,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_file_s, main->error.notable); - fl_print_format("%[' may only be specified once.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_file_s, main->error.notable); + fl_print_format("%[' may only be specified once.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -185,7 +185,7 @@ extern "C" { } } else if (main->parameters[fss_extended_write_parameter_file_e].result == f_console_result_found_e) { - fss_extended_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s, fss_extended_write_long_file_s); + fss_extended_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s,.string fss_extended_write_long_file_s); status = F_status_set_error(F_parameter); } } @@ -194,11 +194,11 @@ extern "C" { if (main->parameters[fss_extended_write_parameter_object_e].locations.used || main->parameters[fss_extended_write_parameter_content_e].locations.used) { if (main->parameters[fss_extended_write_parameter_object_e].locations.used) { if (main->parameters[fss_extended_write_parameter_object_e].locations.used != main->parameters[fss_extended_write_parameter_object_e].values.used) { - fss_extended_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s, fss_extended_write_long_object_s); + fss_extended_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s.string, fss_extended_write_long_object_s); status = F_status_set_error(F_parameter); } else if (main->parameters[fss_extended_write_parameter_content_e].locations.used != main->parameters[fss_extended_write_parameter_content_e].values.used) { - fss_extended_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s, fss_extended_write_long_content_s); + fss_extended_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s.string, fss_extended_write_long_content_s); status = F_status_set_error(F_parameter); } else if (!main->parameters[fss_extended_write_parameter_content_e].locations.used && main->parameters[fss_extended_write_parameter_partial_e].result == f_console_result_none_e) { @@ -210,13 +210,13 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_partial_s, main->error.notable); + fl_print_format("%q%[%sThe '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_partial_s, main->error.notable); fl_print_format("%[' parameter only allows either the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_object_s, main->error.notable); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_object_s, main->error.notable); fl_print_format("%[' parameter or the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_content_s, main->error.notable); - fl_print_format("%[' parameter, but not both.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_content_s, main->error.notable); + fl_print_format("%[' parameter, but not both.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -236,11 +236,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sEach '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_object_s, main->error.notable); + fl_print_format("%q%[%sEach '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_object_s, main->error.notable); fl_print_format("%[' parameter must be specified before a '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_content_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_content_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -257,11 +257,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sEach '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_object_s, main->error.notable); + fl_print_format("%q%[%sEach '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_object_s, main->error.notable); fl_print_format("%[' parameter must have at least one '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_content_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_content_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -274,7 +274,7 @@ extern "C" { } else if (main->parameters[fss_extended_write_parameter_content_e].locations.used) { if (main->parameters[fss_extended_write_parameter_content_e].locations.used != main->parameters[fss_extended_write_parameter_content_e].values.used) { - fss_extended_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s, fss_extended_write_long_content_s); + fss_extended_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s.string, fss_extended_write_long_content_s); status = F_status_set_error(F_parameter); } else if (!main->parameters[fss_extended_write_parameter_partial_e].locations.used) { @@ -287,11 +287,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThis requires either piped data or the use of the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_object_s, main->error.notable); + fl_print_format("%q%[%sThis requires either piped data or the use of the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_object_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_content_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_content_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -304,9 +304,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThis '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_partial_s, main->error.notable); - fl_print_format("%[' parameter cannot be used when processing a pipe.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThis '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_partial_s, main->error.notable); + fl_print_format("%[' parameter cannot be used when processing a pipe.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -321,9 +321,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_prepend_s, main->error.notable); - fl_print_format("%[' is specified, but no value is given.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_prepend_s, main->error.notable); + fl_print_format("%[' is specified, but no value is given.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -348,9 +348,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_prepend_s, main->error.notable); - fl_print_format("%[' must only contain whitespace.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_prepend_s, main->error.notable); + fl_print_format("%[' must only contain whitespace.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -365,9 +365,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_prepend_s, main->error.notable); - fl_print_format("%[' must not be an empty string.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_prepend_s, main->error.notable); + fl_print_format("%[' must not be an empty string.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -382,9 +382,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_ignore_s, main->error.notable); - fl_print_format("%[' was specified, but no values were given.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_ignore_s, main->error.notable); + fl_print_format("%[' was specified, but no values were given.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -398,9 +398,9 @@ extern "C" { if (total_locations * 2 > total_arguments) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_ignore_s, main->error.notable); - fl_print_format("%[' requires two values.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_ignore_s, main->error.notable); + fl_print_format("%[' requires two values.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -438,8 +438,8 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sWhile processing the '%]%[input pipe%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context, main->error.notable, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sWhile processing the '%]%[input pipe%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context, main->error.notable, main->error.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -581,8 +581,8 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sWhile processing the '%]%[input arguments%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context, main->error.notable, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sWhile processing the '%]%[input arguments%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context, main->error.notable, main->error.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -590,7 +590,7 @@ extern "C" { else if (main->error.verbosity != f_console_verbosity_quiet_e && main->parameters[fss_extended_write_parameter_file_e].result == f_console_result_none_e) { // Ensure there is always a newline at the end, unless in quiet mode. - fll_print_character(f_string_eol_s[0], main->output.to.stream); + fll_print_dynamic(f_string_eol_s, main->output.to.stream); } } @@ -618,7 +618,7 @@ extern "C" { fflush(main->output.to.stream); } - fll_print_terminated(f_string_eol_s, main->output.to.stream); + fll_print_dynamic(f_string_eol_s, main->output.to.stream); } } 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 8e7d4bd..efcb106 100644 --- a/level_3/fss_extended_write/c/fss_extended_write.h +++ b/level_3/fss_extended_write/c/fss_extended_write.h @@ -115,15 +115,15 @@ extern "C" { #define fss_extended_write_console_parameter_t_initialize \ { \ - macro_f_console_parameter_t_initialize(f_console_standard_short_help_s, f_console_standard_long_help_s, 0, 0, f_console_type_normal_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_light_s, f_console_standard_long_light_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s, f_console_standard_long_dark_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s, f_console_standard_long_normal_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s, f_console_standard_long_debug_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_version_s, f_console_standard_long_version_s, 0, F_false, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, 0, 0, f_console_type_normal_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, 0, F_false, f_console_type_inverse_e), \ macro_f_console_parameter_t_initialize(fss_extended_write_short_file_s, fss_extended_write_long_file_s, 0, 1, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(fss_extended_write_short_content_s, fss_extended_write_long_content_s, 0, 1, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(fss_extended_write_short_double_s, fss_extended_write_long_double_s, 0, 0, f_console_type_normal_e), \ diff --git a/level_3/fss_extended_write/c/private-common.c b/level_3/fss_extended_write/c/private-common.c index 8d67039..e80a9d6 100644 --- a/level_3/fss_extended_write/c/private-common.c +++ b/level_3/fss_extended_write/c/private-common.c @@ -15,9 +15,9 @@ extern "C" { flockfile(main->warning.to.stream); - fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s[0], f_string_eol_s[0], main->context.set.warning, main->context.set.warning); + fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s, f_string_eol_s, main->context.set.warning, main->context.set.warning); fl_print_format("%[%i%]", main->warning.to.stream, main->context.set.notable, signal, main->context.set.notable); - fl_print_format("%[.%]%c", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s[0]); + fl_print_format("%[.%]%q", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s); funlockfile(main->warning.to.stream); } diff --git a/level_3/fss_extended_write/c/private-write.c b/level_3/fss_extended_write/c/private-write.c index ba224c5..4a343a8 100644 --- a/level_3/fss_extended_write/c/private-write.c +++ b/level_3/fss_extended_write/c/private-write.c @@ -15,13 +15,13 @@ extern "C" { flockfile(main->error.to.stream); - fl_print_format("%c%[%sMust specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_object_s, main->error.notable); + fl_print_format("%q%[%sMust specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_object_s, main->error.notable); fl_print_format("%[' parameter and the '%]", main->error.to.stream, main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_content_s, main->error.notable); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_content_s, main->error.notable); fl_print_format("%[' parameter the same number of times when not specifying the '%]", main->error.to.stream, main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_partial_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_extended_write_long_partial_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -36,9 +36,9 @@ extern "C" { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%S%S%]", main->error.to.stream, main->error.notable, symbol, parameter, main->error.notable); - fl_print_format("%[' is specified, but no value is given.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' is specified, but no value is given.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -53,9 +53,9 @@ extern "C" { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThis standard does not support end of line character '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%sThis standard does not support end of line character '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[\\n%]", main->error.to.stream, main->error.notable, main->error.notable); - fl_print_format("%[' in objects.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' in objects.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } diff --git a/level_3/fss_identify/c/fss_identify.c b/level_3/fss_identify/c/fss_identify.c index 3bdabad..07f8ace 100644 --- a/level_3/fss_identify/c/fss_identify.c +++ b/level_3/fss_identify/c/fss_identify.c @@ -13,43 +13,43 @@ extern "C" { fll_program_print_help_header(file, context, fss_identify_program_name_long_s, fss_identify_program_version); - fll_program_print_help_option(file, context, f_console_standard_short_help_s, f_console_standard_long_help_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print this help message."); - fll_program_print_help_option(file, context, f_console_standard_short_dark_s, f_console_standard_long_dark_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_light_s, f_console_standard_long_light_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, "Do not file in color."); - fll_program_print_help_option(file, context, f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Decrease verbosity, silencing most output."); - fll_program_print_help_option(file, context, f_console_standard_short_normal_s, f_console_standard_long_normal_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Set verbosity to normal file."); - fll_program_print_help_option(file, context, f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Increase verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_debug_s, f_console_standard_long_debug_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Enable debugging, significantly increasing verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_version_s, f_console_standard_long_version_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Print only the version number."); + fll_program_print_help_option(file, context, f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print this help message."); + fll_program_print_help_option(file, context, f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, "Do not file in color."); + fll_program_print_help_option(file, context, f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Decrease verbosity, silencing most output."); + fll_program_print_help_option(file, context, f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Set verbosity to normal file."); + fll_program_print_help_option(file, context, f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Increase verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Enable debugging, significantly increasing verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Print only the version number."); - f_print_character(f_string_eol_s[0], file.stream); + f_print_dynamic(f_string_eol_s, file.stream); - fll_program_print_help_option(file, context, fss_identify_short_content_s, fss_identify_long_content_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Print the Identifier content (the 4-digit hexidecimal type code)."); - fll_program_print_help_option(file, context, fss_identify_short_object_s, fss_identify_long_object_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print the Identifier object (the name)."); + fll_program_print_help_option(file, context, fss_identify_short_content_s, fss_identify_long_content_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "Print the Identifier content (the 4-digit hexidecimal type code)."); + fll_program_print_help_option(file, context, fss_identify_short_object_s, fss_identify_long_object_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print the Identifier object (the name)."); - f_print_character(f_string_eol_s[0], file.stream); + f_print_dynamic(f_string_eol_s, file.stream); - fll_program_print_help_option(file, context, fss_identify_short_line_s, fss_identify_long_line_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print only the Identifier at the given line."); - fll_program_print_help_option(file, context, fss_identify_short_name_s, fss_identify_long_name_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Select Object with this name."); - fll_program_print_help_option(file, context, fss_identify_short_total_s, fss_identify_long_total_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Print the total Identifiers found."); + fll_program_print_help_option(file, context, fss_identify_short_line_s, fss_identify_long_line_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print only the Identifier at the given line."); + fll_program_print_help_option(file, context, fss_identify_short_name_s, fss_identify_long_name_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Select Object with this name."); + fll_program_print_help_option(file, context, fss_identify_short_total_s, fss_identify_long_total_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "Print the total Identifiers found."); fll_program_print_help_usage(file, context, fss_identify_program_name_s, "filename(s)"); - fl_print_format(" The %[%s%s%] parameter refers to the file lines and not the lines in a given file.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_identify_long_line_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The %[%q%s%] parameter refers to the file lines and not the lines in a given file.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_identify_long_line_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" If neither the %[%s%s%] nor", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_identify_long_object_s, context.set.notable); - fl_print_format(" %[%s%s%] are specified, then the default behavior is to print both.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_identify_long_content_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" If neither the %[%q%s%] nor", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_identify_long_object_s, context.set.notable); + fl_print_format(" %[%q%s%] are specified, then the default behavior is to print both.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_identify_long_content_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" When specifying the %[%s%s%] parameter, neither the", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_identify_long_total_s, context.set.notable); - fl_print_format(" %[%s%s%] nor the", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_identify_long_object_s, context.set.notable); - fl_print_format(" %[%s%s%] parameter may be specified.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_identify_long_content_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" When specifying the %[%q%s%] parameter, neither the", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_identify_long_total_s, context.set.notable); + fl_print_format(" %[%q%s%] nor the", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_identify_long_object_s, context.set.notable); + fl_print_format(" %[%q%s%] parameter may be specified.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_identify_long_content_s, context.set.notable, f_string_eol_s, f_string_eol_s); fl_print_format(" An FSS file is identified by the following format: '%[# Object-Content%]'", file.stream, context.set.notable, context.set.notable); - fl_print_format(" where the Object, is a machine-name representing the name and may only consist of \"word\" characters and the Content is a 4-digit hexidecimal number representing a particular variant of the Object.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" This identifier, if provided, must exist on the first line in a file and must begin with the pound character: '#'.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" Whitespace must follow this pound character.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" There may be multiple Object and Content pairs, separated by whitspace, such as: \"# fss-0002 fss-0000 iki-0002\".%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" where the Object, is a machine-name representing the name and may only consist of \"word\" characters and the Content is a 4-digit hexidecimal number representing a particular variant of the Object.%q", file.stream, f_string_eol_s); + fl_print_format(" This identifier, if provided, must exist on the first line in a file and must begin with the pound character: '#'.%q", file.stream, f_string_eol_s); + fl_print_format(" Whitespace must follow this pound character.%q", file.stream, f_string_eol_s); + fl_print_format(" There may be multiple Object and Content pairs, separated by whitspace, such as: \"# fss-0002 fss-0000 iki-0002\".%q%q", file.stream, f_string_eol_s, f_string_eol_s); funlockfile(file.stream); @@ -94,7 +94,7 @@ extern "C" { if (F_status_is_error(status)) { if (main->error.verbosity != f_console_verbosity_quiet_e) { fll_error_print(main->error, F_status_set_fine(status), "fll_program_parameter_process", F_true); - fll_print_character(f_string_eol_s[0], main->error.to.stream); + fll_print_dynamic(f_string_eol_s, main->error.to.stream); } fss_identify_main_delete(main); @@ -164,9 +164,9 @@ extern "C" { if (main->parameters[fss_identify_parameter_line_e].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_identify_long_line_s, main->error.notable); - fl_print_format("%[' requires a positive number.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_identify_long_line_s, main->error.notable); + fl_print_format("%[' requires a positive number.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -188,11 +188,11 @@ extern "C" { if (main->parameters[fss_identify_parameter_object_e].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_identify_long_object_s, main->error.notable); + fl_print_format("%q%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_identify_long_object_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_identify_long_total_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_identify_long_total_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -201,11 +201,11 @@ extern "C" { else if (main->parameters[fss_identify_parameter_content_e].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_identify_long_content_s, main->error.notable); + fl_print_format("%q%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_identify_long_content_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_identify_long_total_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_identify_long_total_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -217,9 +217,9 @@ extern "C" { if (main->parameters[fss_identify_parameter_name_e].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_identify_long_name_s, main->error.notable); - fl_print_format("%[' requires a string.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_identify_long_name_s, main->error.notable); + fl_print_format("%[' requires a string.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -233,9 +233,9 @@ extern "C" { if (length == 0) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_identify_long_name_s, main->error.notable); - fl_print_format("%[' does not allow zero length strings.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_identify_long_name_s, main->error.notable); + fl_print_format("%[' does not allow zero length strings.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -263,11 +263,11 @@ extern "C" { else if (status == F_false) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe value '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%sThe value '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%S%]", main->error.to.stream, main->error.notable, arguments->argv[index], main->error.notable); fl_print_format("%[' for the parameter '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_identify_long_name_s, main->error.notable); - fl_print_format("%[' may only contain word characters.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_identify_long_name_s, main->error.notable); + fl_print_format("%[' may only contain word characters.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -343,7 +343,7 @@ extern "C" { if (F_status_is_error_not(status)) { if (main->parameters[fss_identify_parameter_total_e].result == f_console_result_found_e) { - fll_print_format("%ul%c", main->output.to.stream, data.total, f_string_eol_s[0]); + fll_print_format("%ul%q", main->output.to.stream, data.total, f_string_eol_s); } } @@ -354,7 +354,7 @@ extern "C" { fflush(main->output.to.stream); } - fll_print_terminated(f_string_eol_s, main->output.to.stream); + fll_print_dynamic(f_string_eol_s, main->output.to.stream); } } diff --git a/level_3/fss_identify/c/fss_identify.h b/level_3/fss_identify/c/fss_identify.h index e337831..ed31b27 100644 --- a/level_3/fss_identify/c/fss_identify.h +++ b/level_3/fss_identify/c/fss_identify.h @@ -105,15 +105,15 @@ extern "C" { #define fss_identify_console_parameter_t_initialize \ { \ - macro_f_console_parameter_t_initialize(f_console_standard_short_help_s, f_console_standard_long_help_s, 0, 0, f_console_type_normal_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_light_s, f_console_standard_long_light_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s, f_console_standard_long_dark_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s, f_console_standard_long_normal_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s, f_console_standard_long_debug_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_version_s, f_console_standard_long_version_s, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, 0, 0, f_console_type_normal_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, 0, 0, f_console_type_inverse_e), \ macro_f_console_parameter_t_initialize(fss_identify_short_content_s, fss_identify_long_content_s, 0, 0, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(fss_identify_short_line_s, fss_identify_long_line_s, 0, 1, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(fss_identify_short_name_s, fss_identify_long_name_s, 0, 1, f_console_type_normal_e), \ diff --git a/level_3/fss_identify/c/private-common.c b/level_3/fss_identify/c/private-common.c index def7f17..c960699 100644 --- a/level_3/fss_identify/c/private-common.c +++ b/level_3/fss_identify/c/private-common.c @@ -24,9 +24,9 @@ extern "C" { flockfile(main->warning.to.stream); - fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s[0], f_string_eol_s[0], main->context.set.warning, main->context.set.warning); + fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s, f_string_eol_s, main->context.set.warning, main->context.set.warning); fl_print_format("%[%i%]", main->warning.to.stream, main->context.set.notable, signal, main->context.set.notable); - fl_print_format("%[.%]%c", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s[0]); + fl_print_format("%[.%]%q", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s); funlockfile(main->warning.to.stream); } diff --git a/level_3/fss_identify/c/private-identify.c b/level_3/fss_identify/c/private-identify.c index 076d58f..e35b2d0 100644 --- a/level_3/fss_identify/c/private-identify.c +++ b/level_3/fss_identify/c/private-identify.c @@ -47,12 +47,12 @@ extern "C" { } for (; range->start < buffer->used; ++range->start) { - if (buffer->string[range->start] == f_string_eol_s[0]) break; + if (buffer->string[range->start] == f_string_eol_s.string[0]) break; } // for range->stop = range->start; - if (buffer->string[range->start] == f_string_eol_s[0]) break; + if (buffer->string[range->start] == f_string_eol_s.string[0]) break; } while (F_status_is_error_not(status) && status != F_none_eof); diff --git a/level_3/fss_identify/c/private-print.c b/level_3/fss_identify/c/private-print.c index af50a2e..a8ef271 100644 --- a/level_3/fss_identify/c/private-print.c +++ b/level_3/fss_identify/c/private-print.c @@ -23,7 +23,7 @@ extern "C" { fl_print_format("%04_ui", main->output.to.stream, id.type); } - f_print_character(f_string_eol_s[0], main->output.to.stream); + f_print_dynamic(f_string_eol_s, main->output.to.stream); funlockfile(main->output.to.stream); } diff --git a/level_3/fss_payload_read/c/fss_payload_read.c b/level_3/fss_payload_read/c/fss_payload_read.c index f11cccd..a962f7e 100644 --- a/level_3/fss_payload_read/c/fss_payload_read.c +++ b/level_3/fss_payload_read/c/fss_payload_read.c @@ -14,112 +14,112 @@ extern "C" { fll_program_print_help_header(file, context, fss_payload_program_name_long_s, fss_payload_program_version_s); - fll_program_print_help_option(file, context, f_console_standard_short_help_s, f_console_standard_long_help_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print this help message."); - fll_program_print_help_option(file, context, f_console_standard_short_dark_s, f_console_standard_long_dark_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_light_s, f_console_standard_long_light_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, "Do not file in color."); - fll_program_print_help_option(file, context, f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Decrease verbosity, silencing most output."); - fll_program_print_help_option(file, context, f_console_standard_short_normal_s, f_console_standard_long_normal_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Set verbosity to normal file."); - fll_program_print_help_option(file, context, f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Increase verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_debug_s, f_console_standard_long_debug_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Enable debugging, significantly increasing verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_version_s, f_console_standard_long_version_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Print only the version number."); - - f_print_character(f_string_eol_s[0], file.stream); - - fll_program_print_help_option(file, context, fss_payload_read_short_at_s, fss_payload_read_long_at_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Select Object at this numeric index."); - fll_program_print_help_option(file, context, fss_payload_read_short_content_s, fss_payload_read_long_content_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print the Content (default)."); - fll_program_print_help_option(file, context, fss_payload_read_short_columns_s, fss_payload_read_long_columns_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print the total number of columns."); - fll_program_print_help_option(file, context, fss_payload_read_short_delimit_s, fss_payload_read_long_delimit_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Designate how to handle applying delimits."); - fll_program_print_help_option(file, context, fss_payload_read_short_depth_s, fss_payload_read_long_depth_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Select Object at this numeric depth."); - fll_program_print_help_option(file, context, fss_payload_read_short_empty_s, fss_payload_read_long_empty_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Include empty Content when processing."); - fll_program_print_help_option(file, context, fss_payload_read_short_line_s, fss_payload_read_long_line_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print only the Content at the given line."); - fll_program_print_help_option(file, context, fss_payload_read_short_name_s, fss_payload_read_long_name_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Select Object with this name."); - fll_program_print_help_option(file, context, fss_payload_read_short_object_s, fss_payload_read_long_object_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print the Object."); - fll_program_print_help_option(file, context, fss_payload_read_short_pipe_s, fss_payload_read_long_pipe_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print using the special pipe format."); - fll_program_print_help_option(file, context, fss_payload_read_short_raw_s, fss_payload_read_long_raw_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print with the original quotes and escapes."); - fll_program_print_help_option(file, context, fss_payload_read_short_select_s, fss_payload_read_long_select_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Select sub-Content at this index."); - fll_program_print_help_option(file, context, fss_payload_read_short_total_s, fss_payload_read_long_total_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print the total number of lines."); - fll_program_print_help_option(file, context, fss_payload_read_short_trim_s, fss_payload_read_long_trim_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Trim Object names on select or print."); + fll_program_print_help_option(file, context, f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print this help message."); + fll_program_print_help_option(file, context, f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, "Do not file in color."); + fll_program_print_help_option(file, context, f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Decrease verbosity, silencing most output."); + fll_program_print_help_option(file, context, f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Set verbosity to normal file."); + fll_program_print_help_option(file, context, f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Increase verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Enable debugging, significantly increasing verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Print only the version number."); + + f_print_dynamic(f_string_eol_s, file.stream); + + fll_program_print_help_option(file, context, fss_payload_read_short_at_s, fss_payload_read_long_at_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Select Object at this numeric index."); + fll_program_print_help_option(file, context, fss_payload_read_short_content_s, fss_payload_read_long_content_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print the Content (default)."); + fll_program_print_help_option(file, context, fss_payload_read_short_columns_s, fss_payload_read_long_columns_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print the total number of columns."); + fll_program_print_help_option(file, context, fss_payload_read_short_delimit_s, fss_payload_read_long_delimit_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Designate how to handle applying delimits."); + fll_program_print_help_option(file, context, fss_payload_read_short_depth_s, fss_payload_read_long_depth_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Select Object at this numeric depth."); + fll_program_print_help_option(file, context, fss_payload_read_short_empty_s, fss_payload_read_long_empty_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Include empty Content when processing."); + fll_program_print_help_option(file, context, fss_payload_read_short_line_s, fss_payload_read_long_line_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print only the Content at the given line."); + fll_program_print_help_option(file, context, fss_payload_read_short_name_s, fss_payload_read_long_name_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Select Object with this name."); + fll_program_print_help_option(file, context, fss_payload_read_short_object_s, fss_payload_read_long_object_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print the Object."); + fll_program_print_help_option(file, context, fss_payload_read_short_pipe_s, fss_payload_read_long_pipe_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print using the special pipe format."); + fll_program_print_help_option(file, context, fss_payload_read_short_raw_s, fss_payload_read_long_raw_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print with the original quotes and escapes."); + fll_program_print_help_option(file, context, fss_payload_read_short_select_s, fss_payload_read_long_select_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Select sub-Content at this index."); + fll_program_print_help_option(file, context, fss_payload_read_short_total_s, fss_payload_read_long_total_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print the total number of lines."); + fll_program_print_help_option(file, context, fss_payload_read_short_trim_s, fss_payload_read_long_trim_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Trim Object names on select or print."); fll_program_print_help_usage(file, context, fss_payload_program_name_s, "filename(s)"); - fl_print_format(" %[Notes:%]%c", file.stream, context.set.important, context.set.important, f_string_eol_s[0]); + fl_print_format(" %[Notes:%]%q", file.stream, context.set.important, context.set.important, f_string_eol_s); - fl_print_format(" This program will print the Content associated with the given Object and Content main based on the FSS-000E Payload standard.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" This program will print the Content associated with the given Object and Content main based on the FSS-000E Payload standard.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" All numeric positions (indexes) start at 0 instead of 1.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" For example, a file of 17 lines would range from 0 to 16.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" All numeric positions (indexes) start at 0 instead of 1.%q", file.stream, f_string_eol_s); + fl_print_format(" For example, a file of 17 lines would range from 0 to 16.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" When using the %[%s%s%] option, an order of operations is enforced on the parameters.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_depth_s, context.set.notable, f_string_eol_s[0]); + fl_print_format(" When using the %[%q%s%] option, an order of operations is enforced on the parameters.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_depth_s, context.set.notable, f_string_eol_s); - fl_print_format(" When this order of operations is in effect, parameters to the right of a depth parameter are influenced by that depth parameter:%c", file.stream, f_string_eol_s[0]); + fl_print_format(" When this order of operations is in effect, parameters to the right of a depth parameter are influenced by that depth parameter:%q", file.stream, f_string_eol_s); - fl_print_format(" %[%s%s%]: An Object index at the specified depth.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_at_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" %[%s%s%]: A new depth within the specified depth, indexed from the root.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_depth_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" %[%s%s%]: An Object name at the specified depth.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_name_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" %[%q%s%]: An Object index at the specified depth.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_at_s, context.set.notable, f_string_eol_s); + fl_print_format(" %[%q%s%]: A new depth within the specified depth, indexed from the root.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_depth_s, context.set.notable, f_string_eol_s); + fl_print_format(" %[%q%s%]: An Object name at the specified depth.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_name_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" The parameter %[%s%s%] must be in numeric order, but values in between may be skipped.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_depth_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" ('-d 0 -a 1 -d 2 -a 2' would specify index 1 at depth 0, any index at depth 1, and index 2 at depth 2.)%c", file.stream, f_string_eol_s[0]); - fl_print_format(" ('-d 2 -a 1 -d 0 -a 2' would be invalid because depth 2 is before depth 1.)%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The parameter %[%q%s%] must be in numeric order, but values in between may be skipped.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_depth_s, context.set.notable, f_string_eol_s); + fl_print_format(" ('-d 0 -a 1 -d 2 -a 2' would specify index 1 at depth 0, any index at depth 1, and index 2 at depth 2.)%q", file.stream, f_string_eol_s); + fl_print_format(" ('-d 2 -a 1 -d 0 -a 2' would be invalid because depth 2 is before depth 1.)%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" The parameter %[%s%s%] selects a Content column.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_select_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The parameter %[%q%s%] selects a Content column.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_select_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" Specify both %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_object_s, context.set.notable); - fl_print_format(" and the %[%s%s%] parameters to get the total objects.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_total_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" Specify both %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_object_s, context.set.notable); + fl_print_format(" and the %[%q%s%] parameters to get the total objects.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_total_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" When both %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_at_s, context.set.notable); - fl_print_format(" and %[%s%s%] parameters are specified (at the same depth),", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_name_s, context.set.notable); - fl_print_format(" the %[%s%s%] parameter value will be treated as a position relative to the specified", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_at_s, context.set.notable); - fl_print_format(" %[%s%s%] parameter value.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_name_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" When both %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_at_s, context.set.notable); + fl_print_format(" and %[%q%s%] parameters are specified (at the same depth),", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_name_s, context.set.notable); + fl_print_format(" the %[%q%s%] parameter value will be treated as a position relative to the specified", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_at_s, context.set.notable); + fl_print_format(" %[%q%s%] parameter value.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_name_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" This program may support parameters, such as %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_depth_s, context.set.notable); - fl_print_format(" or %[%s%s%], even if not supported by the standard.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_select_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" This is done to help ensure consistency for scripting.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" This program may support parameters, such as %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_depth_s, context.set.notable); + fl_print_format(" or %[%q%s%], even if not supported by the standard.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_select_s, context.set.notable, f_string_eol_s); + fl_print_format(" This is done to help ensure consistency for scripting.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" For parameters like %[%s%s%],", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_depth_s, context.set.notable); - fl_print_format(" if the standard doesn't support nested Content, then only a depth of 0 would be valid.%c", file.stream, f_string_eol_s[0]); + fl_print_format(" For parameters like %[%q%s%],", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_depth_s, context.set.notable); + fl_print_format(" if the standard doesn't support nested Content, then only a depth of 0 would be valid.%q", file.stream, f_string_eol_s); - fl_print_format(" For parameters like %[%s%s%],", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_select_s, context.set.notable); - fl_print_format(" if the standard doesn't support multiple Content groups, then only a select of 0 would be valid.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" For parameters like %[%q%s%],", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_select_s, context.set.notable); + fl_print_format(" if the standard doesn't support multiple Content groups, then only a select of 0 would be valid.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" The parameter %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_trim_s, context.set.notable); - fl_print_format(" will remove leading and trailing whitespaces when selecting objects or when printing objects.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The parameter %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_trim_s, context.set.notable); + fl_print_format(" will remove leading and trailing whitespaces when selecting objects or when printing objects.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" When specifying both the %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_object_s, context.set.notable); - fl_print_format(" parameter and the %[%s%s%] parameter, the entire Object and Content are printed, including the formatting.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_content_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" Both the Object and Content printed are already escaped.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" Both the Object and Content are separated by an EOL.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" When specifying both the %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_object_s, context.set.notable); + fl_print_format(" parameter and the %[%q%s%] parameter, the entire Object and Content are printed, including the formatting.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_content_s, context.set.notable, f_string_eol_s); + fl_print_format(" Both the Object and Content printed are already escaped.%q", file.stream, f_string_eol_s); + fl_print_format(" Both the Object and Content are separated by an EOL.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" The parameter %[%s%s%] accepts the following:%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_delimit_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" - %[%s%]: Do not apply delimits.%c", file.stream, context.set.notable, fss_payload_read_delimit_mode_name_none_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" - %[%s%]: (default) Apply all delimits.%c", file.stream, context.set.notable, fss_payload_read_delimit_mode_name_all_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" - %[%s%]: Apply delimits for Objects.%c", file.stream, context.set.notable, fss_payload_read_delimit_mode_name_object_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" - A number, 0 or greater: apply delimits for Content at the specified depth.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" - A number, 0 or greater, followed by a %[%s%]: (such as '1+') apply delimits for Content at the specified depth and any greater depth (numerically).%c", file.stream, context.set.notable, fss_payload_read_delimit_mode_name_greater_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); - fl_print_format(" - A number, 0 or lesser, followed by a %[%s%]: (such as '1-') apply delimits for Content at the specified depth and any lesser depth (numerically).%c%c", file.stream, context.set.notable, fss_payload_read_delimit_mode_name_lesser_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The parameter %[%q%s%] accepts the following:%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_delimit_s, context.set.notable, f_string_eol_s); + fl_print_format(" - %[%s%]: Do not apply delimits.%q", file.stream, context.set.notable, fss_payload_read_delimit_mode_name_none_s, context.set.notable, f_string_eol_s); + fl_print_format(" - %[%s%]: (default) Apply all delimits.%q", file.stream, context.set.notable, fss_payload_read_delimit_mode_name_all_s, context.set.notable, f_string_eol_s); + fl_print_format(" - %[%s%]: Apply delimits for Objects.%q", file.stream, context.set.notable, fss_payload_read_delimit_mode_name_object_s, context.set.notable, f_string_eol_s); + fl_print_format(" - A number, 0 or greater: apply delimits for Content at the specified depth.%q", file.stream, f_string_eol_s); + fl_print_format(" - A number, 0 or greater, followed by a %[%s%]: (such as '1+') apply delimits for Content at the specified depth and any greater depth (numerically).%q", file.stream, context.set.notable, fss_payload_read_delimit_mode_name_greater_s, context.set.notable, f_string_eol_s, f_string_eol_s); + fl_print_format(" - A number, 0 or lesser, followed by a %[%s%]: (such as '1-') apply delimits for Content at the specified depth and any lesser depth (numerically).%q%q", file.stream, context.set.notable, fss_payload_read_delimit_mode_name_lesser_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" The %[%s%s%] parameter may be specified multiple times to customize the delimit behavior.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_delimit_s, context.set.notable, f_string_eol_s[0]); + fl_print_format(" The %[%q%s%] parameter may be specified multiple times to customize the delimit behavior.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_delimit_s, context.set.notable, f_string_eol_s); - fl_print_format(" The %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_delimit_s, context.set.notable); + fl_print_format(" The %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_delimit_s, context.set.notable); fl_print_format(" values %[%s%]", file.stream, context.set.notable, fss_payload_read_delimit_mode_name_none_s, context.set.notable); fl_print_format(" and %[%s%],", file.stream, context.set.notable, fss_payload_read_delimit_mode_name_all_s, context.set.notable); - fl_print_format(" overrule all other delimit values.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" overrule all other delimit values.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" The parameters %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_columns_s, context.set.notable); - fl_print_format(" and %[%s%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_select_s, context.set.notable); - fl_print_format(" refer to a Content column.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" The word \"column\" is being loosely defined to refer to a specific Content.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" This is not to be confused with a depth.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The parameters %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_columns_s, context.set.notable); + fl_print_format(" and %[%q%s%]", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_select_s, context.set.notable); + fl_print_format(" refer to a Content column.%q", file.stream, f_string_eol_s); + fl_print_format(" The word \"column\" is being loosely defined to refer to a specific Content.%q", file.stream, f_string_eol_s); + fl_print_format(" This is not to be confused with a depth.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" As an exceptional case, a %[%s%s%] of", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_depth_s, context.set.notable); + fl_print_format(" As an exceptional case, a %[%q%s%] of", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_depth_s, context.set.notable); fl_print_format(" %[1%] applies only to the explicit Object of", file.stream, context.set.notable, context.set.notable); - fl_print_format(" '%[%s%]'.%c", file.stream, context.set.notable, f_fss_string_header_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" Content at this depth is processed as FSS-0001 Extended.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" '%[%q%]'.%q", file.stream, context.set.notable, f_fss_string_header_s, context.set.notable, f_string_eol_s); + fl_print_format(" Content at this depth is processed as FSS-0001 Extended.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" The Content of the explicit Object of", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_depth_s, context.set.notable); - fl_print_format(" '%[%s%]'", file.stream, context.set.notable, f_fss_string_payload_s, context.set.notable, f_string_eol_s[0]); + fl_print_format(" The Content of the explicit Object of", file.stream); + fl_print_format(" '%[%q%]'", file.stream, context.set.notable, f_fss_string_payload_s, context.set.notable, f_string_eol_s); fl_print_format(" will not contain any Content close pipe control codes when using", file.stream); - fl_print_format(" %[%s%s%].%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_pipe_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" %[%q%s%].%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_read_long_pipe_s, context.set.notable, f_string_eol_s, f_string_eol_s); funlockfile(file.stream); @@ -270,9 +270,9 @@ extern "C" { if (main->parameters[parameter_code[i]].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, parameter_name[i], main->error.notable); - fl_print_format("%[' requires a %s.%]%c", main->error.to.stream, main->error.context, parameter_message[i], main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, parameter_name[i], main->error.notable); + fl_print_format("%[' requires a %s.%]%q", main->error.to.stream, main->error.context, parameter_message[i], main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -312,11 +312,11 @@ extern "C" { if (main->parameters[parameter_code[i]].result == parameter_match[i]) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_read_long_columns_s, main->error.notable); + fl_print_format("%q%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_read_long_columns_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, parameter_name[i], main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, parameter_name[i], main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -330,11 +330,11 @@ extern "C" { if (main->parameters[fss_payload_read_parameter_total_e].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_read_long_pipe_s, main->error.notable); + fl_print_format("%q%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_read_long_pipe_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_read_long_total_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_read_long_total_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -343,11 +343,11 @@ extern "C" { else if (main->parameters[fss_payload_read_parameter_line_e].result == f_console_result_additional_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_read_long_pipe_s, main->error.notable); + fl_print_format("%q%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_read_long_pipe_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_read_long_line_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_read_long_line_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -380,9 +380,9 @@ extern "C" { if (!length) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_read_long_delimit_s, main->error.notable); - fl_print_format("%[' must not be empty.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_read_long_delimit_s, main->error.notable); + fl_print_format("%[' must not be empty.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -432,7 +432,7 @@ extern "C" { data.delimit_mode = fss_payload_read_delimit_mode_content_object_e; } - if (arguments->argv[location][length - 1] == fss_payload_read_delimit_mode_name_greater_s[0]) { + if (arguments->argv[location][length - 1] == fss_payload_read_delimit_mode_name_greater_s.string[0]) { if (!(data.delimit_mode == fss_payload_read_delimit_mode_none_e || data.delimit_mode == fss_payload_read_delimit_mode_all_e)) { if (data.delimit_mode == fss_payload_read_delimit_mode_content_object_e) { data.delimit_mode = fss_payload_read_delimit_mode_content_greater_object_e; @@ -445,7 +445,7 @@ extern "C" { // Shorten the length to better convert the remainder to a number. --length; } - else if (arguments->argv[location][length - 1] == fss_payload_read_delimit_mode_name_lesser_s[0]) { + else if (arguments->argv[location][length - 1] == fss_payload_read_delimit_mode_name_lesser_s.string[0]) { if (!(data.delimit_mode == fss_payload_read_delimit_mode_none_e || data.delimit_mode == fss_payload_read_delimit_mode_all_e)) { if (data.delimit_mode == fss_payload_read_delimit_mode_content_object_e) { data.delimit_mode = fss_payload_read_delimit_mode_content_lesser_object_e; @@ -526,9 +526,9 @@ extern "C" { if (F_status_is_error_not(status) && main->parameters[fss_payload_read_parameter_select_e].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_read_long_select_s, main->error.notable); - fl_print_format("%[' parameter requires a positive number.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_read_long_select_s, main->error.notable); + fl_print_format("%[' parameter requires a positive number.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -661,7 +661,7 @@ extern "C" { fss_payload_read_data_delete_simple(&data); } else { - fll_print_format("%c%[%sYou failed to specify one or more files.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sYou failed to specify one or more files.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context, f_string_eol_s); status = F_status_set_error(F_parameter); } @@ -669,7 +669,7 @@ extern "C" { if (F_status_set_fine(status) == F_interrupt) { fflush(main->output.to.stream); - fll_print_terminated(f_string_eol_s, main->output.to.stream); + fll_print_dynamic(f_string_eol_s, main->output.to.stream); } } diff --git a/level_3/fss_payload_read/c/fss_payload_read.h b/level_3/fss_payload_read/c/fss_payload_read.h index dc19fea..aab5170 100644 --- a/level_3/fss_payload_read/c/fss_payload_read.h +++ b/level_3/fss_payload_read/c/fss_payload_read.h @@ -139,15 +139,15 @@ extern "C" { #define fss_payload_read_console_parameter_t_initialize \ { \ - macro_f_console_parameter_t_initialize(f_console_standard_short_help_s, f_console_standard_long_help_s, 0, 0, f_console_type_normal_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_light_s, f_console_standard_long_light_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s, f_console_standard_long_dark_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, 0, F_false, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s, f_console_standard_long_normal_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s, f_console_standard_long_debug_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_version_s, f_console_standard_long_version_s, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, 0, 0, f_console_type_normal_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, 0, F_false, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, 0, 0, f_console_type_inverse_e), \ macro_f_console_parameter_t_initialize(fss_payload_read_short_at_s, fss_payload_read_long_at_s, 0, 1, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(fss_payload_read_short_content_s, fss_payload_read_long_content_s, 0, 0, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(fss_payload_read_short_columns_s, fss_payload_read_long_columns_s, 0, 0, f_console_type_normal_e), \ diff --git a/level_3/fss_payload_read/c/private-common.c b/level_3/fss_payload_read/c/private-common.c index d61200e..aed5f76 100644 --- a/level_3/fss_payload_read/c/private-common.c +++ b/level_3/fss_payload_read/c/private-common.c @@ -73,9 +73,9 @@ extern "C" { flockfile(main->warning.to.stream); - fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s[0], f_string_eol_s[0], main->context.set.warning, main->context.set.warning); + fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s, f_string_eol_s, main->context.set.warning, main->context.set.warning); fl_print_format("%[%i%]", main->warning.to.stream, main->context.set.notable, signal, main->context.set.notable); - fl_print_format("%[.%]%c", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s[0]); + fl_print_format("%[.%]%q", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s); funlockfile(main->warning.to.stream); } diff --git a/level_3/fss_payload_read/c/private-print.c b/level_3/fss_payload_read/c/private-print.c index 4e79f01..82d503f 100644 --- a/level_3/fss_payload_read/c/private-print.c +++ b/level_3/fss_payload_read/c/private-print.c @@ -68,24 +68,24 @@ extern "C" { if (data->option & fss_payload_read_data_option_object_d) { if (data->option & fss_payload_read_data_option_trim_d) { if ((data->option & fss_payload_read_data_option_raw_d) && data->quotes_object_header.array[at]) { - f_print_character_safely(data->quotes_object_header.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s[0] : f_fss_quote_double_s[0], main->output.to.stream); + f_print_character_safely(data->quotes_object_header.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream); } fl_print_trim_except_dynamic_partial(data->buffer, data->objects_header.array[at], delimits_object, main->output.to.stream); if ((data->option & fss_payload_read_data_option_raw_d) && data->quotes_object_header.array[at]) { - f_print_character_safely(data->quotes_object_header.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s[0] : f_fss_quote_double_s[0], main->output.to.stream); + f_print_character_safely(data->quotes_object_header.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream); } } else { if ((data->option & fss_payload_read_data_option_raw_d) && data->quotes_object_header.array[at]) { - f_print_character_safely(data->quotes_object_header.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s[0] : f_fss_quote_double_s[0], main->output.to.stream); + f_print_character_safely(data->quotes_object_header.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream); } f_print_except_dynamic_partial(data->buffer, data->objects_header.array[at], delimits_object, main->output.to.stream); if ((data->option & fss_payload_read_data_option_raw_d) && data->quotes_object_header.array[at]) { - f_print_character_safely(data->quotes_object_header.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s[0] : f_fss_quote_double_s[0], main->output.to.stream); + f_print_character_safely(data->quotes_object_header.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream); } } @@ -102,13 +102,13 @@ extern "C" { content_printed = F_true; if ((data->option & fss_payload_read_data_option_raw_d) && data->quotes_content_header.array[at].array[data->select]) { - f_print_character_safely(data->quotes_content_header.array[at].array[data->select] == f_fss_quote_type_single_e ? f_fss_quote_single_s[0] : f_fss_quote_double_s[0], main->output.to.stream); + f_print_character_safely(data->quotes_content_header.array[at].array[data->select] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream); } f_print_except_dynamic_partial(data->buffer, data->contents_header.array[at].array[data->select], delimits_content, main->output.to.stream); if ((data->option & fss_payload_read_data_option_raw_d) && data->quotes_content_header.array[at].array[data->select]) { - f_print_character_safely(data->quotes_content_header.array[at].array[data->select] == f_fss_quote_type_single_e ? f_fss_quote_single_s[0] : f_fss_quote_double_s[0], main->output.to.stream); + f_print_character_safely(data->quotes_content_header.array[at].array[data->select] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream); } } } @@ -122,13 +122,13 @@ extern "C" { content_printed = F_true; if ((data->option & fss_payload_read_data_option_raw_d) && data->quotes_content_header.array[at].array[i]) { - f_print_character_safely(data->quotes_content_header.array[at].array[i] == f_fss_quote_type_single_e ? f_fss_quote_single_s[0] : f_fss_quote_double_s[0], main->output.to.stream); + f_print_character_safely(data->quotes_content_header.array[at].array[i] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream); } f_print_except_dynamic_partial(data->buffer, data->contents_header.array[at].array[i], delimits_content, main->output.to.stream); if ((data->option & fss_payload_read_data_option_raw_d) && data->quotes_content_header.array[at].array[i]) { - f_print_character_safely(data->quotes_content_header.array[at].array[i] == f_fss_quote_type_single_e ? f_fss_quote_single_s[0] : f_fss_quote_double_s[0], main->output.to.stream); + f_print_character_safely(data->quotes_content_header.array[at].array[i] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream); } if (i + 1 < data->contents_header.array[at].used && data->contents_header.array[at].array[i + 1].start <= data->contents_header.array[at].array[i + 1].stop) { @@ -226,7 +226,7 @@ extern "C" { f_print_character(fss_payload_read_pipe_content_start_s, main->output.to.stream); } else { - f_print_character(F_fss_space_s[0], main->output.to.stream); + f_print_dynamic(f_fss_space_s, main->output.to.stream); } } #endif // _di_fss_payload_read_print_content_end_extended_ @@ -248,11 +248,11 @@ extern "C" { } else { if (main->parameters[fss_payload_read_parameter_content_e].result == f_console_result_found_e) { - f_print_character(f_fss_basic_list_open_s[0], main->output.to.stream); - f_print_character(f_fss_basic_list_open_end_s[0], main->output.to.stream); + f_print_dynamic(f_fss_basic_list_open_s, main->output.to.stream); + f_print_dynamic(f_fss_basic_list_open_end_s, main->output.to.stream); } else { - f_print_character(f_fss_eol_s[0], main->output.to.stream); + f_print_dynamic(f_fss_eol_s, main->output.to.stream); } } } @@ -265,7 +265,7 @@ extern "C" { f_print_character(fss_payload_read_pipe_content_end_s, main->output.to.stream); } else { - f_print_character(F_fss_space_s[0], main->output.to.stream); + f_print_dynamic(f_fss_space_s, main->output.to.stream); } } #endif // _di_fss_payload_read_print_object_end_extended_ @@ -286,7 +286,7 @@ extern "C" { f_print_character(fss_payload_read_pipe_content_end_s, main->output.to.stream); } else { - f_print_character(f_fss_eol_s[0], main->output.to.stream); + f_print_dynamic(f_fss_eol_s, main->output.to.stream); } } #endif // _di_fss_payload_read_print_set_end_extended_ @@ -294,16 +294,16 @@ extern "C" { #ifndef _di_fss_payload_read_print_one_ void fss_payload_read_print_one(fss_payload_read_main_t * const main) { - f_print_character(f_string_ascii_1_s[0], main->output.to.stream); - f_print_character(f_string_eol_s[0], main->output.to.stream); + f_print_dynamic(f_string_ascii_1_s, main->output.to.stream); + f_print_dynamic(f_string_eol_s, main->output.to.stream); } #endif // _di_fss_payload_read_print_one_ #ifndef _di_fss_payload_read_print_zero_ void fss_payload_read_print_zero(fss_payload_read_main_t * const main) { - f_print_character(f_string_ascii_0_s[0], main->output.to.stream); - f_print_character(f_string_eol_s[0], main->output.to.stream); + f_print_dynamic(f_string_ascii_0_s, main->output.to.stream); + f_print_dynamic(f_string_eol_s, main->output.to.stream); } #endif // _di_fss_payload_read_print_zero_ diff --git a/level_3/fss_payload_read/c/private-read.c b/level_3/fss_payload_read/c/private-read.c index 8c36dbc..f511a66 100644 --- a/level_3/fss_payload_read/c/private-read.c +++ b/level_3/fss_payload_read/c/private-read.c @@ -189,11 +189,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe value '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%sThe value '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%ul%]", main->error.to.stream, main->error.notable, data->depths.array[i].depth, main->error.notable); fl_print_format("%[' may only be specified once for the parameter '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_read_long_depth_s, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_read_long_depth_s, main->error.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -204,13 +204,13 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_read_long_depth_s, main->error.notable); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_read_long_depth_s, main->error.notable); fl_print_format("%[' may not have the value '%]", main->error.to.stream, main->error.context, main->error.context); fl_print_format("%[%ul%]", main->error.to.stream, main->error.notable, data->depths.array[i].depth, main->error.notable); fl_print_format("%[' before the value '%]", main->error.to.stream, main->error.context, main->error.context); fl_print_format("%[%ul%]", main->error.to.stream, main->error.notable, data->depths.array[j].depth, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -261,11 +261,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe file '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%sThe file '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%s%]", main->error.to.stream, main->error.notable, file_name, main->error.notable); fl_print_format("%[' does not have the required Object '%]", main->error.to.stream, main->error.context, main->error.context); fl_print_format("%[%s%]", main->error.to.stream, main->error.notable, F_fss_string_payload_s, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -521,7 +521,7 @@ extern "C" { if (status == F_success) return F_none; } else if (data->option & fss_payload_read_data_option_columns_d) { - fll_print_format("%ul%c", main->output.to.stream, data->contents.array[i].used, f_string_eol_s[0]); + fll_print_format("%ul%q", main->output.to.stream, data->contents.array[i].used, f_string_eol_s); } else if (data->option & fss_payload_read_data_option_total_d) { flockfile(main->output.to.stream); @@ -617,18 +617,18 @@ extern "C" { } else { if ((data->option & fss_payload_read_data_option_raw_d) && data->quotes_object_header.array[at]) { - f_print_character_safely(data->quotes_object_header.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s[0] : f_fss_quote_double_s[0], main->output.to.stream); + f_print_character_safely(data->quotes_object_header.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream); } fss_payload_read_print_at_extended(main, i, *delimits_object, *delimits_content, data); if ((data->option & fss_payload_read_data_option_raw_d) && data->quotes_object_header.array[at]) { - f_print_character_safely(data->quotes_object_header.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s[0] : f_fss_quote_double_s[0], main->output.to.stream); + f_print_character_safely(data->quotes_object_header.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream); } } } else if (data->option & fss_payload_read_data_option_columns_d) { - fll_print_format("%ul%c", main->output.to.stream, data->contents_header.array[i].used, f_string_eol_s[0]); + fll_print_format("%ul%q", main->output.to.stream, data->contents_header.array[i].used, f_string_eol_s); } else if (data->option & fss_payload_read_data_option_total_d) { if (fss_payload_read_print_at_total_extended(main, i, data) == F_none) { @@ -637,13 +637,13 @@ extern "C" { } else { if ((data->option & fss_payload_read_data_option_raw_d) && data->quotes_content_header.array[at].array[i]) { - f_print_character_safely(data->quotes_content_header.array[at].array[i] == f_fss_quote_type_single_e ? f_fss_quote_single_s[0] : f_fss_quote_double_s[0], main->output.to.stream); + f_print_character_safely(data->quotes_content_header.array[at].array[i] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream); } fss_payload_read_print_at_extended(main, i, *delimits_object, *delimits_content, data); if ((data->option & fss_payload_read_data_option_raw_d) && data->quotes_content_header.array[at].array[i]) { - f_print_character_safely(data->quotes_content_header.array[at].array[i] == f_fss_quote_type_single_e ? f_fss_quote_single_s[0] : f_fss_quote_double_s[0], main->output.to.stream); + f_print_character_safely(data->quotes_content_header.array[at].array[i] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream); } } @@ -715,7 +715,7 @@ extern "C" { signal_check = 0; } - if (data->buffer.string[i] == f_string_eol_s[0]) { + if (data->buffer.string[i] == f_string_eol_s.string[0]) { if (*line == data->line) { range.stop = i; @@ -742,7 +742,7 @@ extern "C" { } // for // If Content does not end with a newline, it still must be treated as the last line. - if (data->buffer.string[range.stop] != f_string_eol_s[0]) { + if (data->buffer.string[range.stop] != f_string_eol_s.string[0]) { ++(*line); if (*line == data->line) { @@ -755,7 +755,7 @@ extern "C" { range.stop = data->contents.array[at].array[0].stop; f_print_except_in_dynamic_partial(data->buffer, range, delimits_content, data->comments, main->output.to.stream); - f_print_character(f_string_eol_s[0], main->output.to.stream); + f_print_dynamic(f_string_eol_s, main->output.to.stream); } funlockfile(main->output.to.stream); @@ -802,7 +802,7 @@ extern "C" { } } // for - fll_print_format("%ul%c", main->output.to.stream, max, f_string_eol_s[0]); + fll_print_format("%ul%q", main->output.to.stream, max, f_string_eol_s); return F_none; } @@ -832,7 +832,7 @@ extern "C" { } } // for - fll_print_format("%ul%c", main->output.to.stream, max, f_string_eol_s[0]); + fll_print_format("%ul%q", main->output.to.stream, max, f_string_eol_s); return F_none; } @@ -1089,7 +1089,7 @@ extern "C" { for (i = range.start; i <= range.stop; ++i) { - if (data->buffer.string[i] == f_string_eol_s[0]) { + if (data->buffer.string[i] == f_string_eol_s.string[0]) { range.start = i + 1; if (i <= range.stop) { @@ -1099,7 +1099,7 @@ extern "C" { } // for // If Content does not end with a newline, it still must be treated as the last line. - if (data->buffer.string[range.stop] != f_string_eol_s[0]) { + if (data->buffer.string[range.stop] != f_string_eol_s.string[0]) { ++total; } } @@ -1116,7 +1116,7 @@ extern "C" { } } else { - fl_print_format("%ul%c", main->output.to.stream, total, f_string_eol_s[0]); + fl_print_format("%ul%q", main->output.to.stream, total, f_string_eol_s); } funlockfile(main->output.to.stream); @@ -1183,7 +1183,7 @@ extern "C" { } } else { - fl_print_format("%ul%c", main->output.to.stream, total, f_string_eol_s[0]); + fl_print_format("%ul%q", main->output.to.stream, total, f_string_eol_s); } funlockfile(main->output.to.stream); diff --git a/level_3/fss_payload_write/c/fss_payload_write.c b/level_3/fss_payload_write/c/fss_payload_write.c index b6c79d0..1227b7b 100644 --- a/level_3/fss_payload_write/c/fss_payload_write.c +++ b/level_3/fss_payload_write/c/fss_payload_write.c @@ -13,42 +13,42 @@ extern "C" { fll_program_print_help_header(file, context, fss_payload_write_program_name_long_s, fss_payload_write_program_version_s); - fll_program_print_help_option(file, context, f_console_standard_short_help_s, f_console_standard_long_help_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print this help message."); - fll_program_print_help_option(file, context, f_console_standard_short_dark_s, f_console_standard_long_dark_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_light_s, f_console_standard_long_light_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, "Do not file in color."); - fll_program_print_help_option(file, context, f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Decrease verbosity, silencing most output."); - fll_program_print_help_option(file, context, f_console_standard_short_normal_s, f_console_standard_long_normal_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Set verbosity to normal file."); - fll_program_print_help_option(file, context, f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Increase verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_debug_s, f_console_standard_long_debug_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Enable debugging, significantly increasing verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_version_s, f_console_standard_long_version_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Print only the version number."); - - f_print_character(f_string_eol_s[0], file.stream); - - fll_program_print_help_option(file, context, fss_payload_write_short_file_s, fss_payload_write_long_file_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Specify a file to send data to."); - fll_program_print_help_option(file, context, fss_payload_write_short_content_s, fss_payload_write_long_content_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "The Content to file."); - fll_program_print_help_option(file, context, fss_payload_write_short_double_s, fss_payload_write_long_double_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Use double quotes (default)."); - fll_program_print_help_option(file, context, fss_payload_write_short_ignore_s, fss_payload_write_long_ignore_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Ignore a given range within a Content."); - fll_program_print_help_option(file, context, fss_payload_write_short_object_s, fss_payload_write_long_object_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " The Object to file."); - fll_program_print_help_option(file, context, fss_payload_write_short_partial_s, fss_payload_write_long_partial_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Do not file end of Object/Content character."); - fll_program_print_help_option(file, context, fss_payload_write_short_prepend_s, fss_payload_write_long_prepend_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Prepend the given whitespace characters to the start of each multi-line Content."); - fll_program_print_help_option(file, context, fss_payload_write_short_single_s, fss_payload_write_long_single_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Use single quotes."); - fll_program_print_help_option(file, context, fss_payload_write_short_trim_s, fss_payload_write_long_trim_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Trim Object names."); + fll_program_print_help_option(file, context, f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print this help message."); + fll_program_print_help_option(file, context, f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, "Do not file in color."); + fll_program_print_help_option(file, context, f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Decrease verbosity, silencing most output."); + fll_program_print_help_option(file, context, f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Set verbosity to normal file."); + fll_program_print_help_option(file, context, f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Increase verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Enable debugging, significantly increasing verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Print only the version number."); + + f_print_dynamic(f_string_eol_s, file.stream); + + fll_program_print_help_option(file, context, fss_payload_write_short_file_s, fss_payload_write_long_file_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Specify a file to send data to."); + fll_program_print_help_option(file, context, fss_payload_write_short_content_s, fss_payload_write_long_content_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "The Content to file."); + fll_program_print_help_option(file, context, fss_payload_write_short_double_s, fss_payload_write_long_double_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Use double quotes (default)."); + fll_program_print_help_option(file, context, fss_payload_write_short_ignore_s, fss_payload_write_long_ignore_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Ignore a given range within a Content."); + fll_program_print_help_option(file, context, fss_payload_write_short_object_s, fss_payload_write_long_object_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " The Object to file."); + fll_program_print_help_option(file, context, fss_payload_write_short_partial_s, fss_payload_write_long_partial_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "Do not file end of Object/Content character."); + fll_program_print_help_option(file, context, fss_payload_write_short_prepend_s, fss_payload_write_long_prepend_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "Prepend the given whitespace characters to the start of each multi-line Content."); + fll_program_print_help_option(file, context, fss_payload_write_short_single_s, fss_payload_write_long_single_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Use single quotes."); + fll_program_print_help_option(file, context, fss_payload_write_short_trim_s, fss_payload_write_long_trim_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Trim Object names."); fll_program_print_help_usage(file, context, fss_payload_write_program_name_s, f_string_empty_s); - fl_print_format(" The pipe uses the Backspace character '%[\\b%]' (%[U+0008%]) to designate the start of a Content.%c", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s[0]); - fl_print_format(" The pipe uses the Form Feed character '%[\\f%]' (%[U+000C%]) to designate the end of the last Content.%c", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s[0]); - fl_print_format(" The pipe uses the Vertical Line character '%[\\v%]' (%[U+000B%]) is used to ignore a Content range, which does nothing in this program.%c", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s[0]); + fl_print_format(" The pipe uses the Backspace character '%[\\b%]' (%[U+0008%]) to designate the start of a Content.%q", file.stream, context.set.notable, context.set.notable, context.set.notable, context.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.%q", file.stream, context.set.notable, context.set.notable, context.set.notable, context.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, which does nothing in this program.%q", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s); fl_print_format(" For the pipe, an Object is terminated by either a Backspace character '%[\\b%]' (%[U+0008%])", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable); - fl_print_format(" or a Form Feed character '%[\\f%]' (%[U+000C%]).%c", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s[0]); - fl_print_format(" The end of the pipe represents the end of any Object or Content.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" or a Form Feed character '%[\\f%]' (%[U+000C%]).%q", file.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s); + fl_print_format(" The end of the pipe represents the end of any Object or Content.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" The FSS-000E (Payload) specification does not support quoted names, therefore the parameters '%[%s%s%]'", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_write_long_single_s, context.set.notable); - fl_print_format(" and '%[%s%s%]' do nothing.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_write_long_double_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The FSS-000E (Payload) specification does not support quoted names, therefore the parameters '%[%q%s%]'", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_write_long_single_s, context.set.notable); + fl_print_format(" and '%[%q%s%]' do nothing.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_write_long_double_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" This program does not use the parameter '%[%s%s%]', which therefore does nothing.%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_write_long_ignore_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" This parameter requires two values.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" This program does not use the parameter '%[%q%s%]', which therefore does nothing.%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, fss_payload_write_long_ignore_s, context.set.notable, f_string_eol_s); + fl_print_format(" This parameter requires two values.%q%q", file.stream, f_string_eol_s, f_string_eol_s); funlockfile(file.stream); @@ -162,9 +162,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_file_s, main->error.notable); - fl_print_format("%[' may only be specified once.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_file_s, main->error.notable); + fl_print_format("%[' may only be specified once.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -184,7 +184,7 @@ extern "C" { } } else if (main->parameters[fss_payload_write_parameter_file_e].result == f_console_result_found_e) { - fss_payload_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s, fss_payload_write_long_file_s); + fss_payload_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s.string, fss_payload_write_long_file_s); status = F_status_set_error(F_parameter); } } @@ -193,11 +193,11 @@ extern "C" { if (main->parameters[fss_payload_write_parameter_object_e].locations.used || main->parameters[fss_payload_write_parameter_content_e].locations.used) { if (main->parameters[fss_payload_write_parameter_object_e].locations.used) { if (main->parameters[fss_payload_write_parameter_object_e].locations.used != main->parameters[fss_payload_write_parameter_object_e].values.used) { - fss_payload_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s, fss_payload_write_long_object_s); + fss_payload_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s.string, fss_payload_write_long_object_s); status = F_status_set_error(F_parameter); } else if (main->parameters[fss_payload_write_parameter_content_e].locations.used != main->parameters[fss_payload_write_parameter_content_e].values.used) { - fss_payload_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s, fss_payload_write_long_content_s); + fss_payload_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s.string, fss_payload_write_long_content_s); status = F_status_set_error(F_parameter); } else if (main->parameters[fss_payload_write_parameter_object_e].locations.used != main->parameters[fss_payload_write_parameter_content_e].locations.used && main->parameters[fss_payload_write_parameter_partial_e].result == f_console_result_none_e) { @@ -209,13 +209,13 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_partial_s, main->error.notable); + fl_print_format("%q%[%sThe '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_partial_s, main->error.notable); fl_print_format("%[' parameter only allows either the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_object_s, main->error.notable); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_object_s, main->error.notable); fl_print_format("%[' parameter or the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_content_s, main->error.notable); - fl_print_format("%[' parameter, but not both.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_content_s, main->error.notable); + fl_print_format("%[' parameter, but not both.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -241,11 +241,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sEach '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_object_s, main->error.notable); + fl_print_format("%q%[%sEach '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_object_s, main->error.notable); fl_print_format("%[' parameter must be specified before a '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_content_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_content_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -259,7 +259,7 @@ extern "C" { } else if (main->parameters[fss_payload_write_parameter_content_e].locations.used) { if (main->parameters[fss_payload_write_parameter_content_e].locations.used != main->parameters[fss_payload_write_parameter_content_e].values.used) { - fss_payload_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s, fss_payload_write_long_content_s); + fss_payload_write_error_parameter_value_missing_print(main, f_console_symbol_long_enable_s.string, fss_payload_write_long_content_s); status = F_status_set_error(F_parameter); } else if (!main->parameters[fss_payload_write_parameter_partial_e].locations.used) { @@ -272,11 +272,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThis requires either piped data or the use of the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_object_s, main->error.notable); + fl_print_format("%q%[%sThis requires either piped data or the use of the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_object_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_content_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_content_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -289,9 +289,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThis '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_partial_s, main->error.notable); - fl_print_format("%[' parameter cannot be used when processing a pipe.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThis '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_partial_s, main->error.notable); + fl_print_format("%[' parameter cannot be used when processing a pipe.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -306,9 +306,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_prepend_s, main->error.notable); - fl_print_format("%[' is specified, but no value is given.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_prepend_s, main->error.notable); + fl_print_format("%[' is specified, but no value is given.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -335,9 +335,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_prepend_s, main->error.notable); - fl_print_format("%[' must only contain whitespace.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_prepend_s, main->error.notable); + fl_print_format("%[' must only contain whitespace.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -351,9 +351,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_prepend_s, main->error.notable); - fl_print_format("%[' must not be an empty string.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe value for the parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_prepend_s, main->error.notable); + fl_print_format("%[' must not be an empty string.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -368,9 +368,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_ignore_s, main->error.notable); - fl_print_format("%[' was specified, but no values were given.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_ignore_s, main->error.notable); + fl_print_format("%[' was specified, but no values were given.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -384,9 +384,9 @@ extern "C" { if (total_locations * 2 > total_arguments) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_ignore_s, main->error.notable); - fl_print_format("%[' requires two values.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_ignore_s, main->error.notable); + fl_print_format("%[' requires two values.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -427,8 +427,8 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sWhile processing the '%]%[input pipe%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context, main->error.notable, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sWhile processing the '%]%[input pipe%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context, main->error.notable, main->error.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -496,8 +496,8 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sWhile processing the '%]%[input arguments%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context, main->error.notable, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sWhile processing the '%]%[input arguments%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context, main->error.notable, main->error.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -505,7 +505,7 @@ extern "C" { else if (main->error.verbosity != f_console_verbosity_quiet_e && main->parameters[fss_payload_write_parameter_file_e].result == f_console_result_none_e) { // Ensure there is always a newline at the end, unless in quiet mode. - fll_print_character(f_string_eol_s[0], main->output.to.stream); + fll_print_dynamic(f_string_eol_s, main->output.to.stream); } } @@ -530,7 +530,7 @@ extern "C" { // Ensure a newline is always put at the end of the program execution, unless in quiet mode. if (main->error.verbosity != f_console_verbosity_quiet_e) { if (F_status_is_error(status)) { - fll_print_character(f_string_eol_s[0], main->error.to.stream); + fll_print_dynamic(f_string_eol_s, main->error.to.stream); } } diff --git a/level_3/fss_payload_write/c/fss_payload_write.h b/level_3/fss_payload_write/c/fss_payload_write.h index 2bbbe85..2609e24 100644 --- a/level_3/fss_payload_write/c/fss_payload_write.h +++ b/level_3/fss_payload_write/c/fss_payload_write.h @@ -116,15 +116,15 @@ extern "C" { #define fss_payload_write_console_parameter_t_initialize \ { \ - macro_f_console_parameter_t_initialize(f_console_standard_short_help_s, f_console_standard_long_help_s, 0, 0, f_console_type_normal_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_light_s, f_console_standard_long_light_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s, f_console_standard_long_dark_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, 0, F_false, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s, f_console_standard_long_normal_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s, f_console_standard_long_debug_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_version_s, f_console_standard_long_version_s, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, 0, 0, f_console_type_normal_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, 0, F_false, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, 0, 0, f_console_type_inverse_e), \ macro_f_console_parameter_t_initialize(fss_payload_write_short_file_s, fss_payload_write_long_file_s, 0, 1, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(fss_payload_write_short_content_s, fss_payload_write_long_content_s, 0, 1, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(fss_payload_write_short_double_s, fss_payload_write_long_double_s, 0, 0, f_console_type_normal_e), \ diff --git a/level_3/fss_payload_write/c/private-common.c b/level_3/fss_payload_write/c/private-common.c index 7851de3..1317e4e 100644 --- a/level_3/fss_payload_write/c/private-common.c +++ b/level_3/fss_payload_write/c/private-common.c @@ -15,9 +15,9 @@ extern "C" { flockfile(main->warning.to.stream); - fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s[0], f_string_eol_s[0], main->context.set.warning, main->context.set.warning); + fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s, f_string_eol_s, main->context.set.warning, main->context.set.warning); fl_print_format("%[%i%]", main->warning.to.stream, main->context.set.notable, signal, main->context.set.notable); - fl_print_format("%[.%]%c", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s[0]); + fl_print_format("%[.%]%q", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s); funlockfile(main->warning.to.stream); } diff --git a/level_3/fss_payload_write/c/private-write.c b/level_3/fss_payload_write/c/private-write.c index 694adf7..ce6cdaf 100644 --- a/level_3/fss_payload_write/c/private-write.c +++ b/level_3/fss_payload_write/c/private-write.c @@ -15,13 +15,13 @@ extern "C" { flockfile(main->error.to.stream); - fl_print_format("%c%[%sMust specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_object_s, main->error.notable); + fl_print_format("%q%[%sMust specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_object_s, main->error.notable); fl_print_format("%[' parameter and the '%]", main->error.to.stream, main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_content_s, main->error.notable); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_content_s, main->error.notable); fl_print_format("%[' parameter the same number of times when not specifying the '%]", main->error.to.stream, main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_partial_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_payload_write_long_partial_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -36,9 +36,9 @@ extern "C" { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThis standard does not support end of line character '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%sThis standard does not support end of line character '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[\\n%]", main->error.to.stream, main->error.notable, main->error.notable); - fl_print_format("%[' in objects.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' in objects.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -53,9 +53,9 @@ extern "C" { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%S%S%]", main->error.to.stream, main->error.notable, symbol, parameter, main->error.notable); - fl_print_format("%[' is specified, but no value is given.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' is specified, but no value is given.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -322,7 +322,7 @@ extern "C" { if (block.string[range.start] == fss_payload_write_pipe_content_start_s) { if (main->error.verbosity != f_console_verbosity_quiet_e) { - fll_print_format("%c%[%sThis standard only supports one content per object.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sThis standard only supports one content per object.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context, f_string_eol_s); } status = F_status_set_error(F_supported_not); diff --git a/level_3/fss_status_code/c/fss_status_code.c b/level_3/fss_status_code/c/fss_status_code.c index 0eaca1f..c6658a2 100644 --- a/level_3/fss_status_code/c/fss_status_code.c +++ b/level_3/fss_status_code/c/fss_status_code.c @@ -13,22 +13,22 @@ extern "C" { fll_program_print_help_header(file, context, fss_status_code_program_name_long_s, fss_status_code_program_version_s); - fll_program_print_help_option(file, context, f_console_standard_short_help_s, f_console_standard_long_help_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print this help message."); - fll_program_print_help_option(file, context, f_console_standard_short_dark_s, f_console_standard_long_dark_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_light_s, f_console_standard_long_light_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, "Do not file in color."); - fll_program_print_help_option(file, context, f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Decrease verbosity, silencing most output."); - fll_program_print_help_option(file, context, f_console_standard_short_normal_s, f_console_standard_long_normal_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Set verbosity to normal file."); - fll_program_print_help_option(file, context, f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Increase verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_debug_s, f_console_standard_long_debug_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Enable debugging, significantly increasing verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_version_s, f_console_standard_long_version_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Print only the version number."); - - f_print_character(f_string_eol_s[0], file.stream); - - fll_program_print_help_option(file, context, fss_status_code_short_is_fine_s, fss_status_code_long_is_fine_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print F_true if the error code is not an error, F_false otherwise."); - fll_program_print_help_option(file, context, fss_status_code_short_is_warning_s, fss_status_code_long_is_warning_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Print F_true if the error code is a warning, F_false otherwise."); - fll_program_print_help_option(file, context, fss_status_code_short_is_error_s, fss_status_code_long_is_error_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print F_true if the error code is an error, F_false otherwise."); - fll_program_print_help_option(file, context, fss_status_code_short_number_s, fss_status_code_long_number_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Convert status code name to number."); + fll_program_print_help_option(file, context, f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print this help message."); + fll_program_print_help_option(file, context, f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, "Do not file in color."); + fll_program_print_help_option(file, context, f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Decrease verbosity, silencing most output."); + fll_program_print_help_option(file, context, f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Set verbosity to normal file."); + fll_program_print_help_option(file, context, f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Increase verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Enable debugging, significantly increasing verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Print only the version number."); + + f_print_dynamic(f_string_eol_s, file.stream); + + fll_program_print_help_option(file, context, fss_status_code_short_is_fine_s, fss_status_code_long_is_fine_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print F_true if the error code is not an error, F_false otherwise."); + fll_program_print_help_option(file, context, fss_status_code_short_is_warning_s, fss_status_code_long_is_warning_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "Print F_true if the error code is a warning, F_false otherwise."); + fll_program_print_help_option(file, context, fss_status_code_short_is_error_s, fss_status_code_long_is_error_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print F_true if the error code is an error, F_false otherwise."); + fll_program_print_help_option(file, context, fss_status_code_short_number_s, fss_status_code_long_number_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Convert status code name to number."); fll_program_print_help_usage(file, context, fss_status_code_program_name_s, "status code(s)"); @@ -134,11 +134,11 @@ extern "C" { if (main->parameters[fss_status_code_parameter_is_warning_e].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_status_code_long_is_error_s, main->error.notable); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_status_code_long_is_error_s, main->error.notable); fl_print_format("%[' cannot be used with the parameter '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_status_code_long_is_warning_s, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_status_code_long_is_warning_s, main->error.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -148,11 +148,11 @@ extern "C" { else if (main->parameters[fss_status_code_parameter_is_fine_e].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_status_code_long_is_error_s, main->error.notable); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_status_code_long_is_error_s, main->error.notable); fl_print_format("%[' cannot be used with the parameter '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_status_code_long_is_fine_s, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_status_code_long_is_fine_s, main->error.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -163,11 +163,11 @@ extern "C" { else if (main->parameters[fss_status_code_parameter_is_warning_e].result == f_console_result_found_e && main->parameters[fss_status_code_parameter_is_fine_e].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_status_code_long_is_warning_s, main->error.notable); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_status_code_long_is_warning_s, main->error.notable); fl_print_format("%[' cannot be used with the parameter '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_status_code_long_is_fine_s, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, fss_status_code_long_is_fine_s, main->error.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -176,7 +176,7 @@ extern "C" { } if (main->remaining.used == 0 && !main->process_pipe) { - fll_print_format("%[You failed to specify an error code.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fll_print_format("%[You failed to specify an error code.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); fss_status_code_main_delete(main); return F_status_set_error(F_parameter); @@ -282,7 +282,7 @@ extern "C" { if (F_status_set_fine(status) == F_interrupt) { fflush(main->output.to.stream); - fll_print_terminated(f_string_eol_s, main->output.to.stream); + fll_print_dynamic(f_string_eol_s, main->output.to.stream); } } 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 2816e35..526f38e 100644 --- a/level_3/fss_status_code/c/fss_status_code.h +++ b/level_3/fss_status_code/c/fss_status_code.h @@ -99,15 +99,15 @@ extern "C" { #define fss_status_code_console_parameter_t_initialize \ { \ - macro_f_console_parameter_t_initialize(f_console_standard_short_help_s, f_console_standard_long_help_s, 0, 0, f_console_type_normal_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_light_s, f_console_standard_long_light_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s, f_console_standard_long_dark_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s, f_console_standard_long_normal_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s, f_console_standard_long_debug_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_version_s, f_console_standard_long_version_s, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, 0, 0, f_console_type_normal_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, 0, 0, f_console_type_inverse_e), \ macro_f_console_parameter_t_initialize(fss_status_code_short_is_fine_s, fss_status_code_long_is_fine_s, 0, 0, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(fss_status_code_short_is_warning_s, fss_status_code_long_is_warning_s, 0, 0, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(fss_status_code_short_is_error_s, fss_status_code_long_is_error_s, 0, 0, f_console_type_normal_e), \ diff --git a/level_3/fss_status_code/c/private-common.c b/level_3/fss_status_code/c/private-common.c index 97c7d3e..052c043 100644 --- a/level_3/fss_status_code/c/private-common.c +++ b/level_3/fss_status_code/c/private-common.c @@ -15,9 +15,9 @@ extern "C" { flockfile(main->warning.to.stream); - fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s[0], f_string_eol_s[0], main->context.set.warning, main->context.set.warning); + fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s, f_string_eol_s, main->context.set.warning, main->context.set.warning); fl_print_format("%[%i%]", main->warning.to.stream, main->context.set.notable, signal, main->context.set.notable); - fl_print_format("%[.%]%c", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s[0]); + fl_print_format("%[.%]%q", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s); funlockfile(main->warning.to.stream); } diff --git a/level_3/fss_status_code/c/private-fss_status_code.c b/level_3/fss_status_code/c/private-fss_status_code.c index 66adee5..fa17af4 100644 --- a/level_3/fss_status_code/c/private-fss_status_code.c +++ b/level_3/fss_status_code/c/private-fss_status_code.c @@ -24,7 +24,7 @@ extern "C" { f_print_terminated(f_status_false_s, main->output.to.stream); } - f_print_character(f_string_eol_s[0], main->output.to.stream); + f_print_dynamic(f_string_eol_s, main->output.to.stream); } else if (main->parameters[fss_status_code_parameter_is_warning_e].result == f_console_result_found_e) { if (F_status_is_warning(number)) { @@ -34,7 +34,7 @@ extern "C" { f_print_terminated(f_status_false_s, main->output.to.stream); } - f_print_character(f_string_eol_s[0], main->output.to.stream); + f_print_dynamic(f_string_eol_s, main->output.to.stream); } else if (main->parameters[fss_status_code_parameter_is_fine_e].result == f_console_result_found_e) { if (F_status_is_fine(number)) { @@ -44,7 +44,7 @@ extern "C" { f_print_terminated(f_status_false_s, main->output.to.stream); } - f_print_character(f_string_eol_s[0], main->output.to.stream); + f_print_dynamic(f_string_eol_s, main->output.to.stream); } return F_none; @@ -64,13 +64,13 @@ extern "C" { status = fl_conversion_string_to_number_unsigned(value, range, &number); if (status == F_none) { - fl_print_format("%[invalid name%]%c", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[invalid name%]%q", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); return F_status_set_error(F_parameter); } if (status == F_data_not || F_status_set_fine(status) == F_parameter) { - fl_print_format("%[invalid main%]%c", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[invalid main%]%q", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); return status; } @@ -87,10 +87,10 @@ extern "C" { if (F_status_is_error(status)) { if (F_status_set_fine(status) == F_data) { - fl_print_format("%[unknown name%]%c", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[unknown name%]%q", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); } else { - fl_print_format("%[failed to convert%]%c", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[failed to convert%]%q", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); } return status; @@ -98,12 +98,12 @@ extern "C" { } if (status == F_data) { - fl_print_format("%[unknown code%]%c", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[unknown code%]%q", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); return F_none; } - fl_print_format("%ui%c", main->output.to.stream, code, f_string_eol_s[0]); + fl_print_format("%ui%q", main->output.to.stream, code, f_string_eol_s); return F_none; } @@ -124,16 +124,16 @@ extern "C" { if (F_status_is_error(status)) { if (F_status_set_fine(status) == F_data) { - fl_print_format("%[unknown code%]%c", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[unknown code%]%q", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); } else { - fl_print_format("%[failed to convert%]%c", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[failed to convert%]%q", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); } return status; } - fl_print_format("%S%c", main->output.to.stream, string, f_string_eol_s[0]); + fl_print_format("%S%q", main->output.to.stream, string, f_string_eol_s); return F_none; } @@ -147,17 +147,17 @@ extern "C" { f_status_t status = fl_conversion_string_to_number_unsigned(value, range, number); if (*number > F_status_size_max_with_signal) { - fl_print_format("%[out of range%]%c", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[out of range%]%q", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); return status; } if (F_status_is_error(status)) { if (F_status_set_fine(status) == F_number_negative) { - fl_print_format("%[out of range%]%c", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[out of range%]%q", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); } else { - fl_print_format("%[invalid number%]%c", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[invalid number%]%q", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); } return status; diff --git a/level_3/iki_read/c/iki_read.c b/level_3/iki_read/c/iki_read.c index 77fda83..9812500 100644 --- a/level_3/iki_read/c/iki_read.c +++ b/level_3/iki_read/c/iki_read.c @@ -13,51 +13,51 @@ extern "C" { fll_program_print_help_header(file, context, iki_read_program_name_long_s, iki_read_program_version_s); - fll_program_print_help_option(file, context, f_console_standard_short_help_s, f_console_standard_long_help_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print this help message."); - fll_program_print_help_option(file, context, f_console_standard_short_dark_s, f_console_standard_long_dark_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_light_s, f_console_standard_long_light_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, "Do not file in color."); - fll_program_print_help_option(file, context, f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Decrease verbosity, silencing most output."); - fll_program_print_help_option(file, context, f_console_standard_short_normal_s, f_console_standard_long_normal_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Set verbosity to normal file."); - fll_program_print_help_option(file, context, f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Increase verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_debug_s, f_console_standard_long_debug_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Enable debugging, significantly increasing verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_version_s, f_console_standard_long_version_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Print only the version number."); + fll_program_print_help_option(file, context, f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print this help message."); + fll_program_print_help_option(file, context, f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, "Do not file in color."); + fll_program_print_help_option(file, context, f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Decrease verbosity, silencing most output."); + fll_program_print_help_option(file, context, f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Set verbosity to normal file."); + fll_program_print_help_option(file, context, f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Increase verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Enable debugging, significantly increasing verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Print only the version number."); - f_print_character(f_string_eol_s[0], file.stream); + f_print_dynamic(f_string_eol_s, file.stream); - fll_program_print_help_option(file, context, iki_read_short_at_s, iki_read_long_at_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Select variable at this numeric index."); - fll_program_print_help_option(file, context, iki_read_short_line_s, iki_read_long_line_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print only the variables at the given line within the file."); - fll_program_print_help_option(file, context, iki_read_short_name_s, iki_read_long_name_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Select variables with this name."); - fll_program_print_help_option(file, context, iki_read_short_whole_s, iki_read_long_whole_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Print all of the data instead of just the IKI variable data."); + fll_program_print_help_option(file, context, iki_read_short_at_s, iki_read_long_at_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Select variable at this numeric index."); + fll_program_print_help_option(file, context, iki_read_short_line_s, iki_read_long_line_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print only the variables at the given line within the file."); + fll_program_print_help_option(file, context, iki_read_short_name_s, iki_read_long_name_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Select variables with this name."); + fll_program_print_help_option(file, context, iki_read_short_whole_s, iki_read_long_whole_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "Print all of the data instead of just the IKI variable data."); - f_print_character(f_string_eol_s[0], file.stream); + f_print_dynamic(f_string_eol_s, file.stream); - fll_program_print_help_option(file, context, iki_read_short_content_s, iki_read_long_content_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Print the variable content (default)."); - fll_program_print_help_option(file, context, iki_read_short_literal_s, iki_read_long_literal_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Print the entire variable (aka: object, content, and syntax)."); - fll_program_print_help_option(file, context, iki_read_short_object_s, iki_read_long_object_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print the variable name (aka: object)."); - fll_program_print_help_option(file, context, iki_read_short_total_s, iki_read_long_total_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print the total number of variables."); + fll_program_print_help_option(file, context, iki_read_short_content_s, iki_read_long_content_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "Print the variable content (default)."); + fll_program_print_help_option(file, context, iki_read_short_literal_s, iki_read_long_literal_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "Print the entire variable (aka: object, content, and syntax)."); + fll_program_print_help_option(file, context, iki_read_short_object_s, iki_read_long_object_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print the variable name (aka: object)."); + fll_program_print_help_option(file, context, iki_read_short_total_s, iki_read_long_total_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print the total number of variables."); - f_print_character(f_string_eol_s[0], file.stream); + f_print_dynamic(f_string_eol_s, file.stream); - fll_program_print_help_option(file, context, iki_read_short_substitute_s, iki_read_long_substitute_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Substitute the entire variable for the given name and content value with the given string."); + fll_program_print_help_option(file, context, iki_read_short_substitute_s, iki_read_long_substitute_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "Substitute the entire variable for the given name and content value with the given string."); fll_program_print_help_usage(file, context, iki_read_program_name_s, "filename(s)"); - fl_print_format(" %[Notes:%]%c", file.stream, context.set.important, context.set.important, f_string_eol_s[0]); - fl_print_format(" This program will find and print variables, vocabularies, or content following the IKI standard, without focusing on any particular vocabulary specification.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" %[Notes:%]%q", file.stream, context.set.important, context.set.important, f_string_eol_s); + fl_print_format(" This program will find and print variables, vocabularies, or content following the IKI standard, without focusing on any particular vocabulary specification.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" This %[%s%s%] option, requires 3 additional parameters:", file.stream, context.set.notable, f_console_symbol_long_enable_s, iki_read_long_substitute_s, context.set.notable); + fl_print_format(" This %[%q%s%] option, requires 3 additional parameters:", file.stream, context.set.notable, f_console_symbol_long_enable_s, iki_read_long_substitute_s, context.set.notable); fl_print_format(" %[<%]%s%[>%]", file.stream, context.set.notable, context.set.notable, iki_read_substitution_vocabulary_s, context.set.notable, context.set.notable); fl_print_format(" %[<%]%s%[>%]", file.stream, context.set.notable, context.set.notable, iki_read_substitution_replace_s, context.set.notable, context.set.notable); - fl_print_format(" %[<%]%s%[>%].%c", file.stream, context.set.notable, context.set.notable, iki_read_substitution_with_s, context.set.notable, context.set.notable, f_string_eol_s[0]); + fl_print_format(" %[<%]%s%[>%].%q", file.stream, context.set.notable, context.set.notable, iki_read_substitution_with_s, context.set.notable, context.set.notable, f_string_eol_s); - fl_print_format(" %[%s%]: The name of the vocabulary whose content is to be substituted.%c", file.stream, context.set.notable, iki_read_substitution_vocabulary_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" %[%s%]: The content matching this exact string will be substituted.%c", file.stream, context.set.notable, iki_read_substitution_replace_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" %[%s%]: The new string to use as the substitute.%c%c", file.stream, context.set.notable, iki_read_substitution_with_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" %[%s%]: The name of the vocabulary whose content is to be substituted.%q", file.stream, context.set.notable, iki_read_substitution_vocabulary_s, context.set.notable, f_string_eol_s); + fl_print_format(" %[%s%]: The content matching this exact string will be substituted.%q", file.stream, context.set.notable, iki_read_substitution_replace_s, context.set.notable, f_string_eol_s); + fl_print_format(" %[%s%]: The new string to use as the substitute.%q%q", file.stream, context.set.notable, iki_read_substitution_with_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" The vocabulary and replacement are case-sensitive and must exactly match.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The vocabulary and replacement are case-sensitive and must exactly match.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" The default behavior is to only display content portion of the IKI variable.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The default behavior is to only display content portion of the IKI variable.%q%q", file.stream, f_string_eol_s, f_string_eol_s); funlockfile(file.stream); @@ -103,7 +103,7 @@ extern "C" { fll_error_print(main->error, F_status_set_fine(status), "fll_program_parameter_process", F_true); if (main->error.verbosity == f_console_verbosity_verbose_e) { - fll_print_character(f_string_eol_s[0], main->error.to.stream); + fll_print_dynamic(f_string_eol_s, main->error.to.stream); } iki_read_main_delete(main); @@ -174,9 +174,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_at_s, main->error.notable); - fl_print_format("%[' requires a positive number.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_at_s, main->error.notable); + fl_print_format("%[' requires a positive number.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -192,7 +192,7 @@ extern "C" { status = fl_conversion_string_to_number_unsigned(arguments->argv[index], range, &number); if (F_status_is_error(status)) { - fll_error_parameter_integer_print(main->error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, F_console_symbol_long_s_enable iki_read_long_at_s, arguments->argv[index]); + fll_error_parameter_integer_print(main->error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, F_console_symbol_long_enable_s iki_read_long_at_s, arguments->argv[index]); status = F_status_set_error(F_parameter); } @@ -203,11 +203,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_at_s, main->error.notable); + fl_print_format("%q%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_at_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_whole_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_whole_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -220,9 +220,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_line_s, main->error.notable); - fl_print_format("%[' requires a positive number.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_line_s, main->error.notable); + fl_print_format("%[' requires a positive number.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -238,7 +238,7 @@ extern "C" { status = fl_conversion_string_to_number_unsigned(arguments->argv[index], range, &number); if (F_status_is_error(status)) { - fll_error_parameter_integer_print(main->error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, F_console_symbol_long_s_enable iki_read_long_line_s, arguments->argv[index]); + fll_error_parameter_integer_print(main->error, F_status_set_fine(status), "fl_conversion_string_to_number_unsigned", F_true, F_console_symbol_long_enable_s iki_read_long_line_s, arguments->argv[index]); status = F_status_set_error(F_parameter); } @@ -250,9 +250,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_name_s, main->error.notable); - fl_print_format("%[' requires a string.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_name_s, main->error.notable); + fl_print_format("%[' requires a string.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -265,9 +265,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_substitute_s, main->error.notable); - fl_print_format("%[' requires 3 strings.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_substitute_s, main->error.notable); + fl_print_format("%[' requires 3 strings.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -279,11 +279,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_substitute_s, main->error.notable); + fl_print_format("%q%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_substitute_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_total_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_total_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -297,11 +297,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_literal_s, main->error.notable); + fl_print_format("%q%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_literal_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_object_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_object_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -313,11 +313,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_literal_s, main->error.notable); + fl_print_format("%q%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_literal_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_content_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_content_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -329,11 +329,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_literal_s, main->error.notable); + fl_print_format("%q%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_literal_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_total_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_total_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -348,11 +348,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_object_s, main->error.notable); + fl_print_format("%q%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_object_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_content_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_content_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -364,11 +364,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_object_s, main->error.notable); + fl_print_format("%q%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_object_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_total_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_total_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -391,11 +391,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_whole_s, main->error.notable); + fl_print_format("%q%[%sCannot specify the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_whole_s, main->error.notable); fl_print_format("%[' parameter with the '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_total_s, main->error.notable); - fl_print_format("%[' parameter.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_read_long_total_s, main->error.notable); + fl_print_format("%[' parameter.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -406,7 +406,7 @@ extern "C" { if (F_status_is_error(status)) { if (main->error.verbosity != f_console_verbosity_quiet_e) { - fll_print_character(f_string_eol_s[0], main->error.to.stream); + fll_print_dynamic(f_string_eol_s, main->error.to.stream); } iki_read_main_delete(main); @@ -492,7 +492,7 @@ extern "C" { } else { if (main->error.verbosity != f_console_verbosity_quiet_e) { - fll_print_format("%c%[%sYou failed to specify one or more files.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sYou failed to specify one or more files.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context, f_string_eol_s); } status = F_status_set_error(F_parameter); @@ -505,7 +505,7 @@ extern "C" { fflush(main->output.to.stream); } - fll_print_terminated(f_string_eol_s, main->output.to.stream); + fll_print_dynamic(f_string_eol_s, main->output.to.stream); } } diff --git a/level_3/iki_read/c/iki_read.h b/level_3/iki_read/c/iki_read.h index d975190..a4ee261 100644 --- a/level_3/iki_read/c/iki_read.h +++ b/level_3/iki_read/c/iki_read.h @@ -129,15 +129,15 @@ extern "C" { #define iki_read_console_parameter_t_initialize \ { \ - macro_f_console_parameter_t_initialize(f_console_standard_short_help_s, f_console_standard_long_help_s, 0, 0, f_console_type_normal_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_light_s, f_console_standard_long_light_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s, f_console_standard_long_dark_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s, f_console_standard_long_normal_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s, f_console_standard_long_debug_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_version_s, f_console_standard_long_version_s, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, 0, 0, f_console_type_normal_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, 0, 0, f_console_type_inverse_e), \ macro_f_console_parameter_t_initialize(iki_read_short_at_s, iki_read_long_at_s, 0, 1, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(iki_read_short_content_s, iki_read_long_content_s, 0, 0, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(iki_read_short_line_s, iki_read_long_line_s, 0, 1, f_console_type_normal_e), \ diff --git a/level_3/iki_read/c/private-common.c b/level_3/iki_read/c/private-common.c index 7e48ae2..4f8908b 100644 --- a/level_3/iki_read/c/private-common.c +++ b/level_3/iki_read/c/private-common.c @@ -15,9 +15,9 @@ extern "C" { flockfile(main->warning.to.stream); - fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s[0], f_string_eol_s[0], main->context.set.warning, main->context.set.warning); + fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s, f_string_eol_s, main->context.set.warning, main->context.set.warning); fl_print_format("%[%i%]", main->warning.to.stream, main->context.set.notable, signal, main->context.set.notable); - fl_print_format("%[.%]%c", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s[0]); + fl_print_format("%[.%]%q", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s); funlockfile(main->warning.to.stream); } diff --git a/level_3/iki_read/c/private-read.c b/level_3/iki_read/c/private-read.c index 121aff0..a5a72c0 100644 --- a/level_3/iki_read/c/private-read.c +++ b/level_3/iki_read/c/private-read.c @@ -19,13 +19,13 @@ extern "C" { range->start = 0; if (main->line > 0) { for (; line < main->line && range->start < main->buffer.used; ++range->start) { - if (main->buffer.string[range->start] == f_string_eol_s[0]) ++line; + if (main->buffer.string[range->start] == f_string_eol_s.string[0]) ++line; } // for } if (line == main->line) { for (range->stop = range->start; range->stop < main->buffer.used; ++range->stop) { - if (main->buffer.string[range->stop] == f_string_eol_s[0]) break; + if (main->buffer.string[range->stop] == f_string_eol_s.string[0]) break; } // for return F_true; @@ -116,7 +116,7 @@ extern "C" { } for (f_array_length_t i = 0; i < iki_data->delimits.used; ++i) { - main->buffer.string[iki_data->delimits.array[i]] = f_iki_syntax_placeholder_s[0]; + main->buffer.string[iki_data->delimits.array[i]] = f_iki_syntax_placeholder_s.string[0]; } // for const bool content_only = main->mode == iki_read_mode_content_e; @@ -188,7 +188,7 @@ extern "C" { f_print_dynamic_partial(main->buffer, ranges->array[j], main->output.to.stream); } - f_print_character(f_string_eol_s[0], main->output.to.stream); + f_print_dynamic(f_string_eol_s, main->output.to.stream); } } // for @@ -212,7 +212,7 @@ extern "C" { f_print_dynamic_partial(main->buffer, ranges->array[main->at], main->output.to.stream); } - f_print_character(f_string_eol_s[0], main->output.to.stream); + f_print_dynamic(f_string_eol_s, main->output.to.stream); funlockfile(main->output.to.stream); @@ -234,7 +234,7 @@ extern "C" { f_print_dynamic_partial(main->buffer, ranges->array[i], main->output.to.stream); } - f_print_character(f_string_eol_s[0], main->output.to.stream); + f_print_dynamic(f_string_eol_s, main->output.to.stream); } // for funlockfile(main->output.to.stream); @@ -273,7 +273,7 @@ extern "C" { } for (f_array_length_t i = 0; i < iki_data->delimits.used; ++i) { - main->buffer.string[iki_data->delimits.array[i]] = f_iki_syntax_placeholder_s[0]; + main->buffer.string[iki_data->delimits.array[i]] = f_iki_syntax_placeholder_s.string[0]; } // for if (!iki_data->variable.used) { @@ -459,13 +459,13 @@ extern "C" { if (status == F_true) { if (range.start > main->buffer.used) { - fll_print_format("0%c", main->output.to.stream, f_string_eol_s[0]); + fll_print_format("0%q", main->output.to.stream, f_string_eol_s); return F_none; } } else if (status == F_data_not) { - fll_print_format("0%c", main->output.to.stream, f_string_eol_s[0]); + fll_print_format("0%q", main->output.to.stream, f_string_eol_s); return F_none; } @@ -483,7 +483,7 @@ extern "C" { } for (f_array_length_t i = 0; i < iki_data->delimits.used; ++i) { - main->buffer.string[iki_data->delimits.array[i]] = f_iki_syntax_placeholder_s[0]; + main->buffer.string[iki_data->delimits.array[i]] = f_iki_syntax_placeholder_s.string[0]; } // for f_array_length_t total = 0; @@ -547,7 +547,7 @@ extern "C" { } } - fll_print_format("%ul%c", main->output.to.stream, total, f_string_eol_s[0]); + fll_print_format("%ul%q", main->output.to.stream, total, f_string_eol_s); return F_none; } diff --git a/level_3/iki_write/c/iki_write.c b/level_3/iki_write/c/iki_write.c index a882f63..c8f95b1 100644 --- a/level_3/iki_write/c/iki_write.c +++ b/level_3/iki_write/c/iki_write.c @@ -13,33 +13,33 @@ extern "C" { fll_program_print_help_header(file, context, iki_write_program_name_long_s, iki_write_program_version_s); - fll_program_print_help_option(file, context, f_console_standard_short_help_s, f_console_standard_long_help_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print this help message."); - fll_program_print_help_option(file, context, f_console_standard_short_dark_s, f_console_standard_long_dark_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_light_s, f_console_standard_long_light_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, "Do not file in color."); - fll_program_print_help_option(file, context, f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Decrease verbosity, silencing most output."); - fll_program_print_help_option(file, context, f_console_standard_short_normal_s, f_console_standard_long_normal_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Set verbosity to normal file."); - fll_program_print_help_option(file, context, f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Increase verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_debug_s, f_console_standard_long_debug_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Enable debugging, significantly increasing verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_version_s, f_console_standard_long_version_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Print only the version number."); - - f_print_character(f_string_eol_s[0], file.stream); - - fll_program_print_help_option(file, context, iki_write_short_file_s, iki_write_long_file_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Specify a file to send data to."); - fll_program_print_help_option(file, context, iki_write_short_content_s, iki_write_long_content_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "The content to file."); - fll_program_print_help_option(file, context, iki_write_short_double_s, iki_write_long_double_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Use double quotes (default)."); - fll_program_print_help_option(file, context, iki_write_short_object_s, iki_write_long_object_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " The object to file."); - fll_program_print_help_option(file, context, iki_write_short_single_s, iki_write_long_single_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Use single quotes."); + fll_program_print_help_option(file, context, f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print this help message."); + fll_program_print_help_option(file, context, f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, "Do not file in color."); + fll_program_print_help_option(file, context, f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Decrease verbosity, silencing most output."); + fll_program_print_help_option(file, context, f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Set verbosity to normal file."); + fll_program_print_help_option(file, context, f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Increase verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Enable debugging, significantly increasing verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Print only the version number."); + + f_print_dynamic(f_string_eol_s, file.stream); + + fll_program_print_help_option(file, context, iki_write_short_file_s, iki_write_long_file_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Specify a file to send data to."); + fll_program_print_help_option(file, context, iki_write_short_content_s, iki_write_long_content_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "The content to file."); + fll_program_print_help_option(file, context, iki_write_short_double_s, iki_write_long_double_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Use double quotes (default)."); + fll_program_print_help_option(file, context, iki_write_short_object_s, iki_write_long_object_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " The object to file."); + fll_program_print_help_option(file, context, iki_write_short_single_s, iki_write_long_single_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Use single quotes."); fll_program_print_help_usage(file, context, iki_write_program_name_s, f_string_empty_s); - fl_print_format(" %[Notes:%]%c", file.stream, context.set.important, context.set.important, f_string_eol_s[0]); - fl_print_format(" This program will accept object and content strings to generate an IKI string, such as %[object:\"content\"%].%c", file.stream, context.set.notable, context.set.notable, f_string_eol_s[0]); + fl_print_format(" %[Notes:%]%q", file.stream, context.set.important, context.set.important, f_string_eol_s); + fl_print_format(" This program will accept object and content strings to generate an IKI string, such as %[object:\"content\"%].%q", file.stream, context.set.notable, context.set.notable, f_string_eol_s); - fl_print_format(" Each object must have a content (and each content must have an object).%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" Each object must have a content (and each content must have an object).%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" When piping main to this program, a single end of line (\\n) must be used to separate each object from each content.%c", file.stream, f_string_eol_s[0]); - fl_print_format(" Furthermore, each object must be followed by a content.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" When piping main to this program, a single end of line (\\n) must be used to separate each object from each content.%q", file.stream, f_string_eol_s); + fl_print_format(" Furthermore, each object must be followed by a content.%q%q", file.stream, f_string_eol_s, f_string_eol_s); funlockfile(file.stream); @@ -84,7 +84,7 @@ extern "C" { if (F_status_is_error(status)) { if (main->error.verbosity != f_console_verbosity_quiet_e) { fll_error_print(main->error, F_status_set_fine(status), "fll_program_parameter_process", F_true); - f_print_character(f_string_eol_s[0], main->error.to.stream); + f_print_dynamic(f_string_eol_s, main->error.to.stream); } iki_write_main_delete(main); @@ -160,9 +160,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_write_long_file_s, main->error.notable); - fl_print_format("%[' may only be specified once.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_write_long_file_s, main->error.notable); + fl_print_format("%[' may only be specified once.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -186,9 +186,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_write_long_file_s, main->error.notable); - fl_print_format("%[' is specified, but no value is given.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_write_long_file_s, main->error.notable); + fl_print_format("%[' is specified, but no value is given.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -201,9 +201,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_write_long_object_s, main->error.notable); - fl_print_format("%[' is specified, but no value is given.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_write_long_object_s, main->error.notable); + fl_print_format("%[' is specified, but no value is given.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -215,9 +215,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_write_long_content_s, main->error.notable); - fl_print_format("%[' is specified, but no value is given.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_write_long_content_s, main->error.notable); + fl_print_format("%[' is specified, but no value is given.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -230,11 +230,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sNo main provided, either pipe the main or use the '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_write_long_object_s, main->error.notable); + fl_print_format("%q%[%sNo main provided, either pipe the main or use the '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_write_long_object_s, main->error.notable); fl_print_format("%[' and the '%]", main->error.to.stream, main->error.context, main->error.context); fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_write_long_content_s, main->error.notable); - fl_print_format("%[' parameters.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' parameters.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -248,11 +248,11 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameters '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_write_long_content_s, main->error.notable); + fl_print_format("%q%[%sThe parameters '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_write_long_content_s, main->error.notable); fl_print_format("%[' and '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_write_long_object_s, main->error.notable); - fl_print_format("%[' must be specified the same number of times.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, iki_write_long_object_s, main->error.notable); + fl_print_format("%[' must be specified the same number of times.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -261,18 +261,18 @@ extern "C" { } } - uint8_t quote = f_iki_syntax_quote_double_s[0]; + uint8_t quote = f_iki_syntax_quote_double_s.string[0]; if (F_status_is_error_not(status)) { if (main->parameters[iki_write_parameter_double_e].result == f_console_result_found_e) { if (main->parameters[iki_write_parameter_single_e].result == f_console_result_found_e) { if (main->parameters[iki_write_parameter_double_e].location < main->parameters[iki_write_parameter_single_e].location) { - quote = f_iki_syntax_quote_single_s[0]; + quote = f_iki_syntax_quote_single_s.string[0]; } } } else if (main->parameters[iki_write_parameter_single_e].result == f_console_result_found_e) { - quote = f_iki_syntax_quote_single_s[0]; + quote = f_iki_syntax_quote_single_s.string[0]; } } @@ -320,7 +320,7 @@ extern "C" { if (!buffer.used) { if (main->error.verbosity != f_console_verbosity_quiet_e) { - fll_print_format("%c%[%sThe pipe has no main.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sThe pipe has no main.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context, f_string_eol_s); } status = F_status_set_error(F_parameter); @@ -347,7 +347,7 @@ extern "C" { if (object_ended && previous == range.start) { if (main->error.verbosity != f_console_verbosity_quiet_e) { - fll_print_format("%c%[%sThe pipe has incorrectly placed newlines.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sThe pipe has incorrectly placed newlines.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context, f_string_eol_s); } status = F_status_set_error(F_parameter); @@ -372,7 +372,7 @@ extern "C" { status = iki_write_process(main, file, object, content, quote, &escaped); if (F_status_is_error(status)) break; - fll_print_character(f_string_eol_s[0], file.stream); + fll_print_dynamic(f_string_eol_s, file.stream); object_ended = F_false; } @@ -404,7 +404,7 @@ extern "C" { if (F_status_is_error_not(status) && object_ended) { if (main->error.verbosity != f_console_verbosity_quiet_e) { - fll_print_format("%c%[%sThe pipe has an object without content.%]%c", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sThe pipe has an object without content.%]%q", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context, f_string_eol_s); } status = F_status_set_error(F_parameter); @@ -442,12 +442,12 @@ extern "C" { status = iki_write_process(main, file, object, content, quote, &escaped); if (F_status_is_error(status)) break; - fll_print_character(f_string_eol_s[0], file.stream); + fll_print_dynamic(f_string_eol_s, file.stream); } // for // Ensure there is always a newline at the end, unless in quiet mode. if (F_status_is_error_not(status) && main->error.verbosity != f_console_verbosity_quiet_e && main->parameters[iki_write_parameter_file_e].result == f_console_result_none_e) { - fll_print_character(f_string_eol_s[0], file.stream); + fll_print_dynamic(f_string_eol_s, file.stream); } } @@ -467,7 +467,7 @@ extern "C" { fflush(main->output.to.stream); } - fll_print_character(f_string_eol_s[0], main->output.to.stream); + fll_print_dynamic(f_string_eol_s, main->output.to.stream); } } diff --git a/level_3/iki_write/c/iki_write.h b/level_3/iki_write/c/iki_write.h index 0c25e43..1e325b4 100644 --- a/level_3/iki_write/c/iki_write.h +++ b/level_3/iki_write/c/iki_write.h @@ -110,15 +110,15 @@ extern "C" { #define iki_write_console_parameter_t_initialize \ { \ - macro_f_console_parameter_t_initialize(f_console_standard_short_help_s, f_console_standard_long_help_s, 0, 0, f_console_type_normal_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_light_s, f_console_standard_long_light_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s, f_console_standard_long_dark_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s, f_console_standard_long_normal_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s, f_console_standard_long_debug_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_version_s, f_console_standard_long_version_s, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, 0, 0, f_console_type_normal_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, 0, 0, f_console_type_inverse_e), \ macro_f_console_parameter_t_initialize(iki_write_short_file_s, iki_write_long_file_s, 0, 1, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(iki_write_short_content_s, iki_write_long_content_s, 0, 1, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(iki_write_short_double_s, iki_write_long_double_s, 0, 0, f_console_type_normal_e), \ diff --git a/level_3/iki_write/c/private-common.c b/level_3/iki_write/c/private-common.c index efc9870..bab9455 100644 --- a/level_3/iki_write/c/private-common.c +++ b/level_3/iki_write/c/private-common.c @@ -15,9 +15,9 @@ extern "C" { flockfile(main->warning.to.stream); - fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s[0], f_string_eol_s[0], main->context.set.warning, main->context.set.warning); + fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s, f_string_eol_s, main->context.set.warning, main->context.set.warning); fl_print_format("%[%i%]", main->warning.to.stream, main->context.set.notable, signal, main->context.set.notable); - fl_print_format("%[.%]%c", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s[0]); + fl_print_format("%[.%]%q", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s); funlockfile(main->warning.to.stream); } diff --git a/level_3/iki_write/c/private-write.c b/level_3/iki_write/c/private-write.c index 45acea7..719d308 100644 --- a/level_3/iki_write/c/private-write.c +++ b/level_3/iki_write/c/private-write.c @@ -13,9 +13,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe object is missing, it must not have a length of %]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%sThe object is missing, it must not have a length of %]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[0%]", main->error.to.stream, main->error.notable, main->error.notable); - fl_print_format("%[.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -29,9 +29,9 @@ extern "C" { if (main->error.verbosity != f_console_verbosity_quiet_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe object '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); + fl_print_format("%q%[%sThe object '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[%Q%]", main->error.to.stream, main->error.notable, object, main->error.notable); - fl_print_format("%[' is not a valid IKI object.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[' is not a valid IKI object.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); } @@ -56,7 +56,7 @@ extern "C" { return F_status_set_error(F_failure); } - fl_print_format("%Q%c%c%Q%c", output.stream, object, f_iki_syntax_separator_s[0], quote, *escaped, quote); + fl_print_format("%Q%q%c%Q%c", output.stream, object, f_iki_syntax_separator_s, quote, *escaped, quote); return F_none; } diff --git a/level_3/status_code/c/private-common.c b/level_3/status_code/c/private-common.c index 687dafc..7de2a72 100644 --- a/level_3/status_code/c/private-common.c +++ b/level_3/status_code/c/private-common.c @@ -15,9 +15,9 @@ extern "C" { flockfile(main->warning.to.stream); - fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s[0], f_string_eol_s[0], main->context.set.warning, main->context.set.warning); + fl_print_format("%]%c%c%[Received signal code %]", main->warning.to.stream, main->context.set.reset, f_string_eol_s, f_string_eol_s, main->context.set.warning, main->context.set.warning); fl_print_format("%[%i%]", main->warning.to.stream, main->context.set.notable, signal, main->context.set.notable); - fl_print_format("%[.%]%c", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s[0]); + fl_print_format("%[.%]%q", main->warning.to.stream, main->context.set.warning, main->context.set.warning, f_string_eol_s); funlockfile(main->warning.to.stream); } diff --git a/level_3/status_code/c/private-status_code.c b/level_3/status_code/c/private-status_code.c index a4d98dc..a66f3fc 100644 --- a/level_3/status_code/c/private-status_code.c +++ b/level_3/status_code/c/private-status_code.c @@ -24,7 +24,7 @@ extern "C" { f_print_terminated(f_status_false_s, main->output.to.stream); } - f_print_character(f_string_eol_s[0], main->output.to.stream); + f_print_dynamic(f_string_eol_s, main->output.to.stream); } else if (main->parameters[status_code_parameter_is_warning_e].result == f_console_result_found_e) { if (F_status_is_warning(number)) { @@ -34,7 +34,7 @@ extern "C" { f_print_terminated(f_status_false_s, main->output.to.stream); } - f_print_character(f_string_eol_s[0], main->output.to.stream); + f_print_dynamic(f_string_eol_s, main->output.to.stream); } else if (main->parameters[status_code_parameter_is_fine_e].result == f_console_result_found_e) { if (F_status_is_fine(number)) { @@ -44,7 +44,7 @@ extern "C" { f_print_terminated(f_status_false_s, main->output.to.stream); } - f_print_character(f_string_eol_s[0], main->output.to.stream); + f_print_dynamic(f_string_eol_s, main->output.to.stream); } return F_none; @@ -64,13 +64,13 @@ extern "C" { status = fl_conversion_string_to_number_unsigned(value, range, &number); if (status == F_none) { - fl_print_format("%[invalid name%]%c", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[invalid name%]%q", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); return F_status_set_error(F_parameter); } if (status == F_data_not || F_status_set_fine(status) == F_parameter) { - fl_print_format("%[invalid main%]%c", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[invalid main%]%q", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); return status; } @@ -82,22 +82,22 @@ extern "C" { if (F_status_is_error(status)) { if (F_status_set_fine(status) == F_data) { - fl_print_format("%[unknown name%]%c", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[unknown name%]%q", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); } else { - fl_print_format("%[failed to convert%]%c", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[failed to convert%]%q", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); } return status; } if (status == F_data) { - fl_print_format("%[unknown code%]%c", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[unknown code%]%q", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); return F_none; } - fl_print_format("%ui%c", main->output.to.stream, code, f_string_eol_s[0]); + fl_print_format("%ui%q", main->output.to.stream, code, f_string_eol_s); return F_none; } @@ -114,22 +114,22 @@ extern "C" { } const f_status_t code = (f_status_t) number; - f_string_t string = 0; + f_string_static_t name = 0; - status = f_status_string_to(code, &string); + status = f_status_string_to(code, &name); if (F_status_is_error(status)) { if (F_status_set_fine(status) == F_data) { - fl_print_format("%[unknown code%]%c", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[unknown code%]%q", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); } else { - fl_print_format("%[failed to convert%]%c", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[failed to convert%]%q", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); } return status; } - fl_print_format("%S%c", main->output.to.stream, string, f_string_eol_s[0]); + fl_print_format("%S%q", main->output.to.stream, name, f_string_eol_s); return F_none; } @@ -143,17 +143,17 @@ extern "C" { f_status_t status = fl_conversion_string_to_number_unsigned(value, range, number); if (*number > F_status_size_max_with_signal) { - fl_print_format("%[out of range%]%c", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[out of range%]%q", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); return status; } if (F_status_is_error(status)) { if (F_status_set_fine(status) == F_number_negative) { - fl_print_format("%[out of range%]%c", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[out of range%]%q", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); } else { - fl_print_format("%[invalid number%]%c", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[invalid number%]%q", main->output.to.stream, main->context.set.error, main->context.set.error, f_string_eol_s); } return status; diff --git a/level_3/status_code/c/status_code.c b/level_3/status_code/c/status_code.c index 51080c3..7affb76 100644 --- a/level_3/status_code/c/status_code.c +++ b/level_3/status_code/c/status_code.c @@ -13,22 +13,22 @@ extern "C" { fll_program_print_help_header(file, context, status_code_progam_name_long_s, status_code_progam_version_s); - fll_program_print_help_option(file, context, f_console_standard_short_help_s, f_console_standard_long_help_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print this help message."); - fll_program_print_help_option(file, context, f_console_standard_short_dark_s, f_console_standard_long_dark_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_light_s, f_console_standard_long_light_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, "Do not file in color."); - fll_program_print_help_option(file, context, f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Decrease verbosity, silencing most output."); - fll_program_print_help_option(file, context, f_console_standard_short_normal_s, f_console_standard_long_normal_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Set verbosity to normal file."); - fll_program_print_help_option(file, context, f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Increase verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_debug_s, f_console_standard_long_debug_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Enable debugging, significantly increasing verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_version_s, f_console_standard_long_version_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Print only the version number."); - - f_print_character(f_string_eol_s[0], file.stream); - - fll_program_print_help_option(file, context, status_code_short_is_fine_s, status_code_long_is_fine_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print F_true if the error code is not an error, F_false otherwise."); - fll_program_print_help_option(file, context, status_code_short_is_warning_s, status_code_long_is_warning_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Print F_true if the error code is a warning, F_false otherwise."); - fll_program_print_help_option(file, context, status_code_short_is_error_s, status_code_long_is_error_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print F_true if the error code is an error, F_false otherwise."); - fll_program_print_help_option(file, context, status_code_short_number_s, status_code_long_number_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Convert status code name to number."); + fll_program_print_help_option(file, context, f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print this help message."); + fll_program_print_help_option(file, context, f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, "Do not file in color."); + fll_program_print_help_option(file, context, f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Decrease verbosity, silencing most output."); + fll_program_print_help_option(file, context, f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Set verbosity to normal file."); + fll_program_print_help_option(file, context, f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Increase verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Enable debugging, significantly increasing verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Print only the version number."); + + f_print_dynamic(f_string_eol_s, file.stream); + + fll_program_print_help_option(file, context, status_code_short_is_fine_s, status_code_long_is_fine_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print F_true if the error code is not an error, F_false otherwise."); + fll_program_print_help_option(file, context, status_code_short_is_warning_s, status_code_long_is_warning_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "Print F_true if the error code is a warning, F_false otherwise."); + fll_program_print_help_option(file, context, status_code_short_is_error_s, status_code_long_is_error_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print F_true if the error code is an error, F_false otherwise."); + fll_program_print_help_option(file, context, status_code_short_number_s, status_code_long_number_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Convert status code name to number."); fll_program_print_help_usage(file, context, status_code_progam_name_s, "status code(s)"); @@ -137,11 +137,11 @@ extern "C" { if (main->parameters[status_code_parameter_is_warning_e].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, status_code_long_is_error_s, main->error.notable); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, status_code_long_is_error_s, main->error.notable); fl_print_format("%[' cannot be used with the parameter '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, status_code_long_is_warning_s, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, status_code_long_is_warning_s, main->error.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -152,11 +152,11 @@ extern "C" { else if (main->parameters[status_code_parameter_is_fine_e].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, status_code_long_is_error_s, main->error.notable); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, status_code_long_is_error_s, main->error.notable); fl_print_format("%[' cannot be used with the parameter '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, status_code_long_is_fine_s, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, status_code_long_is_fine_s, main->error.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -168,11 +168,11 @@ extern "C" { else if (main->parameters[status_code_parameter_is_warning_e].result == f_console_result_found_e && main->parameters[status_code_parameter_is_fine_e].result == f_console_result_found_e) { flockfile(main->error.to.stream); - fl_print_format("%c%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s[0], main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, status_code_long_is_warning_s, main->error.notable); + fl_print_format("%q%[%sThe parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, status_code_long_is_warning_s, main->error.notable); fl_print_format("%[' cannot be used with the parameter '%]", main->error.to.stream, main->error.context, main->error.context); - fl_print_format("%[%s%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, status_code_long_is_fine_s, main->error.notable); - fl_print_format("%['.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fl_print_format("%[%q%s%]", main->error.to.stream, main->error.notable, f_console_symbol_long_enable_s, status_code_long_is_fine_s, main->error.notable); + fl_print_format("%['.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); funlockfile(main->error.to.stream); @@ -182,7 +182,7 @@ extern "C" { } if (main->remaining.used == 0 && !main->process_pipe) { - fll_print_format("%[You failed to specify a status code.%]%c", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s[0]); + fll_print_format("%[You failed to specify a status code.%]%q", main->error.to.stream, main->error.context, main->error.context, f_string_eol_s); status_code_main_delete(main); @@ -289,7 +289,7 @@ extern "C" { if (F_status_set_fine(status) == F_interrupt) { fflush(main->output.to.stream); - fll_print_terminated(f_string_eol_s, main->output.to.stream); + fll_print_dynamic(f_string_eol_s, main->output.to.stream); } } diff --git a/level_3/status_code/c/status_code.h b/level_3/status_code/c/status_code.h index 7aa0653..b6b77e1 100644 --- a/level_3/status_code/c/status_code.h +++ b/level_3/status_code/c/status_code.h @@ -98,15 +98,15 @@ extern "C" { #define status_code_console_parameter_t_initialize \ { \ - macro_f_console_parameter_t_initialize(f_console_standard_short_help_s, f_console_standard_long_help_s, 0, 0, f_console_type_normal_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_light_s, f_console_standard_long_light_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s, f_console_standard_long_dark_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s, f_console_standard_long_normal_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s, f_console_standard_long_debug_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_version_s, f_console_standard_long_version_s, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, 0, 0, f_console_type_normal_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, 0, 0, f_console_type_inverse_e), \ macro_f_console_parameter_t_initialize(status_code_short_is_fine_s, status_code_long_is_fine_s, 0, 0, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(status_code_short_is_warning_s, status_code_long_is_warning_s, 0, 0, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(status_code_short_is_error_s, status_code_long_is_error_s, 0, 0, f_console_type_normal_e), \ diff --git a/level_3/utf8/c/private-print.c b/level_3/utf8/c/private-print.c index 2b6240f..52f6913 100644 --- a/level_3/utf8/c/private-print.c +++ b/level_3/utf8/c/private-print.c @@ -98,7 +98,7 @@ extern "C" { if (data->main->parameters[utf8_parameter_strip_invalid_e].result == f_console_result_found_e) return; if (data->main->parameters[utf8_parameter_verify_e].result == f_console_result_found_e) return; - fl_print_format("%c%[%SFailed to decode character code '%]", data->main->error.to.stream, f_string_eol_s[0], data->main->context.set.error, data->main->error.prefix, data->main->context.set.error); + fl_print_format("%q%[%SFailed to decode character code '%]", data->main->error.to.stream, f_string_eol_s, data->main->context.set.error, data->main->error.prefix, data->main->context.set.error); if (character.used) { fl_print_format("%[0x", data->main->error.to.stream, data->main->context.set.notable); @@ -111,15 +111,15 @@ extern "C" { } if (F_status_set_fine(status) == F_utf) { - fl_print_format("%[', not a valid UTF-8 character sequence.%]%c", data->main->error.to.stream, data->main->context.set.error, data->main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[', not a valid UTF-8 character sequence.%]%q", data->main->error.to.stream, data->main->context.set.error, data->main->context.set.error, f_string_eol_s); } else if (F_status_set_fine(status) == F_utf_fragment) { - fl_print_format("%[', invalid UTF-8 fragment.%]%c", data->main->error.to.stream, data->main->context.set.error, data->main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[', invalid UTF-8 fragment.%]%q", data->main->error.to.stream, data->main->context.set.error, data->main->context.set.error, f_string_eol_s); } else { - fl_print_format("%[', error status code%] ", data->main->error.to.stream, data->main->context.set.error, data->main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[', error status code%] ", data->main->error.to.stream, data->main->context.set.error, data->main->context.set.error, f_string_eol_s); fl_print_format("%[%ui%]", data->main->error.to.stream, data->main->context.set.notable, F_status_set_fine(status), data->main->context.set.notable); - fl_print_format("%[.%]%c", data->main->error.to.stream, data->main->context.set.error, data->main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[.%]%q", data->main->error.to.stream, data->main->context.set.error, data->main->context.set.error, f_string_eol_s); } } #endif // _di_utf8_print_error_decode_ @@ -129,16 +129,16 @@ extern "C" { if (data->main->error.verbosity == f_console_verbosity_quiet_e) return; - fl_print_format("%c%[%SFailed to encode Unicode codepoint '%]", data->main->error.to.stream, f_string_eol_s[0], data->main->context.set.error, data->main->error.prefix, data->main->context.set.error); + fl_print_format("%q%[%SFailed to encode Unicode codepoint '%]", data->main->error.to.stream, f_string_eol_s, data->main->context.set.error, data->main->error.prefix, data->main->context.set.error); fl_print_format("%[U+%_U%]", data->main->error.to.stream, data->main->context.set.notable, codepoint, data->main->context.set.notable); if (F_status_set_fine(status) == F_utf) { - fl_print_format("%[', not a valid Unicode codepoint.%]%c", data->main->error.to.stream, data->main->context.set.error, data->main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[', not a valid Unicode codepoint.%]%q", data->main->error.to.stream, data->main->context.set.error, data->main->context.set.error, f_string_eol_s); } else { - fl_print_format("%[', error status code%] ", data->main->error.to.stream, data->main->context.set.error, data->main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[', error status code%] ", data->main->error.to.stream, data->main->context.set.error, data->main->context.set.error, f_string_eol_s); fl_print_format("%[%ui%]", data->main->error.to.stream, data->main->context.set.notable, F_status_set_fine(status), data->main->context.set.notable); - fl_print_format("%[.%]%c", data->main->error.to.stream, data->main->context.set.error, data->main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[.%]%q", data->main->error.to.stream, data->main->context.set.error, data->main->context.set.error, f_string_eol_s); } } #endif // _di_utf8_print_error_encode_ @@ -148,7 +148,7 @@ extern "C" { if (data->main->error.verbosity == f_console_verbosity_quiet_e) return; - fll_print_format("%c%[%sNo from sources are specified, please pipe data, designate a file, or add parameters.%]%c", data->main->error.to.stream, f_string_eol_s[0], data->main->error.context, data->main->error.prefix, data->main->error.context, f_string_eol_s[0]); + fll_print_format("%q%[%sNo from sources are specified, please pipe data, designate a file, or add parameters.%]%q", data->main->error.to.stream, f_string_eol_s, data->main->error.context, data->main->error.prefix, data->main->error.context, f_string_eol_s); } #endif // _di_utf8_print_error_no_from_ @@ -159,9 +159,9 @@ extern "C" { flockfile(data->main->error.to.stream); - fl_print_format("%c%[%SThe parameter '%]", data->main->error.to.stream, f_string_eol_s[0], data->main->context.set.error, data->main->error.prefix, data->main->context.set.error); - fl_print_format("%[%s%S%]", data->main->error.to.stream, data->main->context.set.notable, f_console_symbol_long_enable_s, parameter, data->main->context.set.notable); - fl_print_format("%[' is specified, but no value was given.%]%c", data->main->error.to.stream, data->main->context.set.error, data->main->context.set.error, f_string_eol_s[0]); + fl_print_format("%q%[%SThe parameter '%]", data->main->error.to.stream, f_string_eol_s, data->main->context.set.error, data->main->error.prefix, data->main->context.set.error); + fl_print_format("%[%q%S%]", data->main->error.to.stream, data->main->context.set.notable, f_console_symbol_long_enable_s, parameter, data->main->context.set.notable); + fl_print_format("%[' is specified, but no value was given.%]%q", data->main->error.to.stream, data->main->context.set.error, data->main->context.set.error, f_string_eol_s); funlockfile(data->main->error.to.stream); } @@ -174,9 +174,9 @@ extern "C" { flockfile(data->main->error.to.stream); - fl_print_format("%c%[%SNo file specified at parameter index %]", data->main->error.to.stream, f_string_eol_s[0], data->main->context.set.error, data->main->error.prefix, data->main->context.set.error); + fl_print_format("%q%[%SNo file specified at parameter index %]", data->main->error.to.stream, f_string_eol_s, data->main->context.set.error, data->main->error.prefix, data->main->context.set.error); fl_print_format("%[%ul%]", data->main->error.to.stream, data->main->context.set.notable, index, data->main->context.set.notable); - fl_print_format("%[.%]%c", data->main->error.to.stream, data->main->context.set.error, data->main->context.set.error, f_string_eol_s[0]); + fl_print_format("%[.%]%q", data->main->error.to.stream, data->main->context.set.error, data->main->context.set.error, f_string_eol_s); funlockfile(data->main->error.to.stream); } @@ -189,9 +189,9 @@ extern "C" { flockfile(data->main->error.to.stream); - fl_print_format("%c%[%SFailed to find the %s file '%]", data->main->error.to.stream, f_string_eol_s[0], data->main->context.set.error, data->main->error.prefix, from ? utf8_string_from_s : utf8_string_to_s, data->main->context.set.error); + fl_print_format("%q%[%SFailed to find the %s file '%]", data->main->error.to.stream, f_string_eol_s, data->main->context.set.error, data->main->error.prefix, from ? utf8_string_from_s : utf8_string_to_s, data->main->context.set.error); fl_print_format("%[%S%]", data->main->error.to.stream, data->main->context.set.notable, name, data->main->context.set.notable); - fl_print_format("%['.%]%c", data->main->error.to.stream, data->main->context.set.error, data->main->context.set.error, f_string_eol_s[0]); + fl_print_format("%['.%]%q", data->main->error.to.stream, data->main->context.set.error, data->main->context.set.error, f_string_eol_s); funlockfile(data->main->error.to.stream); } @@ -202,7 +202,7 @@ extern "C" { if (data->main->error.verbosity == f_console_verbosity_quiet_e) return; - fll_print_format("%c%[%SToo many %s files specified, there may only be one to file.%]%c", data->main->error.to.stream, f_string_eol_s[0], data->main->context.set.error, data->main->error.prefix, utf8_string_to_s, data->main->context.set.error, f_string_eol_s[0]); + fll_print_format("%q%[%SToo many %s files specified, there may only be one to file.%]%q", data->main->error.to.stream, f_string_eol_s, data->main->context.set.error, data->main->error.prefix, utf8_string_to_s, data->main->context.set.error, f_string_eol_s); } #endif // _di_utf8_print_error_parameter_file_to_too_many_ @@ -214,13 +214,13 @@ extern "C" { flockfile(data->main->output.to.stream); - fl_print_format("%c%[File%] ", data->main->output.to.stream, f_string_eol_s[0], data->main->output.set->title, data->main->output.set->title); + fl_print_format("%q%[File%] ", data->main->output.to.stream, f_string_eol_s, data->main->output.set->title, data->main->output.set->title); if (data->file.stream == data->main->output.to.stream) { - fl_print_format("%[%S%]:%c", data->main->output.to.stream, data->main->output.set->notable, name, data->main->output.set->notable, f_string_eol_s[0]); + fl_print_format("%[%S%]:%q", data->main->output.to.stream, data->main->output.set->notable, name, data->main->output.set->notable, f_string_eol_s); } else { - fl_print_format("%[%S%]: %S.%c", data->main->output.to.stream, data->main->output.set->notable, name, data->main->output.set->notable, data->file_name, f_string_eol_s[0]); + fl_print_format("%[%S%]: %S.%q", data->main->output.to.stream, data->main->output.set->notable, name, data->main->output.set->notable, data->file_name, f_string_eol_s); } funlockfile(data->main->output.to.stream); @@ -235,8 +235,8 @@ extern "C" { flockfile(data->main->output.to.stream); - fl_print_format("%c%[Parameter%] ", data->main->output.to.stream, f_string_eol_s[0], data->main->output.set->title, data->main->output.set->title); - fl_print_format("%[%ul%]:%c", data->main->output.to.stream, data->main->output.set->notable, index, data->main->output.set->notable, f_string_eol_s[0]); + fl_print_format("%q%[Parameter%] ", data->main->output.to.stream, f_string_eol_s, data->main->output.set->title, data->main->output.set->title); + fl_print_format("%[%ul%]:%q", data->main->output.to.stream, data->main->output.set->notable, index, data->main->output.set->notable, f_string_eol_s); funlockfile(data->main->output.to.stream); } @@ -248,7 +248,7 @@ extern "C" { if (data->main->parameters[utf8_parameter_headers_e].result == f_console_result_none_e) return; if (data->main->parameters[utf8_parameter_verify_e].result == f_console_result_found_e) return; - fll_print_format("%c%[Pipe%]:%c", data->main->output.to.stream, f_string_eol_s[0], data->main->output.set->title, data->main->output.set->title, f_string_eol_s[0]); + fll_print_format("%q%[Pipe%]:%q", data->main->output.to.stream, f_string_eol_s, data->main->output.set->title, data->main->output.set->title, f_string_eol_s); } #endif // _di_utf8_print_section_header_pipe_ @@ -262,9 +262,9 @@ extern "C" { flockfile(data->main->warning.to.stream); - fl_print_format("%]%c%c%[Received signal code %]", data->main->warning.to.stream, data->main->context.set.reset, f_string_eol_s[0], f_string_eol_s[0], data->main->context.set.warning, data->main->context.set.warning); + fl_print_format("%]%c%c%[Received signal code %]", data->main->warning.to.stream, data->main->context.set.reset, f_string_eol_s, f_string_eol_s, data->main->context.set.warning, data->main->context.set.warning); fl_print_format("%[%i%]", data->main->warning.to.stream, data->main->context.set.notable, signal, data->main->context.set.notable); - fl_print_format("%[.%]%c", data->main->warning.to.stream, data->main->context.set.warning, data->main->context.set.warning, f_string_eol_s[0]); + fl_print_format("%[.%]%q", data->main->warning.to.stream, data->main->context.set.warning, data->main->context.set.warning, f_string_eol_s); funlockfile(data->main->warning.to.stream); } diff --git a/level_3/utf8/c/private-utf8_codepoint.c b/level_3/utf8/c/private-utf8_codepoint.c index b517c03..a9ec654 100644 --- a/level_3/utf8/c/private-utf8_codepoint.c +++ b/level_3/utf8/c/private-utf8_codepoint.c @@ -103,10 +103,10 @@ extern "C" { f_status_t status = F_none; - if (character.string[0] == f_string_ascii_u_s[0] || character.string[0] == f_string_ascii_U_s[0] || character.string[0] == f_string_ascii_plus_s[0]) { + if (character.string[0] == f_string_ascii_u_s.string[0] || character.string[0] == f_string_ascii_U_s.string[0] || character.string[0] == f_string_ascii_plus_s.string[0]) { // Do nothing. } - else if (character.string[0] == f_string_ascii_space_s[0]) { + else if (character.string[0] == f_string_ascii_space_s.string[0]) { status = F_space; } else if (macro_f_utf_byte_width_is(*character.string)) { @@ -170,7 +170,7 @@ extern "C" { if (status == F_space) { status = F_next; } - else if (character.string[0] == f_string_ascii_u_s[0] || character.string[0] == f_string_ascii_U_s[0]) { + else if (character.string[0] == f_string_ascii_u_s.string[0] || character.string[0] == f_string_ascii_U_s.string[0]) { *mode = utf8_codepoint_mode_begin_e; data->text.used = 0; } @@ -179,7 +179,7 @@ extern "C" { } } else if (*mode == utf8_codepoint_mode_begin_e) { - if (character.string[0] == f_string_ascii_plus_s[0]) { + if (character.string[0] == f_string_ascii_plus_s.string[0]) { *mode = utf8_codepoint_mode_number_e; } else { diff --git a/level_3/utf8/c/utf8.c b/level_3/utf8/c/utf8.c index c6ef915..b949b7d 100644 --- a/level_3/utf8/c/utf8.c +++ b/level_3/utf8/c/utf8.c @@ -16,49 +16,49 @@ extern "C" { fll_program_print_help_header(file, context, utf8_program_name_long_s, utf8_version_s); - fll_program_print_help_option(file, context, f_console_standard_short_help_s, f_console_standard_long_help_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print this help message."); - fll_program_print_help_option(file, context, f_console_standard_short_dark_s, f_console_standard_long_dark_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on dark backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_light_s, f_console_standard_long_light_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Output using colors that show up better on light backgrounds."); - fll_program_print_help_option(file, context, f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, "Do not file in color."); - fll_program_print_help_option(file, context, f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Decrease verbosity, silencing most output."); - fll_program_print_help_option(file, context, f_console_standard_short_normal_s, f_console_standard_long_normal_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Set verbosity to normal file."); - fll_program_print_help_option(file, context, f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Increase verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_debug_s, f_console_standard_long_debug_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Enable debugging, significantly increasing verbosity beyond normal output."); - fll_program_print_help_option(file, context, f_console_standard_short_version_s, f_console_standard_long_version_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Print only the version number."); + fll_program_print_help_option(file, context, f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print this help message."); + fll_program_print_help_option(file, context, f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on dark backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Output using colors that show up better on light backgrounds."); + fll_program_print_help_option(file, context, f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, "Do not file in color."); + fll_program_print_help_option(file, context, f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Decrease verbosity, silencing most output."); + fll_program_print_help_option(file, context, f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Set verbosity to normal file."); + fll_program_print_help_option(file, context, f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Increase verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Enable debugging, significantly increasing verbosity beyond normal output."); + fll_program_print_help_option(file, context, f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, f_console_symbol_short_disable_s.string, f_console_symbol_long_disable_s.string, " Print only the version number."); - f_print_character(f_string_eol_s[0], file.stream); + f_print_dynamic(f_string_eol_s, file.stream); - fll_program_print_help_option(file, context, utf8_short_from_binary_s, utf8_long_from_binary_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " The expected input format is binary (character data)."); - fll_program_print_help_option(file, context, utf8_short_from_codepoint_s, utf8_long_from_codepoint_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "The expected input format is codepoint (such as U+0000)."); - fll_program_print_help_option(file, context, utf8_short_from_file_s, utf8_long_from_file_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Use the given file as the input source."); + fll_program_print_help_option(file, context, utf8_short_from_binary_s, utf8_long_from_binary_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " The expected input format is binary (character data)."); + fll_program_print_help_option(file, context, utf8_short_from_codepoint_s, utf8_long_from_codepoint_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "The expected input format is codepoint (such as U+0000)."); + fll_program_print_help_option(file, context, utf8_short_from_file_s, utf8_long_from_file_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Use the given file as the input source."); - f_print_character(f_string_eol_s[0], file.stream); + f_print_dynamic(f_string_eol_s, file.stream); - fll_program_print_help_option(file, context, utf8_short_to_binary_s, utf8_long_to_binary_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " The output format is binary (character data)."); - fll_program_print_help_option(file, context, utf8_short_to_codepoint_s, utf8_long_to_codepoint_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "The output format is codepoint (such as U+0000)."); - fll_program_print_help_option(file, context, utf8_short_to_combining_s, utf8_long_to_combining_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "The output format is to print whether or not character is combining or not."); - fll_program_print_help_option(file, context, utf8_short_to_file_s, utf8_long_to_file_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Use the given file as the output destination."); - fll_program_print_help_option(file, context, utf8_short_to_width_s, utf8_long_to_width_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " The output format is to print the width of a character (either 0, 1, or 2)."); + fll_program_print_help_option(file, context, utf8_short_to_binary_s, utf8_long_to_binary_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " The output format is binary (character data)."); + fll_program_print_help_option(file, context, utf8_short_to_codepoint_s, utf8_long_to_codepoint_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "The output format is codepoint (such as U+0000)."); + fll_program_print_help_option(file, context, utf8_short_to_combining_s, utf8_long_to_combining_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "The output format is to print whether or not character is combining or not."); + fll_program_print_help_option(file, context, utf8_short_to_file_s, utf8_long_to_file_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Use the given file as the output destination."); + fll_program_print_help_option(file, context, utf8_short_to_width_s, utf8_long_to_width_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " The output format is to print the width of a character (either 0, 1, or 2)."); - f_print_character(f_string_eol_s[0], file.stream); + f_print_dynamic(f_string_eol_s, file.stream); - fll_program_print_help_option(file, context, utf8_short_headers_s, utf8_long_headers_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Print headers for each section (pipe, file, or parameter)."); - fll_program_print_help_option(file, context, utf8_short_separate_s, utf8_long_separate_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Separate characters by newlines (implied when printing headers)."); - fll_program_print_help_option(file, context, utf8_short_strip_invalid_s, utf8_long_strip_invalid_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Strip invalid Unicode characters (do not print invalid sequences)."); - fll_program_print_help_option(file, context, utf8_short_verify_s, utf8_long_verify_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, " Only perform verification of valid sequences."); + fll_program_print_help_option(file, context, utf8_short_headers_s, utf8_long_headers_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Print headers for each section (pipe, file, or parameter)."); + fll_program_print_help_option(file, context, utf8_short_separate_s, utf8_long_separate_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Separate characters by newlines (implied when printing headers)."); + fll_program_print_help_option(file, context, utf8_short_strip_invalid_s, utf8_long_strip_invalid_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, "Strip invalid Unicode characters (do not print invalid sequences)."); + fll_program_print_help_option(file, context, utf8_short_verify_s, utf8_long_verify_s, f_console_symbol_short_enable_s.string, f_console_symbol_long_enable_s.string, " Only perform verification of valid sequences."); fll_program_print_help_usage(file, context, utf8_program_name_s, "filename(s)"); - fl_print_format(" The default behavior is to assume the expected input is binary from the command line to be output to the screen as codepoints.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" The default behavior is to assume the expected input is binary from the command line to be output to the screen as codepoints.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" Multiple input sources are allowed but only a single output destination is allowed.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" Multiple input sources are allowed but only a single output destination is allowed.%q%q", file.stream, f_string_eol_s, f_string_eol_s); - fl_print_format(" When using the parameter '%[%s%s%]', no data is printed and 0 is returned if valid or 1 is returned if invalid.%c%c", file.stream, context.set.notable, f_console_symbol_long_enable_s, utf8_long_verify_s, context.set.notable, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" When using the parameter '%[%q%s%]', no data is printed and 0 is returned if valid or 1 is returned if invalid.%q%q", file.stream, context.set.notable, f_console_symbol_long_enable_s, utf8_long_verify_s, context.set.notable, f_string_eol_s, f_string_eol_s); - fl_print_format(" When using the parameter '%[%s%s%]' with the parameter ", file.stream, context.set.notable, f_console_symbol_long_enable_s, utf8_long_to_combining_s, context.set.notable); - fl_print_format("'%[%s%s%]', the ", file.stream, context.set.notable, f_console_symbol_long_enable_s, utf8_long_to_width_s, context.set.notable); - fl_print_format("'%[%s%]' character is printed to represent the combining and the digits are used to represent widths.%c", file.stream, context.set.notable, utf8_string_combining_is_s, context.set.notable, f_string_eol_s[0]); - fl_print_format(" The combining characters should be considered 1-width by themselves or 0-width when combined.%c%c", file.stream, f_string_eol_s[0], f_string_eol_s[0]); + fl_print_format(" When using the parameter '%[%q%s%]' with the parameter ", file.stream, context.set.notable, f_console_symbol_long_enable_s, utf8_long_to_combining_s, context.set.notable); + fl_print_format("'%[%q%s%]', the ", file.stream, context.set.notable, f_console_symbol_long_enable_s, utf8_long_to_width_s, context.set.notable); + fl_print_format("'%[%s%]' character is printed to represent the combining and the digits are used to represent widths.%q", file.stream, context.set.notable, utf8_string_combining_is_s, context.set.notable, f_string_eol_s); + fl_print_format(" The combining characters should be considered 1-width by themselves or 0-width when combined.%q%q", file.stream, f_string_eol_s, f_string_eol_s); funlockfile(file.stream); @@ -493,7 +493,7 @@ extern "C" { } } - fll_print_terminated(f_string_eol_s, main->output.to.stream); + fll_print_dynamic(f_string_eol_s, main->output.to.stream); } utf8_data_delete(&data); diff --git a/level_3/utf8/c/utf8.h b/level_3/utf8/c/utf8.h index d20aeea..b3344ba 100644 --- a/level_3/utf8/c/utf8.h +++ b/level_3/utf8/c/utf8.h @@ -185,15 +185,15 @@ extern "C" { #define utf8_console_parameter_t_initialize \ { \ - macro_f_console_parameter_t_initialize(f_console_standard_short_help_s, f_console_standard_long_help_s, 0, 0, f_console_type_normal_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_light_s, f_console_standard_long_light_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s, f_console_standard_long_dark_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s, f_console_standard_long_no_color_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s, f_console_standard_long_quiet_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s, f_console_standard_long_normal_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s, f_console_standard_long_verbose_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s, f_console_standard_long_debug_s, 0, 0, f_console_type_inverse_e), \ - macro_f_console_parameter_t_initialize(f_console_standard_short_version_s, f_console_standard_long_version_s, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_help_s.string, f_console_standard_long_help_s.string, 0, 0, f_console_type_normal_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_light_s.string, f_console_standard_long_light_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_dark_s.string, f_console_standard_long_dark_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_no_color_s.string, f_console_standard_long_no_color_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_quiet_s.string, f_console_standard_long_quiet_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_normal_s.string, f_console_standard_long_normal_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_verbose_s.string, f_console_standard_long_verbose_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_debug_s.string, f_console_standard_long_debug_s.string, 0, 0, f_console_type_inverse_e), \ + macro_f_console_parameter_t_initialize(f_console_standard_short_version_s.string, f_console_standard_long_version_s.string, 0, 0, f_console_type_inverse_e), \ macro_f_console_parameter_t_initialize(utf8_short_from_binary_s, utf8_long_from_binary_s, 0, 0, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(utf8_short_from_codepoint_s, utf8_long_from_codepoint_s, 0, 0, f_console_type_normal_e), \ macro_f_console_parameter_t_initialize(utf8_short_from_file_s, utf8_long_from_file_s, 0, 1, f_console_type_normal_e), \