From: Kevin Day Date: Thu, 31 Aug 2023 03:21:50 +0000 (-0500) Subject: Update: Relocate some of the more common or expected to be common format strings... X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=383470762e16e9152e0c8cdc39faf0a3c01867f4;p=fll Update: Relocate some of the more common or expected to be common format strings to global statics. This is a minor resource optimization. There will hopefully be more optimizations in the future where several of the commonly used strings (within individual projects) are moved into a single location for that given project. --- diff --git a/level_0/f_string/c/string/static.c b/level_0/f_string/c/string/static.c index 25d6b93..442d0b1 100644 --- a/level_0/f_string/c/string/static.c +++ b/level_0/f_string/c/string/static.c @@ -149,6 +149,12 @@ extern "C" { #ifndef _di_f_string_format_s_ const f_string_static_t f_string_format_Q_double_s = macro_f_string_static_t_initialize_1(F_string_format_Q_double_s, 0, F_string_format_Q_double_s_length); const f_string_static_t f_string_format_Q_single_s = macro_f_string_static_t_initialize_1(F_string_format_Q_single_s, 0, F_string_format_Q_single_s_length); + const f_string_static_t f_string_format_QQ_double_s = macro_f_string_static_t_initialize_1(F_string_format_QQ_double_s, 0, F_string_format_QQ_double_s_length); + const f_string_static_t f_string_format_QQ_single_s = macro_f_string_static_t_initialize_1(F_string_format_QQ_single_s, 0, F_string_format_QQ_single_s_length); + const f_string_static_t f_string_format_r_double_s = macro_f_string_static_t_initialize_1(F_string_format_r_double_s, 0, F_string_format_r_double_s_length); + const f_string_static_t f_string_format_r_single_s = macro_f_string_static_t_initialize_1(F_string_format_r_single_s, 0, F_string_format_r_single_s_length); + const f_string_static_t f_string_format_rr_double_s = macro_f_string_static_t_initialize_1(F_string_format_rr_double_s, 0, F_string_format_rr_double_s_length); + const f_string_static_t f_string_format_rr_single_s = macro_f_string_static_t_initialize_1(F_string_format_rr_single_s, 0, F_string_format_rr_single_s_length); const f_string_static_t f_string_format_sentence_end_s = macro_f_string_static_t_initialize_1(F_string_format_sentence_end_s, 0, F_string_format_sentence_end_s_length); const f_string_static_t f_string_format_sentence_end_quote_s = macro_f_string_static_t_initialize_1(F_string_format_sentence_end_quote_s, 0, F_string_format_sentence_end_quote_s_length); #endif // _di_f_string_format_s_ diff --git a/level_0/f_string/c/string/static.h b/level_0/f_string/c/string/static.h index 05c2b02..8a80779 100644 --- a/level_0/f_string/c/string/static.h +++ b/level_0/f_string/c/string/static.h @@ -501,16 +501,34 @@ extern "C" { #ifndef _di_f_string_format_s_ #define F_string_format_Q_double_s "%[%[%Q%]%]" #define F_string_format_Q_single_s "%[%Q%]" + #define F_string_format_QQ_double_s "%[%[%Q%Q%]%]" + #define F_string_format_QQ_single_s "%[%Q%Q%]" + #define F_string_format_r_double_s "%[%[%r%]%]" + #define F_string_format_r_single_s "%[%r%]" + #define F_string_format_rr_double_s "%[%[%r%r%]%]" + #define F_string_format_rr_single_s "%[%r%r%]" #define F_string_format_sentence_end_s "%[.%]%r" #define F_string_format_sentence_end_quote_s "%['.%]%r" #define F_string_format_Q_double_s_length 10 #define F_string_format_Q_single_s_length 6 + #define F_string_format_QQ_double_s_length 12 + #define F_string_format_QQ_single_s_length 8 + #define F_string_format_r_double_s_length 10 + #define F_string_format_r_single_s_length 6 + #define F_string_format_rr_double_s_length 12 + #define F_string_format_rr_single_s_length 8 #define F_string_format_sentence_end_s_length 7 #define F_string_format_sentence_end_quote_s_length 6 extern const f_string_static_t f_string_format_Q_double_s; extern const f_string_static_t f_string_format_Q_single_s; + extern const f_string_static_t f_string_format_QQ_double_s; + extern const f_string_static_t f_string_format_QQ_single_s; + extern const f_string_static_t f_string_format_r_double_s; + extern const f_string_static_t f_string_format_r_single_s; + extern const f_string_static_t f_string_format_rr_double_s; + extern const f_string_static_t f_string_format_rr_single_s; extern const f_string_static_t f_string_format_sentence_end_s; extern const f_string_static_t f_string_format_sentence_end_quote_s; #endif // _di_f_string_format_s_ diff --git a/level_2/fll_program/c/program/print.c b/level_2/fll_program/c/program/print.c index 5aa0ca8..b5224cd 100644 --- a/level_2/fll_program/c/program/print.c +++ b/level_2/fll_program/c/program/print.c @@ -85,9 +85,9 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QThe '%]", print->to, print->set->error, print->prefix, print->set->error); - fl_print_format("%[%Q%Q%]", print->to, print->set->notable, symbol_1, name_1, print->set->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol_1, name_1, print->set->notable); fl_print_format("%[' parameter and the '%]", print->to, print->set->error, print->set->error); - fl_print_format("%[%Q%Q%]", print->to, print->set->notable, symbol_2, name_2, print->set->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol_2, name_2, print->set->notable); fl_print_format("%[' parameter must be specified the same number of times.%]%r", print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -107,11 +107,11 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QThe '%]", print->to, print->set->error, print->prefix, print->set->error); - fl_print_format("%[%Q%Q%]", print->to, print->set->notable, symbol_1, name_1, print->set->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol_1, name_1, print->set->notable); fl_print_format("%[' parameter and the '%]", print->to, print->set->error, print->set->error); - fl_print_format("%[%Q%Q%]", print->to, print->set->notable, symbol_2, name_2, print->set->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol_2, name_2, print->set->notable); fl_print_format("%[' parameter must be specified the same number of times when not specifying the '%]", print->to, print->set->error, print->set->error); - fl_print_format("%[%Q%Q%]", print->to, print->set->notable, symbol_3, name_3, print->set->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol_3, name_3, print->set->notable); fl_print_format("%[' parameter.%]%r", print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -131,9 +131,9 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QCannot specify the '%]", print->to, print->set->error, print->prefix, print->set->error); - fl_print_format("%[%Q%Q%]", print->to, print->set->notable, symbol_1, name_1, print->set->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol_1, name_1, print->set->notable); fl_print_format("%[' parameter with the '%]", print->to, print->set->error, print->set->error); - fl_print_format("%[%Q%Q%]", print->to, print->set->notable, symbol_2, name_2, print->set->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol_2, name_2, print->set->notable); fl_print_format("%[' parameter.%]%r", print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -153,11 +153,11 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QCannot specify the '%]", print->to, print->set->error, print->prefix, print->set->error); - fl_print_format("%[%Q%Q%]", print->to, print->set->notable, symbol_1, name_1, print->set->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol_1, name_1, print->set->notable); fl_print_format("%[' parameter with the '%]", print->to, print->set->error, print->set->error); - fl_print_format("%[%Q%Q%]", print->to, print->set->notable, symbol_2, name_2, print->set->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol_2, name_2, print->set->notable); fl_print_format("%[' parameter without the '%]", print->to, print->set->error, print->set->error); - fl_print_format("%[%Q%Q%]", print->to, print->set->notable, symbol_3, name_3, print->set->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol_3, name_3, print->set->notable); fl_print_format("%[' parameter.%]%r", print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -177,7 +177,7 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QCannot specify the '%]", print->to, print->set->error, print->prefix, print->set->error); - fl_print_format("%[%Q%Q%]", print->to, print->set->notable, symbol, parameter, print->set->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol, parameter, print->set->notable); fl_print_format("%[' when processing a pipe.%]%r", print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -197,11 +197,11 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QThe '%]", print->to, print->set->error, print->prefix, print->set->error); - fl_print_format("%[%Q%Q%]", print->to, print->set->notable, symbol_1, name_1, print->set->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol_1, name_1, print->set->notable); fl_print_format("%[' parameter only allows either the '%]", print->to, print->set->error, print->set->error); - fl_print_format("%[%Q%Q%]", print->to, print->set->notable, symbol_2, name_2, print->set->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol_2, name_2, print->set->notable); fl_print_format("%[' parameter or the '%]", print->to, print->set->error, print->set->error); - fl_print_format("%[%Q%Q%]", print->to, print->set->notable, symbol_3, name_3, print->set->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol_3, name_3, print->set->notable); fl_print_format("%[' parameter, but not both.%]%r", print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -221,7 +221,7 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QThe parameter%] ", print->to, print->set->error, print->prefix, print->set->error); - fl_print_format("%[%Q%Q%]", print->to, print->set->notable, symbol, name, print->set->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol, name, print->set->notable); fl_print_format(" %[is specified as an empty string, but an empty string is not allowed.%]%r", print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -243,7 +243,7 @@ extern "C" { fl_print_format("%[%QThe value '%]", print->to, print->set->error, print->prefix, print->set->error); fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, value, print->set->notable); fl_print_format("%[' for the parameter '%]", print->to, print->set->error, print->set->error); - fl_print_format("%[%Q%Q%]", print->to, print->set->notable, symbol, name, print->set->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol, name, print->set->notable); fl_print_format("%[' must not be less than %]", print->to, print->set->error, print->set->error); fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, than, print->set->notable); fl_print_format(f_string_format_sentence_end_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); @@ -267,7 +267,7 @@ extern "C" { fl_print_format("%[%QThe value '%]", print->to, print->set->error, print->prefix, print->set->error); fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, value, print->set->notable); fl_print_format("%[' for the parameter '%]", print->to, print->set->error, print->set->error); - fl_print_format("%[%Q%Q%]", print->to, print->set->notable, symbol, name, print->set->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol, name, print->set->notable); fl_print_format("%[' must not be more than %]", print->to, print->set->error, print->set->error); fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, than, print->set->notable); fl_print_format(f_string_format_sentence_end_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); @@ -291,7 +291,7 @@ extern "C" { fl_print_format("%[%QThe value '%]", print->to, print->set->error, print->prefix, print->set->error); fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, value, print->set->notable); fl_print_format("%[' for the parameter '%]", print->to, print->set->error, print->set->error); - fl_print_format("%[%Q%Q%]", print->to, print->set->notable, symbol, name, print->set->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol, name, print->set->notable); fl_print_format("%[' is not a valid integer.%]%r", print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -313,7 +313,7 @@ extern "C" { fl_print_format("%[%QThe value '%]", print->to, print->set->error, print->prefix, print->set->error); fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, value, print->set->notable); fl_print_format("%[' for the parameter '%]", print->to, print->set->error, print->set->error); - fl_print_format("%[%Q%Q%]", print->to, print->set->notable, symbol, name, print->set->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol, name, print->set->notable); fl_print_format("%[' is not a valid negative integer.%]%r", print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -335,7 +335,7 @@ extern "C" { fl_print_format("%[%QThe value '%]", print->to, print->set->error, print->prefix, print->set->error); fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, value, print->set->notable); fl_print_format("%[' for the parameter '%]", print->to, print->set->error, print->set->error); - fl_print_format("%[%Q%Q%]", print->to, print->set->notable, symbol, name, print->set->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol, name, print->set->notable); fl_print_format("%[' is not a valid positive integer.%]%r", print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -355,7 +355,7 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QThe parameter%] ", print->to, print->set->error, print->prefix, print->set->error); - fl_print_format("%[%Q%Q%]", print->to, print->set->notable, symbol, name, print->set->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol, name, print->set->notable); fl_print_format(" %[is specified, but no value is given.%]%r", print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -375,7 +375,7 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QThe parameter%] ", print->to, print->set->error, print->prefix, print->set->error); - fl_print_format("%[%Q%Q%]", print->to, print->set->notable, symbol, name, print->set->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol, name, print->set->notable); fl_print_format("%[ is specified, but%] ", print->to, print->set->error, print->set->error); fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, amount, print->set->notable); fl_print_format(" %[values are not given.%]%r", print->to, print->set->error, print->set->error, f_string_eol_s); @@ -397,7 +397,7 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QThe parameter '%]", print->to, print->set->error, print->prefix, print->set->error); - fl_print_format("%[%Q%Q%]", print->to, print->set->notable, symbol, name, print->set->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol, name, print->set->notable); fl_print_format("%[' may only be specified once.%]%r", print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -417,9 +417,9 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%%[%QThe value '%]", print->to, print->set->error, print->prefix, print->set->error); - fl_print_format("%[%Q%Q%]", print->to, print->set->notable, symbol, value, print->set->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol, value, print->set->notable); fl_print_format("%[' may only be specified once for the parameter '%]", print->to, print->set->error, print->set->error); - fl_print_format("%[%Q%Q%]", print->to, print->set->notable, symbol, name, print->set->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol, name, print->set->notable); fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -439,7 +439,7 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QFailure while processing the parameter '%]", print->to, print->set->error, print->prefix, print->set->error); - fl_print_format("%[%Q%Q%]", print->to, print->set->notable, symbol, name, print->set->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol, name, print->set->notable); fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -463,7 +463,7 @@ extern "C" { fl_print_format("%[' may not be greater than the stop value '%]", print->to, print->set->error, print->set->error); fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, value_stop, print->set->notable); fl_print_format("%[' for the parameter '%]", print->to, print->set->error, print->set->error); - fl_print_format("%[%Q%Q%]", print->to, print->set->notable, symbol, name, print->set->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, symbol, name, print->set->notable); fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -483,7 +483,7 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QThe value for the parameter '%]", print->to, print->set->error, print->prefix, print->set->error); - fl_print_format("%[%Q%Q%]", print->to, print->notable, symbol, name, print->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->notable, symbol, name, print->notable); fl_print_format("%[' is too long.%]%r", print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); diff --git a/level_3/byte_dump/c/main/common/string.c b/level_3/byte_dump/c/main/common/string.c index a8bb525..66adfe8 100644 --- a/level_3/byte_dump/c/main/common/string.c +++ b/level_3/byte_dump/c/main/common/string.c @@ -24,8 +24,6 @@ extern "C" { const f_string_static_t byte_dump_character_placeholder_s = macro_f_string_static_t_initialize_1(BYTE_DUMP_character_placeholder_s, 0, BYTE_DUMP_character_placeholder_s_length); const f_string_static_t byte_dump_character_incomplete_s = macro_f_string_static_t_initialize_1(BYTE_DUMP_character_incomplete_s, 0, BYTE_DUMP_character_incomplete_s_length); const f_string_static_t byte_dump_character_unused_s = macro_f_string_static_t_initialize_1(BYTE_DUMP_character_unused_s, 0, BYTE_DUMP_character_unused_s_length); - - const f_string_static_t byte_dump_format_raw_context_s = macro_f_string_static_t_initialize_1(BYTE_DUMP_format_raw_context_s, 0, BYTE_DUMP_format_raw_context_s_length); #endif // _di_byte_dump_s_ #ifndef _di_byte_dump_padding_s_ diff --git a/level_3/byte_dump/c/main/common/string.h b/level_3/byte_dump/c/main/common/string.h index b9ab137..b5242b7 100644 --- a/level_3/byte_dump/c/main/common/string.h +++ b/level_3/byte_dump/c/main/common/string.h @@ -74,8 +74,6 @@ extern "C" { #define BYTE_DUMP_character_incomplete_s "�" #define BYTE_DUMP_character_unused_s "�" - #define BYTE_DUMP_format_raw_context_s "%[%r%]" - #define BYTE_DUMP_hexidecimal_s_length 11 #define BYTE_DUMP_duodecimal_s_length 10 #define BYTE_DUMP_octal_s_length 5 @@ -87,8 +85,6 @@ extern "C" { #define BYTE_DUMP_character_incomplete_s_length 3 #define BYTE_DUMP_character_unused_s_length 3 - #define BYTE_DUMP_format_raw_context_s_length 6 - extern const f_string_static_t byte_dump_hexidecimal_s; extern const f_string_static_t byte_dump_duodecimal_s; extern const f_string_static_t byte_dump_octal_s; @@ -99,8 +95,6 @@ extern "C" { extern const f_string_static_t byte_dump_character_placeholder_s; extern const f_string_static_t byte_dump_character_incomplete_s; extern const f_string_static_t byte_dump_character_unused_s; - - extern const f_string_static_t byte_dump_format_raw_context_s; #endif // _di_byte_dump_s_ /** diff --git a/level_3/byte_dump/c/main/print/data.c b/level_3/byte_dump/c/main/print/data.c index 3188526..90a37b0 100644 --- a/level_3/byte_dump/c/main/print/data.c +++ b/level_3/byte_dump/c/main/print/data.c @@ -256,7 +256,7 @@ extern "C" { if (main->setting.flag & byte_dump_main_flag_placeholder_e) { for (; *offset && at < main->setting.width; --(*offset), ++at) { - fl_print_format(byte_dump_format_raw_context_s.string, print->to, print->set->warning, byte_dump_character_placeholder_s, print->set->warning); + fl_print_format(f_string_format_r_single_s.string, print->to, print->set->warning, byte_dump_character_placeholder_s, print->set->warning); if (main->setting.flag & byte_dump_main_flag_wide_e) { f_print_dynamic_raw(f_string_space_s, print->to); @@ -289,13 +289,13 @@ extern "C" { for (; at < previous->bytes && at < main->setting.width; ++at) { if (previous->invalid) { - fl_print_format(byte_dump_format_raw_context_s.string, print->to, print->set->error, byte_dump_character_placeholder_s, print->set->error); + fl_print_format(f_string_format_r_single_s.string, print->to, print->set->error, byte_dump_character_placeholder_s, print->set->error); } else if (main->setting.flag & byte_dump_main_flag_classic_e) { f_print_dynamic_raw(f_string_ascii_period_s, print->to); } else { - fl_print_format(byte_dump_format_raw_context_s.string, print->to, print->set->warning, byte_dump_character_placeholder_s, print->set->warning); + fl_print_format(f_string_format_r_single_s.string, print->to, print->set->warning, byte_dump_character_placeholder_s, print->set->warning); } if (main->setting.flag & byte_dump_main_flag_wide_e) { @@ -330,7 +330,7 @@ extern "C" { width_utf = macro_f_utf_byte_width_is(c); if (invalid[i]) { - fl_print_format(byte_dump_format_raw_context_s.string, print->to, print->set->error, byte_dump_character_incomplete_s, print->set->error); + fl_print_format(f_string_format_r_single_s.string, print->to, print->set->error, byte_dump_character_incomplete_s, print->set->error); if (main->setting.flag & byte_dump_main_flag_wide_e) { f_print_dynamic_raw(f_string_ascii_space_s, print->to); @@ -420,7 +420,7 @@ extern "C" { f_print_dynamic_raw(f_string_ascii_period_s, print->to); } else { - fl_print_format("%[%[%r%]%]", print->to, print->set->notable, print->set->warning, f_print_sequence_space_s, print->set->warning, print->set->notable); + fl_print_format(f_string_format_r_double_s.string, print->to, print->set->notable, print->set->warning, f_print_sequence_space_s, print->set->warning, print->set->notable); } if (main->setting.flag & byte_dump_main_flag_wide_e) { @@ -432,7 +432,7 @@ extern "C" { f_print_dynamic_raw(f_string_ascii_period_s, print->to); } else if (main->setting.flag & byte_dump_main_flag_placeholder_e) { - fl_print_format("%[%[%r%]%]", print->to, print->set->notable, print->set->warning, byte_dump_character_placeholder_s, print->set->warning, print->set->notable); + fl_print_format(f_string_format_r_double_s.string, print->to, print->set->notable, print->set->warning, byte_dump_character_placeholder_s, print->set->warning, print->set->notable); } else { f_print_dynamic_raw(f_string_space_s, print->to); @@ -449,10 +449,10 @@ extern "C" { // Print invalid placeholder for invalid UTF-8 widths. if (invalid[i]) { - fl_print_format(byte_dump_format_raw_context_s.string, print->to, print->set->error, byte_dump_character_incomplete_s, print->set->error); + fl_print_format(f_string_format_r_single_s.string, print->to, print->set->error, byte_dump_character_incomplete_s, print->set->error); } else { - fl_print_format(byte_dump_format_raw_context_s.string, print->to, print->set->warning, byte_dump_character_incomplete_s, print->set->warning); + fl_print_format(f_string_format_r_single_s.string, print->to, print->set->warning, byte_dump_character_incomplete_s, print->set->warning); } } else if (width_utf == 2) { @@ -541,13 +541,13 @@ extern "C" { if (width_utf > 1 && at + 1 < main->setting.width) { if (main->setting.flag & byte_dump_main_flag_placeholder_e) { if (invalid[i]) { - fl_print_format(byte_dump_format_raw_context_s.string, print->to, print->set->error, byte_dump_character_placeholder_s, print->set->error); + fl_print_format(f_string_format_r_single_s.string, print->to, print->set->error, byte_dump_character_placeholder_s, print->set->error); } else if (main->setting.flag & byte_dump_main_flag_classic_e) { f_print_dynamic_raw(f_string_ascii_period_s, print->to); } else { - fl_print_format(byte_dump_format_raw_context_s.string, print->to, print->set->warning, byte_dump_character_placeholder_s, print->set->warning); + fl_print_format(f_string_format_r_single_s.string, print->to, print->set->warning, byte_dump_character_placeholder_s, print->set->warning); } } else { @@ -563,13 +563,13 @@ extern "C" { if (width_utf > 2 && at + 1 < main->setting.width) { if (main->setting.flag & byte_dump_main_flag_placeholder_e) { if (invalid[i]) { - fl_print_format(byte_dump_format_raw_context_s.string, print->to, print->set->error, byte_dump_character_placeholder_s, print->set->error); + fl_print_format(f_string_format_r_single_s.string, print->to, print->set->error, byte_dump_character_placeholder_s, print->set->error); } else if (main->setting.flag & byte_dump_main_flag_classic_e) { f_print_dynamic_raw(f_string_ascii_period_s, print->to); } else { - fl_print_format(byte_dump_format_raw_context_s.string, print->to, print->set->warning, byte_dump_character_placeholder_s, print->set->warning); + fl_print_format(f_string_format_r_single_s.string, print->to, print->set->warning, byte_dump_character_placeholder_s, print->set->warning); } } else { @@ -585,13 +585,13 @@ extern "C" { if (width_utf > 3 && at + 1 < main->setting.width) { if (main->setting.flag & byte_dump_main_flag_placeholder_e) { if (invalid[i]) { - fl_print_format(byte_dump_format_raw_context_s.string, print->to, print->set->error, byte_dump_character_placeholder_s, print->set->error); + fl_print_format(f_string_format_r_single_s.string, print->to, print->set->error, byte_dump_character_placeholder_s, print->set->error); } else if (main->setting.flag & byte_dump_main_flag_classic_e) { f_print_dynamic_raw(f_string_ascii_period_s, print->to); } else { - fl_print_format(byte_dump_format_raw_context_s.string, print->to, print->set->warning, byte_dump_character_placeholder_s, print->set->warning); + fl_print_format(f_string_format_r_single_s.string, print->to, print->set->warning, byte_dump_character_placeholder_s, print->set->warning); } } else { @@ -613,13 +613,13 @@ extern "C" { for (; at < main->setting.width; ++at) { if (invalid[at]) { - fl_print_format(byte_dump_format_raw_context_s.string, print->to, print->set->error, byte_dump_character_placeholder_s, print->set->error); + fl_print_format(f_string_format_r_single_s.string, print->to, print->set->error, byte_dump_character_placeholder_s, print->set->error); } else if (main->setting.flag & byte_dump_main_flag_classic_e) { f_print_dynamic_raw(f_string_ascii_period_s, print->to); } else { - fl_print_format(byte_dump_format_raw_context_s.string, print->to, print->set->warning, byte_dump_character_placeholder_s, print->set->warning); + fl_print_format(f_string_format_r_single_s.string, print->to, print->set->warning, byte_dump_character_placeholder_s, print->set->warning); } if (main->setting.flag & byte_dump_main_flag_wide_e) { diff --git a/level_3/byte_dump/c/main/print/error.c b/level_3/byte_dump/c/main/print/error.c index 1da1b9c..8134849 100644 --- a/level_3/byte_dump/c/main/print/error.c +++ b/level_3/byte_dump/c/main/print/error.c @@ -91,11 +91,11 @@ extern "C" { fl_print_format("%[%QThe value '%]", print->to, print->set->error, print->prefix, print->set->error); fl_print_format("%[%ul%]", print->to, print->set->notable, main->setting.first, print->set->notable); fl_print_format("%[' for the parameter '%]", print->to, print->set->error, print->set->error); - fl_print_format("%[%r%r%]", print->to, print->set->notable, f_console_symbol_long_normal_s, byte_dump_long_first_s, print->set->notable); + fl_print_format(f_string_format_rr_single_s.string, print->to, print->set->notable, f_console_symbol_long_normal_s, byte_dump_long_first_s, print->set->notable); fl_print_format("%[' cannot be greater than the value '%]", print->to, print->set->error, print->set->error); fl_print_format("%[%ul%]", print->to, print->set->notable, main->setting.last, print->set->notable); fl_print_format("%[' for the parameter '%]", print->to, print->set->error, print->set->error); - fl_print_format("%[%r%r%]", print->to, print->set->notable, f_console_symbol_long_normal_s, byte_dump_long_last_s, print->set->notable); + fl_print_format(f_string_format_rr_single_s.string, print->to, print->set->notable, f_console_symbol_long_normal_s, byte_dump_long_last_s, print->set->notable); fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); diff --git a/level_3/control/c/main/print/error.c b/level_3/control/c/main/print/error.c index f469e0a..291d488 100644 --- a/level_3/control/c/main/print/error.c +++ b/level_3/control/c/main/print/error.c @@ -297,7 +297,7 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QThe value for the parameter '%]", print->to, print->set->error, print->prefix, print->set->error); - fl_print_format("%[%r%r%]", print->to, print->set->notable, f_console_symbol_long_normal_s, parameter, print->set->notable); + fl_print_format(f_string_format_rr_single_s.string, print->to, print->set->notable, f_console_symbol_long_normal_s, parameter, print->set->notable); fl_print_format("%[' must not be an empty string.%]%r", print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -315,7 +315,7 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QThe parameter '%]", print->to, print->set->error, print->prefix, print->set->error); - fl_print_format("%[%r%r%]", print->to, print->set->notable, f_console_symbol_long_normal_s, parameter, print->set->notable); + fl_print_format(f_string_format_rr_single_s.string, print->to, print->set->notable, f_console_symbol_long_normal_s, parameter, print->set->notable); fl_print_format("%[' is specified, but no value is given.%]%r", print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); diff --git a/level_3/controller/c/controller.c b/level_3/controller/c/controller.c index 9b9e5ee..e0c7633 100644 --- a/level_3/controller/c/controller.c +++ b/level_3/controller/c/controller.c @@ -112,7 +112,7 @@ extern "C" { controller_lock_print(main->error.to, 0); fl_print_format("%r%[%QThe parameter '%]", main->error.to, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%r%r%]", main->error.to, main->context.set.notable, f_console_symbol_long_normal_s, controller_long_settings_s, main->context.set.notable); + fl_print_format(f_string_format_rr_single_s.string, main->error.to, main->context.set.notable, f_console_symbol_long_normal_s, controller_long_settings_s, main->context.set.notable); fl_print_format("%[' is specified, but no value is given.%]%r", main->error.to, main->error.context, main->error.context, f_string_eol_s); controller_unlock_print_flush(main->error.to, 0); @@ -151,7 +151,7 @@ extern "C" { controller_lock_print(main->error.to, 0); fl_print_format("%r%[%QThe parameter '%]", main->error.to, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%r%r%]", main->error.to, main->context.set.notable, f_console_symbol_long_normal_s, controller_long_pid_s, main->context.set.notable); + fl_print_format(f_string_format_rr_single_s.string, main->error.to, main->context.set.notable, f_console_symbol_long_normal_s, controller_long_pid_s, main->context.set.notable); fl_print_format("%[' is specified, but no value is given.%]%r", main->error.to, main->error.context, main->error.context, f_string_eol_s); controller_unlock_print_flush(main->error.to, 0); @@ -209,7 +209,7 @@ extern "C" { controller_lock_print(main->error.to, 0); fl_print_format("%r%[%QThe parameter '%]", main->error.to, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%r%r%]", main->error.to, main->context.set.notable, f_console_symbol_long_normal_s, controller_long_cgroup_s, main->context.set.notable); + fl_print_format(f_string_format_rr_single_s.string, main->error.to, main->context.set.notable, f_console_symbol_long_normal_s, controller_long_cgroup_s, main->context.set.notable); fl_print_format("%[' is specified, but no value is given.%]%r", main->error.to, main->error.context, main->error.context, f_string_eol_s); controller_unlock_print_flush(main->error.to, 0); @@ -239,7 +239,7 @@ extern "C" { controller_lock_print(main->warning.to, 0); fl_print_format("%r%[%QThe parameter '%]", main->warning.to, f_string_eol_s, main->warning.context, main->warning.prefix, main->warning.context); - fl_print_format("%[%r%r%]", main->warning.to, main->context.set.notable, f_console_symbol_long_normal_s, controller_long_cgroup_s, main->context.set.notable); + fl_print_format(f_string_format_rr_single_s.string, main->warning.to, main->context.set.notable, f_console_symbol_long_normal_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.%]%r", main->warning.to, main->warning.context, main->warning.context, f_string_eol_s); controller_unlock_print_flush(main->warning.to, 0); @@ -255,7 +255,7 @@ extern "C" { fl_print_format("%r%[%QThe parameter '%]", main->error.to, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); fl_print_format("%[' must not be specified with the parameter '%]", main->error.to, main->error.context, main->error.context); - fl_print_format("%[%r%r%]", main->error.to, main->context.set.notable, f_console_symbol_long_normal_s, controller_long_daemon_s, main->context.set.notable); + fl_print_format(f_string_format_rr_single_s.string, main->error.to, main->context.set.notable, f_console_symbol_long_normal_s, controller_long_daemon_s, main->context.set.notable); fl_print_format(f_string_format_sentence_end_quote_s.string, main->error.to, main->error.context, main->error.context, f_string_eol_s); controller_unlock_print_flush(main->error.to, 0); diff --git a/level_3/controller/c/entry/private-entry.c b/level_3/controller/c/entry/private-entry.c index 0989cf8..232c93b 100644 --- a/level_3/controller/c/entry/private-entry.c +++ b/level_3/controller/c/entry/private-entry.c @@ -456,11 +456,11 @@ extern "C" { f_file_stream_lock(global.main->error.to); fl_print_format("%r%[%QThe %r item action third parameter (and beyond) must be one of '%]", global.main->error.to, 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("%[%r%]", global.main->error.to, global.main->error.notable, controller_asynchronous_s, global.main->error.notable); + fl_print_format(f_string_format_r_single_s.string, global.main->error.to, global.main->error.notable, controller_asynchronous_s, global.main->error.notable); fl_print_format("%[', '%]", global.main->error.to, global.main->error.context, global.main->error.context); - fl_print_format("%[%r%]", global.main->error.to, global.main->error.notable, controller_require_s, global.main->error.notable); + fl_print_format(f_string_format_r_single_s.string, global.main->error.to, global.main->error.notable, controller_require_s, global.main->error.notable); fl_print_format("%[', or '%]", global.main->error.to, global.main->error.context, global.main->error.context); - fl_print_format("%[%r%]", global.main->error.to, global.main->error.notable, controller_wait_s, global.main->error.notable); + fl_print_format(f_string_format_r_single_s.string, global.main->error.to, global.main->error.notable, controller_wait_s, global.main->error.notable); fl_print_format("%[' but instead has '%]", global.main->error.to, global.main->error.context, global.main->error.context); fl_print_format(f_string_format_Q_single_s.string, global.main->error.to, global.main->error.notable, action->parameters.array[j], global.main->error.notable); fl_print_format("%['.%]", global.main->error.to, global.main->error.context, global.main->error.context, f_string_eol_s); @@ -482,7 +482,7 @@ extern "C" { f_file_stream_lock(global.main->error.to); fl_print_format("%r%[%QThe %r item action may not specify the reserved item '%]", global.main->error.to, 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("%[%r%]", global.main->error.to, global.main->error.notable, controller_main_s, global.main->error.notable); + fl_print_format(f_string_format_r_single_s.string, global.main->error.to, global.main->error.notable, controller_main_s, global.main->error.notable); fl_print_format("%['.%]", global.main->error.to, global.main->error.context, global.main->error.context, f_string_eol_s); f_file_stream_unlock(global.main->error.to); @@ -511,11 +511,11 @@ extern "C" { f_file_stream_lock(global.main->error.to); fl_print_format("%r%[%QThe %r item action must have one of '%]", global.main->error.to, 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("%[%r%]", global.main->error.to, global.main->error.notable, controller_kill_s, global.main->error.notable); + fl_print_format(f_string_format_r_single_s.string, global.main->error.to, global.main->error.notable, controller_kill_s, global.main->error.notable); fl_print_format("%[', '%]", global.main->error.to, global.main->error.context, global.main->error.context); - fl_print_format("%[%r%]", global.main->error.to, global.main->error.notable, controller_start_s, global.main->error.notable); + fl_print_format(f_string_format_r_single_s.string, global.main->error.to, global.main->error.notable, controller_start_s, global.main->error.notable); fl_print_format("%[', or '%]", global.main->error.to, global.main->error.context, global.main->error.context); - fl_print_format("%[%r%]", global.main->error.to, global.main->error.notable, controller_stop_s, global.main->error.notable); + fl_print_format(f_string_format_r_single_s.string, global.main->error.to, global.main->error.notable, controller_stop_s, global.main->error.notable); fl_print_format("%[' but instead has '%]", global.main->error.to, global.main->error.context, global.main->error.context); fl_print_format(f_string_format_Q_single_s.string, global.main->error.to, global.main->error.notable, action->parameters.array[0], global.main->error.notable); fl_print_format("%['.%]", global.main->error.to, global.main->error.context, global.main->error.context, f_string_eol_s); @@ -578,7 +578,7 @@ extern "C" { f_file_stream_lock(global.main->error.to); fl_print_format("%r%[%QThe %r item action may only have '%]", global.main->error.to, 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("%[%r%]", global.main->error.to, global.main->error.notable, controller_wait_s, global.main->error.notable); + fl_print_format(f_string_format_r_single_s.string, global.main->error.to, global.main->error.notable, controller_wait_s, global.main->error.notable); fl_print_format("%[' but instead has '%]", global.main->error.to, global.main->error.context, global.main->error.context); fl_print_format(f_string_format_Q_single_s.string, global.main->error.to, global.main->error.notable, action->parameters.array[0], global.main->error.notable); fl_print_format("%['.%]", global.main->error.to, global.main->error.context, global.main->error.context, f_string_eol_s); @@ -677,7 +677,7 @@ extern "C" { controller_lock_print(global.main->warning.to, global.thread); fl_print_format("%r%[%QMultiple '%]", global.main->warning.to, f_string_eol_s, global.main->warning.context, global.main->warning.prefix, global.main->warning.context); - fl_print_format("%[%r%]", global.main->warning.to, global.main->warning.notable, controller_ready_s, global.main->warning.notable); + fl_print_format(f_string_format_r_single_s.string, global.main->warning.to, global.main->warning.notable, controller_ready_s, global.main->warning.notable); fl_print_format("%[' %r item actions detected; only the first will be used.%]%r", global.main->warning.to, 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); @@ -1008,7 +1008,7 @@ extern "C" { controller_lock_print(global->main->output.to, global->thread); fl_print_format("%rWaiting before processing %r item action '", global->main->output.to, f_string_eol_s, is_entry ? controller_entry_s : controller_exit_s); - fl_print_format("%[%r%]", global->main->output.to, global->main->context.set.title, controller_ready_s, global->main->context.set.title); + fl_print_format(f_string_format_r_single_s.string, global->main->output.to, global->main->context.set.title, controller_ready_s, global->main->context.set.title); fl_print_format("'.%r", global->main->output.to, f_string_eol_s); controller_unlock_print_flush(global->main->output.to, global->thread); @@ -1027,7 +1027,7 @@ extern "C" { controller_lock_print(global->main->output.to, global->thread); fl_print_format("%rIgnoring %r item action '", global->main->output.to, f_string_eol_s, is_entry ? controller_entry_s : controller_exit_s); - fl_print_format("%[%r%]", global->main->output.to, global->main->context.set.title, controller_ready_s, global->main->context.set.title); + fl_print_format(f_string_format_r_single_s.string, global->main->output.to, global->main->context.set.title, controller_ready_s, global->main->context.set.title); fl_print_format("', state already is ready.%r", global->main->output.to, f_string_eol_s); controller_unlock_print_flush(global->main->output.to, global->thread); @@ -1496,7 +1496,7 @@ extern "C" { controller_lock_print(global->main->output.to, global->thread); fl_print_format("%rDone processing %r item '", global->main->output.to, f_string_eol_s, is_entry ? controller_entry_s : controller_exit_s); - fl_print_format("%[%r%]", global->main->output.to, global->main->context.set.title, controller_main_s, global->main->context.set.title); + fl_print_format(f_string_format_r_single_s.string, global->main->output.to, global->main->context.set.title, controller_main_s, global->main->context.set.title); fl_print_format("'.%r", global->main->output.to, f_string_eol_s); // failsafe should not print the extra newline because the failure exit from controller_main should handle this. @@ -1767,7 +1767,7 @@ extern "C" { controller_lock_print(global.main->error.to, global.thread); fl_print_format("%r%[%QThe required %r item '%]", global.main->error.to, 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("%[%r%]", global.main->error.to, global.main->error.notable, controller_main_s, global.main->error.notable); + fl_print_format(f_string_format_r_single_s.string, global.main->error.to, global.main->error.notable, controller_main_s, global.main->error.notable); fl_print_format("%[' is not found.%]%r", global.main->error.to, global.main->error.context, global.main->error.context, f_string_eol_s); controller_unlock_print_flush(global.main->error.to, global.thread); diff --git a/level_3/controller/c/rule/private-rule.c b/level_3/controller/c/rule/private-rule.c index 5d8e23f..531322e 100644 --- a/level_3/controller/c/rule/private-rule.c +++ b/level_3/controller/c/rule/private-rule.c @@ -439,7 +439,7 @@ extern "C" { controller_lock_print(global.main->error.to, global.thread); fl_print_format("%r%[%QRule item action '%]", global.main->error.to, f_string_eol_s, global.main->error.context, global.main->error.prefix, global.main->error.context); - fl_print_format("%[%r%]", global.main->error.to, global.main->error.notable, controller_rerun_s, global.main->error.notable); + fl_print_format(f_string_format_r_single_s.string, global.main->error.to, global.main->error.notable, controller_rerun_s, global.main->error.notable); fl_print_format("%[' has '%]", global.main->error.to, global.main->error.context, global.main->error.context); fl_print_format("%[%/Q%]", global.main->error.to, global.main->error.notable, cache->buffer_item, cache->content_action.array[0], global.main->error.notable); fl_print_format("%[' as the first value, only the following are allowed: '%]", global.main->error.to, global.main->error.context, global.main->error.context); @@ -451,7 +451,7 @@ extern "C" { fl_print_format("%[%r%]%[', '%]", global.main->error.to, global.main->error.notable, controller_resume_s, global.main->error.notable, global.main->error.context, global.main->error.context); fl_print_format("%[%r%]%[', '%]", global.main->error.to, global.main->error.notable, controller_start_s, global.main->error.notable, global.main->error.context, global.main->error.context); fl_print_format("%[%r%]%[', or '%]", global.main->error.to, global.main->error.notable, controller_stop_s, global.main->error.notable, global.main->error.context, global.main->error.context); - fl_print_format("%[%r%]", global.main->error.to, global.main->error.notable, controller_thaw_s, global.main->error.notable, global.main->error.context); + fl_print_format(f_string_format_r_single_s.string, global.main->error.to, global.main->error.notable, controller_thaw_s, global.main->error.notable, global.main->error.context); fl_print_format(f_string_format_sentence_end_quote_s.string, global.main->error.to, global.main->error.context, global.main->error.context, f_string_eol_s); controller_rule_print_error_cache(global.main->error, cache->action, F_true); @@ -479,12 +479,12 @@ extern "C" { controller_lock_print(global.main->error.to, global.thread); fl_print_format("%r%[%QRule item action '%]", global.main->error.to, f_string_eol_s, global.main->error.context, global.main->error.prefix, global.main->error.context); - fl_print_format("%[%r%]", global.main->error.to, global.main->error.notable, controller_rerun_s, global.main->error.notable); + fl_print_format(f_string_format_r_single_s.string, global.main->error.to, global.main->error.notable, controller_rerun_s, global.main->error.notable); fl_print_format("%[' has '%]", global.main->error.to, global.main->error.context, global.main->error.context); fl_print_format("%[%/Q%]", global.main->error.to, 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, global.main->error.context, global.main->error.context); fl_print_format("%[%r%]%[' or '%]", global.main->error.to, global.main->error.notable, controller_stop_s, global.main->error.notable, global.main->error.context, global.main->error.context); - fl_print_format("%[%r%]", global.main->error.to, global.main->error.notable, controller_thaw_s, global.main->error.notable, global.main->error.context); + fl_print_format(f_string_format_r_single_s.string, global.main->error.to, global.main->error.notable, controller_thaw_s, global.main->error.notable, global.main->error.context); fl_print_format(f_string_format_sentence_end_quote_s.string, global.main->error.to, global.main->error.context, global.main->error.context, f_string_eol_s); controller_rule_print_error_cache(global.main->error, cache->action, F_true); @@ -511,7 +511,7 @@ extern "C" { controller_lock_print(global.main->error.to, global.thread); fl_print_format("%r%[%QRule item action '%]", global.main->error.to, f_string_eol_s, global.main->error.context, global.main->error.prefix, global.main->error.context); - fl_print_format("%[%r%]", global.main->error.to, global.main->error.notable, controller_rerun_s, global.main->error.notable); + fl_print_format(f_string_format_r_single_s.string, global.main->error.to, global.main->error.notable, controller_rerun_s, global.main->error.notable); fl_print_format("%[' has an unknown value '%]", global.main->error.to, global.main->error.context, global.main->error.context); fl_print_format("%[%/Q%]", global.main->error.to, global.main->error.notable, cache->buffer_item, cache->content_action.array[i], global.main->error.notable); fl_print_format(f_string_format_sentence_end_quote_s.string, global.main->error.to, global.main->error.context, global.main->error.context, f_string_eol_s); @@ -701,7 +701,7 @@ extern "C" { controller_lock_print(global.main->error.to, global.thread); fl_print_format("%r%[%QRule item action '%]", global.main->error.to, f_string_eol_s, global.main->error.context, global.main->error.prefix, global.main->error.context); - fl_print_format("%[%r%]", global.main->error.to, global.main->error.notable, controller_rerun_s, global.main->error.notable); + fl_print_format(f_string_format_r_single_s.string, global.main->error.to, 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, global.main->error.context, global.main->error.context); fl_print_format("%[%S%]", global.main->error.to, global.main->error.notable, name, global.main->error.notable); fl_print_format("%[' value", global.main->error.to, global.main->error.context, global.main->error.context); @@ -2570,7 +2570,7 @@ extern "C" { controller_lock_print(global.main->error.to, global.thread); fl_print_format("%r%[%QUnsupported action type '%]", global.main->error.to, f_string_eol_s, global.main->error.context, global.main->error.prefix, global.main->error.context); - fl_print_format("%[%r%]", global.main->error.to, global.main->error.notable, controller_rule_action_type_name(process->action), global.main->error.notable); + fl_print_format(f_string_format_r_single_s.string, global.main->error.to, global.main->error.notable, controller_rule_action_type_name(process->action), global.main->error.notable); fl_print_format("%[' while attempting to execute rule.%]%r", global.main->error.to, 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); @@ -2993,7 +2993,7 @@ extern "C" { fl_print_format("%r%[%QThe rule '%]", global.main->error.to, f_string_eol_s, global.main->error.context, global.main->error.prefix, global.main->error.context); fl_print_format(f_string_format_Q_single_s.string, global.main->error.to, global.main->error.notable, process->rule.name, global.main->error.notable); fl_print_format("%[' has no '%]", global.main->error.to, global.main->error.context, global.main->error.context); - fl_print_format("%[%r%]", global.main->error.to, global.main->error.notable, controller_rule_action_type_name(process->action), global.main->error.notable); + fl_print_format(f_string_format_r_single_s.string, global.main->error.to, global.main->error.notable, controller_rule_action_type_name(process->action), global.main->error.notable); fl_print_format("%[' action to execute.%]%r", global.main->error.to, global.main->error.context, global.main->error.context, f_string_eol_s); } else { @@ -3002,13 +3002,13 @@ extern "C" { fl_print_format("%[ has no known '%]", global.main->error.to, global.main->error.context, global.main->error.context); fl_print_format("%[%r %r%]", global.main->error.to, global.main->error.notable, controller_rule_s, controller_type_s, global.main->error.notable); fl_print_format("%[' (such as '%]", global.main->error.to, global.main->error.context, global.main->error.context); - fl_print_format("%[%r%]", global.main->error.to, global.main->error.notable, controller_command_s, global.main->error.notable); + fl_print_format(f_string_format_r_single_s.string, global.main->error.to, global.main->error.notable, controller_command_s, global.main->error.notable); fl_print_format("%[', '%]", global.main->error.to, global.main->error.context, global.main->error.context); - fl_print_format("%[%r%]", global.main->error.to, global.main->error.notable, controller_service_s, global.main->error.notable); + fl_print_format(f_string_format_r_single_s.string, global.main->error.to, global.main->error.notable, controller_service_s, global.main->error.notable); fl_print_format("%[', '%]", global.main->error.to, global.main->error.context, global.main->error.context); - fl_print_format("%[%r%]", global.main->error.to, global.main->error.notable, controller_script_s, global.main->error.notable); + fl_print_format(f_string_format_r_single_s.string, global.main->error.to, global.main->error.notable, controller_script_s, global.main->error.notable); fl_print_format("%[', or '%]", global.main->error.to, global.main->error.context, global.main->error.context); - fl_print_format("%[%r%]", global.main->error.to, global.main->error.notable, controller_utility_s, global.main->error.notable); + fl_print_format(f_string_format_r_single_s.string, global.main->error.to, global.main->error.notable, controller_utility_s, global.main->error.notable); fl_print_format("%[') to execute.%]%r", global.main->error.to, global.main->error.context, global.main->error.context, f_string_eol_s); } @@ -5708,7 +5708,7 @@ extern "C" { controller_lock_print(main->error.to, global.thread); fl_print_format("%r%[%QUnsupported action type '%]", main->error.to, f_string_eol_s, main->error.context, main->error.prefix, main->error.context); - fl_print_format("%[%r%]", main->error.to, main->error.notable, controller_rule_action_type_name(action), main->error.notable); + fl_print_format(f_string_format_r_single_s.string, main->error.to, main->error.notable, controller_rule_action_type_name(action), main->error.notable); fl_print_format("%[' while attempting to validate rule execution.%]%r", main->error.to, main->error.context, main->error.context, f_string_eol_s); controller_rule_print_error_cache(main->error, cache->action, F_true); diff --git a/level_3/fake/c/main/build/print/warning.c b/level_3/fake/c/main/build/print/warning.c index b4317f3..8affa80 100644 --- a/level_3/fake/c/main/build/print/warning.c +++ b/level_3/fake/c/main/build/print/warning.c @@ -23,15 +23,15 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%r%[%QThe setting '%]", print->to, f_string_eol_s, print->context, print->prefix, print->context); - fl_print_format("%[%r%]", print->to, print->notable, name, print->notable); + fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, name, print->notable); fl_print_format("%[' in the file '%]", print->to, print->context, print->context); fl_print_format("%[%Q%]", print->to, print->notable, path, print->notable); fl_print_format("%[' may be either '%]", print->to, print->context, print->context); - fl_print_format("%[%r%]", print->to, print->notable, fake_common_setting_bool_yes_s, print->notable); + fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, fake_common_setting_bool_yes_s, print->notable); fl_print_format("%[' or '%]", print->to, print->context, print->context); - fl_print_format("%[%r%]", print->to, print->notable, fake_common_setting_bool_no_s, print->notable); + fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, fake_common_setting_bool_no_s, print->notable); fl_print_format("%[', defaulting to '%]", print->to, print->context, print->context); - fl_print_format("%[%r%]", print->to, print->notable, default_to, print->notable); + fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, default_to, print->notable); fl_print_format("%['.%]%r", print->to, print->context, print->context, f_string_eol_s); f_file_stream_unlock(print->to); @@ -63,13 +63,13 @@ extern "C" { fl_print_format("%[' in the file '%]", print->to, print->context, print->context); fl_print_format("%[%Q%]", print->to, print->notable, path, print->notable); fl_print_format("%[' may only be one of '%]", print->to, print->context, print->context); - fl_print_format("%[%r%]", print->to, print->notable, fake_build_language_bash_s, print->notable); + fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, fake_build_language_bash_s, print->notable); fl_print_format("%[', '%]", print->to, print->context, print->context); - fl_print_format("%[%r%]", print->to, print->notable, fake_build_language_c_s, print->notable); + fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, fake_build_language_c_s, print->notable); fl_print_format("%[', or '%]", print->to, print->context, print->context); - fl_print_format("%[%r%]", print->to, print->notable, fake_build_language_cpp_s, print->notable); + fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, fake_build_language_cpp_s, print->notable); fl_print_format("%[', defaulting to '%]", print->to, print->context, print->context); - fl_print_format("%[%r%]", print->to, print->notable, default_to, print->notable); + fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, default_to, print->notable); fl_print_format("%['.%]%r", print->to, print->context, print->context, f_string_eol_s); f_file_stream_unlock(print->to); @@ -108,19 +108,19 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QThe setting '%]", print->to, f_string_eol_s, print->context, print->prefix, print->context); - fl_print_format("%[%r%]", print->to, print->notable, name, print->notable); + fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, name, print->notable); fl_print_format("%[' in the file '%]", print->to, print->context, print->context); fl_print_format("%[%Q%]", print->to, print->notable, path, print->notable); fl_print_format("%[' may only be one of '%]", print->to, print->context, print->context); - fl_print_format("%[%r%]", print->to, print->notable, fake_build_version_major_s, print->notable); + fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, fake_build_version_major_s, print->notable); fl_print_format("%[', '%]", print->to, print->context, print->context); - fl_print_format("%[%r%]", print->to, print->notable, fake_build_version_minor_s, print->notable); + fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, fake_build_version_minor_s, print->notable); fl_print_format("%[', '%]", print->to, print->context, print->context); - fl_print_format("%[%r%]", print->to, print->notable, fake_build_version_micro_s, print->notable); + fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, fake_build_version_micro_s, print->notable); fl_print_format("%[', or '%]", print->to, print->context, print->context); - fl_print_format("%[%r%]", print->to, print->notable, fake_build_version_nano_s, print->notable); + fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, fake_build_version_nano_s, print->notable); fl_print_format("%[', defaulting to '%]", print->to, print->context, print->context); - fl_print_format("%[%r%]", print->to, print->notable, default_to, print->notable); + fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, default_to, print->notable); fl_print_format("%['.%]%r", print->to, print->context, print->context, f_string_eol_s); f_file_stream_unlock(print->to); diff --git a/level_3/fake/c/main/make/print/error.c b/level_3/fake/c/main/make/print/error.c index eb91d3e..c25f852 100644 --- a/level_3/fake/c/main/make/print/error.c +++ b/level_3/fake/c/main/make/print/error.c @@ -141,11 +141,11 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%Q%S '%]", print->to, print->context, print->prefix, message, print->context); - fl_print_format("%[%r%]", print->to, print->notable, fake_make_operation_if_s, print->notable); + fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, fake_make_operation_if_s, print->notable); fl_print_format("%[', '%]", print->to, print->context, print->context); - fl_print_format("%[%r%]", print->to, print->notable, fake_make_operation_and_s, print->notable); + fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, fake_make_operation_and_s, print->notable); fl_print_format("%[', or '%]", print->to, print->context, print->context); - fl_print_format("%[%r%]", print->to, print->notable, fake_make_operation_or_s, print->notable); + fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, fake_make_operation_or_s, print->notable); fl_print_format("%[' section operation.%]%r", print->to, print->context, print->context, f_string_eol_s); f_file_stream_unlock(print->to); @@ -201,16 +201,16 @@ extern "C" { fl_print_format("%[%QIncomplete '%]", print->to, print->context, print->prefix, print->context); if (operation == fake_make_operation_type_and_e) { - fl_print_format("%[%r%]", print->to, print->notable, fake_make_operation_and_s, print->notable); + fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, fake_make_operation_and_s, print->notable); } else if (operation == fake_make_operation_type_else_e) { - fl_print_format("%[%r%]", print->to, print->notable, fake_make_operation_else_s, print->notable); + fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, fake_make_operation_else_s, print->notable); } else if (operation == fake_make_operation_type_if_e) { - fl_print_format("%[%r%]", print->to, print->notable, fake_make_operation_if_s, print->notable); + fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, fake_make_operation_if_s, print->notable); } else { - fl_print_format("%[%r%]", print->to, print->notable, fake_make_operation_or_s, print->notable); + fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, fake_make_operation_or_s, print->notable); } fl_print_format("%[' at end of the section.%]%r", print->to, print->context, print->context, f_string_eol_s); diff --git a/level_3/fake/c/main/make/print/verbose.c b/level_3/fake/c/main/make/print/verbose.c index aff4655..d2a8562 100644 --- a/level_3/fake/c/main/make/print/verbose.c +++ b/level_3/fake/c/main/make/print/verbose.c @@ -126,13 +126,13 @@ extern "C" { f_print_terminated("Set failure state to '", print->to); if (fail == fake_make_operation_fail_exit_e) { - fl_print_format("%[%r%]", print->to, print->set->notable, fake_make_operation_argument_exit_s, print->set->notable); + fl_print_format(f_string_format_r_single_s.string, print->to, print->set->notable, fake_make_operation_argument_exit_s, print->set->notable); } else if (fail == fake_make_operation_fail_warn_e) { - fl_print_format("%[%r%]", print->to, print->set->notable, fake_make_operation_argument_warn_s, print->set->notable); + fl_print_format(f_string_format_r_single_s.string, print->to, print->set->notable, fake_make_operation_argument_warn_s, print->set->notable); } else { - fl_print_format("%[%r%]", print->to, print->set->notable, fake_make_operation_argument_ignore_s, print->set->notable); + fl_print_format(f_string_format_r_single_s.string, print->to, print->set->notable, fake_make_operation_argument_ignore_s, print->set->notable); } fl_print_format("'.%r", print->to, f_string_eol_s); diff --git a/level_3/fake/c/main/print/context.c b/level_3/fake/c/main/print/context.c index bef9f56..b8b0d1e 100644 --- a/level_3/fake/c/main/print/context.c +++ b/level_3/fake/c/main/print/context.c @@ -79,7 +79,7 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%Q%S'%]", print->to, print->context, print->prefix, before, print->context); - fl_print_format("%[%Q%Q%]", print->to, print->notable, symbol, name, print->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->notable, symbol, name, print->notable); fl_print_format("%['%S.%]%r", print->to, print->context, after, print->context, f_string_eol_s); f_file_stream_unlock(print->to); @@ -94,7 +94,7 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%Q%S'%]", print->to, print->context, print->prefix, before, print->context); - fl_print_format("%[%Q%Q%]", print->to, print->notable, symbol, name, print->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->notable, symbol, name, print->notable); fl_print_format("%['%S'%]%r", print->to, print->context, between, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, value, print->notable); fl_print_format("%['%S.%]%r", print->to, print->context, after, print->context, f_string_eol_s); @@ -111,11 +111,11 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%Q%S'%]", print->to, print->context, print->prefix, before, print->context); - fl_print_format("%[%Q%Q%]", print->to, print->notable, symbol_1, name_1, print->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->notable, symbol_1, name_1, print->notable); fl_print_format("%['%S'%]%r", print->to, print->context, between_1, print->context); - fl_print_format("%[%Q%Q%]", print->to, print->notable, symbol_2, name_2, print->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->notable, symbol_2, name_2, print->notable); fl_print_format("%['%S'%]%r", print->to, print->context, between_2, print->context); - fl_print_format("%[%Q%Q%]", print->to, print->notable, symbol_3, name_3, print->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->notable, symbol_3, name_3, print->notable); fl_print_format("%['%S.%]%r", print->to, print->context, after, print->context, f_string_eol_s); f_file_stream_unlock(print->to); diff --git a/level_3/fake/c/main/print/error.c b/level_3/fake/c/main/print/error.c index 64c69f0..d20724f 100644 --- a/level_3/fake/c/main/print/error.c +++ b/level_3/fake/c/main/print/error.c @@ -674,7 +674,7 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QThe '%]", print->to, print->context, print->prefix, print->context); - fl_print_format("%[%Q%Q%]", print->to, print->notable, symbol, name, print->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->notable, symbol, name, print->notable); fl_print_format("%[' parameter value '%]", print->to, print->context, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, value, print->notable); fl_print_format("%[' contains non-word, non-dash, and non-plus characters.%]%r", print->to, print->context, print->context, f_string_eol_s); diff --git a/level_3/fss_identify/c/main/print/error.c b/level_3/fss_identify/c/main/print/error.c index 36b5ed0..8bfaeeb 100644 --- a/level_3/fss_identify/c/main/print/error.c +++ b/level_3/fss_identify/c/main/print/error.c @@ -50,10 +50,10 @@ extern "C" { f_file_stream_lock(print->to); - fl_print_format("%[%QEmpt string is not allowed at index%] ", print->to, print->set->error, print->prefix, print->set->error); + fl_print_format("%[%QEmpty string is not allowed at index%] ", print->to, print->set->error, print->prefix, print->set->error); fl_print_format("%[%ul%] ", print->to, print->set->notable, index, print->set->notable); fl_print_format("%[for the parameter '%]", print->to, print->set->error, print->set->error); - fl_print_format("%[%r%r%]", print->to, print->set->notable, f_console_symbol_long_normal_s, fss_identify_long_name_s, print->set->notable); + fl_print_format(f_string_format_rr_single_s.string, print->to, print->set->notable, f_console_symbol_long_normal_s, fss_identify_long_name_s, print->set->notable); fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -75,7 +75,7 @@ extern "C" { fl_print_format("%[' at index%] ", print->to, print->set->error, print->set->error); fl_print_format("%[%ul%] ", print->to, print->set->notable, index, print->set->notable); fl_print_format("%[for the parameter '%]", print->to, print->set->error, print->set->error); - fl_print_format("%[%r%r%]", print->to, print->set->notable, f_console_symbol_long_normal_s, fss_identify_long_name_s, print->set->notable); + fl_print_format(f_string_format_rr_single_s.string, print->to, print->set->notable, f_console_symbol_long_normal_s, fss_identify_long_name_s, print->set->notable); fl_print_format("%[' may only contain word characters or the dash (minus) character.%]%r", print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); diff --git a/level_3/fss_read/c/main/main/print.c b/level_3/fss_read/c/main/main/print.c index 2ac1648..95453f8 100644 --- a/level_3/fss_read/c/main/main/print.c +++ b/level_3/fss_read/c/main/main/print.c @@ -22,7 +22,7 @@ extern "C" { fl_print_format("%[%QThe format '%]", print->to, print->set->error, print->prefix, print->set->error); fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, value, print->set->notable); fl_print_format("%[' is not known for the parameter%] ", print->to, print->set->error, print->set->error); - fl_print_format("%[%Q%Q%]", print->to, print->set->notable, f_console_symbol_long_normal_s, fss_read_long_as_s, print->set->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, f_console_symbol_long_normal_s, fss_read_long_as_s, print->set->notable); fl_print_format(f_string_format_sentence_end_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); diff --git a/level_3/fss_read/c/main/print/error.c b/level_3/fss_read/c/main/print/error.c index e623d16..96c17e1 100644 --- a/level_3/fss_read/c/main/print/error.c +++ b/level_3/fss_read/c/main/print/error.c @@ -37,7 +37,7 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QThe parameter '%]", print->to, print->context, print->prefix, print->context); - fl_print_format("%[%r%r%]", print->to, print->notable, symbol, name, print->notable); + fl_print_format(f_string_format_rr_single_s.string, print->to, print->notable, symbol, name, print->notable); fl_print_format("%[' requires %Q.%]%r", print->to, print->context, message, print->context, f_string_eol_s); f_file_stream_unlock(print->to); @@ -55,7 +55,7 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QThe parameter '%]", print->to, print->context, print->prefix, print->context); - fl_print_format("%[%r%r%]", print->to, print->notable, symbol, name, print->notable); + fl_print_format(f_string_format_rr_single_s.string, print->to, print->notable, symbol, name, print->notable); fl_print_format("%[' may not have the value '%]", print->to, print->context, print->context); fl_print_format("%[%ul%]", print->to, print->notable, value, print->notable); fl_print_format("%[' before the value '%]", print->to, print->context, print->context); @@ -79,7 +79,7 @@ extern "C" { fl_print_format("%[%QThe value '%]", print->to, print->context, print->prefix, print->context); fl_print_format("%[%ul%]", print->to, print->notable, value, print->notable); fl_print_format("%[' may only be specified once for the parameter '%]", print->to, print->context, print->context); - fl_print_format("%[%r%r%]", print->to, print->notable, symbol, name, print->notable); + fl_print_format(f_string_format_rr_single_s.string, print->to, print->notable, symbol, name, print->notable); fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); f_file_stream_unlock(print->to); @@ -97,7 +97,7 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QThe%] ", print->to, print->context, print->prefix, print->context); - fl_print_format("%[%r%]", print->to, print->notable, ((fss_read_main_t *) print->custom)->setting.standard, print->notable); + fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, ((fss_read_main_t *) print->custom)->setting.standard, print->notable); fl_print_format(" %[standard only supports one Content per Object.%]%r", print->to, print->context, print->context, f_string_eol_s); f_file_stream_unlock(print->to); @@ -115,7 +115,7 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QThe%] ", print->to, print->context, print->prefix, print->context); - fl_print_format("%[%r%]", print->to, print->notable, ((fss_read_main_t *) print->custom)->setting.standard, print->notable); + fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, ((fss_read_main_t *) print->custom)->setting.standard, print->notable); fl_print_format(" %[standard does not support end of line character '%]", print->to, print->context, print->context); fl_print_format("%[\\n%]", print->to, print->set->notable, print->set->notable); fl_print_format("%[' (%]", print->to, print->set->error, print->set->error); diff --git a/level_3/fss_write/c/main/main/print.c b/level_3/fss_write/c/main/main/print.c index 9b7dfee..b9aaf1c 100644 --- a/level_3/fss_write/c/main/main/print.c +++ b/level_3/fss_write/c/main/main/print.c @@ -22,7 +22,7 @@ extern "C" { fl_print_format("%[%QThe format '%]", print->to, print->set->error, print->prefix, print->set->error); fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, value, print->set->notable); fl_print_format("%[' is not known for the parameter%] ", print->to, print->set->error, print->set->error); - fl_print_format("%[%Q%Q%]", print->to, print->set->notable, f_console_symbol_long_normal_s, fss_write_long_as_s, print->set->notable); + fl_print_format(f_string_format_QQ_single_s.string, print->to, print->set->notable, f_console_symbol_long_normal_s, fss_write_long_as_s, print->set->notable); fl_print_format(f_string_format_sentence_end_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); diff --git a/level_3/fss_write/c/main/print/error.c b/level_3/fss_write/c/main/print/error.c index 9e1d148..a1d1641 100644 --- a/level_3/fss_write/c/main/print/error.c +++ b/level_3/fss_write/c/main/print/error.c @@ -37,11 +37,11 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QMust specify the '%]", print->to, print->context, print->prefix, print->context); - fl_print_format("%[%r%r%]", print->to, print->notable, f_console_symbol_long_normal_s, fss_write_long_content_s, print->notable); + fl_print_format(f_string_format_rr_single_s.string, print->to, print->notable, f_console_symbol_long_normal_s, fss_write_long_content_s, print->notable); fl_print_format("%[' parameter at least the same number of times as the '%]", print->to, print->context, print->context); - fl_print_format("%[%r%r%]", print->to, print->notable, f_console_symbol_long_normal_s, fss_write_long_object_s, print->notable); + fl_print_format(f_string_format_rr_single_s.string, print->to, print->notable, f_console_symbol_long_normal_s, fss_write_long_object_s, print->notable); fl_print_format("%[' parameter when not specifying the '%]", print->to, print->context, print->context); - fl_print_format("%[%r%r%]", print->to, print->notable, f_console_symbol_long_normal_s, fss_write_long_partial_s, print->notable); + fl_print_format(f_string_format_rr_single_s.string, print->to, print->notable, f_console_symbol_long_normal_s, fss_write_long_partial_s, print->notable); fl_print_format("%[' parameter.%]%r", print->to, print->context, print->context, f_string_eol_s); f_file_stream_unlock(print->to); @@ -59,7 +59,7 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QThe%] ", print->to, print->context, print->prefix, print->context); - fl_print_format("%[%r%]", print->to, print->notable, ((fss_write_main_t *) print->custom)->setting.standard, print->notable); + fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, ((fss_write_main_t *) print->custom)->setting.standard, print->notable); fl_print_format(" %[standard only supports one Content per Object.%]%r", print->to, print->context, print->context, f_string_eol_s); f_file_stream_unlock(print->to); @@ -77,7 +77,7 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QThe value for the parameter '%]", print->to, print->set->error, print->prefix, print->set->error); - fl_print_format("%[%r%r%]", print->to, print->set->notable, f_console_symbol_long_normal_s, fss_write_long_prepend_s, print->set->notable); + fl_print_format(f_string_format_rr_single_s.string, print->to, print->set->notable, f_console_symbol_long_normal_s, fss_write_long_prepend_s, print->set->notable); fl_print_format("%[' must only contain white space.%]%r", print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -95,7 +95,7 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QThe%] ", print->to, print->context, print->prefix, print->context); - fl_print_format("%[%r%]", print->to, print->notable, ((fss_write_main_t *) print->custom)->setting.standard, print->notable); + fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, ((fss_write_main_t *) print->custom)->setting.standard, print->notable); fl_print_format(" %[standard does not support end of line character '%]", print->to, print->context, print->context); fl_print_format("%[\\n%]", print->to, print->set->notable, print->set->notable); fl_print_format("%[' (%]", print->to, print->set->error, print->set->error); diff --git a/level_3/iki_write/c/main/print/error.c b/level_3/iki_write/c/main/print/error.c index cd0e57b..85e88af 100644 --- a/level_3/iki_write/c/main/print/error.c +++ b/level_3/iki_write/c/main/print/error.c @@ -39,9 +39,9 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QNo main provided, either pipe the main data or use the '%]", print->to, print->set->error, print->prefix, print->set->error); - fl_print_format("%[%r%r%]", print->to, print->set->notable, f_console_symbol_long_normal_s, iki_write_long_object_s, print->set->notable); + fl_print_format(f_string_format_rr_single_s.string, print->to, print->set->notable, f_console_symbol_long_normal_s, iki_write_long_object_s, print->set->notable); fl_print_format("%[' and the '%]", print->to, print->set->error, print->set->error); - fl_print_format("%[%r%r%]", print->to, print->set->notable, f_console_symbol_long_normal_s, iki_write_long_content_s, print->set->notable); + fl_print_format(f_string_format_rr_single_s.string, print->to, print->set->notable, f_console_symbol_long_normal_s, iki_write_long_content_s, print->set->notable); fl_print_format("%[' parameters.%]%r", print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); diff --git a/level_3/status_code/c/main/print/error.c b/level_3/status_code/c/main/print/error.c index d4df9c4..b1b0a3d 100644 --- a/level_3/status_code/c/main/print/error.c +++ b/level_3/status_code/c/main/print/error.c @@ -25,11 +25,11 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QCannot specify the '%]", print->to, print->context, print->prefix, print->context); - fl_print_format("%[%r%r%]", print->to, print->notable, f_console_symbol_long_normal_s, status_code_long_error_s, print->notable); + fl_print_format(f_string_format_rr_single_s.string, print->to, print->notable, f_console_symbol_long_normal_s, status_code_long_error_s, print->notable); fl_print_format("%[' parameter with the '%]", print->to, print->context, print->context); - fl_print_format("%[%r%r%]", print->to, print->notable, f_console_symbol_long_normal_s, status_code_long_warning_s, print->notable); + fl_print_format(f_string_format_rr_single_s.string, print->to, print->notable, f_console_symbol_long_normal_s, status_code_long_warning_s, print->notable); fl_print_format("%[' parameter when not also specifying the '%]", print->to, print->context, print->context); - fl_print_format("%[%r%r%]", print->to, print->notable, f_console_symbol_long_normal_s, status_code_long_number_s, print->notable); + fl_print_format(f_string_format_rr_single_s.string, print->to, print->notable, f_console_symbol_long_normal_s, status_code_long_number_s, print->notable); fl_print_format("%[' parameter.%]%r", print->to, print->context, print->context, f_string_eol_s); f_file_stream_unlock(print->to);