From 1f6ba24896cb07ad2803926e64ffbf3bcd0c11ea Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sun, 28 Jul 2024 17:20:47 -0500 Subject: [PATCH] Update: The global static sentence end strings based on related changes in the FLL project. --- data/build/stand_alone/config.h | 8 ++++++-- .../c/program/controller/main/print/debug/perform/control.c | 2 +- sources/c/program/controller/main/print/debug/perform/pid.c | 2 +- sources/c/program/controller/main/print/debug/rule/execute.c | 2 +- sources/c/program/controller/main/print/error.c | 2 +- sources/c/program/controller/main/print/error/entry/action.c | 12 ++++++------ sources/c/program/controller/main/print/error/entry/item.c | 2 +- sources/c/program/controller/main/print/error/lock.c | 2 +- sources/c/program/controller/main/print/error/rule/action.c | 8 ++++---- sources/c/program/controller/main/print/error/rule/item.c | 2 +- sources/c/program/controller/main/print/error/rule/setting.c | 4 ++-- .../c/program/controller/main/print/message/entry/action.c | 2 +- sources/c/program/controller/main/print/message/entry/item.c | 4 ++-- .../c/program/controller/main/print/warning/entry/action.c | 2 +- sources/c/program/controller/main/print/warning/entry/item.c | 2 +- .../c/program/controller/main/print/warning/entry/setting.c | 4 ++-- .../c/program/controller/main/print/warning/rule/action.c | 2 +- sources/c/program/controller/main/print/warning/rule/item.c | 2 +- .../c/program/controller/main/print/warning/rule/setting.c | 2 +- 19 files changed, 35 insertions(+), 31 deletions(-) diff --git a/data/build/stand_alone/config.h b/data/build/stand_alone/config.h index f77eb57..0730853 100644 --- a/data/build/stand_alone/config.h +++ b/data/build/stand_alone/config.h @@ -1645,8 +1645,12 @@ //#define _di_f_string_format_s_ #define _di_f_string_format_s_double_s_ #define _di_f_string_format_S_double_s_ -//#define _di_f_string_format_sentence_end_quote_s_ -//#define _di_f_string_format_sentence_end_s_ +#define _di_f_string_format_sentence_end_quote_s_ +#define _di_f_string_format_sentence_end_s_ +#define _di_f_string_format_sentence_end_double_quote_s_ +#define _di_f_string_format_sentence_end_double_s_ +//#define _di_f_string_format_sentence_end_single_single_quote_s_ +//#define _di_f_string_format_sentence_end_single_s_ #define _di_f_string_format_s_s_ #define _di_f_string_format_S_s_ #define _di_f_string_format_ss_double_s_ diff --git a/sources/c/program/controller/main/print/debug/perform/control.c b/sources/c/program/controller/main/print/debug/perform/control.c index 8c0b9fd..15901b3 100644 --- a/sources/c/program/controller/main/print/debug/perform/control.c +++ b/sources/c/program/controller/main/print/debug/perform/control.c @@ -18,7 +18,7 @@ extern "C" { fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, main->process.path_control, print->notable); fl_print_format("%[' %S, code %]", print->to, print->context, message, print->context); fl_print_format(f_string_format_ui_single_s.string, print->to, print->notable, status, print->notable); - fl_print_format(f_string_format_sentence_end_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_s.string, print->to, print->context, print->context, f_string_eol_s); controller_unlock_print_flush(print->to, &main->thread); } diff --git a/sources/c/program/controller/main/print/debug/perform/pid.c b/sources/c/program/controller/main/print/debug/perform/pid.c index 70ddf47..77769ea 100644 --- a/sources/c/program/controller/main/print/debug/perform/pid.c +++ b/sources/c/program/controller/main/print/debug/perform/pid.c @@ -20,7 +20,7 @@ extern "C" { if (main->process.path_control.used) { fl_print_format("%rControl socket '", print->to, f_string_eol_s); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, main->process.path_control, print->notable); - fl_print_format("'.%r", print->to, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, f_string_eol_s); } controller_unlock_print_flush(print->to, &main->thread); diff --git a/sources/c/program/controller/main/print/debug/rule/execute.c b/sources/c/program/controller/main/print/debug/rule/execute.c index 0489f21..0a74c14 100644 --- a/sources/c/program/controller/main/print/debug/rule/execute.c +++ b/sources/c/program/controller/main/print/debug/rule/execute.c @@ -24,7 +24,7 @@ extern "C" { fl_print_format(" for %[%ul%]", print->to, print->set->notable, rerun->count, print->set->notable); fl_print_format(" of %[%r%] ", print->to, print->set->notable, controller_max_s, print->set->notable); fl_print_format(f_string_format_un_single_s.string, print->to, print->set->notable, rerun->max, print->set->notable); - fl_print_format(".%r", print->to, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_s.string, print->to, f_string_eol_s); } else { fl_print_format(" with no %[%r%].%r", print->to, print->set->notable, controller_max_s, print->set->notable, f_string_eol_s); diff --git a/sources/c/program/controller/main/print/error.c b/sources/c/program/controller/main/print/error.c index d5d4eef..588d6e8 100644 --- a/sources/c/program/controller/main/print/error.c +++ b/sources/c/program/controller/main/print/error.c @@ -32,7 +32,7 @@ extern "C" { fl_print_format("%r%[%QFailed while processing requested failsafe item '%]", print->to, f_string_eol_s, print->context, print->prefix, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, name, print->set->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); controller_unlock_print_flush(print->to, thread); diff --git a/sources/c/program/controller/main/print/error/entry/action.c b/sources/c/program/controller/main/print/error/entry/action.c index e6f65ac..0e8ff55 100644 --- a/sources/c/program/controller/main/print/error/entry/action.c +++ b/sources/c/program/controller/main/print/error/entry/action.c @@ -16,7 +16,7 @@ extern "C" { fl_print_format("%r%[%QExecution failed with return value of '%]", print->to, f_string_eol_s, print->context, print->prefix, print->context); fl_print_format(f_string_format_i_single_s.string, print->to, print->notable, code, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); controller_print_error_entry_cache(print, action, is_entry); @@ -38,7 +38,7 @@ extern "C" { fl_print_format("%r%[%QExecution failed, unable to find program or script '%]", print->to, f_string_eol_s, print->context, print->prefix, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); controller_print_error_entry_cache(print, action, is_entry); @@ -69,7 +69,7 @@ extern "C" { fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, allow, print->notable); fl_print_format("%[' but instead has '%]", print->to, print->context, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, has, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); controller_print_error_entry_cache(print, action, is_entry); @@ -103,7 +103,7 @@ extern "C" { fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, allow_3, print->notable); fl_print_format("%[' but instead has '%]", print->to, print->context, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, has, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); controller_print_error_entry_cache(print, action, is_entry); @@ -147,7 +147,7 @@ extern "C" { fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, has, print->notable); fl_print_format("%[' must be a base path name, such as '%]", print->to, print->context, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, example, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); controller_print_error_entry_cache(print, action, is_entry); @@ -234,7 +234,7 @@ extern "C" { fl_print_format("%r%[%QThe %r Item Action may not specify the reserved item '%]", print->to, f_string_eol_s, print->context, print->prefix, is_entry ? controller_entry_s : controller_exit_s, print->context); fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, item, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); controller_print_error_entry_cache(print, action, is_entry); diff --git a/sources/c/program/controller/main/print/error/entry/item.c b/sources/c/program/controller/main/print/error/entry/item.c index ac9b6a5..915f304 100644 --- a/sources/c/program/controller/main/print/error/entry/item.c +++ b/sources/c/program/controller/main/print/error/entry/item.c @@ -63,7 +63,7 @@ extern "C" { fl_print_format("%[' does not support the option '%]", print->to, print->context, print->context, f_string_eol_s); fl_print_format(f_string_format_Q_range_single_s.string, print->to, print->notable, buffer, range, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); controller_print_error_entry_cache(print, &cache->action, is_entry); diff --git a/sources/c/program/controller/main/print/error/lock.c b/sources/c/program/controller/main/print/error/lock.c index 3face96..80c4587 100644 --- a/sources/c/program/controller/main/print/error/lock.c +++ b/sources/c/program/controller/main/print/error/lock.c @@ -35,7 +35,7 @@ extern "C" { } } - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); controller_unlock_print_flush(print->to, &main->thread); diff --git a/sources/c/program/controller/main/print/error/rule/action.c b/sources/c/program/controller/main/print/error/rule/action.c index ae59fb7..0e38d70 100644 --- a/sources/c/program/controller/main/print/error/rule/action.c +++ b/sources/c/program/controller/main/print/error/rule/action.c @@ -28,7 +28,7 @@ extern "C" { fl_print_format("%[%r%]%[', '%]", print->to, print->notable, controller_start_s, print->notable, print->context, print->context); fl_print_format("%[%r%]%[', or '%]", print->to, print->notable, controller_stop_s, print->notable, print->context, print->context); fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, controller_thaw_s, print->notable, print->context); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); controller_print_error_rule_cache(print, action, F_true); @@ -50,7 +50,7 @@ extern "C" { fl_print_format("%r%[%QFSS Extended List (FSS-0003) is not allowed for the Rule Item Action '%]", print->to, f_string_eol_s, print->context, print->prefix, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); controller_print_error_rule_cache(print, action, F_true); @@ -140,7 +140,7 @@ extern "C" { fl_print_format("%[' as the second value, only the following are allowed: '%]", print->to, print->context, print->context); fl_print_format("%[%r%]%[' or '%]", print->to, print->notable, controller_stop_s, print->notable, print->context, print->context); fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, controller_thaw_s, print->notable, print->context); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); controller_print_error_rule_cache(print, action, F_true); @@ -186,7 +186,7 @@ extern "C" { fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); fl_print_format("%[' has an unknown value '%]", print->to, print->context, print->context); fl_print_format(f_string_format_Q_range_single_s.string, print->to, print->notable, buffer, range, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); controller_print_error_rule_cache(print, action, F_true); diff --git a/sources/c/program/controller/main/print/error/rule/item.c b/sources/c/program/controller/main/print/error/rule/item.c index ccfba01..acb5a8f 100644 --- a/sources/c/program/controller/main/print/error/rule/item.c +++ b/sources/c/program/controller/main/print/error/rule/item.c @@ -263,7 +263,7 @@ extern "C" { else { fl_print_format("%[' failed with the execute error code %]", print->to, print->context, print->context); fl_print_format("%[%i%]", print->to, print->notable, code, print->notable); - fl_print_format(f_string_format_sentence_end_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_s.string, print->to, print->context, print->context, f_string_eol_s); } } else { diff --git a/sources/c/program/controller/main/print/error/rule/setting.c b/sources/c/program/controller/main/print/error/rule/setting.c index 63cf5a9..4f50a1f 100644 --- a/sources/c/program/controller/main/print/error/rule/setting.c +++ b/sources/c/program/controller/main/print/error/rule/setting.c @@ -36,7 +36,7 @@ extern "C" { fl_print_format("%r%[%Q%S '%]", print->to, f_string_eol_s, print->context, print->prefix, reason, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); controller_print_error_rule_cache(print, action, F_false); @@ -313,7 +313,7 @@ extern "C" { } } // for - fl_print_format(".%r", print->to, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_s.string, print->to, f_string_eol_s); controller_unlock_print_flush(print->to, &main->thread); diff --git a/sources/c/program/controller/main/print/message/entry/action.c b/sources/c/program/controller/main/print/message/entry/action.c index 09432ad..551c4bc 100644 --- a/sources/c/program/controller/main/print/message/entry/action.c +++ b/sources/c/program/controller/main/print/message/entry/action.c @@ -133,7 +133,7 @@ extern "C" { fl_print_format("%rWaiting before processing %r Item Action '", print->to, f_string_eol_s, is_entry ? controller_entry_s : controller_exit_s); fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->title, name, print->set->title); - fl_print_format("'.%r", print->to, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, f_string_eol_s); controller_unlock_print_flush(print->to, &main->thread); diff --git a/sources/c/program/controller/main/print/message/entry/item.c b/sources/c/program/controller/main/print/message/entry/item.c index 60a2a21..89c60dd 100644 --- a/sources/c/program/controller/main/print/message/entry/item.c +++ b/sources/c/program/controller/main/print/message/entry/item.c @@ -45,7 +45,7 @@ extern "C" { } } // for - fl_print_format("'.%r", print->to, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, f_string_eol_s); controller_unlock_print_flush(print->to, &main->thread); @@ -124,7 +124,7 @@ extern "C" { } } - fl_print_format(".%r", print->to, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_s.string, print->to, f_string_eol_s); controller_unlock_print_flush(print->to, &main->thread); diff --git a/sources/c/program/controller/main/print/warning/entry/action.c b/sources/c/program/controller/main/print/warning/entry/action.c index ee2cadb..b48ebc7 100644 --- a/sources/c/program/controller/main/print/warning/entry/action.c +++ b/sources/c/program/controller/main/print/warning/entry/action.c @@ -58,7 +58,7 @@ extern "C" { fl_print_format("%r%[%QUnknown %r Item Action '%]", print->to, f_string_eol_s, print->context, print->prefix, is_entry ? controller_entry_s : controller_exit_s, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); controller_print_error_rule_cache(print, action, F_true); diff --git a/sources/c/program/controller/main/print/warning/entry/item.c b/sources/c/program/controller/main/print/warning/entry/item.c index 7647510..7e0b8b4 100644 --- a/sources/c/program/controller/main/print/warning/entry/item.c +++ b/sources/c/program/controller/main/print/warning/entry/item.c @@ -16,7 +16,7 @@ extern "C" { fl_print_format("%r%[%QIgnoring duplicate %r '%]", print->to, f_string_eol_s, print->context, print->prefix, is_entry ? controller_entry_s : controller_exit_s, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); controller_print_error_entry_cache(print, &cache->action, is_entry); diff --git a/sources/c/program/controller/main/print/warning/entry/setting.c b/sources/c/program/controller/main/print/warning/entry/setting.c index b81d8c7..06cead4 100644 --- a/sources/c/program/controller/main/print/warning/entry/setting.c +++ b/sources/c/program/controller/main/print/warning/entry/setting.c @@ -16,7 +16,7 @@ extern "C" { fl_print_format("%r%[%QUnknown %r item setting '%]", print->to, f_string_eol_s, print->context, print->prefix, is_entry ? controller_entry_s : controller_exit_s, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); controller_print_error_entry_cache(print, &cache->action, is_entry); @@ -40,7 +40,7 @@ extern "C" { fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); fl_print_format("%[' has an unknown value '%]", print->to, print->context, print->context); fl_print_format(f_string_format_Q_range_single_s.string, print->to, print->notable, buffer, range, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); controller_print_error_entry_cache(print, &cache->action, is_entry); diff --git a/sources/c/program/controller/main/print/warning/rule/action.c b/sources/c/program/controller/main/print/warning/rule/action.c index 66a954e..f4124ac 100644 --- a/sources/c/program/controller/main/print/warning/rule/action.c +++ b/sources/c/program/controller/main/print/warning/rule/action.c @@ -16,7 +16,7 @@ extern "C" { fl_print_format("%r%[%QUnknown Rule Item Action '%]", print->to, f_string_eol_s, print->context, print->prefix, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); controller_print_error_rule_cache(print, action, F_true); diff --git a/sources/c/program/controller/main/print/warning/rule/item.c b/sources/c/program/controller/main/print/warning/rule/item.c index ef72d33..a038ee8 100644 --- a/sources/c/program/controller/main/print/warning/rule/item.c +++ b/sources/c/program/controller/main/print/warning/rule/item.c @@ -16,7 +16,7 @@ extern "C" { fl_print_format("%r%[%QUnknown Rule Item '%]", print->to, f_string_eol_s, print->context, print->prefix, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); controller_print_error_rule_cache(print, action, F_true); diff --git a/sources/c/program/controller/main/print/warning/rule/setting.c b/sources/c/program/controller/main/print/warning/rule/setting.c index 6007e42..d6604fb 100644 --- a/sources/c/program/controller/main/print/warning/rule/setting.c +++ b/sources/c/program/controller/main/print/warning/rule/setting.c @@ -16,7 +16,7 @@ extern "C" { fl_print_format("%r%[%Q%S Rule setting '%]", print->to, f_string_eol_s, print->context, print->prefix, what, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); - fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->context, print->context, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_single_quote_s.string, print->to, print->context, print->context, f_string_eol_s); controller_print_error_rule_cache(print, action, F_true); -- 1.8.3.1