From f37a66466c296489ad9c483fb2bed5760918ed52 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sun, 14 Jan 2024 21:13:47 -0600 Subject: [PATCH] Update: Switch to using the common format string structure where possible. There may be other cases, but these are the ones I was able to quickly find. After glancing over this I would also note that the common parameter argument printing could also be made common strings. These would be common strings that are specific to something like fll_program. --- level_3/controller/c/entry/private-entry.c | 4 ++-- level_3/controller/c/entry/private-entry_print.c | 4 ++-- level_3/controller/c/rule/private-rule.c | 18 +++++++++--------- level_3/controller/c/rule/private-rule_print.c | 2 +- level_3/fake/c/main/build/print/warning.c | 14 +++++++------- level_3/fake/c/main/make/print/error.c | 14 +++++++------- level_3/fake/c/main/make/print/message.c | 6 +++--- level_3/fake/c/main/make/print/warning.c | 16 ++++++++-------- level_3/fake/c/main/print/error.c | 16 ++++++++-------- level_3/firewall/c/private-firewall.c | 8 ++++---- 10 files changed, 51 insertions(+), 51 deletions(-) diff --git a/level_3/controller/c/entry/private-entry.c b/level_3/controller/c/entry/private-entry.c index 289c0f5..bcda753 100644 --- a/level_3/controller/c/entry/private-entry.c +++ b/level_3/controller/c/entry/private-entry.c @@ -1945,7 +1945,7 @@ extern "C" { fl_print_format(f_string_format_Q_single_s.string, global.main->error.to, global.main->error.notable, controller_control_s, global.main->error.notable); fl_print_format("%[' does not support the option '%]", global.main->error.to, global.main->error.context, global.main->error.context, f_string_eol_s); - fl_print_format("%[%/Q%]", global.main->error.to, global.main->error.notable, cache->buffer_file, cache->content_actions.array[i].array[1], global.main->error.notable); + fl_print_format(f_string_format_Q_range_single_s.string, global.main->error.to, global.main->error.notable, cache->buffer_file, cache->content_actions.array[i].array[1], 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); @@ -2286,7 +2286,7 @@ extern "C" { f_file_stream_lock(global.main->error.to); fl_print_format("%r%[%QThe %r setting '%]", 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("%[%/Q%]", global.main->error.to, global.main->error.notable, cache->buffer_file, cache->content_actions.array[i].array[1], global.main->error.notable); + fl_print_format(f_string_format_Q_range_single_s.string, global.main->error.to, global.main->error.notable, cache->buffer_file, cache->content_actions.array[i].array[1], global.main->error.notable); fl_print_format("%[' is not a valid supported number.%]", global.main->error.to, global.main->error.context, global.main->error.context, f_string_eol_s); f_file_stream_unlock(global.main->error.to); diff --git a/level_3/controller/c/entry/private-entry_print.c b/level_3/controller/c/entry/private-entry_print.c index cde6ee7..525a6f3 100644 --- a/level_3/controller/c/entry/private-entry_print.c +++ b/level_3/controller/c/entry/private-entry_print.c @@ -134,7 +134,7 @@ extern "C" { controller_lock_print(print.to, thread); fl_print_format("%r%[%Q%r setting%S '%]", print.to, f_string_eol_s, print.context, print.prefix, is_entry ? controller_Entry_s : controller_Exit_s, before, print.context); - fl_print_format("%[%/Q%]", print.to, print.notable, cache->buffer_file, range, print.notable); + fl_print_format(f_string_format_Q_range_single_s.string, print.to, print.notable, cache->buffer_file, range, print.notable); fl_print_format("%['%S.%]%r", print.to, print.context, after, print.context, f_string_eol_s); controller_entry_print_error_cache(is_entry, print, cache->action); @@ -227,7 +227,7 @@ extern "C" { fl_print_format("%r%[%QThe %Q item setting '%]", global.main->warning.to, f_string_eol_s, global.main->warning.context, global.main->warning.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->warning.context); fl_print_format(f_string_format_Q_single_s.string, global.main->warning.to, global.main->warning.notable, cache.action.name_action, global.main->warning.notable); fl_print_format("%[' has an unknown value '%]", global.main->warning.to, global.main->warning.context, global.main->warning.context); - fl_print_format("%[%/Q%]", global.main->warning.to, global.main->warning.notable, cache.buffer_file, cache.content_actions.array[index].array[0], global.main->warning.notable); + fl_print_format(f_string_format_Q_range_single_s.string, global.main->warning.to, global.main->warning.notable, cache.buffer_file, cache.content_actions.array[index].array[0], global.main->warning.notable); fl_print_format(f_string_format_sentence_end_quote_s.string, global.main->warning.to, global.main->warning.context, global.main->warning.context, f_string_eol_s); controller_entry_print_error_cache(is_entry, global.main->warning, cache.action); diff --git a/level_3/controller/c/rule/private-rule.c b/level_3/controller/c/rule/private-rule.c index ca7a307..d8013ad 100644 --- a/level_3/controller/c/rule/private-rule.c +++ b/level_3/controller/c/rule/private-rule.c @@ -441,7 +441,7 @@ extern "C" { 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(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(f_string_format_Q_range_single_s.string, 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); fl_print_format("%[%r%]%[', '%]", global.main->error.to, global.main->error.notable, controller_freeze_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_kill_s, global.main->error.notable, global.main->error.context, global.main->error.context); @@ -481,7 +481,7 @@ extern "C" { 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(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(f_string_format_Q_range_single_s.string, 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(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); @@ -513,7 +513,7 @@ extern "C" { 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(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_Q_range_single_s.string, 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); controller_rule_print_error_cache(global.main->error, cache->action, F_true); @@ -548,7 +548,7 @@ extern "C" { controller_lock_print(global.main->error.to, global.thread); fl_print_format("%r%[%QUnknown value '%]", global.main->error.to, f_string_eol_s, global.main->error.context, global.main->error.prefix, 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_Q_range_single_s.string, global.main->error.to, global.main->error.notable, cache->buffer_item, cache->content_action.array[i], global.main->error.notable); fl_print_format("%[' for rule item action '%]%[%r%]", global.main->error.to, global.main->error.context, global.main->error.context, global.main->error.notable, controller_with_s, 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); @@ -4848,7 +4848,7 @@ extern "C" { controller_lock_print(global.main->error.to, global.thread); fl_print_format("%r%[%QRule setting has an invalid number '%]", global.main->error.to, f_string_eol_s, global.main->error.context, global.main->error.prefix, global.main->error.context); - fl_print_format("%[%/Q%]", global.main->error.to, global.main->error.notable, cache->buffer_item, cache->content_actions.array[i].array[1], global.main->error.notable); + fl_print_format(f_string_format_Q_range_single_s.string, global.main->error.to, global.main->error.notable, cache->buffer_item, cache->content_actions.array[i].array[1], global.main->error.notable); if (zero_only) { fl_print_format("%[', only%] ", global.main->error.to, global.main->error.context, global.main->error.context); @@ -4927,7 +4927,7 @@ extern "C" { controller_lock_print(global.main->error.to, global.thread); fl_print_format("%r%[%QRule setting's first value has '%]", global.main->error.to, f_string_eol_s, global.main->error.context, global.main->error.prefix, global.main->error.context); - fl_print_format("%[%/Q%]", global.main->error.to, global.main->error.notable, cache->buffer_item, cache->content_actions.array[i].array[0], global.main->error.notable); + fl_print_format(f_string_format_Q_range_single_s.string, global.main->error.to, global.main->error.notable, cache->buffer_item, cache->content_actions.array[i].array[0], global.main->error.notable); fl_print_format("%[' but only supports %r, %r, and %r.%]%r", global.main->error.to, global.main->error.context, controller_kill_s, controller_start_s, controller_stop_s, global.main->error.context, f_string_eol_s); controller_rule_print_error_cache(global.main->error, cache->action, F_false); @@ -5124,7 +5124,7 @@ extern "C" { controller_lock_print(global.main->error.to, global.thread); fl_print_format("%r%[%QRule setting has an invalid number '%]", global.main->error.to, f_string_eol_s, global.main->error.context, global.main->error.prefix, global.main->error.context); - fl_print_format("%[%/Q%]", global.main->error.to, global.main->error.notable, cache->buffer_item, cache->content_actions.array[i].array[0], global.main->error.notable); + fl_print_format(f_string_format_Q_range_single_s.string, global.main->error.to, global.main->error.notable, cache->buffer_item, cache->content_actions.array[i].array[0], global.main->error.notable); fl_print_format("%[', only the whole numbers inclusively between%] ", global.main->error.to, global.main->error.context, global.main->error.context); fl_print_format("%[-20%]", global.main->error.to, global.main->error.notable, global.main->error.notable); fl_print_format(" %[and%] ", global.main->error.to, global.main->error.context, global.main->error.context); @@ -5510,7 +5510,7 @@ extern "C" { controller_lock_print(global.main->error.to, global.thread); fl_print_format("%r%[%QRule setting's second value has '%]", global.main->error.to, f_string_eol_s, global.main->error.context, global.main->error.prefix, global.main->error.context); - fl_print_format("%[%/Q%]", global.main->error.to, global.main->error.notable, cache->buffer_item, cache->content_actions.array[i].array[1], global.main->error.notable); + fl_print_format(f_string_format_Q_range_single_s.string, global.main->error.to, global.main->error.notable, cache->buffer_item, cache->content_actions.array[i].array[1], global.main->error.notable); fl_print_format("%[' but only supports %r, %r, %r, %r, %r", global.main->error.to, global.main->error.context, controller_freeze_s, controller_kill_s, controller_pause_s, controller_reload_s, controller_restart_s); fl_print_format("%r, %r, %r, and %r.%]%r", global.main->error.to, controller_resume_s, controller_start_s, controller_stop_s, controller_thaw_s, global.main->error.context, f_string_eol_s); @@ -5559,7 +5559,7 @@ extern "C" { controller_lock_print(global.main->error.to, global.thread); fl_print_format("%r%[%QRule setting's second value has '%]", global.main->error.to, f_string_eol_s, global.main->error.context, global.main->error.prefix, global.main->error.context); - fl_print_format("%[%/Q%]", global.main->error.to, global.main->error.notable, cache->buffer_item, cache->content_actions.array[i].array[1], global.main->error.notable); + fl_print_format(f_string_format_Q_range_single_s.string, global.main->error.to, global.main->error.notable, cache->buffer_item, cache->content_actions.array[i].array[1], global.main->error.notable); fl_print_format("%[' but only supports %r, %r, and %r.%]%r", global.main->error.to, global.main->error.context, controller_need_s, controller_want_s, controller_wish_s, global.main->error.context, f_string_eol_s); controller_rule_print_error_cache(global.main->error, cache->action, F_false); diff --git a/level_3/controller/c/rule/private-rule_print.c b/level_3/controller/c/rule/private-rule_print.c index c38076c..f8e1aee 100644 --- a/level_3/controller/c/rule/private-rule_print.c +++ b/level_3/controller/c/rule/private-rule_print.c @@ -400,7 +400,7 @@ extern "C" { controller_lock_print(print.to, thread); fl_print_format("%r%[%QRule setting%S '%]", print.to, f_string_eol_s, print.context, print.prefix, before, print.context); - fl_print_format("%[%/Q%]", print.to, print.notable, cache->buffer_item, range, print.notable); + fl_print_format(f_string_format_Q_range_single_s.string, print.to, print.notable, cache->buffer_item, range, print.notable); fl_print_format("%['%S.%]%r", print.to, print.context, after, print.context, f_string_eol_s); controller_rule_print_error_cache(print, cache->action, F_false); diff --git a/level_3/fake/c/main/build/print/warning.c b/level_3/fake/c/main/build/print/warning.c index 8affa80..3ec8b46 100644 --- a/level_3/fake/c/main/build/print/warning.c +++ b/level_3/fake/c/main/build/print/warning.c @@ -25,7 +25,7 @@ extern "C" { fl_print_format("%r%[%QThe setting '%]", print->to, f_string_eol_s, print->context, print->prefix, print->context); 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(f_string_format_Q_single_s.string, print->to, print->notable, path, print->notable); fl_print_format("%[' may be either '%]", print->to, print->context, print->context); 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); @@ -59,9 +59,9 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QThe setting '%]", print->to, print->context, print->prefix, print->context); - fl_print_format("%[%Q%]", print->to, print->notable, name, print->notable); + fl_print_format(f_string_format_Q_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(f_string_format_Q_single_s.string, print->to, print->notable, path, print->notable); fl_print_format("%[' may only be one of '%]", print->to, print->context, print->context); 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); @@ -86,11 +86,11 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QThe setting '%]", print->to, print->context, print->prefix, print->context); - fl_print_format("%[%Q%]", print->to, print->notable, name, print->notable); + fl_print_format(f_string_format_Q_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(f_string_format_Q_single_s.string, print->to, print->notable, path, print->notable); fl_print_format("%[' is required, defaulting to '%]", print->to, print->context, print->context); - fl_print_format("%[%Q%]", print->to, print->notable, default_to, print->notable); + fl_print_format(f_string_format_Q_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); @@ -110,7 +110,7 @@ extern "C" { fl_print_format("%[%QThe setting '%]", print->to, f_string_eol_s, print->context, print->prefix, print->context); 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(f_string_format_Q_single_s.string, print->to, print->notable, path, print->notable); fl_print_format("%[' may only be one of '%]", print->to, print->context, print->context); 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); diff --git a/level_3/fake/c/main/make/print/error.c b/level_3/fake/c/main/make/print/error.c index 3d62d92..688b9aa 100644 --- a/level_3/fake/c/main/make/print/error.c +++ b/level_3/fake/c/main/make/print/error.c @@ -37,7 +37,7 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QThe %S%rcontent '%]", print->to, print->context, print->prefix, content, content ? f_string_space_s : f_string_empty_s, print->context); - fl_print_format("%[%Q%]", print->to, print->notable, file, print->notable); + fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, file, print->notable); fl_print_format("%[' must be a valid directory.%]%r", print->to, print->context, print->context, f_string_eol_s); f_file_stream_unlock(print->to); @@ -79,9 +79,9 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QThe fakefile '%]", print->to, print->context, print->prefix, print->context); - fl_print_format("%[%Q%]", print->to, print->notable, fakefile, print->notable); + fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, fakefile, print->notable); fl_print_format("%[' is missing the required '%]", print->to, print->context, print->context); - fl_print_format("%[%Q%]", print->to, print->notable, section, print->notable); + fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, section, print->notable); fl_print_format("%[' section.%]%r", print->to, print->context, print->context, f_string_eol_s); f_file_stream_unlock(print->to); @@ -111,7 +111,7 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QThe file '%]", print->to, print->context, print->prefix, print->context); - fl_print_format("%[%Q%]", print->to, print->notable, file, print->notable); + fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, file, print->notable); fl_print_format("%[' must be a %Q file.%]%r", print->to, print->context, print->context, type, f_string_eol_s); f_file_stream_unlock(print->to); @@ -230,7 +230,7 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QThe section operation '%]", print->to, print->context, print->prefix, print->context); - fl_print_format("%[%/Q%]", print->to, print->notable, buffer, range, print->notable); + fl_print_format(f_string_format_Q_range_single_s.string, print->to, print->notable, buffer, range, print->notable); fl_print_format("%[' is already in the operation stack, recursion is not allowed.%]%r", print->to, print->context, print->context, f_string_eol_s); f_file_stream_unlock(print->to); @@ -260,7 +260,7 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QThe number '%]", print->to, print->context, print->prefix, print->context); - fl_print_format("%[%Q%]", print->to, print->notable, number, print->notable); + fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, number, print->notable); fl_print_format("%[' may only be between the ranges -%un to %un.%]%r", print->to, print->context, minimum, maximum, print->context, f_string_eol_s); f_file_stream_unlock(print->to); @@ -356,7 +356,7 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QUnsupported %Q type '%]", print->to, print->context, print->prefix, type, print->context); - fl_print_format("%[%Q%]", print->to, print->notable, value, print->notable); + fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, value, 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/message.c b/level_3/fake/c/main/make/print/message.c index b154397..63afd00 100644 --- a/level_3/fake/c/main/make/print/message.c +++ b/level_3/fake/c/main/make/print/message.c @@ -15,14 +15,14 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[Now making using '%]", print->to, print->set->important, print->set->important); - fl_print_format("%[%Q%]", print->to, print->set->notable, fakefile, print->set->notable); + fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, fakefile, print->set->notable); if (main->setting.modes.used) { fl_print_format("%[' with modes '%]", print->to, print->set->important, print->set->important); for (f_number_unsigned_t i = 0; i < main->setting.modes.used; ) { - fl_print_format("%[%Q%]", print->to, print->set->notable, main->setting.modes.array[i], print->set->notable); + fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, main->setting.modes.array[i], print->set->notable); if (++i < main->setting.modes.used) { fl_print_format("%[', '%]", print->to, print->set->important, print->set->important); @@ -47,7 +47,7 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%r%[Processing Section '%]", print->to, f_string_eol_s, print->set->important, print->set->important); - fl_print_format("%[%/Q%]", print->to, print->set->notable, buffer, section.name, print->set->notable); + fl_print_format(f_string_format_Q_range_single_s.string, print->to, print->set->notable, buffer, section.name, print->set->notable); fl_print_format("%['.%]%r", print->to, print->set->important, print->set->important, f_string_eol_s); f_file_stream_unlock(print->to); diff --git a/level_3/fake/c/main/make/print/warning.c b/level_3/fake/c/main/make/print/warning.c index fa2efd0..41608ce 100644 --- a/level_3/fake/c/main/make/print/warning.c +++ b/level_3/fake/c/main/make/print/warning.c @@ -15,7 +15,7 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QFailed change back to original path '%]", print->to, print->context, print->prefix, print->context); - fl_print_format("%[%Q%]", print->to, print->notable, path, print->notable); + fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, path, print->notable); fl_print_format("%[', status code =%] ", print->to, print->context, print->context); fl_print_format("%[%ui%]", print->to, print->notable, main->setting.state.status, print->notable); fl_print_format("%['.%]%r", print->to, print->context, print->context, f_string_eol_s); @@ -83,11 +83,11 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QThe fakefile '%]", print->to, print->context, print->prefix, print->context); - fl_print_format("%[%Q%]", print->to, print->notable, fakefile, print->notable); + fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, fakefile, print->notable); fl_print_format("%[' has empty content for the '%]", print->to, print->context, print->context); - fl_print_format("%[%Q%]", print->to, print->notable, name, print->notable); + fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); fl_print_format("%[' object '%]", print->to, print->context, print->context); - fl_print_format("%[%/Q%]", print->to, print->notable, buffer, range, print->notable); + fl_print_format(f_string_format_Q_range_single_s.string, print->to, print->notable, buffer, range, print->notable); fl_print_format("%['.%]%r", print->to, print->context, print->context, f_string_eol_s); f_file_stream_unlock(print->to); @@ -105,13 +105,13 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QThe fakefile '%]", print->to, print->context, print->prefix, print->context); - fl_print_format("%[%Q%]", print->to, print->notable, fakefile, print->notable); + fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, fakefile, print->notable); fl_print_format("%[' has invalid content '%]", print->to, print->context, print->context); - fl_print_format("%[%/Q%]", print->to, print->notable, buffer, content, print->notable); + fl_print_format(f_string_format_Q_range_single_s.string, print->to, print->notable, buffer, content, print->notable); fl_print_format("%[' for the '%]", print->to, print->context, print->context); - fl_print_format("%[%Q%]", print->to, print->notable, name, print->notable); + fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, name, print->notable); fl_print_format("%[' object '%]", print->to, print->context, print->context); - fl_print_format("%[%/Q%]", print->to, print->notable, buffer, object, print->notable); + fl_print_format(f_string_format_Q_range_single_s.string, print->to, print->notable, buffer, object, 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/print/error.c b/level_3/fake/c/main/print/error.c index ab9f37d..d5791b8 100644 --- a/level_3/fake/c/main/print/error.c +++ b/level_3/fake/c/main/print/error.c @@ -467,9 +467,9 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QThe section operation '%]", print->to, print->context, print->prefix, print->context); - fl_print_format("%[%/Q%]", print->to, print->notable, buffer, operation_name, print->notable); + fl_print_format(f_string_format_Q_range_single_s.string, print->to, print->notable, buffer, operation_name, print->notable); fl_print_format("%[' from section '%]", print->to, print->context, print->context); - fl_print_format("%[%/Q%]", print->to, print->notable, buffer, section_name, print->notable); + fl_print_format(f_string_format_Q_range_single_s.string, print->to, print->notable, buffer, section_name, print->notable); fl_print_format("%[' on line%] ", print->to, print->context, print->context); fl_print_format("%[%un%]", print->to, print->notable, line, print->notable); fl_print_format(" %[failed.%]%r", print->to, print->context, print->context, f_string_eol_s); @@ -491,9 +491,9 @@ extern "C" { fl_print_format("%[%QThe argument '%]", print->to, print->context, print->prefix, print->context); fl_print_format(f_string_format_Q_single_s.string, print->to, print->notable, argument, print->notable); fl_print_format("%[' is not not valid and may only be one of either '%]", print->to, print->context, print->context); - fl_print_format("%[%r%]", print->to, print->notable, fake_make_operation_argument_force_s, print->notable); + fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, fake_make_operation_argument_force_s, print->notable); fl_print_format("%[' or '%]", print->to, print->context, print->context); - fl_print_format("%[%r%]", print->to, print->notable, fake_make_operation_argument_strict_s, print->notable); + fl_print_format(f_string_format_r_single_s.string, print->to, print->notable, fake_make_operation_argument_strict_s, 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); @@ -595,9 +595,9 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QThe section operation '%]", print->to, print->context, print->prefix, print->context); - fl_print_format("%[%/Q%]", print->to, print->notable, buffer, operation_name, print->notable); + fl_print_format(f_string_format_Q_range_single_s.string, print->to, print->notable, buffer, operation_name, print->notable); fl_print_format("%[' from section '%]", print->to, print->context, buffer, print->context); - fl_print_format("%[%/Q%]", print->to, print->notable, buffer, section_name, print->notable); + fl_print_format(f_string_format_Q_range_single_s.string, print->to, print->notable, buffer, section_name, print->notable); fl_print_format("%[' on line%] ", print->to, print->context, print->context); fl_print_format("%[%ul%]", print->to, print->notable, line, print->notable); fl_print_format("%[' cannot be processed because the max stack depth of%] ", print->to, print->context, print->context); @@ -628,9 +628,9 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QThe section operation '%]", print->to, print->context, print->prefix, print->context); - fl_print_format("%[%/Q%]", print->to, print->notable, buffer, operation_name, print->notable); + fl_print_format(f_string_format_Q_range_single_s.string, print->to, print->notable, buffer, operation_name, print->notable); fl_print_format("%[' from section '%]", print->to, print->context, buffer, print->context); - fl_print_format("%[%/Q%]", print->to, print->notable, buffer, section_name, print->notable); + fl_print_format(f_string_format_Q_range_single_s.string, print->to, print->notable, buffer, section_name, print->notable); fl_print_format("%[' on line%] ", print->to, print->context, print->context); fl_print_format("%[%ul%]", print->to, print->notable, line, print->notable); fl_print_format(" %[is not a known operation name.%]%r", print->to, print->context, print->context, f_string_eol_s); diff --git a/level_3/firewall/c/private-firewall.c b/level_3/firewall/c/private-firewall.c index 498a252..f8826af 100644 --- a/level_3/firewall/c/private-firewall.c +++ b/level_3/firewall/c/private-firewall.c @@ -294,7 +294,7 @@ f_status_t firewall_perform_commands(firewall_data_t * const data, firewall_loca f_file_stream_lock(data->main->warning.to); fl_print_format("%r%[%QAt line %ul, the object '%]", data->main->warning.to, f_string_eol_s, data->main->warning.context, data->main->warning.prefix, i, data->main->warning.context, data->main->warning.notable); - fl_print_format("%[%/Q%]", data->main->warning.to, data->main->warning.notable, local->buffer, local->rule_objects.array[i], data->main->warning.notable); + fl_print_format(f_string_format_Q_range_single_s.string, data->main->warning.to, data->main->warning.notable, local->buffer, local->rule_objects.array[i], data->main->warning.notable); fl_print_format("%[' is invalid.%]%r", data->main->warning.to, data->main->warning.context, data->main->warning.context, f_string_eol_s); f_file_stream_unlock(data->main->warning.to); @@ -313,9 +313,9 @@ f_status_t firewall_perform_commands(firewall_data_t * const data, firewall_loca f_file_stream_lock(data->main->warning.to); fl_print_format("%r%[%QAt line %ul, the object '%]", data->main->warning.to, f_string_eol_s, data->main->warning.context, data->main->warning.prefix, i, data->main->warning.context); - fl_print_format("%[%/Q%]", data->main->warning.to, data->main->warning.notable, local->buffer, local->rule_objects.array[i], data->main->warning.notable); + fl_print_format(f_string_format_Q_range_single_s.string, data->main->warning.to, data->main->warning.notable, local->buffer, local->rule_objects.array[i], data->main->warning.notable); fl_print_format("%[' has invalid content '%]", data->main->warning.to, data->main->warning.context, data->main->warning.context); - fl_print_format("%[%/Q%]", data->main->warning.to, data->main->warning.notable, local->buffer, local->rule_contents.array[i].array[0], data->main->warning.notable); + fl_print_format(f_string_format_Q_range_single_s.string, data->main->warning.to, data->main->warning.notable, local->buffer, local->rule_contents.array[i].array[0], data->main->warning.notable); fl_print_format(f_string_format_sentence_end_quote_s.string, data->main->warning.to, data->main->warning.context, data->main->warning.context, f_string_eol_s); f_file_stream_unlock(data->main->warning.to); @@ -519,7 +519,7 @@ f_status_t firewall_perform_commands(firewall_data_t * const data, firewall_loca f_file_stream_lock(data->main->warning.to); fl_print_format("%r%[%QAt line %ul, the object '%]", data->main->warning.to, f_string_eol_s, data->main->warning.context, data->main->warning.prefix, i, data->main->warning.context); - fl_print_format("%[%/Q%]", data->main->warning.to, data->main->warning.notable, local->buffer, local->rule_objects.array[i], data->main->warning.notable); + fl_print_format(f_string_format_Q_range_single_s.string, data->main->warning.to, data->main->warning.notable, local->buffer, local->rule_objects.array[i], data->main->warning.notable); fl_print_format("%]%[' has no content.%]%r", data->main->warning.to, data->main->warning.context, data->main->warning.context, f_string_eol_s); f_file_stream_unlock(data->main->warning.to); -- 1.8.3.1