From 35b86b935587fa0c6a0582322272f092d73d1a6a Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sat, 30 May 2020 17:42:26 -0500 Subject: [PATCH] Cleanup: make f_string_eol and f_string_placeholder a string instead of a char In the back of my mind I keep reading f_string_eol as a string. It is not. Instead, it is a character. To prevent this potential confusion, just make it a string and require the use of f_string_eol[0]. Make the same kind of change to f_string_placeholder as well. --- level_0/f_fss/c/fss.h | 2 +- level_0/f_string/c/string.h | 4 +- level_1/fl_color/c/color.c | 4 +- level_1/fl_directory/c/directory.c | 4 +- level_1/fl_directory/c/private-directory.c | 4 +- level_1/fl_fss/c/fss.c | 6 +-- level_1/fl_fss/c/fss_basic.c | 26 +++++----- level_1/fl_fss/c/fss_basic_list.c | 40 +++++++-------- level_1/fl_fss/c/fss_extended.c | 38 +++++++------- level_1/fl_fss/c/fss_extended_list.c | 52 +++++++++---------- level_1/fl_fss/c/fss_macro.h | 8 +-- level_1/fl_string/c/string.c | 16 +++--- level_2/fll_fss/c/fss_basic.c | 2 +- level_2/fll_fss/c/fss_basic_list.c | 2 +- level_2/fll_fss/c/fss_extended.c | 2 +- level_2/fll_fss/c/fss_extended_list.c | 2 +- level_2/fll_program/c/program.c | 20 ++++---- level_3/byte_dump/c/byte_dump.c | 20 ++++---- level_3/byte_dump/c/private-byte_dump.c | 12 ++--- level_3/fake/c/fake.c | 24 ++++----- level_3/fake/c/private-build.c | 24 ++++----- level_3/fake/c/private-clean.c | 4 +- level_3/fake/c/private-fake.c | 20 ++++---- level_3/fake/c/private-print.c | 60 +++++++++++----------- level_3/fake/c/private-skeleton.c | 20 ++++---- level_3/firewall/c/firewall.c | 12 ++--- .../fss_basic_list_read/c/fss_basic_list_read.c | 60 +++++++++++----------- .../c/private-fss_basic_list_read.c | 48 ++++++++--------- .../fss_basic_list_write/c/fss_basic_list_write.c | 2 +- level_3/fss_basic_read/c/fss_basic_read.c | 60 +++++++++++----------- level_3/fss_basic_read/c/private-fss_basic_read.c | 36 ++++++------- level_3/fss_basic_write/c/fss_basic_write.c | 2 +- .../c/fss_extended_list_read.c | 58 ++++++++++----------- .../c/private-fss_extended_list_read.c | 50 +++++++++--------- level_3/fss_extended_read/c/fss_extended_read.c | 60 +++++++++++----------- .../c/private-fss_extended_read.c | 48 ++++++++--------- level_3/fss_extended_write/c/fss_extended_write.c | 2 +- level_3/fss_status_code/c/fss_status_code.c | 2 +- level_3/init/c/init.c | 2 +- level_3/status_code/c/status_code.c | 2 +- 40 files changed, 430 insertions(+), 430 deletions(-) diff --git a/level_0/f_fss/c/fss.h b/level_0/f_fss/c/fss.h index fc0a755..03cebe2 100644 --- a/level_0/f_fss/c/fss.h +++ b/level_0/f_fss/c/fss.h @@ -57,7 +57,7 @@ extern "C" { #define f_fss_delimit_slash '\\' #define f_fss_delimit_single_quote '\'' #define f_fss_delimit_double_quote '"' - #define f_fss_delimit_placeholder f_string_placeholder + #define f_fss_delimit_placeholder f_string_placeholder[0] #endif //_di_f_fss_delimiters_ /** diff --git a/level_0/f_string/c/string.h b/level_0/f_string/c/string.h index 3b9f883..a672e9e 100644 --- a/level_0/f_string/c/string.h +++ b/level_0/f_string/c/string.h @@ -38,11 +38,11 @@ extern "C" { * FLL forbids '\r' and '\r\n' as end of line characters, \r will be silently ignored. */ #ifndef _di_f_string_has_eol_ - #define f_string_eol '\n' + #define f_string_eol "\n" #endif // _di_f_string_has_eol_ #ifndef _di_f_string_has_placeholder_ - #define f_string_placeholder '\0' + #define f_string_placeholder "\0" #endif // _di_f_string_has_placeholder_ #ifndef _di_string_format_pointers_ diff --git a/level_1/fl_color/c/color.c b/level_1/fl_color/c/color.c index 82dc943..ff044f3 100644 --- a/level_1/fl_color/c/color.c +++ b/level_1/fl_color/c/color.c @@ -207,7 +207,7 @@ extern "C" { } // now print the trailing newline, this is done _after_ ending the colors to avoid color wrapping issues that can happen when a color code follows a newline - fprintf(file, "%c", f_string_eol); + fprintf(file, "%c", f_string_eol[0]); return F_none; } @@ -245,7 +245,7 @@ extern "C" { } // now print the trailing newline, this is done _after_ ending the colors to avoid color wrapping issues that can happen when a color code follows a newline - fprintf(file, "%c", f_string_eol); + fprintf(file, "%c", f_string_eol[0]); return F_none; } diff --git a/level_1/fl_directory/c/directory.c b/level_1/fl_directory/c/directory.c index f651127..e548203 100644 --- a/level_1/fl_directory/c/directory.c +++ b/level_1/fl_directory/c/directory.c @@ -41,7 +41,7 @@ extern "C" { } if (verbose) { - fprintf(verbose, "Cloned '%s' to '%s'.%c", source, destination, f_string_eol); + fprintf(verbose, "Cloned '%s' to '%s'.%c", source, destination, f_string_eol[0]); } f_string_static static_source = { source, source_length, source_length }; @@ -131,7 +131,7 @@ extern "C" { } if (verbose) { - fprintf(verbose, "Copied '%s' to '%s'.%c", source, destination, f_string_eol); + fprintf(verbose, "Copied '%s' to '%s'.%c", source, destination, f_string_eol[0]); } f_string_static static_source = { source, source_length, source_length }; diff --git a/level_1/fl_directory/c/private-directory.c b/level_1/fl_directory/c/private-directory.c index 7158021..c70276d 100644 --- a/level_1/fl_directory/c/private-directory.c +++ b/level_1/fl_directory/c/private-directory.c @@ -228,7 +228,7 @@ extern "C" { } if (verbose) { - fprintf(verbose, "Cloned '%s' to '%s'.%c", source.string, destination.string, f_string_eol); + fprintf(verbose, "Cloned '%s' to '%s'.%c", source.string, destination.string, f_string_eol[0]); } return F_none; @@ -450,7 +450,7 @@ extern "C" { } if (verbose) { - fprintf(verbose, "Copied '%s' to '%s'.%c", source.string, destination.string, f_string_eol); + fprintf(verbose, "Copied '%s' to '%s'.%c", source.string, destination.string, f_string_eol[0]); } return F_none; diff --git a/level_1/fl_fss/c/fss.c b/level_1/fl_fss/c/fss.c index e3bcfdc..1529b80 100644 --- a/level_1/fl_fss/c/fss.c +++ b/level_1/fl_fss/c/fss.c @@ -297,7 +297,7 @@ extern "C" { } for (;;) { - if (buffer.string[range->start] != f_string_placeholder) { + if (buffer.string[range->start] != f_fss_delimit_placeholder) { status = f_utf_is_whitespace(buffer.string + range->start, width_max); if (status == F_false) { @@ -352,7 +352,7 @@ extern "C" { else if (F_status_is_error(status)) return status; } - if (buffer.string[range->start] == f_string_eol) return F_none_eol; + if (buffer.string[range->start] == f_string_eol[0]) return F_none_eol; width = f_macro_utf_byte_width_is(buffer.string[range->start]); @@ -408,7 +408,7 @@ extern "C" { } for (;;) { - if (buffer.string[range->start] != f_string_placeholder) { + if (buffer.string[range->start] != f_fss_delimit_placeholder) { status = f_utf_is_graph(buffer.string + range->start, width_max); if (status == F_true) { diff --git a/level_1/fl_fss/c/fss_basic.c b/level_1/fl_fss/c/fss_basic.c index db4bc4f..04e9ca5 100644 --- a/level_1/fl_fss/c/fss_basic.c +++ b/level_1/fl_fss/c/fss_basic.c @@ -137,7 +137,7 @@ extern "C" { fl_macro_fss_apply_delimit_placeholders((*buffer), delimits); - if (buffer->string[location->start] == f_string_eol) { + if (buffer->string[location->start] == f_string_eol[0]) { location->start++; return FL_fss_found_object_content_not; } @@ -217,7 +217,7 @@ extern "C" { fl_macro_fss_object_delimited_return_on_overflow((*buffer), (*location), (*found), delimits, F_none_eos, F_none_stop) if ((status = fl_fss_is_graph(*buffer, *location)) == F_true) { - while (location->start < buffer->used && location->start <= location->stop && buffer->string[location->start] != f_string_eol) { + while (location->start < buffer->used && location->start <= location->stop && buffer->string[location->start] != f_string_eol[0]) { status = fl_fss_increment_buffer(*buffer, location, 1); if (F_status_is_error(status)) return status; } // while @@ -244,7 +244,7 @@ extern "C" { return status; } - else if (buffer->string[location->start] == f_string_eol) { + else if (buffer->string[location->start] == f_string_eol[0]) { fl_macro_fss_apply_delimit_placeholders((*buffer), delimits); found->stop = length - 1; @@ -296,7 +296,7 @@ extern "C" { if (F_status_is_error(status)) return status; while (location->start <= location->stop && location->start < buffer->used) { - if (buffer->string[location->start] == f_string_eol) { + if (buffer->string[location->start] == f_string_eol[0]) { fl_macro_fss_apply_delimit_placeholders((*buffer), delimits); location->start++; @@ -314,7 +314,7 @@ extern "C" { return status; } else if (buffer->string[location->start] != f_fss_delimit_placeholder) { - while (location->start < buffer->used && location->start <= location->stop && buffer->string[location->start] != f_string_eol) { + while (location->start < buffer->used && location->start <= location->stop && buffer->string[location->start] != f_string_eol[0]) { status = fl_fss_increment_buffer(*buffer, location, 1); if (F_status_is_error(status)) return status; @@ -337,7 +337,7 @@ extern "C" { fl_macro_fss_object_delimited_return_on_overflow((*buffer), (*location), (*found), delimits, F_none_eos, F_none_stop) } - else if (buffer->string[location->start] == f_string_eol) { + else if (buffer->string[location->start] == f_string_eol[0]) { f_macro_string_lengths_delete_simple(delimits); location->start++; @@ -352,7 +352,7 @@ extern "C" { } // seek to the end of the line when no valid object is found - while (location->start < buffer->used && location->start <= location->stop && buffer->string[location->start] != f_string_eol) { + while (location->start < buffer->used && location->start <= location->stop && buffer->string[location->start] != f_string_eol[0]) { status = fl_fss_increment_buffer(*buffer, location, 1); if (F_status_is_error(status)) return status; } // while @@ -389,7 +389,7 @@ extern "C" { fl_macro_fss_content_return_on_overflow((*buffer), (*location), (*found), delimits, F_none_eos, F_none_stop) // return found nothing if this line only contains whitespace and delimit placeholders - if (buffer->string[location->start] == f_string_eol) { + if (buffer->string[location->start] == f_string_eol[0]) { location->start++; return FL_fss_found_content_not; } @@ -517,7 +517,7 @@ extern "C" { continue; } - else if (object.string[location->start] == f_string_eol) { + else if (object.string[location->start] == f_string_eol[0]) { if (quoted) { buffer->string[buffer_position.stop] = f_fss_delimit_double_quote; buffer_position.stop++; @@ -606,7 +606,7 @@ extern "C" { continue; } - else if (object.string[location->start] == f_string_eol) { + else if (object.string[location->start] == f_string_eol[0]) { buffer->string[buffer_position.stop] = f_fss_delimit_double_quote; buffer_position.stop++; @@ -682,8 +682,8 @@ extern "C" { } while (location->start <= location->stop && location->start < content.used) { - if (content.string[location->start] == f_string_eol) { - buffer->string[buffer_position.stop] = f_string_eol; + if (content.string[location->start] == f_string_eol[0]) { + buffer->string[buffer_position.stop] = f_string_eol[0]; buffer->used = buffer_position.stop + 1; return F_none_eos; } @@ -697,7 +697,7 @@ extern "C" { if (F_status_is_error(status)) return status; } // while - buffer->string[buffer_position.stop] = f_string_eol; + buffer->string[buffer_position.stop] = f_string_eol[0]; buffer->used = buffer_position.stop + 1; if (location->start > location->stop) { diff --git a/level_1/fl_fss/c/fss_basic_list.c b/level_1/fl_fss/c/fss_basic_list.c index 1a47513..9aebd6c 100644 --- a/level_1/fl_fss/c/fss_basic_list.c +++ b/level_1/fl_fss/c/fss_basic_list.c @@ -25,7 +25,7 @@ extern "C" { fl_macro_fss_object_return_on_overflow((*buffer), (*location), (*found), delimits, F_data_not_eos, F_data_not_stop) // return found nothing if this line only contains whitespace and delimit placeholders. - if (buffer->string[location->start] == f_string_eol) { + if (buffer->string[location->start] == f_string_eol[0]) { location->start++; return FL_fss_found_object_not; } @@ -44,7 +44,7 @@ extern "C" { } // identify where the object ends. - while (location->start < buffer->used && location->start <= location->stop && buffer->string[location->start] != f_string_eol) { + while (location->start < buffer->used && location->start <= location->stop && buffer->string[location->start] != f_string_eol[0]) { if (buffer->string[location->start] == f_fss_delimit_slash) { f_string_length first_slash = location->start; f_string_length slash_count = 1; @@ -70,7 +70,7 @@ extern "C" { if (F_status_is_error(status)) return status; while (location->start < buffer->used && location->start <= location->stop) { - if (buffer->string[location->start] == f_string_eol || (status = fl_fss_is_graph(*buffer, *location)) == F_true) { + if (buffer->string[location->start] == f_string_eol[0] || (status = fl_fss_is_graph(*buffer, *location)) == F_true) { break; } @@ -82,7 +82,7 @@ extern "C" { fl_macro_fss_object_return_on_overflow((*buffer), (*location), (*found), delimits, F_data_not_eos, F_data_not_stop) - if (buffer->string[location->start] == f_string_eol) { + if (buffer->string[location->start] == f_string_eol[0]) { f_string_length start = location->start; location->start = first_slash; @@ -133,7 +133,7 @@ extern "C" { if (F_status_is_error(status)) return status; while (location->start < buffer->used && location->start <= location->stop) { - if (buffer->string[location->start] == f_string_eol || (status = fl_fss_is_graph(*buffer, *location)) == F_true) { + if (buffer->string[location->start] == f_string_eol[0] || (status = fl_fss_is_graph(*buffer, *location)) == F_true) { break; } @@ -145,7 +145,7 @@ extern "C" { fl_macro_fss_object_delimited_return_on_overflow((*buffer), (*location), (*found), delimits, F_none_eos, F_none_stop) - if (buffer->string[location->start] == f_string_eol) { + if (buffer->string[location->start] == f_string_eol[0]) { fl_macro_fss_apply_delimit_placeholders((*buffer), delimits); found->stop = stop_point; @@ -164,7 +164,7 @@ extern "C" { } // while // seek to the end of the line when no valid object is found. - while (location->start < buffer->used && location->start <= location->stop && buffer->string[location->start] != f_string_eol) { + while (location->start < buffer->used && location->start <= location->stop && buffer->string[location->start] != f_string_eol[0]) { status = fl_fss_increment_buffer(*buffer, location, 1); if (F_status_is_error(status)) return status; } // while @@ -206,7 +206,7 @@ extern "C" { // identify where the content ends. while (location->start < buffer->used && location->start <= location->stop) { - if (buffer->string[location->start] == f_string_eol) { + if (buffer->string[location->start] == f_string_eol[0]) { found_newline = F_true; last_newline = location->start; @@ -248,7 +248,7 @@ extern "C" { if (F_status_is_error(status)) return status; while (location->start < buffer->used && location->start <= location->stop) { - if (buffer->string[location->start] == f_string_eol || (status = fl_fss_is_graph(*buffer, *location)) == F_true) { + if (buffer->string[location->start] == f_string_eol[0] || (status = fl_fss_is_graph(*buffer, *location)) == F_true) { break; } @@ -265,7 +265,7 @@ extern "C" { fl_macro_fss_content_return_on_overflow((*buffer), (*location), (*found), delimits, F_data_not_eos, F_data_not_stop) } - if (buffer->string[location->start] == f_string_eol) { + if (buffer->string[location->start] == f_string_eol[0]) { f_string_length start = location->start; location->start = first_slash; @@ -319,7 +319,7 @@ extern "C" { if (F_status_is_error(status)) return status; while (location->start < buffer->used && location->start <= location->stop) { - if (buffer->string[location->start] == f_string_eol || (status = fl_fss_is_graph(*buffer, *location)) == F_true) { + if (buffer->string[location->start] == f_string_eol[0] || (status = fl_fss_is_graph(*buffer, *location)) == F_true) { break; } @@ -336,7 +336,7 @@ extern "C" { fl_macro_fss_content_return_on_overflow((*buffer), (*location), (*found), delimits, F_data_not_eos, F_data_not_stop) } - if (buffer->string[location->start] == f_string_eol) { + if (buffer->string[location->start] == f_string_eol[0]) { if (found_newline) { fl_macro_fss_apply_delimit_placeholders((*buffer), delimits); @@ -483,7 +483,7 @@ extern "C" { break; } } - else if (object.string[location->start] == f_string_eol) { + else if (object.string[location->start] == f_string_eol[0]) { if (buffer_position.stop == buffer_position.start) { return F_data_not_eol; } @@ -501,7 +501,7 @@ extern "C" { } // while buffer->string[buffer_position.stop] = f_fss_basic_list_open; - buffer->string[buffer_position.stop + 1] = f_string_eol; + buffer->string[buffer_position.stop + 1] = f_string_eol[0]; buffer->used = buffer_position.stop + 2; if (location->start > location->stop) { @@ -590,7 +590,7 @@ extern "C" { if (F_status_is_error(status)) return status; while (location->start < content.used && location->start <= location->stop) { - if (content.string[location->start] == f_string_eol || (status = fl_fss_is_graph(content, *location)) == F_true) { + if (content.string[location->start] == f_string_eol[0] || (status = fl_fss_is_graph(content, *location)) == F_true) { break; } @@ -600,7 +600,7 @@ extern "C" { if (F_status_is_error(status)) return status; } // while - if (content.string[location->start] == f_string_eol || location->start >= content.used || location->start > location->stop) { + if (content.string[location->start] == f_string_eol[0] || location->start >= content.used || location->start > location->stop) { pre_allocate_size += slash_count + 1; if (pre_allocate_size > buffer->size) { @@ -636,7 +636,7 @@ extern "C" { if (F_status_is_error(status)) return status; while (location->start < content.used && location->start <= location->stop) { - if (content.string[location->start] == f_string_eol || (status = fl_fss_is_graph(content, *location)) == F_true) { + if (content.string[location->start] == f_string_eol[0] || (status = fl_fss_is_graph(content, *location)) == F_true) { break; } @@ -646,7 +646,7 @@ extern "C" { if (F_status_is_error(status)) return status; } // while - if (content.string[location->start] == f_string_eol || location->start >= content.used || location->start > location->stop) { + if (content.string[location->start] == f_string_eol[0] || location->start >= content.used || location->start > location->stop) { pre_allocate_size++; if (pre_allocate_size > buffer->size) { @@ -669,7 +669,7 @@ extern "C" { else if (content.string[location->start] == f_fss_comment && !has_graph) { is_comment = F_true; } - else if (content.string[location->start] == f_string_eol) { + else if (content.string[location->start] == f_string_eol[0]) { has_graph = F_false; is_comment = F_false; } @@ -699,7 +699,7 @@ extern "C" { if (F_status_is_error(status)) return status; } // while - buffer->string[buffer_position.stop] = f_string_eol; + buffer->string[buffer_position.stop] = f_string_eol[0]; buffer->used = buffer_position.stop + 1; if (location->start > location->stop) { diff --git a/level_1/fl_fss/c/fss_extended.c b/level_1/fl_fss/c/fss_extended.c index 07e1e95..e637f4c 100644 --- a/level_1/fl_fss/c/fss_extended.c +++ b/level_1/fl_fss/c/fss_extended.c @@ -142,7 +142,7 @@ extern "C" { fl_macro_fss_apply_delimit_placeholders((*buffer), delimits); - if (buffer->string[location->start] == f_string_eol) { + if (buffer->string[location->start] == f_string_eol[0]) { location->start++; return FL_fss_found_object_content_not; } @@ -219,7 +219,7 @@ extern "C" { fl_macro_fss_object_return_on_overflow((*buffer), (*location), (*found), delimits, F_status_is_warning(F_unterminated_group_eos), F_status_is_warning(F_unterminated_group_stop)) if ((status = fl_fss_is_graph(*buffer, *location)) == F_true) { - while (location->start < buffer->used && location->start <= location->stop && buffer->string[location->start] != f_string_eol) { + while (location->start < buffer->used && location->start <= location->stop && buffer->string[location->start] != f_string_eol[0]) { status = fl_fss_increment_buffer(*buffer, location, 1); if (F_status_is_error(status)) return status; } // while @@ -244,7 +244,7 @@ extern "C" { return status; } - else if (buffer->string[location->start] == f_string_eol) { + else if (buffer->string[location->start] == f_string_eol[0]) { fl_macro_fss_apply_delimit_placeholders((*buffer), delimits); found->stop = length - 1; @@ -296,7 +296,7 @@ extern "C" { if (F_status_is_error(status)) return status; while (location->start <= location->stop && location->start < buffer->used) { - if (buffer->string[location->start] == f_string_eol) { + if (buffer->string[location->start] == f_string_eol[0]) { fl_macro_fss_apply_delimit_placeholders((*buffer), delimits); location->start++; @@ -314,7 +314,7 @@ extern "C" { return status; } else if (buffer->string[location->start] != f_fss_delimit_placeholder) { - while (location->start < buffer->used && location->start <= location->stop && buffer->string[location->start] != f_string_eol) { + while (location->start < buffer->used && location->start <= location->stop && buffer->string[location->start] != f_string_eol[0]) { status = fl_fss_increment_buffer(*buffer, location, 1); if (F_status_is_error(status)) return status; } // while @@ -333,7 +333,7 @@ extern "C" { fl_macro_fss_object_delimited_return_on_overflow((*buffer), (*location), (*found), delimits, F_none_eos, F_none_stop) } - else if (buffer->string[location->start] == f_string_eol) { + else if (buffer->string[location->start] == f_string_eol[0]) { location->start++; return FL_fss_found_object_not; } @@ -346,7 +346,7 @@ extern "C" { } // seek to the end of the line when no valid object is found - while (location->start < buffer->used && location->start <= location->stop && buffer->string[location->start] != f_string_eol) { + while (location->start < buffer->used && location->start <= location->stop && buffer->string[location->start] != f_string_eol[0]) { status = fl_fss_increment_buffer(*buffer, location, 1); if (F_status_is_error(status)) return status; } // while @@ -436,7 +436,7 @@ extern "C" { found->used++; - if (buffer->string[location->start] == f_string_eol) { + if (buffer->string[location->start] == f_string_eol[0]) { fl_macro_fss_apply_delimit_placeholders((*buffer), delimits); return FL_fss_found_content; @@ -517,7 +517,7 @@ extern "C" { found->array[found->used].stop = location->start - 1; found->used++; - if (buffer->string[location->start] == f_string_eol) { + if (buffer->string[location->start] == f_string_eol[0]) { fl_macro_fss_apply_delimit_placeholders((*buffer), delimits); location->start++; @@ -595,7 +595,7 @@ extern "C" { fl_macro_fss_content_delimited_return_on_overflow((*buffer), (*location), (*found), delimits, F_none_eos, F_none_stop) if ((status = fl_fss_is_graph(*buffer, *location)) == F_true) { - while (location->start < buffer->used && location->start <= location->stop && buffer->string[location->start] != f_string_eol) { + while (location->start < buffer->used && location->start <= location->stop && buffer->string[location->start] != f_string_eol[0]) { status = fl_fss_increment_buffer(*buffer, location, 1); if (F_status_is_error(status)) return status; } // while @@ -620,7 +620,7 @@ extern "C" { return status; } - else if (buffer->string[location->start] == f_string_eol) { + else if (buffer->string[location->start] == f_string_eol[0]) { fl_macro_fss_apply_delimit_placeholders((*buffer), delimits); found->array[found->used].stop = length - 1; @@ -673,7 +673,7 @@ extern "C" { while (location->start <= location->stop && location->start < buffer->used) { - if (buffer->string[location->start] == f_string_eol) { + if (buffer->string[location->start] == f_string_eol[0]) { fl_macro_fss_apply_delimit_placeholders((*buffer), delimits); location->start++; @@ -692,7 +692,7 @@ extern "C" { return status; } else if (buffer->string[location->start] != f_fss_delimit_placeholder) { - while (location->start < buffer->used && location->start <= location->stop && buffer->string[location->start] != f_string_eol) { + while (location->start < buffer->used && location->start <= location->stop && buffer->string[location->start] != f_string_eol[0]) { status = fl_fss_increment_buffer(*buffer, location, 1); if (F_status_is_error(status)) return status; } // while @@ -715,7 +715,7 @@ extern "C" { fl_macro_fss_content_delimited_return_on_overflow((*buffer), (*location), (*found), delimits, F_none_eos, F_none_stop) } - else if (buffer->string[location->start] == f_string_eol) { + else if (buffer->string[location->start] == f_string_eol[0]) { if (found->used == already_used) { location->start++; @@ -753,7 +753,7 @@ extern "C" { fl_macro_fss_content_delimited_return_on_overflow((*buffer), (*location), (*found), delimits, F_none_eos, F_none_stop) // seek to the end of the line when no valid content is found - while (location->start < buffer->used && location->start <= location->stop && buffer->string[location->start] != f_string_eol) { + while (location->start < buffer->used && location->start <= location->stop && buffer->string[location->start] != f_string_eol[0]) { status = fl_fss_increment_buffer(*buffer, location, 1); if (F_status_is_error(status)) return status; } // while @@ -874,7 +874,7 @@ extern "C" { continue; } - else if (object.string[location->start] == f_string_eol) { + else if (object.string[location->start] == f_string_eol[0]) { if (quoted) { buffer->string[buffer_position.stop] = f_fss_delimit_double_quote; buffer_position.stop++; @@ -981,7 +981,7 @@ extern "C" { continue; } - else if (object.string[location->start] == f_string_eol) { + else if (object.string[location->start] == f_string_eol[0]) { buffer->string[buffer_position.stop] = f_fss_delimit_double_quote; buffer_position.stop++; @@ -1141,7 +1141,7 @@ extern "C" { } while (location->start <= location->stop && location->start < content.used) { - if (content.string[location->start] == f_string_eol) { + if (content.string[location->start] == f_string_eol[0]) { buffer->string[buffer_position.stop] = ' '; buffer->used = buffer_position.stop + 1; return F_none_eol; @@ -1247,7 +1247,7 @@ extern "C" { buffer->string[buffer_position.stop + 1] = quoted; buffer_position.stop += 2; } - else if (content.string[location->start] == f_string_eol) { + else if (content.string[location->start] == f_string_eol[0]) { buffer->string[buffer_position.stop] = quoted; buffer->string[buffer_position.stop + 1] = ' '; buffer->used = buffer_position.stop + 2; diff --git a/level_1/fl_fss/c/fss_extended_list.c b/level_1/fl_fss/c/fss_extended_list.c index 24fa215..39bbf5c 100644 --- a/level_1/fl_fss/c/fss_extended_list.c +++ b/level_1/fl_fss/c/fss_extended_list.c @@ -25,7 +25,7 @@ extern "C" { fl_macro_fss_object_return_on_overflow((*buffer), (*location), (*found), delimits, F_data_not_eos, F_data_not_stop) // return found nothing if this line only contains whitespace and delimit placeholders. - if (buffer->string[location->start] == f_string_eol) { + if (buffer->string[location->start] == f_string_eol[0]) { status = fl_fss_increment_buffer(*buffer, location, 1); if (F_status_is_error(status)) return status; @@ -46,7 +46,7 @@ extern "C" { } // identify where the object ends. - while (location->start < buffer->used && location->start <= location->stop && buffer->string[location->start] != f_string_eol) { + while (location->start < buffer->used && location->start <= location->stop && buffer->string[location->start] != f_string_eol[0]) { if (buffer->string[location->start] == f_fss_delimit_slash) { f_string_length first_slash = location->start; f_string_length slash_count = 1; @@ -72,7 +72,7 @@ extern "C" { if (F_status_is_error(status)) return status; while (location->start < buffer->used && location->start <= location->stop) { - if (buffer->string[location->start] == f_string_eol || (status = fl_fss_is_graph(*buffer, *location)) == F_true) { + if (buffer->string[location->start] == f_string_eol[0] || (status = fl_fss_is_graph(*buffer, *location)) == F_true) { break; } @@ -84,7 +84,7 @@ extern "C" { fl_macro_fss_object_return_on_overflow((*buffer), (*location), (*found), delimits, F_data_not_eos, F_data_not_stop) - if (buffer->string[location->start] == f_string_eol) { + if (buffer->string[location->start] == f_string_eol[0]) { f_string_length start = location->start; location->start = first_slash; @@ -135,7 +135,7 @@ extern "C" { if (F_status_is_error(status)) return status; while (location->start < buffer->used && location->start <= location->stop) { - if (buffer->string[location->start] == f_string_eol || (status = fl_fss_is_graph(*buffer, *location)) == F_true) { + if (buffer->string[location->start] == f_string_eol[0] || (status = fl_fss_is_graph(*buffer, *location)) == F_true) { break; } @@ -147,7 +147,7 @@ extern "C" { fl_macro_fss_object_delimited_return_on_overflow((*buffer), (*location), (*found), delimits, F_none_eos, F_none_stop) - if (buffer->string[location->start] == f_string_eol) { + if (buffer->string[location->start] == f_string_eol[0]) { fl_macro_fss_apply_delimit_placeholders((*buffer), delimits); found->stop = stop_point; @@ -166,7 +166,7 @@ extern "C" { } // while // seek to the end of the line when no valid object is found. - while (location->start < buffer->used && location->start <= location->stop && buffer->string[location->start] != f_string_eol) { + while (location->start < buffer->used && location->start <= location->stop && buffer->string[location->start] != f_string_eol[0]) { status = fl_fss_increment_buffer(*buffer, location, 1); if (F_status_is_error(status)) return status; } // while @@ -237,7 +237,7 @@ extern "C" { positions_start.used = 1; while (location->start < buffer->used && location->start <= location->stop) { - if (buffer->string[location->start] == f_string_eol) { + if (buffer->string[location->start] == f_string_eol[0]) { last_newline = location->start; position_previous = location->start; location->start++; @@ -298,7 +298,7 @@ extern "C" { // Only the first slash before a close is delimited, all others are maintained. // for example '}' = valid close, '\}' represents '}', '\\}' represents '\}', '\\\}' represents '\\}', '\\\\}' represents '\\\}', and so on.. // When slash is odd and a (delimited) valid open/close is found, then save delimited positions and continue. - if (buffer->string[location->start] == f_string_eol) { + if (buffer->string[location->start] == f_string_eol[0]) { last_newline = location->start; position_previous = location->start; location->start++; @@ -316,7 +316,7 @@ extern "C" { location->start++; while (location->start < buffer->used && location->start <= location->stop) { - if (buffer->string[location->start] == f_string_eol) { + if (buffer->string[location->start] == f_string_eol[0]) { last_newline = location->start; line_start = location->start + 1; break; @@ -353,7 +353,7 @@ extern "C" { } // this is a valid object open/close that has been delimited, save the slash delimit positions. - if (buffer->string[location->start] == f_string_eol) { + if (buffer->string[location->start] == f_string_eol[0]) { last_newline = location->start; line_start = location->start + 1; @@ -462,7 +462,7 @@ extern "C" { while (location->start < buffer->used && location->start <= location->stop) { - if (buffer->string[location->start] == f_string_eol) { + if (buffer->string[location->start] == f_string_eol[0]) { break; } @@ -496,7 +496,7 @@ extern "C" { fl_macro_fss_nest_return_on_overflow((*buffer), (*location), (*found), delimits, positions_start, objects, F_data_not_eos, F_data_not_stop) } - if (buffer->string[location->start] == f_string_eol) { + if (buffer->string[location->start] == f_string_eol[0]) { depth++; if (depth >= positions_start.size) { @@ -536,7 +536,7 @@ extern "C" { // No valid object open found, seek until EOL. else { while (location->start < buffer->used && location->start <= location->stop) { - if (buffer->string[location->start] == f_string_eol) { + if (buffer->string[location->start] == f_string_eol[0]) { last_newline = location->start; line_start = location->start + 1; break; @@ -573,7 +573,7 @@ extern "C" { return status; } - if (buffer->string[location->start] == f_string_eol) { + if (buffer->string[location->start] == f_string_eol[0]) { break; } @@ -597,7 +597,7 @@ extern "C" { fl_macro_fss_nest_return_on_overflow((*buffer), (*location), (*found), delimits, positions_start, objects, F_data_not_eos, F_data_not_stop) } - if (buffer->string[location->start] == f_string_eol) { + if (buffer->string[location->start] == f_string_eol[0]) { if (depth + 1 >= found->size) { f_macro_fss_nest_resize(status, (*found), found->size + f_fss_default_allocation_step); @@ -682,7 +682,7 @@ extern "C" { // No valid object close found, seek until EOL. else { while (location->start < buffer->used && location->start <= location->stop) { - if (buffer->string[location->start] == f_string_eol) { + if (buffer->string[location->start] == f_string_eol[0]) { last_newline = location->start; line_start = location->start + 1; break; @@ -707,7 +707,7 @@ extern "C" { } } } - else if (buffer->string[location->start] != f_string_eol) { + else if (buffer->string[location->start] != f_string_eol[0]) { position_previous = location->start; status = fl_fss_increment_buffer(*buffer, location, 1); if (F_status_is_error(status)) { @@ -870,7 +870,7 @@ extern "C" { break; } } - else if (object.string[location->start] == f_string_eol) { + else if (object.string[location->start] == f_string_eol[0]) { if (buffer_position.stop == buffer_position.start) { return F_data_not_eol; } @@ -888,7 +888,7 @@ extern "C" { } // while buffer->string[buffer_position.stop] = f_fss_extended_list_open; - buffer->string[buffer_position.stop + 1] = f_string_eol; + buffer->string[buffer_position.stop + 1] = f_string_eol[0]; buffer->used = buffer_position.stop + 2; if (location->start > location->stop) { @@ -979,7 +979,7 @@ extern "C" { if (F_status_is_error(status)) return status; while (location->start < content.used && location->start <= location->stop) { - if (content.string[location->start] == f_string_eol || (status = fl_fss_is_graph(content, *location)) == F_true) { + if (content.string[location->start] == f_string_eol[0] || (status = fl_fss_is_graph(content, *location)) == F_true) { break; } @@ -989,7 +989,7 @@ extern "C" { if (F_status_is_error(status)) return status; } // while - if (content.string[location->start] == f_string_eol || location->start >= content.used || location->start > location->stop) { + if (content.string[location->start] == f_string_eol[0] || location->start >= content.used || location->start > location->stop) { pre_allocate_size += slash_count + 1; if (pre_allocate_size > buffer->size) { @@ -1025,7 +1025,7 @@ extern "C" { if (F_status_is_error(status)) return status; while (location->start < content.used && location->start <= location->stop) { - if (content.string[location->start] == f_string_eol || (status = fl_fss_is_graph(content, *location)) == F_true) { + if (content.string[location->start] == f_string_eol[0] || (status = fl_fss_is_graph(content, *location)) == F_true) { break; } @@ -1035,7 +1035,7 @@ extern "C" { if (F_status_is_error(status)) return status; } // while - if (content.string[location->start] == f_string_eol || location->start >= content.used || location->start > location->stop) { + if (content.string[location->start] == f_string_eol[0] || location->start >= content.used || location->start > location->stop) { pre_allocate_size++; if (pre_allocate_size > buffer->size) { @@ -1058,7 +1058,7 @@ extern "C" { else if (content.string[location->start] == f_fss_comment && !has_graph) { is_comment = F_true; } - else if (content.string[location->start] == f_string_eol) { + else if (content.string[location->start] == f_string_eol[0]) { has_graph = F_false; is_comment = F_false; } @@ -1088,7 +1088,7 @@ extern "C" { if (F_status_is_error(status)) return status; } // while - buffer->string[buffer_position.stop] = f_string_eol; + buffer->string[buffer_position.stop] = f_string_eol[0]; buffer->used = buffer_position.stop + 1; if (location->start > location->stop) { diff --git a/level_1/fl_fss/c/fss_macro.h b/level_1/fl_fss/c/fss_macro.h index 5486e25..ea9ccad 100644 --- a/level_1/fl_fss/c/fss_macro.h +++ b/level_1/fl_fss/c/fss_macro.h @@ -209,7 +209,7 @@ extern "C" { #ifndef _di_fl_macro_fss_object_seek_till_newline_ #define fl_macro_fss_object_seek_till_newline(buffer, location, delimits, eos_status, stop_status) \ - while (buffer.string[location.start] != f_string_eol) { \ + while (buffer.string[location.start] != f_string_eol[0]) { \ location.start++; \ if (location.start >= buffer.used) { \ f_status macro_allocation_status = F_none; \ @@ -228,7 +228,7 @@ extern "C" { #ifndef _di_fl_macro_fss_object_delimited_seek_till_newline_ #define fl_macro_fss_object_delimited_seek_till_newline(buffer, location, delimits, eos_status, stop_status) \ - while (buffer.string[location.start] != f_string_eol) { \ + while (buffer.string[location.start] != f_string_eol[0]) { \ location.start++; \ if (location.start >= buffer.used) { \ f_status macro_allocation_status = F_none; \ @@ -259,7 +259,7 @@ extern "C" { #ifndef _di_fl_macro_fss_content_seek_till_newline_ #define fl_macro_fss_content_seek_till_newline(buffer, location, found, delimits, eos_status, stop_status) \ - while (buffer.string[location.start] != f_string_eol) { \ + while (buffer.string[location.start] != f_string_eol[0]) { \ location.start++; \ if (location.start >= buffer.used) { \ f_status macro_allocation_status = F_none; \ @@ -280,7 +280,7 @@ extern "C" { #ifndef _di_fl_macro_fss_content_delimited_seek_till_newline_ #define fl_macro_fss_content_delimited_seek_till_newline(buffer, location, found, delimits, eos_status, stop_status) \ - while (buffer.string[location.start] != f_string_eol) { \ + while (buffer.string[location.start] != f_string_eol[0]) { \ location.start++; \ if (location.start >= buffer.used) { \ f_status macro_allocation_status = F_none; \ diff --git a/level_1/fl_string/c/string.c b/level_1/fl_string/c/string.c index d4eeb4a..7b2614f 100644 --- a/level_1/fl_string/c/string.c +++ b/level_1/fl_string/c/string.c @@ -765,7 +765,7 @@ extern "C" { if (range->start > range->stop) return F_none_stop; while (buffer.string[range->start] != seek_to_this) { - if (buffer.string[range->start] == f_string_eol) return F_none_eol; + if (buffer.string[range->start] == f_string_eol[0]) return F_none_eol; range->start++; @@ -808,7 +808,7 @@ extern "C" { if (width == 0) { width = 1; - if (buffer.string[range->start] == f_string_eol) return F_none_eol; + if (buffer.string[range->start] == f_string_eol[0]) return F_none_eol; if (seek_width == width) { if (buffer.string[range->start] == seek_to_this) return F_none; @@ -862,7 +862,7 @@ extern "C" { while (buffer.string[range->start] == placeholder || (status = f_utf_is_graph(buffer.string + range->start, width_max)) == F_false) { if (F_status_is_error(status)) return status; - if (buffer.string[range->start] == f_string_eol) return F_none_eol; + if (buffer.string[range->start] == f_string_eol[0]) return F_none_eol; width = f_macro_utf_byte_width_is(buffer.string[range->start]); @@ -918,7 +918,7 @@ extern "C" { while (buffer.string[range->start] == placeholder || (status = f_utf_is_whitespace(buffer.string + range->start, width_max)) == F_false) { if (F_status_is_error(status)) return status; - if (buffer.string[range->start] == f_string_eol) return F_none_eol; + if (buffer.string[range->start] == f_string_eol[0]) return F_none_eol; width = f_macro_utf_byte_width_is(buffer.string[range->start]); @@ -1315,7 +1315,7 @@ extern "C" { if (range->start > range->stop) return F_none_stop; while (string[range->start] != seek_to_this) { - if (string[range->start] == f_string_eol) return F_none_eol; + if (string[range->start] == f_string_eol[0]) return F_none_eol; range->start++; @@ -1350,7 +1350,7 @@ extern "C" { if (width == 0) { width = 1; - if (string[range->start] == f_string_eol) return F_none_eol; + if (string[range->start] == f_string_eol[0]) return F_none_eol; if (seek_width == width) { if (string[range->start] == seek_to_this) return F_none; @@ -1392,7 +1392,7 @@ extern "C" { while (string[range->start] == placeholder || (status = f_utf_is_graph(string + range->start, width_max)) == F_false) { if (F_status_is_error(status)) return status; - if (string[range->start] == f_string_eol) return F_none_eol; + if (string[range->start] == f_string_eol[0]) return F_none_eol; width = f_macro_utf_byte_width_is(string[range->start]); @@ -1438,7 +1438,7 @@ extern "C" { return status; } - if (string[range->start] == f_string_eol) return F_none_eol; + if (string[range->start] == f_string_eol[0]) return F_none_eol; width = f_macro_utf_byte_width_is(string[range->start]); diff --git a/level_2/fll_fss/c/fss_basic.c b/level_2/fll_fss/c/fss_basic.c index c8169d1..89f045c 100644 --- a/level_2/fll_fss/c/fss_basic.c +++ b/level_2/fll_fss/c/fss_basic.c @@ -178,7 +178,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - buffer->string[buffer->used] = f_string_eol; + buffer->string[buffer->used] = f_string_eol[0]; buffer->used++; } } diff --git a/level_2/fll_fss/c/fss_basic_list.c b/level_2/fll_fss/c/fss_basic_list.c index 18942f5..988dcf7 100644 --- a/level_2/fll_fss/c/fss_basic_list.c +++ b/level_2/fll_fss/c/fss_basic_list.c @@ -178,7 +178,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - buffer->string[buffer->used] = f_string_eol; + buffer->string[buffer->used] = f_string_eol[0]; buffer->used++; } } diff --git a/level_2/fll_fss/c/fss_extended.c b/level_2/fll_fss/c/fss_extended.c index 6999b00..d0c6258 100644 --- a/level_2/fll_fss/c/fss_extended.c +++ b/level_2/fll_fss/c/fss_extended.c @@ -176,7 +176,7 @@ extern "C" { } // while // extended always ends each call with a space, and so the last position should be replaced with an eol. - buffer->string[buffer->used - 1] = f_string_eol; + buffer->string[buffer->used - 1] = f_string_eol[0]; } return F_none; diff --git a/level_2/fll_fss/c/fss_extended_list.c b/level_2/fll_fss/c/fss_extended_list.c index 6bceb6d..be3aab2 100644 --- a/level_2/fll_fss/c/fss_extended_list.c +++ b/level_2/fll_fss/c/fss_extended_list.c @@ -148,7 +148,7 @@ extern "C" { if (F_status_is_error(status)) return status; } - buffer->string[buffer->used] = f_string_eol; + buffer->string[buffer->used] = f_string_eol[0]; buffer->used++; } } diff --git a/level_2/fll_program/c/program.c b/level_2/fll_program/c/program.c index 5d7972f..546a18c 100644 --- a/level_2/fll_program/c/program.c +++ b/level_2/fll_program/c/program.c @@ -6,13 +6,13 @@ extern "C" { #ifndef _di_fll_program_print_help_header_ f_return_status fll_program_print_help_header(const fl_color_context context, const f_string name, const f_string version) { - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); fl_color_print(f_type_output, context.title, context.reset, " %s", name); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); fl_color_print(f_type_output, context.notable, context.reset, " Version %s", version); - printf("%c%c", f_string_eol, f_string_eol); + printf("%c%c", f_string_eol[0], f_string_eol[0]); fl_color_print(f_type_output, context.important, context.reset, " Available Options: "); return F_none; @@ -21,7 +21,7 @@ extern "C" { #ifndef _di_fll_program_print_help_option_ f_return_status fll_program_print_help_option(const fl_color_context context, const f_string option_short, const f_string option_long, const f_string symbol_short, const f_string symbol_long, const f_string description) { - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" %s", symbol_short); fl_color_print(f_type_output, context.standout, context.reset, option_short); @@ -35,7 +35,7 @@ extern "C" { #ifndef _di_fll_program_print_help_option_long_ f_return_status fll_program_print_help_option_long(const fl_color_context context, const f_string option_long, const f_string symbol_long, const f_string description) { - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" %s", symbol_long); fl_color_print(f_type_output, context.standout, context.reset, option_long); printf(" %s", description); @@ -46,7 +46,7 @@ extern "C" { #ifndef _di_fll_program_print_help_option_other_ f_return_status fll_program_print_help_option_other(const fl_color_context context, const f_string option_other, const f_string description) { - printf("%c ", f_string_eol); + printf("%c ", f_string_eol[0]); fl_color_print(f_type_output, context.standout, context.reset, option_other); printf(" %s", description); @@ -57,10 +57,10 @@ extern "C" { #ifndef _di_fll_program_print_help_usage_ f_return_status fll_program_print_help_usage(const fl_color_context context, const f_string name, const f_string parameters) { - printf("%c%c", f_string_eol, f_string_eol); + printf("%c%c", f_string_eol[0], f_string_eol[0]); fl_color_print(f_type_output, context.important, context.reset, " Usage:"); - printf("%c ", f_string_eol); + printf("%c ", f_string_eol[0]); fl_color_print(f_type_output, context.standout, context.reset, name); printf(" "); @@ -77,13 +77,13 @@ extern "C" { fl_color_print(f_type_output, context.notable, context.reset, "]"); } - printf("%c%c", f_string_eol, f_string_eol); + printf("%c%c", f_string_eol[0], f_string_eol[0]); } #endif // _di_fll_program_print_help_usage_ #ifndef _di_fll_program_print_version_ f_return_status fll_program_print_version(const f_string version) { - printf("%s%c", version, f_string_eol); + printf("%s%c", version, f_string_eol[0]); return F_none; } diff --git a/level_3/byte_dump/c/byte_dump.c b/level_3/byte_dump/c/byte_dump.c index 332c5c6..36f6525 100644 --- a/level_3/byte_dump/c/byte_dump.c +++ b/level_3/byte_dump/c/byte_dump.c @@ -15,7 +15,7 @@ extern "C" { fll_program_print_help_option(context, f_console_standard_short_no_color, f_console_standard_long_no_color, f_console_symbol_short_disable, f_console_symbol_long_disable, " Do not output in color."); fll_program_print_help_option(context, f_console_standard_short_version, f_console_standard_long_version, f_console_symbol_short_disable, f_console_symbol_long_disable, " Print only the version number."); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); fll_program_print_help_option(context, byte_dump_short_binary, byte_dump_long_binary, f_console_symbol_short_enable, f_console_symbol_long_enable, " Display binary representation."); fll_program_print_help_option(context, byte_dump_short_decimal, byte_dump_long_decimal, f_console_symbol_short_enable, f_console_symbol_long_enable, " Display decimal representation."); @@ -23,18 +23,18 @@ extern "C" { fll_program_print_help_option(context, byte_dump_short_hexidecimal, byte_dump_long_hexidecimal, f_console_symbol_short_enable, f_console_symbol_long_enable, "Display hexadecimal representation."); fll_program_print_help_option(context, byte_dump_short_octal, byte_dump_long_octal, f_console_symbol_short_enable, f_console_symbol_long_enable, " Display octal representation."); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); fll_program_print_help_option(context, byte_dump_short_first, byte_dump_long_first, f_console_symbol_short_enable, f_console_symbol_long_enable, " Start reading at this byte offset."); fll_program_print_help_option(context, byte_dump_short_last, byte_dump_long_last, f_console_symbol_short_enable, f_console_symbol_long_enable, " Stop reading at this (inclusive) byte offset."); fll_program_print_help_option(context, byte_dump_short_width, byte_dump_long_width, f_console_symbol_short_enable, f_console_symbol_long_enable, " Set number of columns of Bytes to display."); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); fll_program_print_help_option(context, byte_dump_short_text, byte_dump_long_text, f_console_symbol_short_enable, f_console_symbol_long_enable, " Include a column of text when displaying the bytes."); fll_program_print_help_option(context, byte_dump_short_placeholder, byte_dump_long_placeholder, f_console_symbol_short_enable, f_console_symbol_long_enable, "Use a placeholder character instead of a space for placeholders."); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); fll_program_print_help_option_long(context, byte_dump_long_normal, f_console_symbol_long_enable, " Display UTF-8 symbols for ASCII control codes."); fll_program_print_help_option_long(context, byte_dump_long_simple, f_console_symbol_long_enable, " Display spaces for ASCII control codes."); @@ -46,23 +46,23 @@ extern "C" { fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, byte_dump_long_text); printf(" option, some UTF-8 characters may be replaced by your instance and cause display alignment issues."); - printf("%c%c", f_string_eol, f_string_eol); + printf("%c%c", f_string_eol[0], f_string_eol[0]); printf(" Special UTF-8 characters and non-spacing UTF-8 characters may be replaced with a space (or a placeholder when the "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, byte_dump_long_placeholder); printf(" option is used)."); - printf("%c%c", f_string_eol, f_string_eol); + printf("%c%c", f_string_eol[0], f_string_eol[0]); printf(" UTF-8 \"Combining\" characters might have a space appended to allow a proper display but this may cause copy and paste issues."); - printf("%c%c", f_string_eol, f_string_eol); + printf("%c%c", f_string_eol[0], f_string_eol[0]); printf(" When "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, byte_dump_long_last); printf(" is used, any UTF-8 sequences will still be printed in full should any part is found within the requested range."); - printf("%c%c", f_string_eol, f_string_eol); + printf("%c%c", f_string_eol[0], f_string_eol[0]); return F_none; } @@ -266,7 +266,7 @@ extern "C" { file.id = f_type_descriptor_input; - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); fl_color_print(f_type_output, data->context.title, data->context.reset, "Piped Byte Dump: (in "); if (data->mode == byte_dump_mode_hexidecimal) { @@ -329,7 +329,7 @@ extern "C" { return status; } - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); fl_color_print(f_type_output, data->context.title, data->context.reset, "Byte Dump of: "); fl_color_print(f_type_output, data->context.notable, data->context.reset, "%s", arguments.argv[data->remaining.array[counter]]); fl_color_print(f_type_output, data->context.title, data->context.reset, " (in "); diff --git a/level_3/byte_dump/c/private-byte_dump.c b/level_3/byte_dump/c/private-byte_dump.c index ab61a6a..9ea6a7f 100644 --- a/level_3/byte_dump/c/private-byte_dump.c +++ b/level_3/byte_dump/c/private-byte_dump.c @@ -196,11 +196,11 @@ extern "C" { byte_dump_print_text(data, characters, invalid, &previous, &offset); } else { - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); } } - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); // make sure to flush standard out to help prevent standard error from causing poblems. fflush(f_type_output); @@ -209,7 +209,7 @@ extern "C" { fl_color_print(f_type_error, data.context.error, data.context.reset, "Invalid UTF-8 codes were detected for file '"); fl_color_print(f_type_error, data.context.notable, data.context.reset, "%s", file_name); fl_color_print_line(f_type_error, data.context.error, data.context.reset, "'."); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); } if (size < 0) { @@ -217,7 +217,7 @@ extern "C" { fl_color_print(f_type_error, data.context.error, data.context.reset, "ERROR: read() failed for '"); fl_color_print(f_type_error, data.context.notable, data.context.reset, "%s", file_name); fl_color_print_line(f_type_error, data.context.error, data.context.reset, "'."); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); status = F_status_set_error(F_failure); } @@ -392,7 +392,7 @@ extern "C" { byte_dump_print_text(data, characters, invalid, previous, offset); } else { - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); } cell->column = 0; @@ -819,7 +819,7 @@ extern "C" { } fl_color_print(f_type_output, data.context.notable, data.context.reset, " |"); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); } #endif // _di_byte_dump_file_ diff --git a/level_3/fake/c/fake.c b/level_3/fake/c/fake.c index c069e1d..d9ad36e 100644 --- a/level_3/fake/c/fake.c +++ b/level_3/fake/c/fake.c @@ -22,21 +22,21 @@ extern "C" { fll_program_print_help_option(context, f_console_standard_short_verbose, f_console_standard_long_verbose, f_console_symbol_short_disable, f_console_symbol_long_disable, " Increase verbosity beyond normal output."); fll_program_print_help_option(context, f_console_standard_short_version, f_console_standard_long_version, f_console_symbol_short_disable, f_console_symbol_long_disable, " Print only the version number."); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); fll_program_print_help_option(context, fake_short_defines, fake_long_defines, f_console_symbol_short_enable, f_console_symbol_long_enable, " Override custom defines with these defines."); fll_program_print_help_option(context, fake_short_mode, fake_long_mode, f_console_symbol_short_enable, f_console_symbol_long_enable, " Use this mode when processing the build settings."); fll_program_print_help_option(context, fake_short_process, fake_long_process, f_console_symbol_short_enable, f_console_symbol_long_enable, " Process name for storing build states."); fll_program_print_help_option(context, fake_short_settings, fake_long_settings, f_console_symbol_short_enable, f_console_symbol_long_enable, "Use this settings file, from within the source settings directory."); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); fll_program_print_help_option(context, fake_short_path_build, fake_long_path_build, f_console_symbol_short_enable, f_console_symbol_long_enable, " Specify a custom build directory."); fll_program_print_help_option(context, fake_short_path_data, fake_long_path_data, f_console_symbol_short_enable, f_console_symbol_long_enable, " Specify a custom path to the data files."); fll_program_print_help_option(context, fake_short_path_sources, fake_long_path_sources, f_console_symbol_short_enable, f_console_symbol_long_enable, " Specify a custom path to the source files."); fll_program_print_help_option(context, fake_short_path_work, fake_long_path_work, f_console_symbol_short_enable, f_console_symbol_long_enable, " Use includes/libraries/programs from this directory instead of system."); - printf("%c%c", f_string_eol, f_string_eol); + printf("%c%c", f_string_eol[0], f_string_eol[0]); fl_color_print(f_type_output, context.important, context.reset, " Special Options: "); @@ -47,7 +47,7 @@ extern "C" { fll_program_print_help_option_long(context, fake_long_static_disabled, f_console_symbol_long_enable, "Forcibly do not build static files."); fll_program_print_help_option_long(context, fake_long_static_enabled, f_console_symbol_long_enable, " Forcibly do build static files."); - printf("%c%c", f_string_eol, f_string_eol); + printf("%c%c", f_string_eol[0], f_string_eol[0]); fl_color_print(f_type_output, context.important, context.reset, " Operations: "); @@ -63,13 +63,13 @@ extern "C" { printf(" operation, the "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fake_long_mode); printf(" parameter specifies a name (limited to alpha-numeric, underscore, and dash) to be used in addition to the global."); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" For example, when a "); fl_color_print(f_type_output, context.notable, context.reset, "%s", fake_long_mode); printf(" of 'fll_monolithic' is specified, build libaries from both 'build_libraries' and 'build_libraries-fll_monolithic' are used (but not 'build_libraries-fll_level')."); - printf("%c%c", f_string_eol, f_string_eol); + printf("%c%c", f_string_eol[0], f_string_eol[0]); return F_none; } @@ -303,7 +303,7 @@ extern "C" { } if (data->verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, data->context.error, data->context.reset, "ERROR: the operation '"); fl_color_print(f_type_error, data->context.notable, data->context.reset, "%s", fake_other_operation_make); fl_color_print_line(f_type_error, data->context.error, data->context.reset, "' is not yet implemented."); @@ -315,7 +315,7 @@ extern "C" { if (F_status_is_error(status)) { if (data->verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, data->context.error, data->context.reset, "ERROR: the operation '"); fl_color_print(f_type_error, data->context.notable, data->context.reset, "%s", operations_name[i]); fl_color_print_line(f_type_error, data->context.error, data->context.reset, "' failed."); @@ -328,18 +328,18 @@ extern "C" { // ensure a newline is always put at the end of the program execution, unless in quite mode. if (data->verbosity != fake_verbosity_quiet) { if (F_status_is_error(status)) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); } else { - fprintf(f_type_output, "%cAll operations complete.%c%c", f_string_eol, f_string_eol, f_string_eol); + fprintf(f_type_output, "%cAll operations complete.%c%c", f_string_eol[0], f_string_eol[0], f_string_eol[0]); } } } else { if (data->verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print_line(f_type_error, data->context.error, data->context.reset, "ERROR: you failed to specify an operation."); - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); } status = F_status_set_error(F_parameter); diff --git a/level_3/fake/c/private-build.c b/level_3/fake/c/private-build.c index 7491334..2b3996f 100644 --- a/level_3/fake/c/private-build.c +++ b/level_3/fake/c/private-build.c @@ -14,7 +14,7 @@ extern "C" { f_string_dynamic path_source = f_string_dynamic_initialize; if (data.verbosity != fake_verbosity_quiet) { - printf("%cCopying source settings.%c", f_string_eol, f_string_eol); + printf("%cCopying source settings.%c", f_string_eol[0], f_string_eol[0]); } f_macro_string_dynamic_new(status, path_source, data.path_data_settings.used); @@ -114,7 +114,7 @@ extern "C" { }; if (data.verbosity != fake_verbosity_quiet) { - printf("%cCreating base build directories.%c", f_string_eol, f_string_eol); + printf("%cCreating base build directories.%c", f_string_eol[0], f_string_eol[0]); } for (uint8_t i = 0; i < 14; i++) { @@ -130,7 +130,7 @@ extern "C" { } if (data.verbosity == fake_verbosity_verbose) { - printf("Created directory '%s'%c", directorys[i]->string, f_string_eol); + printf("Created directory '%s'%c", directorys[i]->string, f_string_eol[0]); } } // for @@ -331,7 +331,7 @@ extern "C" { if (names.used + settings.environment.used > names.size) { if (names.used + settings.environment.used > f_array_length_size) { if (data.verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, data.context.error, data.context.reset, "ERROR: The values for the settings '"); fl_color_print(f_type_error, data.context.notable, data.context.reset, "%s", fake_build_settings_name_environment); fl_color_print(f_type_error, data.context.error, data.context.reset, "' of settings file '"); @@ -458,7 +458,7 @@ extern "C" { if (F_status_is_error(status)) { if (F_status_set_fine(status) == F_failure) { if (data.verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, data.context.error, data.context.reset, "ERROR: Failed to execute script: "); fl_color_print(f_type_error, data.context.notable, data.context.reset, "%s", path.string); fl_color_print_line(f_type_error, data.context.error, data.context.reset, "."); @@ -478,7 +478,7 @@ extern "C" { #ifndef _di_fake_build_operate_ f_return_status fake_build_operate(const fake_data data) { if (data.verbosity != fake_verbosity_quiet) { - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); fl_color_print_line(f_type_output, data.context.important, data.context.reset, "Building project."); } @@ -586,7 +586,7 @@ extern "C" { if (status == F_status_set_error(F_incomplete_utf_stop)) { if (data.verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, data.context.error, data.context.reset, "ENCODING ERROR: error occurred on invalid UTF-8 character at stop position (at "); fl_color_print(f_type_error, data.context.notable, data.context.reset, "%d", range.start); fl_color_print(f_type_error, data.context.error, data.context.reset, " of settings file '"); @@ -596,7 +596,7 @@ extern "C" { } else if (status == F_status_set_error(F_incomplete_utf_stop)) { if (data.verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, data.context.error, data.context.reset, "ENCODING ERROR: error occurred on invalid UTF-8 character at end of string (at "); fl_color_print(f_type_error, data.context.notable, data.context.reset, "%d", range.start); fl_color_print(f_type_error, data.context.error, data.context.reset, " of settings file '"); @@ -775,7 +775,7 @@ extern "C" { if (found == F_false) { if (data.verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, data.context.error, data.context.reset, "ERROR: the specified mode '"); fl_color_print(f_type_error, data.context.notable, data.context.reset, "%s", modes->array[i].string); fl_color_print(f_type_error, data.context.error, data.context.reset, "' is not a valid mode, according to '"); @@ -828,7 +828,7 @@ extern "C" { if (status == F_status_set_error(F_string_too_large)) { if (data.verbosity != fake_verbosity_quiet) { // @todo update FSS functions to return which setting index the problem happened on. - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, data.context.error, data.context.reset, "ERROR: a setting in the build settings file '"); fl_color_print(f_type_error, data.context.notable, data.context.reset, "%s", data.file_data_build_settings.string); fl_color_print_line(f_type_error, data.context.error, data.context.reset, "' is too long."); @@ -921,7 +921,7 @@ extern "C" { if (settings_single_source[i]->used > 1) { if (data.verbosity != fake_verbosity_quiet) { - fprintf(f_type_warning, "%c", f_string_eol); + fprintf(f_type_warning, "%c", f_string_eol[0]); fl_color_print(f_type_warning, data.context.warning, data.context.reset, "WARNING: the setting '"); fl_color_print(f_type_warning, data.context.notable, data.context.reset, "%s", settings_single_name[i]); fl_color_print(f_type_warning, data.context.warning, data.context.reset, "' in the file '"); @@ -943,7 +943,7 @@ extern "C" { *settings_single_bool[i] = F_true; if (data.verbosity != fake_verbosity_quiet) { - fprintf(f_type_warning, "%c", f_string_eol); + fprintf(f_type_warning, "%c", f_string_eol[0]); fl_color_print(f_type_warning, data.context.warning, data.context.reset, "WARNING: the setting '"); fl_color_print(f_type_warning, data.context.notable, data.context.reset, "%s", settings_single_name[i]); fl_color_print(f_type_warning, data.context.warning, data.context.reset, "' in the file '"); diff --git a/level_3/fake/c/private-clean.c b/level_3/fake/c/private-clean.c index fd0f7a5..c2e7c02 100644 --- a/level_3/fake/c/private-clean.c +++ b/level_3/fake/c/private-clean.c @@ -12,7 +12,7 @@ extern "C" { f_status status = F_none; if (data.verbosity != fake_verbosity_quiet) { - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); fl_color_print(f_type_output, data.context.important, data.context.reset, "Deleting all files within build directory '"); fl_color_print(f_type_output, data.context.notable, data.context.reset, "%s", data.path_build.string); fl_color_print_line(f_type_output, data.context.important, data.context.reset, "'."); @@ -41,7 +41,7 @@ extern "C" { int result = remove(path); if (result == 0) { - printf("Removed '%s'.%c", path, f_string_eol); + printf("Removed '%s'.%c", path, f_string_eol[0]); } return result; diff --git a/level_3/fake/c/private-fake.c b/level_3/fake/c/private-fake.c index 6aac31a..5f152ab 100644 --- a/level_3/fake/c/private-fake.c +++ b/level_3/fake/c/private-fake.c @@ -440,7 +440,7 @@ extern "C" { for (uint8_t i = 0; i < 4; i++) { if (data->parameters[parameters_id[i]].total > 1) { if (data->verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, data->context.error, data->context.reset, "ERROR: the operation '"); fl_color_print(f_type_error, data->context.notable, data->context.reset, "%s", parameters_name[i]); fl_color_print_line(f_type_error, data->context.error, data->context.reset, "' specified too many times."); @@ -497,7 +497,7 @@ extern "C" { if (F_status_is_error(status)) { if (status == F_status_set_error(F_string_too_large)) { if (data->verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, data->context.error, data->context.reset, "ERROR: the parameter '"); fl_color_print(f_type_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, parameters_name[i]); fl_color_print_line(f_type_error, data->context.error, data->context.reset, "' is too long."); @@ -516,7 +516,7 @@ extern "C" { if (length == 0 || status == F_data_not) { if (data->verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, data->context.error, data->context.reset, "ERROR: the parameter '"); fl_color_print(f_type_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, parameters_name[i]); fl_color_print_line(f_type_error, data->context.error, data->context.reset, "' must not be empty and must not contain only whitespace."); @@ -593,7 +593,7 @@ extern "C" { if (F_status_is_error(status)) { if (fake_print_error(data->context, data->verbosity, F_status_set_fine(status), "fl_console_parameter_to_string_dynamic_directory", F_false) == F_unknown && data->verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, data->context.error, data->context.reset, "ERROR: failed to process parameter '"); fl_color_print(f_type_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, parameters_name[i]); fl_color_print_line(f_type_error, data->context.error, data->context.reset, "'."); @@ -607,7 +607,7 @@ extern "C" { if (F_status_is_error(status)) { if (fake_print_error(data->context, data->verbosity, F_status_set_fine(status), "f_macro_string_dynamic_new", F_false) == F_unknown && data->verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, data->context.error, data->context.reset, "ERROR: failed to load default for the parameter '"); fl_color_print(f_type_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, parameters_name[i]); fl_color_print_line(f_type_error, data->context.error, data->context.reset, "'."); @@ -628,7 +628,7 @@ extern "C" { if (F_status_is_error(status)) { if (status == F_status_set_error(F_string_too_large)) { if (data->verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, data->context.error, data->context.reset, "ERROR: the (combined) parameter '"); fl_color_print(f_type_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fake_long_defines); fl_color_print_line(f_type_error, data->context.error, data->context.reset, "' is too long."); @@ -651,7 +651,7 @@ extern "C" { if (F_status_is_error(status)) { if (fake_print_error(data->context, data->verbosity, F_status_set_fine(status), "fll_program_parameter_additional_rip", F_false) == F_unknown && data->verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, data->context.error, data->context.reset, "ERROR: failed to process the parameter '"); fl_color_print(f_type_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fake_long_mode); fl_color_print_line(f_type_error, data->context.error, data->context.reset, "'."); @@ -672,7 +672,7 @@ extern "C" { if (F_status_is_error(status)) { if (fake_print_error(data->context, data->verbosity, F_status_set_fine(status), "f_utf_is_word_dash_plus", F_false) == F_unknown && data->verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, data->context.error, data->context.reset, "ERROR: failed to process the parameter '"); fl_color_print(f_type_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fake_long_mode); fl_color_print_line(f_type_error, data->context.error, data->context.reset, "'."); @@ -683,7 +683,7 @@ extern "C" { if (status == F_false) { if (data->verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, data->context.error, data->context.reset, "ERROR: the '"); fl_color_print(f_type_error, data->context.notable, data->context.reset, "%s%s", f_console_symbol_long_enable, fake_long_mode); fl_color_print(f_type_error, data->context.error, data->context.reset, "' parameters value '"); @@ -757,7 +757,7 @@ extern "C" { } } else if (parameters_required[i]) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, data.context.error, data.context.reset, "ERROR: No valid path for the (required) directory parameter '"); fl_color_print(f_type_error, data.context.notable, data.context.reset, "%s%s", f_console_symbol_long_enable, parameters_name[i]); fl_color_print_line(f_type_error, data.context.error, data.context.reset, "' was found."); diff --git a/level_3/fake/c/private-print.c b/level_3/fake/c/private-print.c index 923ed6c..9f66fd5 100644 --- a/level_3/fake/c/private-print.c +++ b/level_3/fake/c/private-print.c @@ -11,7 +11,7 @@ extern "C" { if (status == F_parameter) { if (verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, context.error, context.reset, "ERROR: Invalid parameter when calling function "); fl_color_print(f_type_error, context.notable, context.reset, "%s", function); fl_color_print_line(f_type_error, context.error, context.reset, "()."); @@ -22,7 +22,7 @@ extern "C" { if (status == F_memory_allocation || status == F_memory_reallocation) { if (verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, context.error, context.reset, "ERROR: Unable to allocate memory in function "); fl_color_print(f_type_error, context.notable, context.reset, "%s", function); fl_color_print_line(f_type_error, context.error, context.reset, "()."); @@ -32,7 +32,7 @@ extern "C" { } if (fallback && verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, context.error, context.reset, "UNKNOWN ERROR: ("); fl_color_print(f_type_error, context.notable, context.reset, "%d", status); fl_color_print(f_type_error, context.error, context.reset, ") in function "); @@ -53,7 +53,7 @@ extern "C" { if (status == F_file_found_not) { if (verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, context.error, context.reset, "ERROR: failed to find %s '", file_or_directory); fl_color_print(f_type_error, context.notable, context.reset, "%s", name); fl_color_print_line(f_type_error, context.error, context.reset, "'."); @@ -64,7 +64,7 @@ extern "C" { if (status == F_parameter) { if (verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, context.error, context.reset, "INTERNAL ERROR: Invalid parameter when calling "); fl_color_print(f_type_error, context.notable, context.reset, "%s", function); fl_color_print(f_type_error, context.error, context.reset, "() for the %s '", file_or_directory); @@ -77,7 +77,7 @@ extern "C" { if (status == F_name) { if (verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, context.error, context.reset, "ERROR: Invalid %s name '", file_or_directory); fl_color_print(f_type_error, context.notable, context.reset, "%s", name); fl_color_print_line(f_type_error, context.error, context.reset, "'."); @@ -88,7 +88,7 @@ extern "C" { if (status == F_memory_out) { if (verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, context.error, context.reset, "CRITICAL ERROR: Unable to allocate memory, while trying to %s %s '", operation, file_or_directory); fl_color_print(f_type_error, context.notable, context.reset, "%s", name); fl_color_print_line(f_type_error, context.error, context.reset, "'."); @@ -99,7 +99,7 @@ extern "C" { if (status == F_number_overflow) { if (verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, context.error, context.reset, "ERROR: Overflow while trying to %s %s '", operation, file_or_directory); fl_color_print(f_type_error, context.notable, context.reset, "%s", name); fl_color_print_line(f_type_error, context.error, context.reset, "'."); @@ -110,7 +110,7 @@ extern "C" { if (status == F_directory) { if (verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, context.error, context.reset, "ERROR: Invalid directory while trying to %s %s '", operation, file_or_directory); fl_color_print(f_type_error, context.notable, context.reset, "%s", name); fl_color_print_line(f_type_error, context.error, context.reset, "'."); @@ -121,7 +121,7 @@ extern "C" { if (status == F_access_denied) { if (verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, context.error, context.reset, "ERROR: Access denied while trying to %s %s '", operation, file_or_directory); fl_color_print(f_type_error, context.notable, context.reset, "%s", name); fl_color_print_line(f_type_error, context.error, context.reset, "'."); @@ -132,7 +132,7 @@ extern "C" { if (status == F_loop) { if (verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, context.error, context.reset, "ERROR: Loop while trying to %s %s '", operation, file_or_directory); fl_color_print(f_type_error, context.notable, context.reset, "%s", name); fl_color_print_line(f_type_error, context.error, context.reset, "'."); @@ -143,7 +143,7 @@ extern "C" { if (status == F_prohibited) { if (verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, context.error, context.reset, "ERROR: Prohibited by system while trying to %s %s '", operation, file_or_directory); fl_color_print(f_type_error, context.notable, context.reset, "%s", name); fl_color_print_line(f_type_error, context.error, context.reset, "'."); @@ -155,7 +155,7 @@ extern "C" { if (is_file) { if (status == F_directory_found_not) { if (verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, context.error, context.reset, "ERROR: failed to %s %s '", operation, file_or_directory); fl_color_print(f_type_error, context.notable, context.reset, "%s", name); fl_color_print_line(f_type_error, context.error, context.reset, "' due to an invalid directory in the path."); @@ -167,7 +167,7 @@ extern "C" { else { if (status == F_directory_found_not) { if (verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, context.error, context.reset, "ERROR: failed to %s %s '", operation, file_or_directory); fl_color_print(f_type_error, context.notable, context.reset, "%s", name); fl_color_print_line(f_type_error, context.error, context.reset, "' due to an invalid directory in the path."); @@ -178,7 +178,7 @@ extern "C" { if (status == F_failure) { if (verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, context.error, context.reset, "ERROR: failed to %s %s '", operation, file_or_directory); fl_color_print(f_type_error, context.notable, context.reset, "%s", name); fl_color_print_line(f_type_error, context.error, context.reset, "'."); @@ -189,7 +189,7 @@ extern "C" { } if (fake_print_error(context, verbosity, status, function, F_false) == F_unknown && fallback && verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, context.error, context.reset, "UNKNOWN ERROR: ("); fl_color_print(f_type_error, context.notable, context.reset, "%d", status); fl_color_print(f_type_error, context.error, context.reset, ") occurred while trying to %s %s '", operation, file_or_directory); @@ -206,7 +206,7 @@ extern "C" { if (status == F_file_found_not) { if (verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, context.error, context.reset, "ERROR: Failed to find '"); if (f_file_exists(source) == F_true) { @@ -232,7 +232,7 @@ extern "C" { if (status == F_parameter) { if (verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, context.error, context.reset, "INTERNAL ERROR: Invalid parameter when calling "); fl_color_print(f_type_error, context.notable, context.reset, "%s", function); fl_color_print(f_type_error, context.error, context.reset, "() to %s '", operation); @@ -251,7 +251,7 @@ extern "C" { if (status == F_name) { if (verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, context.error, context.reset, "ERROR: Invalid name for '"); fl_color_print(f_type_error, context.notable, context.reset, "%s", source); @@ -268,7 +268,7 @@ extern "C" { if (status == F_memory_out) { if (verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, context.error, context.reset, "CRITICAL ERROR: Unable to allocate memory, while trying to %s '", operation); fl_color_print(f_type_error, context.notable, context.reset, "%s", source); @@ -286,7 +286,7 @@ extern "C" { if (status == F_number_overflow) { if (verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, context.error, context.reset, "ERROR: Overflow while trying to %s '", operation); fl_color_print(f_type_error, context.notable, context.reset, "%s", source); @@ -303,7 +303,7 @@ extern "C" { if (status == F_directory) { if (verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, context.error, context.reset, "ERROR: Invalid directory while trying to %s '", operation); fl_color_print(f_type_error, context.notable, context.reset, "%s", source); @@ -320,7 +320,7 @@ extern "C" { if (status == F_access_denied) { if (verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, context.error, context.reset, "ERROR: Access denied while trying to %s '", operation); fl_color_print(f_type_error, context.notable, context.reset, "%s", source); @@ -337,7 +337,7 @@ extern "C" { if (status == F_loop) { if (verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, context.error, context.reset, "ERROR: Loop while trying to %s '", operation); fl_color_print(f_type_error, context.notable, context.reset, "%s", source); @@ -354,7 +354,7 @@ extern "C" { if (status == F_prohibited) { if (verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, context.error, context.reset, "ERROR: Prohibited by system while trying to %s '", operation); fl_color_print(f_type_error, context.notable, context.reset, "%s", source); @@ -371,7 +371,7 @@ extern "C" { if (status == F_directory_found_not) { if (verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, context.error, context.reset, "ERROR: Failed to %s '", operation); fl_color_print(f_type_error, context.notable, context.reset, "%s", source); @@ -388,7 +388,7 @@ extern "C" { if (status == F_failure) { if (verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, context.error, context.reset, "ERROR: Failed to %s '", operation); fl_color_print(f_type_error, context.notable, context.reset, "%s", source); @@ -404,7 +404,7 @@ extern "C" { } if (fake_print_error(context, verbosity, status, function, F_false) == F_unknown && fallback && verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, context.error, context.reset, "UNKNOWN ERROR: ("); fl_color_print(f_type_error, context.notable, context.reset, "%d", status); fl_color_print(f_type_error, context.error, context.reset, ") occurred while trying to %s '", operation); @@ -425,7 +425,7 @@ extern "C" { #ifndef _di_fake_print_error_parameter_missing_value_ void fake_print_error_parameter_missing_value(const fl_color_context context, const uint8_t verbosity, const f_string parameter) { if (verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, context.error, context.reset, "ERROR: The parameter '"); fl_color_print(f_type_error, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, parameter); fl_color_print_line(f_type_error, context.error, context.reset, "' was specified, but no value was given."); @@ -436,7 +436,7 @@ extern "C" { #ifndef _di_fake_print_error_parameter_too_many_ void fake_print_error_parameter_too_many(const fl_color_context context, const uint8_t verbosity, const f_string parameter) { if (verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, context.error, context.reset, "ERROR: the parameter '"); fl_color_print(f_type_error, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, parameter); fl_color_print_line(f_type_error, context.error, context.reset, "' specified too many times."); diff --git a/level_3/fake/c/private-skeleton.c b/level_3/fake/c/private-skeleton.c index 144738f..ad6cf1d 100644 --- a/level_3/fake/c/private-skeleton.c +++ b/level_3/fake/c/private-skeleton.c @@ -12,7 +12,7 @@ extern "C" { f_status status = F_none; if (data.verbosity != fake_verbosity_quiet) { - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); fl_color_print_line(f_type_output, data.context.important, data.context.reset, "Generating skeleton structure."); } @@ -96,7 +96,7 @@ extern "C" { status = f_directory_exists(path.string); if (status == F_true) { if (data.verbosity == fake_verbosity_verbose) { - printf("Directory '%s' already exists.%c", path.string, f_string_eol); + printf("Directory '%s' already exists.%c", path.string, f_string_eol[0]); } return F_none; @@ -104,7 +104,7 @@ extern "C" { if (status == F_false) { if (data.verbosity != fake_verbosity_quiet) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, data.context.error, data.context.reset, "ERROR: The path '"); fl_color_print(f_type_error, data.context.notable, data.context.reset, "%s", path.string); fl_color_print_line(f_type_error, data.context.error, data.context.reset, "' exists but is not a directory."); @@ -117,7 +117,7 @@ extern "C" { if (F_status_is_error(status)) { if (F_status_set_fine(status) == F_file_found_not) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, data.context.error, data.context.reset, "ERROR: The path '"); fl_color_print(f_type_error, data.context.notable, data.context.reset, "%s", path.string); fl_color_print_line(f_type_error, data.context.error, data.context.reset, "' could not be created, a parent directory does not exist."); @@ -130,7 +130,7 @@ extern "C" { } if (data.verbosity == fake_verbosity_verbose) { - printf("Directory '%s' created.%c", path.string, f_string_eol); + printf("Directory '%s' created.%c", path.string, f_string_eol[0]); } } else if (F_status_is_error(status)) { @@ -151,7 +151,7 @@ extern "C" { status = f_file_is(path.string, f_file_type_regular); if (status == F_true) { if (data.verbosity == fake_verbosity_verbose) { - printf("File '%s' already exists.%c", path.string, f_string_eol); + printf("File '%s' already exists.%c", path.string, f_string_eol[0]); } return F_none; @@ -163,7 +163,7 @@ extern "C" { if (status == F_true) { if (data.verbosity == fake_verbosity_verbose) { - printf("File '%s' already exists (as a symbolic link).%c", path.string, f_string_eol); + printf("File '%s' already exists (as a symbolic link).%c", path.string, f_string_eol[0]); } return F_none; @@ -172,7 +172,7 @@ extern "C" { if (status == F_false) { if (data.verbosity == fake_verbosity_verbose) { - printf("File '%s' already exists but is not a regular file (or symbolic link).%c", path.string, f_string_eol); + printf("File '%s' already exists but is not a regular file (or symbolic link).%c", path.string, f_string_eol[0]); } return F_status_set_warning(F_none); @@ -188,7 +188,7 @@ extern "C" { if (F_status_is_error(status)) { if (F_status_set_fine(status) == F_file_found_not) { - fprintf(f_type_error, "%c", f_string_eol); + fprintf(f_type_error, "%c", f_string_eol[0]); fl_color_print(f_type_error, data.context.error, data.context.reset, "ERROR: The file '"); fl_color_print(f_type_error, data.context.notable, data.context.reset, "%s", path.string); fl_color_print_line(f_type_error, data.context.error, data.context.reset, "' could not be created, a parent directory does not exist."); @@ -201,7 +201,7 @@ extern "C" { } if (data.verbosity == fake_verbosity_verbose) { - printf("File '%s' created.%c", path.string, f_string_eol); + printf("File '%s' created.%c", path.string, f_string_eol[0]); } } else if (F_status_is_error(status)) { diff --git a/level_3/firewall/c/firewall.c b/level_3/firewall/c/firewall.c index a30647a..992d90e 100644 --- a/level_3/firewall/c/firewall.c +++ b/level_3/firewall/c/firewall.c @@ -25,26 +25,26 @@ extern "C" { fll_program_print_help_option(context, f_console_standard_short_debug, f_console_standard_long_debug, f_console_symbol_short_disable, f_console_symbol_long_disable, " Enable debugging."); #endif // _en_firewall_debug_ - printf("%c%c", f_string_eol, f_string_eol); + printf("%c%c", f_string_eol[0], f_string_eol[0]); fl_color_print(f_type_output, context.important, context.reset, " Available Commands: "); - printf("%c ", f_string_eol); + printf("%c ", f_string_eol[0]); fl_color_print(f_type_output, context.standout, context.reset, firewall_command_start); printf(" Turn on the firewall"); - printf("%c ", f_string_eol); + printf("%c ", f_string_eol[0]); fl_color_print(f_type_output, context.standout, context.reset, firewall_command_stop); printf(" Turn off the firewall"); - printf("%c ", f_string_eol); + printf("%c ", f_string_eol[0]); fl_color_print(f_type_output, context.standout, context.reset, firewall_command_restart); printf(" Turn off and then turn on the firewall"); - printf("%c ", f_string_eol); + printf("%c ", f_string_eol[0]); fl_color_print(f_type_output, context.standout, context.reset, firewall_command_lock); printf(" Prevent all communication"); - printf("%c ", f_string_eol); + printf("%c ", f_string_eol[0]); fl_color_print(f_type_output, context.standout, context.reset, firewall_command_show); printf(" Show active firewall settings"); diff --git a/level_3/fss_basic_list_read/c/fss_basic_list_read.c b/level_3/fss_basic_list_read/c/fss_basic_list_read.c index 7f679a3..77c4c92 100644 --- a/level_3/fss_basic_list_read/c/fss_basic_list_read.c +++ b/level_3/fss_basic_list_read/c/fss_basic_list_read.c @@ -15,7 +15,7 @@ extern "C" { fll_program_print_help_option(context, f_console_standard_short_no_color, f_console_standard_long_no_color, f_console_symbol_short_disable, f_console_symbol_long_disable, "Do not output in color."); fll_program_print_help_option(context, f_console_standard_short_version, f_console_standard_long_version, f_console_symbol_short_disable, f_console_symbol_long_disable, " Print only the version number."); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); fll_program_print_help_option(context, fss_basic_list_read_short_at, fss_basic_list_read_long_at, f_console_symbol_short_enable, f_console_symbol_long_enable, " Select object at this numeric index."); fll_program_print_help_option(context, fss_basic_list_read_short_depth, fss_basic_list_read_long_depth, f_console_symbol_short_enable, f_console_symbol_long_enable, " Select object at this numeric depth."); @@ -31,54 +31,54 @@ extern "C" { fl_color_print(f_type_output, context.important, context.reset, " Notes:"); - printf("%c", f_string_eol, f_string_eol); + printf("%c", f_string_eol[0], f_string_eol[0]); - printf(" This program will print the content associated with the given object and content data based on the FSS-0002 Basic List standard.%c", f_string_eol); + printf(" This program will print the content associated with the given object and content data based on the FSS-0002 Basic List standard.%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" When using the "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_depth); - printf(" option, an order of operations is enforced on the parameters.%c", f_string_eol); + printf(" option, an order of operations is enforced on the parameters.%c", f_string_eol[0]); - printf(" When this order of operations is in effect, parameters to the right of a depth parameter are influenced by that depth parameter:%c", f_string_eol); + printf(" When this order of operations is in effect, parameters to the right of a depth parameter are influenced by that depth parameter:%c", f_string_eol[0]); printf(" "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_at); - printf(": An object index at the specified depth.%c", f_string_eol); + printf(": An object index at the specified depth.%c", f_string_eol[0]); printf(" "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_depth); - printf(": A new depth within the specified depth, indexed from the root.%c", f_string_eol); + printf(": A new depth within the specified depth, indexed from the root.%c", f_string_eol[0]); printf(" "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_name); - printf(": An object name at the specified depth.%c", f_string_eol); + printf(": An object name at the specified depth.%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" The parameter "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_depth); - printf(" must be in numeric order, but values in between may be skipped.%c", f_string_eol); - printf(" ('-d 0 -a 1 -d 2 -a 2' would specify index 1 at depth 0, any index at depth 1, and index 2 at depth 2.)%c", f_string_eol); - printf(" ('-d 2 -a 1 -d 0 -a 2' would be invalid because depth 2 is before depth 1.)%c", f_string_eol); + printf(" must be in numeric order, but values in between may be skipped.%c", f_string_eol[0]); + printf(" ('-d 0 -a 1 -d 2 -a 2' would specify index 1 at depth 0, any index at depth 1, and index 2 at depth 2.)%c", f_string_eol[0]); + printf(" ('-d 2 -a 1 -d 0 -a 2' would be invalid because depth 2 is before depth 1.)%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" The parameter "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_select); - printf(" selects a content index at a given depth.%c", f_string_eol); - printf(" (This parameter is not synonymous with the depth parameter and does not relate to nested content).%c", f_string_eol); + printf(" selects a content index at a given depth.%c", f_string_eol[0]); + printf(" (This parameter is not synonymous with the depth parameter and does not relate to nested content).%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" Specify both "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_object); printf(" and the "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_total); - printf(" parameters to get the total objects.%c", f_string_eol); + printf(" parameters to get the total objects.%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" When both "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_at); @@ -88,34 +88,34 @@ extern "C" { fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_at); printf(" parameter value will be treated as a position relative to the specified "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_name); - printf(" parameter value.%c", f_string_eol); + printf(" parameter value.%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" This program may support parameters, such as "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_depth); printf(" or "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_select); - printf(", even if not supported by the standard.%c", f_string_eol); - printf(" This is done to help ensure consistency for scripting.%c", f_string_eol); + printf(", even if not supported by the standard.%c", f_string_eol[0]); + printf(" This is done to help ensure consistency for scripting.%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" For parameters like "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_depth); - printf(", if the standard doesn't support nested content, then only a depth of 0 would be valid.%c", f_string_eol); + printf(", if the standard doesn't support nested content, then only a depth of 0 would be valid.%c", f_string_eol[0]); printf(" For parameters like "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_select); - printf(", if the standard doesn't support multiple content groups, then only a select of 0 would be valid.%c", f_string_eol); + printf(", if the standard doesn't support multiple content groups, then only a select of 0 would be valid.%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" The parameter "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_list_read_long_trim); - printf(" will remove leading and trailing whitespaces when selecting objects or when printing objects.%c", f_string_eol); + printf(" will remove leading and trailing whitespaces when selecting objects or when printing objects.%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); return F_none; } @@ -246,7 +246,7 @@ extern "C" { macro_fss_basic_list_read_depths_delete_simple(depths); if (data->parameters[fss_basic_list_read_parameter_total].result == f_console_result_found) { - fprintf(f_type_output, "0%c", f_string_eol); + fprintf(f_type_output, "0%c", f_string_eol[0]); fss_basic_list_read_delete_data(data); return F_none; diff --git a/level_3/fss_basic_list_read/c/private-fss_basic_list_read.c b/level_3/fss_basic_list_read/c/private-fss_basic_list_read.c index 758c583..78ac249 100644 --- a/level_3/fss_basic_list_read/c/private-fss_basic_list_read.c +++ b/level_3/fss_basic_list_read/c/private-fss_basic_list_read.c @@ -365,10 +365,10 @@ extern "C" { if (data->parameters[fss_basic_list_read_parameter_total].result == f_console_result_found) { if (depths.array[0].index_at > 0) { if (depths.array[0].value_at < data->objects.used && names[depths.array[0].value_at]) { - fprintf(f_type_output, "1%c", f_string_eol); + fprintf(f_type_output, "1%c", f_string_eol[0]); } else { - fprintf(f_type_output, "0%c", f_string_eol); + fprintf(f_type_output, "0%c", f_string_eol[0]); } } else if (depths.array[0].index_name > 0) { @@ -380,10 +380,10 @@ extern "C" { total++; } // for - fprintf(f_type_output, "%llu%c", total, f_string_eol); + fprintf(f_type_output, "%llu%c", total, f_string_eol[0]); } else { - fprintf(f_type_output, "%llu%c", data->objects.used, f_string_eol); + fprintf(f_type_output, "%llu%c", data->objects.used, f_string_eol[0]); } return F_none; @@ -403,7 +403,7 @@ extern "C" { if (names[i]) { if (at == depths.array[0].value_at) { print_object(f_type_output, data->buffer, data->objects.array[i]); - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); break; } @@ -418,7 +418,7 @@ extern "C" { if (names[i] == 0) continue; print_object(f_type_output, data->buffer, data->objects.array[i]); - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); } // for return F_none; @@ -427,7 +427,7 @@ extern "C" { if (depths.array[0].index_at > 0) { if (depths.array[0].value_at >= data->objects.used) { if (names[depths.array[0].value_at] && data->parameters[fss_basic_list_read_parameter_total].result == f_console_result_found) { - fprintf(f_type_output, "0%c", f_string_eol); + fprintf(f_type_output, "0%c", f_string_eol[0]); } return F_none; @@ -441,7 +441,7 @@ extern "C" { if (at == depths.array[0].value_at) { if (data->parameters[fss_basic_list_read_parameter_total].result == f_console_result_found) { if (data->contents.array[i].used == 0) { - fprintf(f_type_output, "0%c", f_string_eol); + fprintf(f_type_output, "0%c", f_string_eol[0]); } else { f_string_length total = 1; @@ -449,12 +449,12 @@ extern "C" { for (f_string_length j = data->contents.array[i].array[0].start; j <= data->contents.array[i].array[0].stop; j++) { if (data->buffer.string[j] == 0) continue; - if (data->buffer.string[j] == f_string_eol) { + if (data->buffer.string[j] == f_string_eol[0]) { total++; } } // for - fprintf(f_type_output, "%llu%c", total, f_string_eol); + fprintf(f_type_output, "%llu%c", total, f_string_eol[0]); } return F_none; @@ -463,7 +463,7 @@ extern "C" { if (data->parameters[fss_basic_list_read_parameter_line].result == f_console_result_additional) { if (data->contents.array[i].used == 0) { if (include_empty && line == 0) { - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); } } else { @@ -472,8 +472,8 @@ extern "C" { if (line == 0) { for (; i <= data->contents.array[i].array[0].stop; i++) { if (data->buffer.string[i] == 0) continue; - if (data->buffer.string[i] == f_string_eol) { - fprintf(f_type_output, "%c", f_string_eol); + if (data->buffer.string[i] == f_string_eol[0]) { + fprintf(f_type_output, "%c", f_string_eol[0]); break; } @@ -486,7 +486,7 @@ extern "C" { for (; i <= data->contents.array[i].array[0].stop; i++) { if (data->buffer.string[i] == 0) continue; - if (data->buffer.string[i] == f_string_eol) { + if (data->buffer.string[i] == f_string_eol[0]) { line_current++; if (line_current == line) { @@ -494,8 +494,8 @@ extern "C" { for (; i <= data->contents.array[i].array[0].stop; i++) { if (data->buffer.string[i] == 0) continue; - if (data->buffer.string[i] == f_string_eol) { - fprintf(f_type_output, "%c", f_string_eol); + if (data->buffer.string[i] == f_string_eol[0]) { + fprintf(f_type_output, "%c", f_string_eol[0]); break; } @@ -516,7 +516,7 @@ extern "C" { f_print_string_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[0]); } else if (include_empty) { - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); } break; @@ -546,13 +546,13 @@ extern "C" { for (f_string_length j = data->contents.array[i].array[0].start; j <= data->contents.array[i].array[0].stop; j++) { if (data->buffer.string[j] == 0) continue; - if (data->buffer.string[j] == f_string_eol) { + if (data->buffer.string[j] == f_string_eol[0]) { total++; } } // for } // for - fprintf(f_type_output, "%llu%c", total, f_string_eol); + fprintf(f_type_output, "%llu%c", total, f_string_eol[0]); return F_none; } @@ -569,7 +569,7 @@ extern "C" { if (data->contents.array[i].used == 0) { if (include_empty) { if (line_current == line) { - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); break; } @@ -583,7 +583,7 @@ extern "C" { if (line_current != line) { for (; j <= data->contents.array[i].array[0].stop; j++) { - if (data->buffer.string[j] == f_string_eol) { + if (data->buffer.string[j] == f_string_eol[0]) { line_current++; if (line_current == line) { @@ -600,8 +600,8 @@ extern "C" { for (; j <= data->contents.array[i].array[0].stop; j++) { if (data->buffer.string[j] == 0) continue; - if (data->buffer.string[j] == f_string_eol) { - fprintf(f_type_output, "%c", f_string_eol); + if (data->buffer.string[j] == f_string_eol[0]) { + fprintf(f_type_output, "%c", f_string_eol[0]); break; } @@ -622,7 +622,7 @@ extern "C" { if (data->contents.array[i].used == 0) { if (include_empty) { - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); } continue; diff --git a/level_3/fss_basic_list_write/c/fss_basic_list_write.c b/level_3/fss_basic_list_write/c/fss_basic_list_write.c index d55e9ab..01e2937 100644 --- a/level_3/fss_basic_list_write/c/fss_basic_list_write.c +++ b/level_3/fss_basic_list_write/c/fss_basic_list_write.c @@ -14,7 +14,7 @@ extern "C" { fll_program_print_help_option(context, f_console_standard_short_no_color, f_console_standard_long_no_color, f_console_symbol_short_disable, f_console_symbol_long_disable, "Do not output in color."); fll_program_print_help_option(context, f_console_standard_short_version, f_console_standard_long_version, f_console_symbol_short_disable, f_console_symbol_long_disable, " Print only the version number."); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); fll_program_print_help_option(context, fss_basic_list_write_short_object, fss_basic_list_write_long_object, f_console_symbol_short_enable, f_console_symbol_long_enable, " Write an object instead of content."); fll_program_print_help_option(context, fss_basic_list_write_short_file, fss_basic_list_write_long_file, f_console_symbol_short_enable, f_console_symbol_long_enable, " Specify a file to send output to."); diff --git a/level_3/fss_basic_read/c/fss_basic_read.c b/level_3/fss_basic_read/c/fss_basic_read.c index 10dc27b..53a5001 100644 --- a/level_3/fss_basic_read/c/fss_basic_read.c +++ b/level_3/fss_basic_read/c/fss_basic_read.c @@ -15,7 +15,7 @@ extern "C" { fll_program_print_help_option(context, f_console_standard_short_no_color, f_console_standard_long_no_color, f_console_symbol_short_disable, f_console_symbol_long_disable, "Do not output in color."); fll_program_print_help_option(context, f_console_standard_short_version, f_console_standard_long_version, f_console_symbol_short_disable, f_console_symbol_long_disable, " Print only the version number."); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); fll_program_print_help_option(context, fss_basic_read_short_at, fss_basic_read_long_at, f_console_symbol_short_enable, f_console_symbol_long_enable, " Select object at this numeric index."); fll_program_print_help_option(context, fss_basic_read_short_depth, fss_basic_read_long_depth, f_console_symbol_short_enable, f_console_symbol_long_enable, " Select object at this numeric depth."); @@ -31,54 +31,54 @@ extern "C" { fl_color_print(f_type_output, context.important, context.reset, " Notes:"); - printf("%c", f_string_eol, f_string_eol); + printf("%c", f_string_eol[0], f_string_eol[0]); - printf(" This program will print the content associated with the given object and content data based on the FSS-0000 Basic standard.%c", f_string_eol); + printf(" This program will print the content associated with the given object and content data based on the FSS-0000 Basic standard.%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" When using the "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_depth); - printf(" option, an order of operations is enforced on the parameters.%c", f_string_eol); + printf(" option, an order of operations is enforced on the parameters.%c", f_string_eol[0]); - printf(" When this order of operations is in effect, parameters to the right of a depth parameter are influenced by that depth parameter:%c", f_string_eol); + printf(" When this order of operations is in effect, parameters to the right of a depth parameter are influenced by that depth parameter:%c", f_string_eol[0]); printf(" "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_at); - printf(": An object index at the specified depth.%c", f_string_eol); + printf(": An object index at the specified depth.%c", f_string_eol[0]); printf(" "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_depth); - printf(": A new depth within the specified depth, indexed from the root.%c", f_string_eol); + printf(": A new depth within the specified depth, indexed from the root.%c", f_string_eol[0]); printf(" "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_name); - printf(": An object name at the specified depth.%c", f_string_eol); + printf(": An object name at the specified depth.%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" The parameter "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_depth); - printf(" must be in numeric order, but values in between may be skipped.%c", f_string_eol); - printf(" ('-d 0 -a 1 -d 2 -a 2' would specify index 1 at depth 0, any index at depth 1, and index 2 at depth 2.)%c", f_string_eol); - printf(" ('-d 2 -a 1 -d 0 -a 2' would be invalid because depth 2 is before depth 1.)%c", f_string_eol); + printf(" must be in numeric order, but values in between may be skipped.%c", f_string_eol[0]); + printf(" ('-d 0 -a 1 -d 2 -a 2' would specify index 1 at depth 0, any index at depth 1, and index 2 at depth 2.)%c", f_string_eol[0]); + printf(" ('-d 2 -a 1 -d 0 -a 2' would be invalid because depth 2 is before depth 1.)%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" The parameter "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_select); - printf(" selects a content index at a given depth.%c", f_string_eol); - printf(" (This parameter is not synonymous with the depth parameter and does not relate to nested content).%c", f_string_eol); + printf(" selects a content index at a given depth.%c", f_string_eol[0]); + printf(" (This parameter is not synonymous with the depth parameter and does not relate to nested content).%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" Specify both "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_object); printf(" and the "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_total); - printf(" parameters to get the total objects.%c", f_string_eol); + printf(" parameters to get the total objects.%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" When both "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_at); @@ -88,34 +88,34 @@ extern "C" { fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_at); printf(" parameter value will be treated as a position relative to the specified "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_name); - printf(" parameter value.%c", f_string_eol); + printf(" parameter value.%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" This program may support parameters, such as "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_depth); printf(" or "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_select); - printf(", even if not supported by the standard.%c", f_string_eol); - printf(" This is done to help ensure consistency for scripting.%c", f_string_eol); + printf(", even if not supported by the standard.%c", f_string_eol[0]); + printf(" This is done to help ensure consistency for scripting.%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" For parameters like "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_depth); - printf(", if the standard doesn't support nested content, then only a depth of 0 would be valid.%c", f_string_eol); + printf(", if the standard doesn't support nested content, then only a depth of 0 would be valid.%c", f_string_eol[0]); printf(" For parameters like "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_select); - printf(", if the standard doesn't support multiple content groups, then only a select of 0 would be valid.%c", f_string_eol); + printf(", if the standard doesn't support multiple content groups, then only a select of 0 would be valid.%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" The parameter "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_basic_read_long_trim); - printf(" will remove leading and trailing whitespaces when selecting objects or when printing objects.%c", f_string_eol); + printf(" will remove leading and trailing whitespaces when selecting objects or when printing objects.%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); return F_none; } @@ -246,7 +246,7 @@ extern "C" { macro_fss_basic_read_depths_delete_simple(depths); if (data->parameters[fss_basic_read_parameter_total].result == f_console_result_found) { - fprintf(f_type_output, "0%c", f_string_eol); + fprintf(f_type_output, "0%c", f_string_eol[0]); fss_basic_read_delete_data(data); return F_none; diff --git a/level_3/fss_basic_read/c/private-fss_basic_read.c b/level_3/fss_basic_read/c/private-fss_basic_read.c index 89028d8..82f191b 100644 --- a/level_3/fss_basic_read/c/private-fss_basic_read.c +++ b/level_3/fss_basic_read/c/private-fss_basic_read.c @@ -365,10 +365,10 @@ extern "C" { if (data->parameters[fss_basic_read_parameter_total].result == f_console_result_found) { if (depths.array[0].index_at > 0) { if (depths.array[0].value_at < data->objects.used && names[depths.array[0].value_at]) { - fprintf(f_type_output, "1%c", f_string_eol); + fprintf(f_type_output, "1%c", f_string_eol[0]); } else { - fprintf(f_type_output, "0%c", f_string_eol); + fprintf(f_type_output, "0%c", f_string_eol[0]); } } else if (depths.array[0].index_name > 0) { @@ -380,10 +380,10 @@ extern "C" { total++; } // for - fprintf(f_type_output, "%llu%c", total, f_string_eol); + fprintf(f_type_output, "%llu%c", total, f_string_eol[0]); } else { - fprintf(f_type_output, "%llu%c", data->objects.used, f_string_eol); + fprintf(f_type_output, "%llu%c", data->objects.used, f_string_eol[0]); } return F_none; @@ -403,7 +403,7 @@ extern "C" { if (names[i]) { if (at == depths.array[0].value_at) { print_object(f_type_output, data->buffer, data->objects.array[i]); - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); break; } @@ -418,7 +418,7 @@ extern "C" { if (names[i] == 0) continue; print_object(f_type_output, data->buffer, data->objects.array[i]); - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); } // for return F_none; @@ -427,7 +427,7 @@ extern "C" { if (depths.array[0].index_at > 0) { if (depths.array[0].value_at >= data->objects.used) { if (names[depths.array[0].value_at] && data->parameters[fss_basic_read_parameter_total].result == f_console_result_found) { - fprintf(f_type_output, "0%c", f_string_eol); + fprintf(f_type_output, "0%c", f_string_eol[0]); } return F_none; @@ -447,28 +447,28 @@ extern "C" { if (at == depths.array[0].value_at) { if (data->parameters[fss_basic_read_parameter_total].result == f_console_result_found) { if (data->contents.array[i].used == 0) { - fprintf(f_type_output, "0%c", f_string_eol); + fprintf(f_type_output, "0%c", f_string_eol[0]); } else { - fprintf(f_type_output, "1%c", f_string_eol); + fprintf(f_type_output, "1%c", f_string_eol[0]); } } else if (data->parameters[fss_basic_read_parameter_line].result == f_console_result_additional) { if (data->contents.array[i].used > 0) { f_print_string_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[0]); - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); } else if (include_empty) { - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); } } else { if (data->contents.array[i].used > 0) { f_print_string_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[0]); - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); } else if (include_empty) { - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); } } @@ -497,7 +497,7 @@ extern "C" { total++; } // for - fprintf(f_type_output, "%llu%c", total, f_string_eol); + fprintf(f_type_output, "%llu%c", total, f_string_eol[0]); return F_none; } @@ -512,7 +512,7 @@ extern "C" { if (data->contents.array[i].used == 0) { if (include_empty) { if (line_current == line) { - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); break; } @@ -524,7 +524,7 @@ extern "C" { if (line_current == line) { f_print_string_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[0]); - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); break; } @@ -542,14 +542,14 @@ extern "C" { if (data->contents.array[i].used == 0) { if (include_empty) { - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); } continue; } f_print_string_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[0]); - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); } // for return F_none; diff --git a/level_3/fss_basic_write/c/fss_basic_write.c b/level_3/fss_basic_write/c/fss_basic_write.c index ac90e9b..932b605 100644 --- a/level_3/fss_basic_write/c/fss_basic_write.c +++ b/level_3/fss_basic_write/c/fss_basic_write.c @@ -14,7 +14,7 @@ extern "C" { fll_program_print_help_option(context, f_console_standard_short_no_color, f_console_standard_long_no_color, f_console_symbol_short_disable, f_console_symbol_long_disable, "Do not output in color."); fll_program_print_help_option(context, f_console_standard_short_version, f_console_standard_long_version, f_console_symbol_short_disable, f_console_symbol_long_disable, " Print only the version number."); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); fll_program_print_help_option(context, fss_basic_write_short_object, fss_basic_write_long_object, f_console_symbol_short_enable, f_console_symbol_long_enable, " Write an object instead of content."); fll_program_print_help_option(context, fss_basic_write_short_file, fss_basic_write_long_file, f_console_symbol_short_enable, f_console_symbol_long_enable, " Specify a file to send output to."); diff --git a/level_3/fss_extended_list_read/c/fss_extended_list_read.c b/level_3/fss_extended_list_read/c/fss_extended_list_read.c index dca81ad..dc7aebf 100644 --- a/level_3/fss_extended_list_read/c/fss_extended_list_read.c +++ b/level_3/fss_extended_list_read/c/fss_extended_list_read.c @@ -15,7 +15,7 @@ extern "C" { fll_program_print_help_option(context, f_console_standard_short_no_color, f_console_standard_long_no_color, f_console_symbol_short_disable, f_console_symbol_long_disable, "Do not output in color."); fll_program_print_help_option(context, f_console_standard_short_version, f_console_standard_long_version, f_console_symbol_short_disable, f_console_symbol_long_disable, " Print only the version number."); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); fll_program_print_help_option(context, fss_extended_list_read_short_at, fss_extended_list_read_long_at, f_console_symbol_short_enable, f_console_symbol_long_enable, " Select object at this numeric index."); fll_program_print_help_option(context, fss_extended_list_read_short_depth, fss_extended_list_read_long_depth, f_console_symbol_short_enable, f_console_symbol_long_enable, " Select object at this numeric depth."); @@ -31,54 +31,54 @@ extern "C" { fl_color_print(f_type_output, context.important, context.reset, " Notes:"); - printf("%c", f_string_eol, f_string_eol); + printf("%c", f_string_eol[0], f_string_eol[0]); - printf(" This program will print the content associated with the given object and content data based on the FSS-0002 Basic List standard.%c", f_string_eol); + printf(" This program will print the content associated with the given object and content data based on the FSS-0002 Basic List standard.%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" When using the "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_depth); - printf(" option, an order of operations is enforced on the parameters.%c", f_string_eol); + printf(" option, an order of operations is enforced on the parameters.%c", f_string_eol[0]); - printf(" When this order of operations is in effect, parameters to the right of a depth parameter are influenced by that depth parameter:%c", f_string_eol); + printf(" When this order of operations is in effect, parameters to the right of a depth parameter are influenced by that depth parameter:%c", f_string_eol[0]); printf(" "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_at); - printf(": An object index at the specified depth.%c", f_string_eol); + printf(": An object index at the specified depth.%c", f_string_eol[0]); printf(" "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_depth); - printf(": A new depth within the specified depth, indexed from the root.%c", f_string_eol); + printf(": A new depth within the specified depth, indexed from the root.%c", f_string_eol[0]); printf(" "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_name); - printf(": An object name at the specified depth.%c", f_string_eol); + printf(": An object name at the specified depth.%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" The parameter "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_depth); - printf(" must be in numeric order, but values in between may be skipped.%c", f_string_eol); - printf(" ('-d 0 -a 1 -d 2 -a 2' would specify index 1 at depth 0, any index at depth 1, and index 2 at depth 2.)%c", f_string_eol); - printf(" ('-d 2 -a 1 -d 0 -a 2' would be invalid because depth 2 is before depth 1.)%c", f_string_eol); + printf(" must be in numeric order, but values in between may be skipped.%c", f_string_eol[0]); + printf(" ('-d 0 -a 1 -d 2 -a 2' would specify index 1 at depth 0, any index at depth 1, and index 2 at depth 2.)%c", f_string_eol[0]); + printf(" ('-d 2 -a 1 -d 0 -a 2' would be invalid because depth 2 is before depth 1.)%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" The parameter "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_select); - printf(" selects a content index at a given depth.%c", f_string_eol); - printf(" (This parameter is not synonymous with the depth parameter and does not relate to nested content).%c", f_string_eol); + printf(" selects a content index at a given depth.%c", f_string_eol[0]); + printf(" (This parameter is not synonymous with the depth parameter and does not relate to nested content).%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" Specify both "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_object); printf(" and the "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_total); - printf(" parameters to get the total objects.%c", f_string_eol); + printf(" parameters to get the total objects.%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" When both "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_at); @@ -88,34 +88,34 @@ extern "C" { fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_at); printf(" parameter value will be treated as a position relative to the specified "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_name); - printf(" parameter value.%c", f_string_eol); + printf(" parameter value.%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" This program may support parameters, such as "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_depth); printf(" or "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_select); - printf(", even if not supported by the standard.%c", f_string_eol); - printf(" This is done to help ensure consistency for scripting.%c", f_string_eol); + printf(", even if not supported by the standard.%c", f_string_eol[0]); + printf(" This is done to help ensure consistency for scripting.%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" For parameters like "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_depth); - printf(", if the standard doesn't support nested content, then only a depth of 0 would be valid.%c", f_string_eol); + printf(", if the standard doesn't support nested content, then only a depth of 0 would be valid.%c", f_string_eol[0]); printf(" For parameters like "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_select); - printf(", if the standard doesn't support multiple content groups, then only a select of 0 would be valid.%c", f_string_eol); + printf(", if the standard doesn't support multiple content groups, then only a select of 0 would be valid.%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" The parameter "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_list_read_long_trim); - printf(" will remove leading and trailing whitespaces when selecting objects or when printing objects.%c", f_string_eol); + printf(" will remove leading and trailing whitespaces when selecting objects or when printing objects.%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); return F_none; } diff --git a/level_3/fss_extended_list_read/c/private-fss_extended_list_read.c b/level_3/fss_extended_list_read/c/private-fss_extended_list_read.c index 2747b67..53e4fc6 100644 --- a/level_3/fss_extended_list_read/c/private-fss_extended_list_read.c +++ b/level_3/fss_extended_list_read/c/private-fss_extended_list_read.c @@ -296,7 +296,7 @@ extern "C" { // Requested depths cannot be greater than contents depth. if (depths.used > data->nest.used) { if (data->parameters[fss_extended_list_read_parameter_total].result == f_console_result_found) { - fprintf(f_type_output, "0%c", f_string_eol); + fprintf(f_type_output, "0%c", f_string_eol[0]); return F_none; } @@ -385,10 +385,10 @@ extern "C" { if (depth_setting.index_at > 0) { if (depth_setting.value_at < items->used && names[depth_setting.value_at]) { - fprintf(f_type_output, "1%c", f_string_eol); + fprintf(f_type_output, "1%c", f_string_eol[0]); } else { - fprintf(f_type_output, "0%c", f_string_eol); + fprintf(f_type_output, "0%c", f_string_eol[0]); } return F_none; @@ -402,12 +402,12 @@ extern "C" { total++; } // for - fprintf(f_type_output, "%llu%c", total, f_string_eol); + fprintf(f_type_output, "%llu%c", total, f_string_eol[0]); return F_none; } - fprintf(f_type_output, "%llu%c", items->used, f_string_eol); + fprintf(f_type_output, "%llu%c", items->used, f_string_eol[0]); return F_none; } @@ -421,7 +421,7 @@ extern "C" { if (depth_setting.index_at > 0) { if (depth_setting.value_at < items->used && names[depth_setting.value_at]) { print_object(f_type_output, data->buffer, items->array[depth_setting.value_at].object); - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); } return F_none; @@ -430,7 +430,7 @@ extern "C" { for (f_array_length i = 0; i < items->used; i++) { if (names[i]) { print_object(f_type_output, data->buffer, items->array[i].object); - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); } } // for @@ -440,7 +440,7 @@ extern "C" { if (depth_setting.index_at > 0) { if (depth_setting.value_at >= items->used) { if (names[depth_setting.value_at] && data->parameters[fss_extended_list_read_parameter_total].result == f_console_result_found) { - fprintf(f_type_output, "0%c", f_string_eol); + fprintf(f_type_output, "0%c", f_string_eol[0]); } return F_none; @@ -454,7 +454,7 @@ extern "C" { if (at == depth_setting.value_at) { if (data->parameters[fss_extended_list_read_parameter_total].result == f_console_result_found) { if (items->array[i].content.used == 0) { - fprintf(f_type_output, "0%c", f_string_eol); + fprintf(f_type_output, "0%c", f_string_eol[0]); } else { f_string_length total = 1; @@ -462,12 +462,12 @@ extern "C" { for (f_string_length j = items->array[i].content.array[0].start; j <= items->array[i].content.array[0].stop; j++) { if (data->buffer.string[j] == 0) continue; - if (data->buffer.string[j] == f_string_eol) { + if (data->buffer.string[j] == f_string_eol[0]) { total++; } } // for - fprintf(f_type_output, "%llu%c", total, f_string_eol); + fprintf(f_type_output, "%llu%c", total, f_string_eol[0]); } return F_none; @@ -476,7 +476,7 @@ extern "C" { if (data->parameters[fss_extended_list_read_parameter_line].result == f_console_result_additional) { if (items->array[i].content.used == 0) { if (include_empty && line == 0) { - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); } } else { @@ -485,8 +485,8 @@ extern "C" { if (line == 0) { for (; i <= items->array[i].content.array[0].stop; i++) { if (data->buffer.string[i] == 0) continue; - if (data->buffer.string[i] == f_string_eol) { - fprintf(f_type_output, "%c", f_string_eol); + if (data->buffer.string[i] == f_string_eol[0]) { + fprintf(f_type_output, "%c", f_string_eol[0]); break; } @@ -499,7 +499,7 @@ extern "C" { for (; i <= items->array[i].content.array[0].stop; i++) { if (data->buffer.string[i] == 0) continue; - if (data->buffer.string[i] == f_string_eol) { + if (data->buffer.string[i] == f_string_eol[0]) { line_current++; if (line_current == line) { @@ -507,8 +507,8 @@ extern "C" { for (; i <= items->array[i].content.array[0].stop; i++) { if (data->buffer.string[i] == 0) continue; - if (data->buffer.string[i] == f_string_eol) { - fprintf(f_type_output, "%c", f_string_eol); + if (data->buffer.string[i] == f_string_eol[0]) { + fprintf(f_type_output, "%c", f_string_eol[0]); break; } @@ -529,7 +529,7 @@ extern "C" { f_print_string_dynamic_partial(f_type_output, data->buffer, items->array[i].content.array[0]); } else if (include_empty) { - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); } break; @@ -559,13 +559,13 @@ extern "C" { for (f_string_length j = items->array[i].content.array[0].start; j <= items->array[i].content.array[0].stop; j++) { if (data->buffer.string[j] == 0) continue; - if (data->buffer.string[j] == f_string_eol) { + if (data->buffer.string[j] == f_string_eol[0]) { total++; } } // for } // for - fprintf(f_type_output, "%llu%c", total, f_string_eol); + fprintf(f_type_output, "%llu%c", total, f_string_eol[0]); return F_none; } @@ -582,7 +582,7 @@ extern "C" { if (items->array[i].content.used == 0) { if (include_empty) { if (line_current == line) { - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); break; } @@ -596,7 +596,7 @@ extern "C" { if (line_current != line) { for (; j <= items->array[i].content.array[0].stop; j++) { - if (data->buffer.string[j] == f_string_eol) { + if (data->buffer.string[j] == f_string_eol[0]) { line_current++; if (line_current == line) { @@ -613,8 +613,8 @@ extern "C" { for (; j <= items->array[i].content.array[0].stop; j++) { if (data->buffer.string[j] == 0) continue; - if (data->buffer.string[j] == f_string_eol) { - fprintf(f_type_output, "%c", f_string_eol); + if (data->buffer.string[j] == f_string_eol[0]) { + fprintf(f_type_output, "%c", f_string_eol[0]); break; } @@ -635,7 +635,7 @@ extern "C" { if (items->array[i].content.used == 0) { if (include_empty) { - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); } continue; diff --git a/level_3/fss_extended_read/c/fss_extended_read.c b/level_3/fss_extended_read/c/fss_extended_read.c index 2fee1ab..af5e3b5 100644 --- a/level_3/fss_extended_read/c/fss_extended_read.c +++ b/level_3/fss_extended_read/c/fss_extended_read.c @@ -15,7 +15,7 @@ extern "C" { fll_program_print_help_option(context, f_console_standard_short_no_color, f_console_standard_long_no_color, f_console_symbol_short_disable, f_console_symbol_long_disable, "Do not output in color."); fll_program_print_help_option(context, f_console_standard_short_version, f_console_standard_long_version, f_console_symbol_short_disable, f_console_symbol_long_disable, " Print only the version number."); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); fll_program_print_help_option(context, fss_extended_read_short_at, fss_extended_read_long_at, f_console_symbol_short_enable, f_console_symbol_long_enable, " Select object at this numeric index."); fll_program_print_help_option(context, fss_extended_read_short_depth, fss_extended_read_long_depth, f_console_symbol_short_enable, f_console_symbol_long_enable, " Select object at this numeric depth."); @@ -31,54 +31,54 @@ extern "C" { fl_color_print(f_type_output, context.important, context.reset, " Notes:"); - printf("%c", f_string_eol, f_string_eol); + printf("%c", f_string_eol[0], f_string_eol[0]); - printf(" This program will print the content associated with the given object and content data based on the FSS-0001 Extended standard.%c", f_string_eol); + printf(" This program will print the content associated with the given object and content data based on the FSS-0001 Extended standard.%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" When using the "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_depth); - printf(" option, an order of operations is enforced on the parameters.%c", f_string_eol); + printf(" option, an order of operations is enforced on the parameters.%c", f_string_eol[0]); - printf(" When this order of operations is in effect, parameters to the right of a depth parameter are influenced by that depth parameter:%c", f_string_eol); + printf(" When this order of operations is in effect, parameters to the right of a depth parameter are influenced by that depth parameter:%c", f_string_eol[0]); printf(" "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_at); - printf(": An object index at the specified depth.%c", f_string_eol); + printf(": An object index at the specified depth.%c", f_string_eol[0]); printf(" "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_depth); - printf(": A new depth within the specified depth, indexed from the root.%c", f_string_eol); + printf(": A new depth within the specified depth, indexed from the root.%c", f_string_eol[0]); printf(" "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_name); - printf(": An object name at the specified depth.%c", f_string_eol); + printf(": An object name at the specified depth.%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" The parameter "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_depth); - printf(" must be in numeric order, but values in between may be skipped.%c", f_string_eol); - printf(" ('-d 0 -a 1 -d 2 -a 2' would specify index 1 at depth 0, any index at depth 1, and index 2 at depth 2.)%c", f_string_eol); - printf(" ('-d 2 -a 1 -d 0 -a 2' would be invalid because depth 2 is before depth 1.)%c", f_string_eol); + printf(" must be in numeric order, but values in between may be skipped.%c", f_string_eol[0]); + printf(" ('-d 0 -a 1 -d 2 -a 2' would specify index 1 at depth 0, any index at depth 1, and index 2 at depth 2.)%c", f_string_eol[0]); + printf(" ('-d 2 -a 1 -d 0 -a 2' would be invalid because depth 2 is before depth 1.)%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" The parameter "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_select); - printf(" selects a content index at a given depth.%c", f_string_eol); - printf(" (This parameter is not synonymous with the depth parameter and does not relate to nested content).%c", f_string_eol); + printf(" selects a content index at a given depth.%c", f_string_eol[0]); + printf(" (This parameter is not synonymous with the depth parameter and does not relate to nested content).%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" Specify both "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_object); printf(" and the "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_total); - printf(" parameters to get the total objects.%c", f_string_eol); + printf(" parameters to get the total objects.%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" When both "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_at); @@ -88,34 +88,34 @@ extern "C" { fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_at); printf(" parameter value will be treated as a position relative to the specified "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_name); - printf(" parameter value.%c", f_string_eol); + printf(" parameter value.%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" This program may support parameters, such as "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_depth); printf(" or "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_select); - printf(", even if not supported by the standard.%c", f_string_eol); - printf(" This is done to help ensure consistency for scripting.%c", f_string_eol); + printf(", even if not supported by the standard.%c", f_string_eol[0]); + printf(" This is done to help ensure consistency for scripting.%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" For parameters like "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_depth); - printf(", if the standard doesn't support nested content, then only a depth of 0 would be valid.%c", f_string_eol); + printf(", if the standard doesn't support nested content, then only a depth of 0 would be valid.%c", f_string_eol[0]); printf(" For parameters like "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_select); - printf(", if the standard doesn't support multiple content groups, then only a select of 0 would be valid.%c", f_string_eol); + printf(", if the standard doesn't support multiple content groups, then only a select of 0 would be valid.%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); printf(" The parameter "); fl_color_print(f_type_output, context.notable, context.reset, "%s%s", f_console_symbol_long_enable, fss_extended_read_long_trim); - printf(" will remove leading and trailing whitespaces when selecting objects or when printing objects.%c", f_string_eol); + printf(" will remove leading and trailing whitespaces when selecting objects or when printing objects.%c", f_string_eol[0]); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); return F_none; } @@ -246,7 +246,7 @@ extern "C" { macro_fss_extended_read_depths_delete_simple(depths); if (data->parameters[fss_extended_read_parameter_total].result == f_console_result_found) { - fprintf(f_type_output, "0%c", f_string_eol); + fprintf(f_type_output, "0%c", f_string_eol[0]); fss_extended_read_delete_data(data); return F_none; diff --git a/level_3/fss_extended_read/c/private-fss_extended_read.c b/level_3/fss_extended_read/c/private-fss_extended_read.c index be2d638..6d4cdd8 100644 --- a/level_3/fss_extended_read/c/private-fss_extended_read.c +++ b/level_3/fss_extended_read/c/private-fss_extended_read.c @@ -360,10 +360,10 @@ extern "C" { if (data->parameters[fss_extended_read_parameter_total].result == f_console_result_found) { if (depths.array[0].index_at > 0) { if (depths.array[0].value_at < data->objects.used && names[depths.array[0].value_at]) { - fprintf(f_type_output, "1%c", f_string_eol); + fprintf(f_type_output, "1%c", f_string_eol[0]); } else { - fprintf(f_type_output, "0%c", f_string_eol); + fprintf(f_type_output, "0%c", f_string_eol[0]); } } else if (depths.array[0].index_name > 0) { @@ -375,10 +375,10 @@ extern "C" { total++; } // for - fprintf(f_type_output, "%llu%c", total, f_string_eol); + fprintf(f_type_output, "%llu%c", total, f_string_eol[0]); } else { - fprintf(f_type_output, "%llu%c", data->objects.used, f_string_eol); + fprintf(f_type_output, "%llu%c", data->objects.used, f_string_eol[0]); } return F_none; @@ -398,7 +398,7 @@ extern "C" { if (names[i]) { if (at == depths.array[0].value_at) { print_object(f_type_output, data->buffer, data->objects.array[i]); - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); break; } @@ -413,7 +413,7 @@ extern "C" { if (names[i] == 0) continue; print_object(f_type_output, data->buffer, data->objects.array[i]); - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); } // for return F_none; @@ -422,7 +422,7 @@ extern "C" { if (depths.array[0].index_at > 0) { if (depths.array[0].value_at >= data->objects.used) { if (names[depths.array[0].value_at] && data->parameters[fss_extended_read_parameter_total].result == f_console_result_found) { - fprintf(f_type_output, "0%c", f_string_eol); + fprintf(f_type_output, "0%c", f_string_eol[0]); } return F_none; @@ -436,10 +436,10 @@ extern "C" { if (at == depths.array[0].value_at) { if (data->parameters[fss_extended_read_parameter_total].result == f_console_result_found) { if (data->contents.array[i].used == 0) { - fprintf(f_type_output, "0%c", f_string_eol); + fprintf(f_type_output, "0%c", f_string_eol[0]); } else { - fprintf(f_type_output, "1%c", f_string_eol); + fprintf(f_type_output, "1%c", f_string_eol[0]); } return F_none; @@ -453,7 +453,7 @@ extern "C" { if (data->parameters[fss_extended_read_parameter_select].result == f_console_result_additional) { if (select < data->contents.array[i].used) { f_print_string_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[select]); - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); } } else { @@ -465,17 +465,17 @@ extern "C" { } } // for - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); } } else if (include_empty) { if (data->parameters[fss_extended_read_parameter_select].result == f_console_result_additional) { if (select == 0) { - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); } } else { - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); } } } @@ -489,7 +489,7 @@ extern "C" { if (data->parameters[fss_extended_read_parameter_select].result == f_console_result_additional) { if (select < data->contents.array[i].used) { f_print_string_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[select]); - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); } } else { @@ -501,17 +501,17 @@ extern "C" { } } // for - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); } } else if (include_empty) { if (data->parameters[fss_extended_read_parameter_select].result == f_console_result_additional) { if (select == 0) { - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); } } else { - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); } } @@ -540,7 +540,7 @@ extern "C" { total++; } // for - fprintf(f_type_output, "%llu%c", total, f_string_eol); + fprintf(f_type_output, "%llu%c", total, f_string_eol[0]); return F_none; } @@ -557,7 +557,7 @@ extern "C" { if (data->contents.array[i].used == 0) { if (include_empty) { if (line_current == line) { - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); break; } @@ -571,7 +571,7 @@ extern "C" { if (data->parameters[fss_extended_read_parameter_select].result == f_console_result_additional) { if (select < data->contents.array[i].used) { f_print_string_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[select]); - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); } } else { @@ -583,7 +583,7 @@ extern "C" { } } // for - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); } break; @@ -605,7 +605,7 @@ extern "C" { if (data->contents.array[i].used == 0) { if (include_empty && select == 0) { - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); } continue; @@ -614,7 +614,7 @@ extern "C" { if (data->parameters[fss_extended_read_parameter_select].result == f_console_result_additional) { if (select < data->contents.array[i].used) { f_print_string_dynamic_partial(f_type_output, data->buffer, data->contents.array[i].array[select]); - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); } } else { @@ -626,7 +626,7 @@ extern "C" { } } // for - fprintf(f_type_output, "%c", f_string_eol); + fprintf(f_type_output, "%c", f_string_eol[0]); } } // for diff --git a/level_3/fss_extended_write/c/fss_extended_write.c b/level_3/fss_extended_write/c/fss_extended_write.c index 890f041..a06db01 100644 --- a/level_3/fss_extended_write/c/fss_extended_write.c +++ b/level_3/fss_extended_write/c/fss_extended_write.c @@ -14,7 +14,7 @@ extern "C" { fll_program_print_help_option(context, f_console_standard_short_no_color, f_console_standard_long_no_color, f_console_symbol_short_disable, f_console_symbol_long_disable, "Do not output in color."); fll_program_print_help_option(context, f_console_standard_short_version, f_console_standard_long_version, f_console_symbol_short_disable, f_console_symbol_long_disable, " Print only the version number."); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); fll_program_print_help_option(context, fss_extended_write_short_object, fss_extended_write_long_object, f_console_symbol_short_enable, f_console_symbol_long_enable, " Write an object instead of content."); fll_program_print_help_option(context, fss_extended_write_short_file, fss_extended_write_long_file, f_console_symbol_short_enable, f_console_symbol_long_enable, " Specify a file to send output to."); diff --git a/level_3/fss_status_code/c/fss_status_code.c b/level_3/fss_status_code/c/fss_status_code.c index 0224303..495ec94 100644 --- a/level_3/fss_status_code/c/fss_status_code.c +++ b/level_3/fss_status_code/c/fss_status_code.c @@ -15,7 +15,7 @@ extern "C" { fll_program_print_help_option(context, f_console_standard_short_no_color, f_console_standard_long_no_color, f_console_symbol_short_disable, f_console_symbol_long_disable, "Do not output in color."); fll_program_print_help_option(context, f_console_standard_short_version, f_console_standard_long_version, f_console_symbol_short_disable, f_console_symbol_long_disable, " Print only the version number."); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); fll_program_print_help_option(context, fss_status_code_short_is_fine, fss_status_code_long_is_fine, f_console_symbol_short_enable, f_console_symbol_long_enable, " Print F_true if the error code is not an error, F_false otherwise."); fll_program_print_help_option(context, fss_status_code_short_is_warning, fss_status_code_long_is_warning, f_console_symbol_short_enable, f_console_symbol_long_enable, "Print F_true if the error code is a warning, F_false otherwise."); diff --git a/level_3/init/c/init.c b/level_3/init/c/init.c index 14ed153..e2976e0 100644 --- a/level_3/init/c/init.c +++ b/level_3/init/c/init.c @@ -31,7 +31,7 @@ extern "C" { fll_program_print_help_option(context, f_console_standard_short_version, f_console_standard_long_version, f_console_symbol_short_disable, f_console_symbol_long_disable, " Print only the version number."); fll_program_print_help_option(context, f_console_standard_short_debug, f_console_standard_long_debug, f_console_symbol_short_disable, f_console_symbol_long_disable, " Enable debugging."); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); fll_program_print_help_option(context, init_parameter_no_prepare_short_name, init_parameter_no_prepare_long_name, f_console_symbol_short_enable, f_console_symbol_long_enable, " Do not attempt to process kernel command line or perform any boot-time specific preparations."); fll_program_print_help_option(context, init_parameter_runlevel_short_name, init_parameter_runlevel_long_name, f_console_symbol_short_enable, f_console_symbol_long_enable, " Specify a custom run level, ignoring the kernel command line runlevel argument."); diff --git a/level_3/status_code/c/status_code.c b/level_3/status_code/c/status_code.c index eb48be6..faf8238 100644 --- a/level_3/status_code/c/status_code.c +++ b/level_3/status_code/c/status_code.c @@ -15,7 +15,7 @@ extern "C" { fll_program_print_help_option(context, f_console_standard_short_no_color, f_console_standard_long_no_color, f_console_symbol_short_disable, f_console_symbol_long_disable, "Do not output in color."); fll_program_print_help_option(context, f_console_standard_short_version, f_console_standard_long_version, f_console_symbol_short_disable, f_console_symbol_long_disable, " Print only the version number."); - printf("%c", f_string_eol); + printf("%c", f_string_eol[0]); fll_program_print_help_option(context, status_code_short_is_fine, status_code_long_is_fine, f_console_symbol_short_enable, f_console_symbol_long_enable, " Print F_true if the error code is not an error, F_false otherwise."); fll_program_print_help_option(context, status_code_short_is_warning, status_code_long_is_warning, f_console_symbol_short_enable, f_console_symbol_long_enable, "Print F_true if the error code is a warning, F_false otherwise."); -- 1.8.3.1