From c01361a275681e8439b7188fd6386c4efa04fa5c Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Wed, 14 Feb 2024 22:28:10 -0600 Subject: [PATCH] Cleanup: Switch from _ui_ format string to _un_ format string to match the print format arguments. The _un_ format string is provided to directly match '%un' which is intended to directly match f_number_unsigned_t. This is intended to make things easier (and safer) to hack. That is, changing the data size of f_number_unsigned_t. The _ul_ format string is specifically intended to be an unsigned long, period. --- level_3/controller/c/rule/private-rule.c | 2 +- level_3/fake/c/main/print/error.c | 6 +++--- level_3/fss_identify/c/main/print/error.c | 4 ++-- level_3/fss_read/c/main/print/error.c | 6 +++--- level_3/utf8/c/main/print/error.c | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/level_3/controller/c/rule/private-rule.c b/level_3/controller/c/rule/private-rule.c index 6064462..e9cdb32 100644 --- a/level_3/controller/c/rule/private-rule.c +++ b/level_3/controller/c/rule/private-rule.c @@ -1887,7 +1887,7 @@ extern "C" { if (rerun_item->max) { fl_print_format(" for %[%ul%]", main->output.to, main->context.set.notable, rerun_item->count, main->context.set.notable); fl_print_format(" of %[%r%] ", main->output.to, main->context.set.notable, controller_max_s, main->context.set.notable); - fl_print_format(f_string_format_ul_single_s.string, main->output.to, main->context.set.notable, rerun_item->max, main->context.set.notable); + fl_print_format(f_string_format_un_single_s.string, main->output.to, main->context.set.notable, rerun_item->max, main->context.set.notable); fl_print_format(".%r", main->output.to, f_string_eol_s); } else { diff --git a/level_3/fake/c/main/print/error.c b/level_3/fake/c/main/print/error.c index 2b4040a..0f40312 100644 --- a/level_3/fake/c/main/print/error.c +++ b/level_3/fake/c/main/print/error.c @@ -599,9 +599,9 @@ extern "C" { fl_print_format("%[' from section '%]", print->to, print->context, buffer, print->context); 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(f_string_format_ul_single_s.string, print->to, print->notable, line, print->notable); + fl_print_format(f_string_format_un_single_s.string, 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); - fl_print_format(f_string_format_ul_single_s.string, print->to, print->notable, stack_max, print->notable); + fl_print_format(f_string_format_un_single_s.string, print->to, print->notable, stack_max, print->notable); fl_print_format(" %[has been reached.%]%r", print->to, print->context, print->context, f_string_eol_s); f_file_stream_unlock(print->to); @@ -632,7 +632,7 @@ extern "C" { fl_print_format("%[' from section '%]", print->to, print->context, buffer, print->context); 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(f_string_format_ul_single_s.string, print->to, print->notable, line, print->notable); + fl_print_format(f_string_format_un_single_s.string, 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); f_file_stream_unlock(print->to); diff --git a/level_3/fss_identify/c/main/print/error.c b/level_3/fss_identify/c/main/print/error.c index 537250d..f525e49 100644 --- a/level_3/fss_identify/c/main/print/error.c +++ b/level_3/fss_identify/c/main/print/error.c @@ -51,7 +51,7 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QEmpty string is not allowed at index%] ", print->to, print->set->error, print->prefix, print->set->error); - fl_print_format(f_string_format_ul_single_s.string, print->to, print->set->notable, index, print->set->notable); + fl_print_format(f_string_format_un_single_s.string, 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(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); @@ -73,7 +73,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, name, print->set->notable); fl_print_format("%[' at index%] ", print->to, print->set->error, print->set->error); - fl_print_format(f_string_format_ul_single_s.string, print->to, print->set->notable, index, print->set->notable); + fl_print_format(f_string_format_un_single_s.string, 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(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); diff --git a/level_3/fss_read/c/main/print/error.c b/level_3/fss_read/c/main/print/error.c index f3c2172..b0e0a24 100644 --- a/level_3/fss_read/c/main/print/error.c +++ b/level_3/fss_read/c/main/print/error.c @@ -57,9 +57,9 @@ extern "C" { fl_print_format("%[%QThe parameter '%]", print->to, print->context, print->prefix, print->context); 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(f_string_format_ul_single_s.string, print->to, print->notable, value, print->notable); + fl_print_format(f_string_format_un_single_s.string, print->to, print->notable, value, print->notable); fl_print_format("%[' before the value '%]", print->to, print->context, print->context); - fl_print_format(f_string_format_ul_single_s.string, print->to, print->notable, before, print->notable); + fl_print_format(f_string_format_un_single_s.string, print->to, print->notable, before, 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); @@ -77,7 +77,7 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QThe value '%]", print->to, print->context, print->prefix, print->context); - fl_print_format(f_string_format_ul_single_s.string, print->to, print->notable, value, print->notable); + fl_print_format(f_string_format_un_single_s.string, 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(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); diff --git a/level_3/utf8/c/main/print/error.c b/level_3/utf8/c/main/print/error.c index edbe962..83efad9 100644 --- a/level_3/utf8/c/main/print/error.c +++ b/level_3/utf8/c/main/print/error.c @@ -118,7 +118,7 @@ extern "C" { f_file_stream_lock(print->to); fl_print_format("%[%QNo file specified at parameter index%] ", print->to, print->set->error, print->prefix, print->set->error); - fl_print_format(f_string_format_ul_single_s.string, print->to, print->set->notable, index, print->set->notable); + fl_print_format(f_string_format_un_single_s.string, print->to, print->set->notable, index, 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); -- 1.8.3.1