From: Kevin Day Date: Sat, 17 Apr 2021 16:36:17 +0000 (-0500) Subject: Cleanup: relocate fl_color code to f_color and remove fl_color. X-Git-Tag: 0.5.3~37 X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=d6959fce193698871342dbc7d865f907247a0c43;p=fll Cleanup: relocate fl_color code to f_color and remove fl_color. Ever since f_string became a core/required/special project where all level_0 could depend on it, fl_color no longer needed to be at level_1. Relocate fl_color into f_color, removing the fl_color project entirely. Update all dependencies. This exposed some missing dependencies in fll_program that fl_color is secretly handling. Fix that as well. --- diff --git a/build/level_1/settings b/build/level_1/settings index f5cbdb5..d19202a 100644 --- a/build/level_1/settings +++ b/build/level_1/settings @@ -21,10 +21,10 @@ build_language c build_libraries -lc -lcap build_libraries-level -lfll_0 build_libraries-level_threadless -lfll_0 -build_sources_library color.c console.c control_group.c conversion.c directory.c private-directory.c environment.c private-fss.c fss_basic.c fss_basic_list.c fss_embedded_list.c fss_extended.c fss_extended_list.c iki.c print.c private-print.c status.c string.c private-string.c utf.c private-utf.c utf_file.c private-utf_file.c +build_sources_library console.c control_group.c conversion.c directory.c private-directory.c environment.c private-fss.c fss_basic.c fss_basic_list.c fss_embedded_list.c fss_extended.c fss_extended_list.c iki.c print.c private-print.c status.c string.c private-string.c utf.c private-utf.c utf_file.c private-utf_file.c build_sources_library-level build_sources_program -build_sources_headers color.h console.h control_group.h conversion.h directory.h environment.h execute.h execute-common.h fss.h fss_basic.h fss_basic_list.h fss_embedded_list.h fss_extended.h fss_extended_list.h fss_status.h iki.h print.h status.h string.h utf.h utf_file.h +build_sources_headers console.h control_group.h conversion.h directory.h environment.h execute.h execute-common.h fss.h fss_basic.h fss_basic_list.h fss_embedded_list.h fss_extended.h fss_extended_list.h fss_status.h iki.h print.h status.h string.h utf.h utf_file.h build_sources_headers-level build_sources_script build_sources_setting diff --git a/build/monolithic/settings b/build/monolithic/settings index 3ddf554..7c64f00 100644 --- a/build/monolithic/settings +++ b/build/monolithic/settings @@ -21,10 +21,10 @@ build_language c build_libraries -lc -lcap build_libraries-monolithic build_libraries-monolithic_threadless -build_sources_library level_0/account.c level_0/private-account.c level_0/capability.c level_0/color.c level_0/color-common.c level_0/console.c level_0/console-common.c level_0/control_group.c level_0/control_group-common.c level_0/conversion.c level_0/directory.c level_0/private-directory.c level_0/environment.c level_0/private-environment.c level_0/file.c level_0/file-common.c level_0/private-file.c level_0/fss.c level_0/private-fss.c level_0/fss_named.c level_0/fss_nest.c level_0/fss_set.c level_0/iki.c level_0/iki-common.c level_0/private-iki.c level_0/limit.c level_0/memory.c level_0/memory_structure.c level_0/private-memory.c level_0/path.c level_0/path-common.c level_0/private-path.c level_0/pipe.c level_0/print.c level_0/private-print.c level_0/serialize.c level_0/serialize-common.c level_0/private-serialize.c level_0/signal.c level_0/socket.c level_0/string.c level_0/string-common.c level_0/private-string.c level_0/string_dynamic.c level_0/string_map.c level_0/string_quantity.c level_0/string_range.c level_0/string_triple.c level_0/type_array.c level_0/private-type_array.c level_0/utf.c level_0/utf-common.c level_0/private-utf.c level_0/utf_dynamic.c level_0/utf_map.c level_0/utf_quantity.c level_0/utf_range.c level_0/utf_triple.c level_1/color.c level_1/console.c level_1/control_group.c level_1/conversion.c level_1/directory.c level_1/private-directory.c level_1/environment.c level_1/private-fss.c level_1/fss_basic.c level_1/fss_basic_list.c level_1/fss_embedded_list.c level_1/fss_extended.c level_1/fss_extended_list.c level_1/iki.c level_1/print.c level_1/private-print.c level_1/status.c level_1/string.c level_1/private-string.c level_1/utf.c level_1/private-utf.c level_1/utf_file.c level_1/private-utf_file.c level_2/control_group.c level_2/error.c level_2/error-common.c level_2/private-error.c level_2/execute.c level_2/private-execute.c level_2/file.c level_2/private-file.c level_2/fss.c level_2/private-fss.c level_2/fss_basic.c level_2/fss_basic_list.c level_2/fss_embedded_list.c level_2/fss_extended.c level_2/fss_extended_list.c level_2/fss_status.c level_2/iki.c level_2/private-iki.c level_2/path.c level_2/program.c level_2/status.c +build_sources_library level_0/account.c level_0/private-account.c level_0/capability.c level_0/color.c level_0/color-common.c level_0/console.c level_0/console-common.c level_0/control_group.c level_0/control_group-common.c level_0/conversion.c level_0/directory.c level_0/private-directory.c level_0/environment.c level_0/private-environment.c level_0/file.c level_0/file-common.c level_0/private-file.c level_0/fss.c level_0/private-fss.c level_0/fss_named.c level_0/fss_nest.c level_0/fss_set.c level_0/iki.c level_0/iki-common.c level_0/private-iki.c level_0/limit.c level_0/memory.c level_0/memory_structure.c level_0/private-memory.c level_0/path.c level_0/path-common.c level_0/private-path.c level_0/pipe.c level_0/print.c level_0/private-print.c level_0/serialize.c level_0/serialize-common.c level_0/private-serialize.c level_0/signal.c level_0/socket.c level_0/string.c level_0/string-common.c level_0/private-string.c level_0/string_dynamic.c level_0/string_map.c level_0/string_quantity.c level_0/string_range.c level_0/string_triple.c level_0/type_array.c level_0/private-type_array.c level_0/utf.c level_0/utf-common.c level_0/private-utf.c level_0/utf_dynamic.c level_0/utf_map.c level_0/utf_quantity.c level_0/utf_range.c level_0/utf_triple.c level_1/console.c level_1/control_group.c level_1/conversion.c level_1/directory.c level_1/private-directory.c level_1/environment.c level_1/private-fss.c level_1/fss_basic.c level_1/fss_basic_list.c level_1/fss_embedded_list.c level_1/fss_extended.c level_1/fss_extended_list.c level_1/iki.c level_1/print.c level_1/private-print.c level_1/status.c level_1/string.c level_1/private-string.c level_1/utf.c level_1/private-utf.c level_1/utf_file.c level_1/private-utf_file.c level_2/control_group.c level_2/error.c level_2/error-common.c level_2/private-error.c level_2/execute.c level_2/private-execute.c level_2/file.c level_2/private-file.c level_2/fss.c level_2/private-fss.c level_2/fss_basic.c level_2/fss_basic_list.c level_2/fss_embedded_list.c level_2/fss_extended.c level_2/fss_extended_list.c level_2/fss_status.c level_2/iki.c level_2/private-iki.c level_2/path.c level_2/program.c level_2/status.c build_sources_library-monolithic level_0/thread.c level_0/private-thread.c build_sources_program -build_sources_headers level_0/account.h level_0/account-common.h level_0/capability.h level_0/capability-common.h level_0/color.h level_0/color-common.h level_0/console.h level_0/console-common.h level_0/control_group.h level_0/control_group-common.h level_0/conversion.h level_0/conversion-common.h level_0/directory.h level_0/directory_type.h level_0/directory-common.h level_0/environment.h level_0/environment-common.h level_0/execute.h level_0/execute-common.h level_0/file.h level_0/file-common.h level_0/fss.h level_0/private-fss.h level_0/fss-common.h level_0/fss_comment.h level_0/fss_delimit.h level_0/fss_named.h level_0/fss_nest.h level_0/fss_quote.h level_0/fss_set.h level_0/iki.h level_0/iki-common.h level_0/limit.h level_0/limit-common.h level_0/memory.h level_0/memory_structure.h level_0/memory-common.h level_0/path.h level_0/path-common.h level_0/pipe.h level_0/print.h level_0/serialize.h level_0/serialize-common.h level_0/signal.h level_0/signal-common.h level_0/socket.h level_0/socket-common.h level_0/status.h level_0/status_array.h level_0/string.h level_0/string-common.h level_0/private-string.h level_0/string_dynamic.h level_0/string_map.h level_0/string_quantity.h level_0/string_range.h level_0/string_triple.h level_0/type.h level_0/type_array.h level_0/private-type_array.h level_0/type_array-common.h level_0/utf.h level_0/utf-common.h level_0/utf_dynamic.h level_0/utf_map.h level_0/utf_quantity.h level_0/utf_range.h level_0/utf_triple.h level_1/color.h level_1/console.h level_1/control_group.h level_1/conversion.h level_1/directory.h level_1/environment.h level_1/execute.h level_1/execute-common.h level_1/fss.h level_1/fss_basic.h level_1/fss_basic_list.h level_1/fss_embedded_list.h level_1/fss_extended.h level_1/fss_extended_list.h level_1/fss_status.h level_1/iki.h level_1/print.h level_1/status.h level_1/string.h level_1/utf.h level_1/utf_file.h level_2/control_group.h level_2/error.h level_2/error-common.h level_2/execute.h level_2/file.h level_2/fss.h level_2/fss_basic.h level_2/fss_basic_list.h level_2/fss_embedded_list.h level_2/fss_extended.h level_2/fss_extended_list.h level_2/fss_status.h level_2/iki.h level_2/path.h level_2/program.h level_2/status.h +build_sources_headers level_0/account.h level_0/account-common.h level_0/capability.h level_0/capability-common.h level_0/color.h level_0/color-common.h level_0/console.h level_0/console-common.h level_0/control_group.h level_0/control_group-common.h level_0/conversion.h level_0/conversion-common.h level_0/directory.h level_0/directory_type.h level_0/directory-common.h level_0/environment.h level_0/environment-common.h level_0/execute.h level_0/execute-common.h level_0/file.h level_0/file-common.h level_0/fss.h level_0/private-fss.h level_0/fss-common.h level_0/fss_comment.h level_0/fss_delimit.h level_0/fss_named.h level_0/fss_nest.h level_0/fss_quote.h level_0/fss_set.h level_0/iki.h level_0/iki-common.h level_0/limit.h level_0/limit-common.h level_0/memory.h level_0/memory_structure.h level_0/memory-common.h level_0/path.h level_0/path-common.h level_0/pipe.h level_0/print.h level_0/serialize.h level_0/serialize-common.h level_0/signal.h level_0/signal-common.h level_0/socket.h level_0/socket-common.h level_0/status.h level_0/status_array.h level_0/string.h level_0/string-common.h level_0/private-string.h level_0/string_dynamic.h level_0/string_map.h level_0/string_quantity.h level_0/string_range.h level_0/string_triple.h level_0/type.h level_0/type_array.h level_0/private-type_array.h level_0/type_array-common.h level_0/utf.h level_0/utf-common.h level_0/utf_dynamic.h level_0/utf_map.h level_0/utf_quantity.h level_0/utf_range.h level_0/utf_triple.h level_1/console.h level_1/control_group.h level_1/conversion.h level_1/directory.h level_1/environment.h level_1/execute.h level_1/execute-common.h level_1/fss.h level_1/fss_basic.h level_1/fss_basic_list.h level_1/fss_embedded_list.h level_1/fss_extended.h level_1/fss_extended_list.h level_1/fss_status.h level_1/iki.h level_1/print.h level_1/status.h level_1/string.h level_1/utf.h level_1/utf_file.h level_2/control_group.h level_2/error.h level_2/error-common.h level_2/execute.h level_2/file.h level_2/fss.h level_2/fss_basic.h level_2/fss_basic_list.h level_2/fss_embedded_list.h level_2/fss_extended.h level_2/fss_extended_list.h level_2/fss_status.h level_2/iki.h level_2/path.h level_2/program.h level_2/status.h build_sources_headers-monolithic level_0/thread.h level_0/thread-common.h build_sources_script build_sources_setting diff --git a/build/scripts/bootstrap-example.sh b/build/scripts/bootstrap-example.sh index 8c81843..adf92ad 100644 --- a/build/scripts/bootstrap-example.sh +++ b/build/scripts/bootstrap-example.sh @@ -56,7 +56,7 @@ if [[ $1 == "individual" ]] ; then bash build/scripts/package.sh $verbose $color build -i if [[ $? -eq 0 ]] ; then - for i in f_type f_status f_memory f_type_array f_string f_utf f_account f_capability f_color f_console f_control_group f_conversion f_directory f_environment f_execute f_file f_fss f_iki f_limit f_path f_pipe f_print f_serialize f_signal f_socket f_thread fl_color fl_console fl_control_group fl_conversion fl_directory fl_environment fl_execute fl_fss fl_iki fl_print fl_status fl_string fl_utf fl_utf_file fll_control_group fll_error fll_execute fll_file fll_fss fll_iki fll_path fll_program fll_status ; do + for i in f_type f_status f_memory f_type_array f_string f_utf f_account f_capability f_color f_console f_control_group f_conversion f_directory f_environment f_execute f_file f_fss f_iki f_limit f_path f_pipe f_print f_serialize f_signal f_socket f_thread fl_console fl_control_group fl_conversion fl_directory fl_environment fl_execute fl_fss fl_iki fl_print fl_status fl_string fl_utf fl_utf_file fll_control_group fll_error fll_execute fll_file fll_fss fll_iki fll_path fll_program fll_status ; do echo && echo "Processing $i." && cd package/individual/$i-$2/ && diff --git a/level_0/f_color/c/color-common.h b/level_0/f_color/c/color-common.h index 5dbf85d..cda622f 100644 --- a/level_0/f_color/c/color-common.h +++ b/level_0/f_color/c/color-common.h @@ -451,7 +451,7 @@ extern "C" { f_macro_string_dynamic_t_destroy_simple(context.normal) \ f_macro_string_dynamic_t_destroy_simple(context.normal_reset) \ f_macro_color_context_t_clear(context) -#endif // _di_fl_color_context_t_ +#endif // _di_f_color__context_t_ #ifdef __cplusplus } // extern "C" diff --git a/level_0/f_color/c/color.c b/level_0/f_color/c/color.c index acc7c64..bd835fa 100644 --- a/level_0/f_color/c/color.c +++ b/level_0/f_color/c/color.c @@ -4,6 +4,399 @@ extern "C" { #endif +#ifndef _di_f_color_set_ + f_status_t f_color_set(FILE *stream, const f_color_format_t format, const int8_t *color1, const int8_t *color2, const int8_t *color3, const int8_t *color4, const int8_t *color5) { + #ifndef _di_level_1_parameter_checking_ + if (!stream) return F_status_set_error(F_parameter); + if (!color1) return F_status_set_error(F_parameter); + + // make sure all data is in the proper order + if (!color2 && (color3 != 0 || color4 != 0 || color5 != 0)) return F_status_set_error(F_parameter); + if (!color3 && (color4 != 0 || color5 != 0)) return F_status_set_error(F_parameter); + if (!color4 && color5 != 0) return F_status_set_error(F_parameter); + #endif // _di_level_1_parameter_checking_ + + if (!color2) fprintf(stream, "%s%s%s", format.begin, color1, format.end); + else if (!color3) fprintf(stream, "%s%s%s%s%s", format.begin, color1, format.medium, color2, format.end); + else if (!color4) fprintf(stream, "%s%s%s%s%s%s%s", format.begin, color1, format.medium, color2, format.medium, color3, format.end); + else if (!color5) fprintf(stream, "%s%s%s%s%s%s%s%s%s", format.begin, color1, format.medium, color2, format.medium, color3, format.medium, color4, format.end); + else fprintf(stream, "%s%s%s%s%s%s%s%s%s%s%s", format.begin, color1, format.medium, color2, format.medium, color3, format.medium, color4, format.medium, color5, format.end); + + return F_none; + } +#endif // _di_f_color_set_ + +#ifndef _di_f_color_set_to_ + f_status_t f_color_set_to(const int id, const f_color_format_t format, const int8_t *color1, const int8_t *color2, const int8_t *color3, const int8_t *color4, const int8_t *color5) { + #ifndef _di_level_1_parameter_checking_ + if (id == -1) return F_status_set_error(F_parameter); + if (!color1) return F_status_set_error(F_parameter); + + // make sure all data is in the proper order + if (!color2 && (color3 != 0 || color4 != 0 || color5 != 0)) return F_status_set_error(F_parameter); + if (!color3 && (color4 != 0 || color5 != 0)) return F_status_set_error(F_parameter); + if (!color4 && color5 != 0) return F_status_set_error(F_parameter); + #endif // _di_level_1_parameter_checking_ + + if (!color2) dprintf(id, "%s%s%s", format.begin, color1, format.end); + else if (!color3) dprintf(id, "%s%s%s%s%s", format.begin, color1, format.medium, color2, format.end); + else if (!color4) dprintf(id, "%s%s%s%s%s%s%s", format.begin, color1, format.medium, color2, format.medium, color3, format.end); + else if (!color5) dprintf(id, "%s%s%s%s%s%s%s%s%s", format.begin, color1, format.medium, color2, format.medium, color3, format.medium, color4, format.end); + else dprintf(id, "%s%s%s%s%s%s%s%s%s%s%s", format.begin, color1, format.medium, color2, format.medium, color3, format.medium, color4, format.medium, color5, format.end); + + return F_none; + } +#endif // _di_f_color_set_to_ + +#ifndef _di_f_color_save_ + f_status_t f_color_save(f_string_dynamic_t *buffer, const f_color_format_t format, const int8_t *color1, const int8_t *color2, const int8_t *color3, const int8_t *color4, const int8_t *color5) { + #ifndef _di_level_1_parameter_checking_ + if (!buffer) return F_status_set_error(F_parameter); + if (!color1) return F_status_set_error(F_parameter); + + // make sure all data is in the proper order + if (!color2 && (color3 != 0 || color4 != 0 || color5 != 0)) return F_status_set_error(F_parameter); + if (!color3 && (color4 != 0 || color5 != 0)) return F_status_set_error(F_parameter); + if (!color4 && color5 != 0) return F_status_set_error(F_parameter); + #endif // _di_level_1_parameter_checking_ + + f_array_length_t string_size = strnlen(format.begin, f_color_max_size) + strnlen(format.end, f_color_max_size) + 1; + + if (!color2) string_size += strnlen(color1, f_color_max_size); + else if (!color3) string_size += strnlen(color1, f_color_max_size) + strnlen(color2, f_color_max_size); + else if (!color4) string_size += strnlen(color1, f_color_max_size) + strnlen(color2, f_color_max_size) + strnlen(color3, f_color_max_size); + else if (!color5) string_size += strnlen(color1, f_color_max_size) + strnlen(color2, f_color_max_size) + strnlen(color3, f_color_max_size) + strnlen(color4, f_color_max_size); + else string_size += strnlen(color1, f_color_max_size) + strnlen(color2, f_color_max_size) + strnlen(color3, f_color_max_size) + strnlen(color4, f_color_max_size) + strnlen(color5, f_color_max_size); + + // make sure there is enough allocated space, if not, then allocate some more + if (buffer->size - buffer->used - 1 < string_size) { + f_status_t status = F_none; + + f_macro_string_dynamic_t_resize(status, (*buffer), buffer->used + string_size + 1); // the additional 1 is the EOS + + if (F_status_is_error(status)) { + return status; + } + } + + if (!color2) { + strncat(buffer->string, format.begin, f_color_max_size); + strncat(buffer->string, color1, f_color_max_size); + strncat(buffer->string, format.end, f_color_max_size); + } + else if (!color3) { + strncat(buffer->string, format.begin, f_color_max_size); + strncat(buffer->string, color1, f_color_max_size); + strncat(buffer->string, format.medium, f_color_max_size); + strncat(buffer->string, color2, f_color_max_size); + strncat(buffer->string, format.end, f_color_max_size); + } + else if (!color4) { + strncat(buffer->string, format.begin, f_color_max_size); + strncat(buffer->string, color1, f_color_max_size); + strncat(buffer->string, format.medium, f_color_max_size); + strncat(buffer->string, color2, f_color_max_size); + strncat(buffer->string, format.medium, f_color_max_size); + strncat(buffer->string, color3, f_color_max_size); + strncat(buffer->string, format.end, f_color_max_size); + } + else if (!color5) { + strncat(buffer->string, format.begin, f_color_max_size); + strncat(buffer->string, color1, f_color_max_size); + strncat(buffer->string, format.medium, f_color_max_size); + strncat(buffer->string, color2, f_color_max_size); + strncat(buffer->string, format.medium, f_color_max_size); + strncat(buffer->string, color3, f_color_max_size); + strncat(buffer->string, format.medium, f_color_max_size); + strncat(buffer->string, color4, f_color_max_size); + strncat(buffer->string, format.end, f_color_max_size); + } + else { + strncat(buffer->string, format.begin, f_color_max_size); + strncat(buffer->string, color1, f_color_max_size); + strncat(buffer->string, format.medium, f_color_max_size); + strncat(buffer->string, color2, f_color_max_size); + strncat(buffer->string, format.medium, f_color_max_size); + strncat(buffer->string, color3, f_color_max_size); + strncat(buffer->string, format.medium, f_color_max_size); + strncat(buffer->string, color4, f_color_max_size); + strncat(buffer->string, format.medium, f_color_max_size); + strncat(buffer->string, color5, f_color_max_size); + strncat(buffer->string, format.end, f_color_max_size); + } + + // update the amount of space that is to be used + buffer->used += string_size; + + // do not forget the EOS + buffer->string[buffer->used] = 0; + + return F_none; + } +#endif // _di_f_color_save_ + +#ifndef _di_f_color_print_ + f_status_t f_color_print(FILE *stream, const f_color_set_t set, const f_string_t string, ...) { + #ifndef _di_level_1_parameter_checking_ + if (!stream) return F_status_set_error(F_parameter); + if (!string) return F_status_set_error(F_parameter); + #endif // _di_level_1_parameter_checking_ + + if (set.before) { + fprintf(stream, "%s", set.before->string); + } + + va_list ap; + + va_start(ap, string); + + vfprintf(stream, string, ap); + + va_end(ap); + + if (set.after) { + fprintf(stream, "%s", set.after->string); + } + + return F_none; + } +#endif // _di_f_color_print_ + +#ifndef _di_f_color_print2_ + f_status_t f_color_print2(FILE *stream, const f_color_set_t set, const f_color_set_t extra, const f_string_t string, ...) { + #ifndef _di_level_1_parameter_checking_ + if (!stream) return F_status_set_error(F_parameter); + if (!string) return F_status_set_error(F_parameter); + #endif // _di_level_1_parameter_checking_ + + f_status_t status = F_none; + + if (set.before) { + fprintf(stream, "%s", set.before->string); + } + + if (extra.before) { + fprintf(stream, "%s", extra.before->string); + } + + va_list ap; + + va_start(ap, string); + + vfprintf(stream, string, ap); + + va_end(ap); + + if (set.after) { + fprintf(stream, "%s", set.after->string); + } + + if (extra.after) { + fprintf(stream, "%s", extra.after->string); + } + + return F_none; + } +#endif // _di_f_color_print2_ + +#ifndef _di_f_color_print_code_ + f_status_t f_color_print_code(FILE *stream, const f_string_static_t color) { + #ifndef _di_level_1_parameter_checking_ + if (!stream) return F_status_set_error(F_parameter); + #endif // _di_level_1_parameter_checking_ + + if (color.used) { + fprintf(stream, "%s", color.string); + } + + return F_none; + } +#endif // _di_f_color_print_code_ + +#ifndef _di_f_color_print_code_to_ + f_status_t f_color_print_code_to(const int id, const f_string_static_t color) { + #ifndef _di_level_1_parameter_checking_ + if (id == -1) return F_status_set_error(F_parameter); + #endif // _di_level_1_parameter_checking_ + + if (color.used) { + dprintf(id, "%s", color.string); + } + + return F_none; + } +#endif // _di_f_color_print_code_to_ + +#ifndef _di_f_color_print_to_ + f_status_t f_color_print_to(const int id, const f_color_set_t set, const f_string_t string, ...) { + #ifndef _di_level_1_parameter_checking_ + if (id == -1) return F_status_set_error(F_parameter); + if (!string) return F_status_set_error(F_parameter); + #endif // _di_level_1_parameter_checking_ + + if (set.before) { + dprintf(id, "%s", set.before->string); + } + + va_list ap; + + va_start(ap, string); + + vdprintf(id, string, ap); + + va_end(ap); + + if (set.after) { + dprintf(id, "%s", set.after->string); + } + + return F_none; + } +#endif // _di_f_color_print_to_ + +#ifndef _di_f_color_print2_to_ + f_status_t f_color_print2_to(const int id, const f_color_set_t set, const f_color_set_t extra, const f_string_t string, ...) { + #ifndef _di_level_1_parameter_checking_ + if (id == -1) return F_status_set_error(F_parameter); + if (!string) return F_status_set_error(F_parameter); + #endif // _di_level_1_parameter_checking_ + + f_status_t status = F_none; + + if (set.before) { + dprintf(id, "%s", set.before->string); + } + + if (extra.before) { + dprintf(id, "%s", extra.before->string); + } + + va_list ap; + + va_start(ap, string); + + vdprintf(id, string, ap); + + va_end(ap); + + if (set.after) { + dprintf(id, "%s", set.after->string); + } + + if (extra.after) { + dprintf(id, "%s", extra.after->string); + } + + return F_none; + } +#endif // _di_f_color_print2_to_ + +#ifndef _di_f_color_load_context_ + f_status_t f_color_load_context(f_color_context_t *context, const bool use_light_colors) { + #ifndef _di_level_1_parameter_checking_ + if (!context) return F_status_set_error(F_parameter); + #endif // _di_level_1_parameter_checking_ + + f_status_t status = F_none; + + // switch to the appropriate terminal color mode + { + int8_t *environment = getenv("TERM"); + + if (!environment || strncmp(environment, "linux", 6) == 0) { + f_macro_color_t_set_linux(context->list); + } + else { + f_macro_color_t_set_xterminal(context->list); + } + } + + status = fl_macro_color_save_1(&context->reset, context->format, context->list.reset); + + if (F_status_is_error_not(status)) { + status = fl_macro_color_save_1(&context->warning, context->format, context->list.yellow); + } + + if (F_status_is_error_not(status)) { + status = fl_macro_color_save_2(&context->error, context->format, context->list.bold, context->list.red); + } + + if (F_status_is_error_not(status)) { + status = fl_macro_color_save_1(&context->notable, context->format, context->list.bold); + } + + if (F_status_is_error_not(status)) { + status = fl_macro_color_save_1(&context->standout, context->format, context->list.purple); + } + + if (use_light_colors) { + if (F_status_is_error_not(status)) { + status = fl_macro_color_save_2(&context->title, context->format, context->list.bold, context->list.blue); + } + + if (F_status_is_error_not(status)) { + status = fl_macro_color_save_1(&context->important, context->format, context->list.blue); + } + + if (F_status_is_error_not(status)) { + context->mode = f_color_mode_light; + } + + if (F_status_is_error_not(status)) { + status = fl_macro_color_save_1(&context->standout, context->format, context->list.purple); + } + } + else { + if (F_status_is_error_not(status)) { + status = fl_macro_color_save_2(&context->title, context->format, context->list.bold, context->list.yellow); + } + + if (F_status_is_error_not(status)) { + status = fl_macro_color_save_2(&context->important, context->format, context->list.bold, context->list.green); + } + + if (F_status_is_error_not(status)) { + context->mode = f_color_mode_dark; + } + + if (F_status_is_error_not(status)) { + status = fl_macro_color_save_1(&context->standout, context->format, context->list.green); + } + } + + if (F_status_is_error_not(status)) { + context->set.warning.before = &context->warning; + context->set.warning.after = &context->reset; + + context->set.error.before = &context->error; + context->set.error.after = &context->reset; + + context->set.title.before = &context->title; + context->set.title.after = &context->reset; + + context->set.notable.before = &context->notable; + context->set.notable.after = &context->reset; + + context->set.important.before = &context->important; + context->set.important.after = &context->reset; + + context->set.standout.before = &context->standout; + context->set.standout.after = &context->reset; + + context->set.normal.before = &context->normal; + context->set.normal.after = &context->reset; + + context->set.warning.before = &context->warning; + context->set.warning.after = &context->reset; + + context->set.normal_reset.before = &context->normal_reset; + context->set.normal_reset.after = &context->reset; + } + + return status; + } +#endif // _di_f_color_load_context_ + #ifdef __cplusplus } // extern "C" #endif diff --git a/level_0/f_color/c/color.h b/level_0/f_color/c/color.h index ef1d2aa..a1bd178 100644 --- a/level_0/f_color/c/color.h +++ b/level_0/f_color/c/color.h @@ -7,10 +7,16 @@ * * Provide basic color output support (linux & xterm). * This is the Featureless LINUX Library, so there is no support for non-linux colors at this time. + * + * For simplicity purposes, all color code strings are required and assumed to be NULL terminated. */ #ifndef _F_color_h #define _F_color_h +// libc includes +#include +#include + // fll-0 includes #include #include @@ -24,6 +30,274 @@ extern "C" { #endif +/** + * Given some file or standard io, and push color information to that file or standard io. + * + * Up to 5 colors may be associted with a single color format block. + * + * @param stream + * The file stream or standard output. + * @param format + * The color format parts. + * @param color1 + * A color to assign, set to 0 to disable. + * @param color2 + * A color to assign, set to 0 to disable. + * @param color3 + * A color to assign, set to 0 to disable. + * @param color4 + * A color to assign, set to 0 to disable. + * @param color5 + * A color to assign, set to 0 to disable. + * + * @return + * F_none on success. + * F_parameter (with error bit) if a parameter is invalid. + */ +#ifndef _di_f_color_set_ + extern f_status_t f_color_set(FILE *stream, const f_color_format_t format, const int8_t *color1, const int8_t *color2, const int8_t *color3, const int8_t *color4, const int8_t *color5); + + #define fl_macro_color_set_1(stream, format, color1) f_color_set(stream, format, color1, 0, 0, 0, 0); + #define fl_macro_color_set_2(stream, format, color1, color2) f_color_set(stream, format, color1, color2, 0, 0, 0); + #define fl_macro_color_set_3(stream, format, color1, color2, color3) f_color_set(stream, format, color1, color2, color3, 0, 0); + #define fl_macro_color_set_4(stream, format, color1, color2, color3, color4) f_color_set(stream, format, color1, color2, color3, color4, 0); + #define fl_macro_color_set_5(stream, format, color1, color2, color3, color4, color5) f_color_set(stream, format, color1, color2, color3, color4, color5); +#endif // _di_f_color_set_ + +/** + * Given some file descriptor, and push color information to that descriptor. + * + * Up to 5 colors may be associted with a single color format block. + * + * @param id + * The file descriptor to print to. + * @param format + * The color format parts. + * @param color1 + * A color to assign, set to 0 to disable. + * @param color2 + * A color to assign, set to 0 to disable. + * @param color3 + * A color to assign, set to 0 to disable. + * @param color4 + * A color to assign, set to 0 to disable. + * @param color5 + * A color to assign, set to 0 to disable. + * + * @return + * F_none on success. + * F_parameter (with error bit) if a parameter is invalid. + */ +#ifndef _di_f_color_set_to_ + extern f_status_t f_color_set_to(const int id, const f_color_format_t format, const int8_t *color1, const int8_t *color2, const int8_t *color3, const int8_t *color4, const int8_t *color5); + + #define fl_macro_color_set_to_1(id, format, color1) f_color_set_to(id, format, color1, 0, 0, 0, 0); + #define fl_macro_color_set_to_2(id, format, color1, color2) f_color_set_to(id, format, color1, color2, 0, 0, 0); + #define fl_macro_color_set_to_3(id, format, color1, color2, color3) f_color_set_to(id, format, color1, color2, color3, 0, 0); + #define fl_macro_color_set_to_4(id, format, color1, color2, color3, color4) f_color_set_to(id, format, color1, color2, color3, color4, 0); + #define fl_macro_color_set_to_5(id, format, color1, color2, color3, color4, color5) f_color_set_to(id, format, color1, color2, color3, color4, color5); +#endif // _di_f_color_set_to_ + +/** + * Save color information to some string. + * + * Up to 5 colors may be associted with a single color format block. + * + * @param buffer + * The string to save the colors to. + * @param format + * The color format parts. + * @param color1 + * A color to assign, set to 0 to disable. + * @param color2 + * A color to assign, set to 0 to disable. + * @param color3 + * A color to assign, set to 0 to disable. + * @param color4 + * A color to assign, set to 0 to disable. + * @param color5 + * A color to assign, set to 0 to disable. + * + * @return + * F_none on success. + * F_memory_not (with error bit) on out of memory. + * F_parameter (with error bit) if a parameter is invalid. + */ +#ifndef _di_f_color_save_ + extern f_status_t f_color_save(f_string_dynamic_t *buffer, const f_color_format_t format, const int8_t *color1, const int8_t *color2, const int8_t *color3, const int8_t *color4, const int8_t *color5); + + #define fl_macro_color_save_1(buffer, format, color1) f_color_save(buffer, format, color1, 0, 0, 0, 0); + #define fl_macro_color_save_2(buffer, format, color1, color2) f_color_save(buffer, format, color1, color2, 0, 0, 0); + #define fl_macro_color_save_3(buffer, format, color1, color2, color3) f_color_save(buffer, format, color1, color2, color3, 0, 0); + #define fl_macro_color_save_4(buffer, format, color1, color2, color3, color4) f_color_save(buffer, format, color1, color2, color3, color4, 0); + #define fl_macro_color_save_5(buffer, format, color1, color2, color3, color4, color5) f_color_save(buffer, format, color1, color2, color3, color4, color5); +#endif // _di_f_color_save_ + +/** + * Print a string, wrapped in a given start and stop color. + * + * If the colors strings have nothing used in them, then this will only print the string. + * + * @param stream + * The file stream or standard output. + * @param set + * The color set used for printing. + * @param string + * The string to print. + * @param ... + * Variable arguments, processed in the same way fprintf() processes them. + * + * @return + * F_none on success. + * F_parameter (with error bit) if a parameter is invalid. + */ +#ifndef _di_f_color_print_ + extern f_status_t f_color_print(FILE *stream, const f_color_set_t set, const f_string_t string, ...); +#endif // _di_f_color_print_ + +/** + * Print a string, wrapped in a given start, extra, and stop color. + * + * If the colors strings have nothing used in them, then this will only print the string. + * + * It is common for colors to be bolded. + * This is intended to simplify printing bold colors. + * + * @param stream + * The file stream or standard output. + * @param set + * The color set used for printing. + * @param extra + * The a second color set used for printing, which gets appended after set.before and set.after, respectively. + * @param string + * The string to print. + * @param ... + * Variable arguments, processed in the same way fprintf() processes them. + * + * @return + * F_none on success. + * F_parameter (with error bit) if a parameter is invalid. + */ +#ifndef _di_f_color_print2_ + extern f_status_t f_color_print2(FILE *stream, const f_color_set_t set, const f_color_set_t extra, const f_string_t string, ...); +#endif // _di_f_color_print2_ + +/** + * Print a single color code to the given file or standard io. + * + * Be sure to forget to print the color reset when done. + * + * @param stream + * The file stream or standard output. + * @param start_color + * The color code to print. + * + * @return + * F_none on success. + * F_parameter (with error bit) if a parameter is invalid. + * + * Errors (with error bit) from: f_print_dynamic(). + */ +#ifndef _di_f_color_print_code_ + extern f_status_t f_color_print_code(FILE *stream, const f_string_static_t color); +#endif // _di_f_color_print_code_ + +/** + * Print a single color code to the given file represented by a file descriptor. + * + * Be sure to forget to print the color reset when done. + * + * @param id + * The file descriptor to print to. + * @param start_color + * The color code to print. + * + * @return + * F_none on success. + * F_parameter (with error bit) if a parameter is invalid. + * + * Errors (with error bit) from: f_print_to_dynamic(). + */ +#ifndef _di_f_color_print_code_to_ + extern f_status_t f_color_print_code_to(const int id, const f_string_static_t color); +#endif // _di_f_color_print_code_to_ + +/** + * Print a string, wrapped in a given start and stop color. + * + * If the colors strings have nothing used in them, then this will only print the string. + * + * @param id + * The file descriptor to print to. + * @param set + * The color set used for printing. + * @param string + * The string to print. + * @param ... + * Variable arguments, processed in the same way fprintf() processes them. + * + * @return + * F_none on success. + * F_parameter (with error bit) if a parameter is invalid. + * + * Errors (with error bit) from: f_print_dynamic(). + */ +#ifndef _di_f_color_print_to_ + extern f_status_t f_color_print_to(const int id, const f_color_set_t set, const f_string_t string, ...); +#endif // _di_f_color_print_to_ + +/** + * Print a string, wrapped in a given start, extra, and stop color. + * + * If the colors strings have nothing used in them, then this will only print the string. + * + * It is common for colors to be bolded. + * This is intended to simplify printing bold colors. + * + * @param id + * The file descriptor to print to. + * @param set + * The color set used for printing. + * @param extra + * The a second color set used for printing, which gets appended after set.before and set.after, respectively. + * @param string + * The string to print. + * @param ... + * Variable arguments, processed in the same way fprintf() processes them. + * + * @return + * F_none on success. + * F_parameter (with error bit) if a parameter is invalid. + * + * Errors (with error bit) from: f_print_dynamic(). + */ +#ifndef _di_f_color_print2_to_ + extern f_status_t f_color_print2_to(const int id, const f_color_set_t set, const f_color_set_t extra, const f_string_t string, ...); +#endif // _di_f_color_print2_to_ + +/** + * Load the appropriate colors into the color context. + * + * This will handle the difference betweem xorg terminals and linux consoles. + * If you wish to use non-standard colors either redefine this function or don't use it. + * + * The default/fallback behavior is f_color_xterminal. + * + * @param context + * The color context the load the color codes into. + * @param use_light_colors + * Set to F_true to use colors for light backgrounds. + * Set to F_false to use colors for dark backgrounds. + * + * @return + * F_none on success. + * F_memory_not (with error bit) on out of memory. + * F_parameter (with error bit) if a parameter is invalid. + */ +#ifndef _di_f_color_load_context_ + extern f_status_t f_color_load_context(f_color_context_t *context, const bool use_light_colors); +#endif // _di_f_color_load_context_ + #ifdef __cplusplus } // extern "C" #endif diff --git a/level_1/fl_color/bash/color.sh b/level_1/fl_color/bash/color.sh deleted file mode 100644 index 0ec159f..0000000 --- a/level_1/fl_color/bash/color.sh +++ /dev/null @@ -1,253 +0,0 @@ -# FLL - Level 1 -# Project: Colors -# Version: 0.5.3 -# Licenses: flll, lgplv2.1 -# Programmers: Kevin Day -# Documentation: Provide basic color output support (linux & xterm) -# There will be future support for getting these values from a specified file, but at a higher level. - fl_color_none= - fl_color_reset="0" - fl_color_bold="1" - fl_color_underline="4" - fl_color_blink="5" - fl_color_highlight="7" - fl_color_nothing="8" - fl_color_black="30" - fl_color_red="31" - fl_color_green="32" - fl_color_yellow="33" - fl_color_blue="34" - fl_color_purple="35" - fl_color_teal="36" - fl_color_white="37" - fl_color_brightblack="90" - fl_color_brightred="91" - fl_color_brightgreen="92" - fl_color_brightyellow="93" - fl_color_brightblue="94" - fl_color_brightpurple="95" - fl_color_brightteal="96" - fl_color_brightwhite="97" - fl_color_black_bg="40" - fl_color_red_bg="41" - fl_color_green_bg="42" - fl_color_yellow_bg="43" - fl_color_blue_bg="44" - fl_color_purple_bg="45" - fl_color_teal_bg="46" - fl_color_white_bg="47" - fl_color_brightblack_bg="100" - fl_color_brightred_bg="101" - fl_color_brightgreen_bg="102" - fl_color_brightyellow_bg="103" - fl_color_brightblue_bg="104" - fl_color_brightpurple_bg="105" - fl_color_brightteal_bg="106" - fl_color_brightwhite_bg="107" - - # $1 = term, $2->$6 = colors, returned = color code returned - fl_set_color(){ - if [[ $1 == "lt" || $1 == "xt" ]] ; then - returned="\\033[" - local hit="no" - local fail="no" - local tailit="no" - - for i in $2 $3 $4 $5 $6 ; do - if [[ $1 == "xt" ]] ; then - case $i in - shade) - hit="yes" - tailit="no" - ;; - esac - elif [[ $1 == "lt" ]] ; then - case $i in - shade) - if [[ $tailit == "yes" ]] ; then returned="$returned;" ; fi - returned="$returned$fl_color_blink" - hit="yes" - tailit="yes" - ;; - blink) - hit="yes" - tailit="no" - ;; - nothing) - hit="yes" - tailit="no" - ;; - esac - fi - - if [[ $hit == "no" ]] ; then - - if [[ $tailit == "yes" ]] ; then - returned="$returned;" - tailit=no; - else - tailit=yes; - fi - - case $i in - reset) - returned="$returned$fl_color_reset" - tailit="yes" - ;; - bold) - returned="$returned$fl_color_bold" - tailit="yes" - ;; - underline) - returned="$returned$fl_color_underline" - tailit="yes" - ;; - blink) - returned="$returned$fl_color_blink" - tailit="yes" - ;; - highlight) - returned="$returned$fl_color_highlight" - tailit="yes" - ;; - nothing) - returned="$returned$fl_color_nothing" - tailit="yes" - ;; - black) - returned="$returned$fl_color_black" - tailit="yes" - ;; - red) - returned="$returned$fl_color_red" - tailit="yes" - ;; - green) - returned="$returned$fl_color_green" - tailit="yes" - ;; - yellow) - returned="$returned$fl_color_yellow" - tailit="yes" - ;; - blue) - returned="$returned$fl_color_blue" - tailit="yes" - ;; - purple) - returned="$returned$fl_color_purple" - tailit="yes" - ;; - teal) - returned="$returned$fl_color_teal" - tailit="yes" - ;; - white) - returned="$returned$fl_color_white" - tailit="yes" - ;; - brightblack) - returned="$returned$fl_color_brightblack" - tailit="yes" - ;; - brightred) - returned="$returned$fl_color_brightred" - tailit="yes" - ;; - brightgreen) - returned="$returned$fl_color_brightgreen" - tailit="yes" - ;; - brightyellow) - returned="$returned$fl_color_brightyellow" - tailit="yes" - ;; - brightblue) - returned="$returned$fl_color_brightblue" - tailit="yes" - ;; - brightpurple) - returned="$returned$fl_color_brightpurple" - tailit="yes" - ;; - brightteal) - returned="$returned$fl_color_brightteal" - tailit="yes" - ;; - brightwhite) - returned="$returned$fl_color_brightwhite" - tailit="yes" - ;; - black_bg) - returned="$returned$fl_color_black_bg" - tailit="yes" - ;; - red_bg) - returned="$returned$fl_color_red_bg" - tailit="yes" - ;; - green_bg) - returned="$returned$fl_color_green_bg" - tailit="yes" - ;; - yellow_bg) - returned="$returned$fl_color_yellow_bg" - tailit="yes" - ;; - blue_bg) - returned="$returned$fl_color_blue_bg" - tailit="yes" - ;; - purple_bg) - returned="$returned$fl_color_purple_bg" - tailit="yes" - ;; - teal_bg) - returned="$returned$fl_color_teal_bg" - tailit="yes" - ;; - white_bg) - returned="$returned$fl_color_white_bg" - tailit="yes" - ;; - brightblack_bg) - returned="$returned$fl_color_brightblack_bg" - tailit="yes" - ;; - brightred_bg) - returned="$returned$fl_color_brightred_bg" - tailit="yes" - ;; - brightgreen_bg) - returned="$returned$fl_color_brightgreen_bg" - tailit="yes" - ;; - brightyellow_bg) - returned="$returned$fl_color_brightyellow_bg" - tailit="yes" - ;; - brightblue_bg) - returned="$returned$fl_color_brightblue_bg" - tailit="yes" - ;; - brightpurple_bg) - returned="$returned$fl_color_brightpurple_bg" - tailit="yes" - ;; - brightteal_bg) - returned="$returned$fl_color_brightteal_bg" - tailit="yes" - ;; - brightwhite_bg) - returned="$returned$fl_color_brightwhite_bg" - tailit="yes" - ;; - esac - fi - - hit="no" - done - - returned="${returned}m" - fi - } diff --git a/level_1/fl_color/c/color.c b/level_1/fl_color/c/color.c deleted file mode 100644 index ab87d96..0000000 --- a/level_1/fl_color/c/color.c +++ /dev/null @@ -1,402 +0,0 @@ -#include "color.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef _di_fl_color_set_ - f_status_t fl_color_set(FILE *stream, const f_color_format_t format, const int8_t *color1, const int8_t *color2, const int8_t *color3, const int8_t *color4, const int8_t *color5) { - #ifndef _di_level_1_parameter_checking_ - if (!stream) return F_status_set_error(F_parameter); - if (!color1) return F_status_set_error(F_parameter); - - // make sure all data is in the proper order - if (!color2 && (color3 != 0 || color4 != 0 || color5 != 0)) return F_status_set_error(F_parameter); - if (!color3 && (color4 != 0 || color5 != 0)) return F_status_set_error(F_parameter); - if (!color4 && color5 != 0) return F_status_set_error(F_parameter); - #endif // _di_level_1_parameter_checking_ - - if (!color2) fprintf(stream, "%s%s%s", format.begin, color1, format.end); - else if (!color3) fprintf(stream, "%s%s%s%s%s", format.begin, color1, format.medium, color2, format.end); - else if (!color4) fprintf(stream, "%s%s%s%s%s%s%s", format.begin, color1, format.medium, color2, format.medium, color3, format.end); - else if (!color5) fprintf(stream, "%s%s%s%s%s%s%s%s%s", format.begin, color1, format.medium, color2, format.medium, color3, format.medium, color4, format.end); - else fprintf(stream, "%s%s%s%s%s%s%s%s%s%s%s", format.begin, color1, format.medium, color2, format.medium, color3, format.medium, color4, format.medium, color5, format.end); - - return F_none; - } -#endif // _di_fl_color_set_ - -#ifndef _di_fl_color_set_to_ - f_status_t fl_color_set_to(const int id, const f_color_format_t format, const int8_t *color1, const int8_t *color2, const int8_t *color3, const int8_t *color4, const int8_t *color5) { - #ifndef _di_level_1_parameter_checking_ - if (id == -1) return F_status_set_error(F_parameter); - if (!color1) return F_status_set_error(F_parameter); - - // make sure all data is in the proper order - if (!color2 && (color3 != 0 || color4 != 0 || color5 != 0)) return F_status_set_error(F_parameter); - if (!color3 && (color4 != 0 || color5 != 0)) return F_status_set_error(F_parameter); - if (!color4 && color5 != 0) return F_status_set_error(F_parameter); - #endif // _di_level_1_parameter_checking_ - - if (!color2) dprintf(id, "%s%s%s", format.begin, color1, format.end); - else if (!color3) dprintf(id, "%s%s%s%s%s", format.begin, color1, format.medium, color2, format.end); - else if (!color4) dprintf(id, "%s%s%s%s%s%s%s", format.begin, color1, format.medium, color2, format.medium, color3, format.end); - else if (!color5) dprintf(id, "%s%s%s%s%s%s%s%s%s", format.begin, color1, format.medium, color2, format.medium, color3, format.medium, color4, format.end); - else dprintf(id, "%s%s%s%s%s%s%s%s%s%s%s", format.begin, color1, format.medium, color2, format.medium, color3, format.medium, color4, format.medium, color5, format.end); - - return F_none; - } -#endif // _di_fl_color_set_to_ - -#ifndef _di_fl_color_save_ - f_status_t fl_color_save(f_string_dynamic_t *buffer, const f_color_format_t format, const int8_t *color1, const int8_t *color2, const int8_t *color3, const int8_t *color4, const int8_t *color5) { - #ifndef _di_level_1_parameter_checking_ - if (!buffer) return F_status_set_error(F_parameter); - if (!color1) return F_status_set_error(F_parameter); - - // make sure all data is in the proper order - if (!color2 && (color3 != 0 || color4 != 0 || color5 != 0)) return F_status_set_error(F_parameter); - if (!color3 && (color4 != 0 || color5 != 0)) return F_status_set_error(F_parameter); - if (!color4 && color5 != 0) return F_status_set_error(F_parameter); - #endif // _di_level_1_parameter_checking_ - - f_array_length_t string_size = strnlen(format.begin, f_color_max_size) + strnlen(format.end, f_color_max_size) + 1; - - if (!color2) string_size += strnlen(color1, f_color_max_size); - else if (!color3) string_size += strnlen(color1, f_color_max_size) + strnlen(color2, f_color_max_size); - else if (!color4) string_size += strnlen(color1, f_color_max_size) + strnlen(color2, f_color_max_size) + strnlen(color3, f_color_max_size); - else if (!color5) string_size += strnlen(color1, f_color_max_size) + strnlen(color2, f_color_max_size) + strnlen(color3, f_color_max_size) + strnlen(color4, f_color_max_size); - else string_size += strnlen(color1, f_color_max_size) + strnlen(color2, f_color_max_size) + strnlen(color3, f_color_max_size) + strnlen(color4, f_color_max_size) + strnlen(color5, f_color_max_size); - - // make sure there is enough allocated space, if not, then allocate some more - if (buffer->size - buffer->used - 1 < string_size) { - f_status_t status = F_none; - - f_macro_string_dynamic_t_resize(status, (*buffer), buffer->used + string_size + 1); // the additional 1 is the EOS - - if (F_status_is_error(status)) { - return status; - } - } - - if (!color2) { - strncat(buffer->string, format.begin, f_color_max_size); - strncat(buffer->string, color1, f_color_max_size); - strncat(buffer->string, format.end, f_color_max_size); - } - else if (!color3) { - strncat(buffer->string, format.begin, f_color_max_size); - strncat(buffer->string, color1, f_color_max_size); - strncat(buffer->string, format.medium, f_color_max_size); - strncat(buffer->string, color2, f_color_max_size); - strncat(buffer->string, format.end, f_color_max_size); - } - else if (!color4) { - strncat(buffer->string, format.begin, f_color_max_size); - strncat(buffer->string, color1, f_color_max_size); - strncat(buffer->string, format.medium, f_color_max_size); - strncat(buffer->string, color2, f_color_max_size); - strncat(buffer->string, format.medium, f_color_max_size); - strncat(buffer->string, color3, f_color_max_size); - strncat(buffer->string, format.end, f_color_max_size); - } - else if (!color5) { - strncat(buffer->string, format.begin, f_color_max_size); - strncat(buffer->string, color1, f_color_max_size); - strncat(buffer->string, format.medium, f_color_max_size); - strncat(buffer->string, color2, f_color_max_size); - strncat(buffer->string, format.medium, f_color_max_size); - strncat(buffer->string, color3, f_color_max_size); - strncat(buffer->string, format.medium, f_color_max_size); - strncat(buffer->string, color4, f_color_max_size); - strncat(buffer->string, format.end, f_color_max_size); - } - else { - strncat(buffer->string, format.begin, f_color_max_size); - strncat(buffer->string, color1, f_color_max_size); - strncat(buffer->string, format.medium, f_color_max_size); - strncat(buffer->string, color2, f_color_max_size); - strncat(buffer->string, format.medium, f_color_max_size); - strncat(buffer->string, color3, f_color_max_size); - strncat(buffer->string, format.medium, f_color_max_size); - strncat(buffer->string, color4, f_color_max_size); - strncat(buffer->string, format.medium, f_color_max_size); - strncat(buffer->string, color5, f_color_max_size); - strncat(buffer->string, format.end, f_color_max_size); - } - - // update the amount of space that is to be used - buffer->used += string_size; - - // do not forget the EOS - buffer->string[buffer->used] = 0; - - return F_none; - } -#endif // _di_fl_color_save_ - -#ifndef _di_fl_color_print_ - f_status_t fl_color_print(FILE *stream, const f_color_set_t set, const f_string_t string, ...) { - #ifndef _di_level_1_parameter_checking_ - if (!stream) return F_status_set_error(F_parameter); - if (!string) return F_status_set_error(F_parameter); - #endif // _di_level_1_parameter_checking_ - - if (set.before) { - fprintf(stream, "%s", set.before->string); - } - - va_list ap; - - va_start(ap, string); - - vfprintf(stream, string, ap); - - va_end(ap); - - if (set.after) { - fprintf(stream, "%s", set.after->string); - } - - return F_none; - } -#endif // _di_fl_color_print_ - -#ifndef _di_fl_color_print2_ - f_status_t fl_color_print2(FILE *stream, const f_color_set_t set, const f_color_set_t extra, const f_string_t string, ...) { - #ifndef _di_level_1_parameter_checking_ - if (!stream) return F_status_set_error(F_parameter); - if (!string) return F_status_set_error(F_parameter); - #endif // _di_level_1_parameter_checking_ - - f_status_t status = F_none; - - if (set.before) { - fprintf(stream, "%s", set.before->string); - } - - if (extra.before) { - fprintf(stream, "%s", extra.before->string); - } - - va_list ap; - - va_start(ap, string); - - vfprintf(stream, string, ap); - - va_end(ap); - - if (set.after) { - fprintf(stream, "%s", set.after->string); - } - - if (extra.after) { - fprintf(stream, "%s", extra.after->string); - } - - return F_none; - } -#endif // _di_fl_color_print2_ - -#ifndef _di_fl_color_print_code_ - f_status_t fl_color_print_code(FILE *stream, const f_string_static_t color) { - #ifndef _di_level_1_parameter_checking_ - if (!stream) return F_status_set_error(F_parameter); - #endif // _di_level_1_parameter_checking_ - - if (color.used) { - fprintf(stream, "%s", color.string); - } - - return F_none; - } -#endif // _di_fl_color_print_code_ - -#ifndef _di_fl_color_print_code_to_ - f_status_t fl_color_print_code_to(const int id, const f_string_static_t color) { - #ifndef _di_level_1_parameter_checking_ - if (id == -1) return F_status_set_error(F_parameter); - #endif // _di_level_1_parameter_checking_ - - if (color.used) { - dprintf(id, "%s", color.string); - } - - return F_none; - } -#endif // _di_fl_color_print_code_to_ - -#ifndef _di_fl_color_print_to_ - f_status_t fl_color_print_to(const int id, const f_color_set_t set, const f_string_t string, ...) { - #ifndef _di_level_1_parameter_checking_ - if (id == -1) return F_status_set_error(F_parameter); - if (!string) return F_status_set_error(F_parameter); - #endif // _di_level_1_parameter_checking_ - - if (set.before) { - dprintf(id, "%s", set.before->string); - } - - va_list ap; - - va_start(ap, string); - - vdprintf(id, string, ap); - - va_end(ap); - - if (set.after) { - dprintf(id, "%s", set.after->string); - } - - return F_none; - } -#endif // _di_fl_color_print_to_ - -#ifndef _di_fl_color_print2_to_ - f_status_t fl_color_print2_to(const int id, const f_color_set_t set, const f_color_set_t extra, const f_string_t string, ...) { - #ifndef _di_level_1_parameter_checking_ - if (id == -1) return F_status_set_error(F_parameter); - if (!string) return F_status_set_error(F_parameter); - #endif // _di_level_1_parameter_checking_ - - f_status_t status = F_none; - - if (set.before) { - dprintf(id, "%s", set.before->string); - } - - if (extra.before) { - dprintf(id, "%s", extra.before->string); - } - - va_list ap; - - va_start(ap, string); - - vdprintf(id, string, ap); - - va_end(ap); - - if (set.after) { - dprintf(id, "%s", set.after->string); - } - - if (extra.after) { - dprintf(id, "%s", extra.after->string); - } - - return F_none; - } -#endif // _di_fl_color_print2_to_ - -#ifndef _di_fl_color_load_context_ - f_status_t fl_color_load_context(f_color_context_t *context, const bool use_light_colors) { - #ifndef _di_level_1_parameter_checking_ - if (!context) return F_status_set_error(F_parameter); - #endif // _di_level_1_parameter_checking_ - - f_status_t status = F_none; - - // switch to the appropriate terminal color mode - { - int8_t *environment = getenv("TERM"); - - if (!environment || strncmp(environment, "linux", 6) == 0) { - f_macro_color_t_set_linux(context->list); - } - else { - f_macro_color_t_set_xterminal(context->list); - } - } - - status = fl_macro_color_save_1(&context->reset, context->format, context->list.reset); - - if (F_status_is_error_not(status)) { - status = fl_macro_color_save_1(&context->warning, context->format, context->list.yellow); - } - - if (F_status_is_error_not(status)) { - status = fl_macro_color_save_2(&context->error, context->format, context->list.bold, context->list.red); - } - - if (F_status_is_error_not(status)) { - status = fl_macro_color_save_1(&context->notable, context->format, context->list.bold); - } - - if (F_status_is_error_not(status)) { - status = fl_macro_color_save_1(&context->standout, context->format, context->list.purple); - } - - if (use_light_colors) { - if (F_status_is_error_not(status)) { - status = fl_macro_color_save_2(&context->title, context->format, context->list.bold, context->list.blue); - } - - if (F_status_is_error_not(status)) { - status = fl_macro_color_save_1(&context->important, context->format, context->list.blue); - } - - if (F_status_is_error_not(status)) { - context->mode = f_color_mode_light; - } - - if (F_status_is_error_not(status)) { - status = fl_macro_color_save_1(&context->standout, context->format, context->list.purple); - } - } - else { - if (F_status_is_error_not(status)) { - status = fl_macro_color_save_2(&context->title, context->format, context->list.bold, context->list.yellow); - } - - if (F_status_is_error_not(status)) { - status = fl_macro_color_save_2(&context->important, context->format, context->list.bold, context->list.green); - } - - if (F_status_is_error_not(status)) { - context->mode = f_color_mode_dark; - } - - if (F_status_is_error_not(status)) { - status = fl_macro_color_save_1(&context->standout, context->format, context->list.green); - } - } - - if (F_status_is_error_not(status)) { - context->set.warning.before = &context->warning; - context->set.warning.after = &context->reset; - - context->set.error.before = &context->error; - context->set.error.after = &context->reset; - - context->set.title.before = &context->title; - context->set.title.after = &context->reset; - - context->set.notable.before = &context->notable; - context->set.notable.after = &context->reset; - - context->set.important.before = &context->important; - context->set.important.after = &context->reset; - - context->set.standout.before = &context->standout; - context->set.standout.after = &context->reset; - - context->set.normal.before = &context->normal; - context->set.normal.after = &context->reset; - - context->set.warning.before = &context->warning; - context->set.warning.after = &context->reset; - - context->set.normal_reset.before = &context->normal_reset; - context->set.normal_reset.after = &context->reset; - } - - return status; - } -#endif // _di_fl_color_load_context_ - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/level_1/fl_color/c/color.h b/level_1/fl_color/c/color.h deleted file mode 100644 index 24d759f..0000000 --- a/level_1/fl_color/c/color.h +++ /dev/null @@ -1,305 +0,0 @@ -/** - * FLL - Level 1 - * - * Project: Color - * API Version: 0.5 - * Licenses: lgplv2.1 - * - * Provide basic color output support (linux & xterm). - * This is the Featureless LINUX Library, so there is no support for non-linux colors at this time. - * - * For simplicity purposes, all color code strings are assumed to be NULL terminated. - */ -#ifndef _FL_color_h -#define _FL_color_h - -// libc includes -#include -#include - -// fll-0 includes -#include -#include -#include -#include -#include -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * Given some file or standard io, and push color information to that file or standard io. - * - * Up to 5 colors may be associted with a single color format block. - * - * @param stream - * The file stream or standard output. - * @param format - * The color format parts. - * @param color1 - * A color to assign, set to 0 to disable. - * @param color2 - * A color to assign, set to 0 to disable. - * @param color3 - * A color to assign, set to 0 to disable. - * @param color4 - * A color to assign, set to 0 to disable. - * @param color5 - * A color to assign, set to 0 to disable. - * - * @return - * F_none on success. - * F_parameter (with error bit) if a parameter is invalid. - */ -#ifndef _di_fl_color_set_ - extern f_status_t fl_color_set(FILE *stream, const f_color_format_t format, const int8_t *color1, const int8_t *color2, const int8_t *color3, const int8_t *color4, const int8_t *color5); - - #define fl_macro_color_set_1(stream, format, color1) fl_color_set(stream, format, color1, 0, 0, 0, 0); - #define fl_macro_color_set_2(stream, format, color1, color2) fl_color_set(stream, format, color1, color2, 0, 0, 0); - #define fl_macro_color_set_3(stream, format, color1, color2, color3) fl_color_set(stream, format, color1, color2, color3, 0, 0); - #define fl_macro_color_set_4(stream, format, color1, color2, color3, color4) fl_color_set(stream, format, color1, color2, color3, color4, 0); - #define fl_macro_color_set_5(stream, format, color1, color2, color3, color4, color5) fl_color_set(stream, format, color1, color2, color3, color4, color5); -#endif // _di_fl_color_set_ - -/** - * Given some file descriptor, and push color information to that descriptor. - * - * Up to 5 colors may be associted with a single color format block. - * - * @param id - * The file descriptor to print to. - * @param format - * The color format parts. - * @param color1 - * A color to assign, set to 0 to disable. - * @param color2 - * A color to assign, set to 0 to disable. - * @param color3 - * A color to assign, set to 0 to disable. - * @param color4 - * A color to assign, set to 0 to disable. - * @param color5 - * A color to assign, set to 0 to disable. - * - * @return - * F_none on success. - * F_parameter (with error bit) if a parameter is invalid. - */ -#ifndef _di_fl_color_set_to_ - extern f_status_t fl_color_set_to(const int id, const f_color_format_t format, const int8_t *color1, const int8_t *color2, const int8_t *color3, const int8_t *color4, const int8_t *color5); - - #define fl_macro_color_set_to_1(id, format, color1) fl_color_set_to(id, format, color1, 0, 0, 0, 0); - #define fl_macro_color_set_to_2(id, format, color1, color2) fl_color_set_to(id, format, color1, color2, 0, 0, 0); - #define fl_macro_color_set_to_3(id, format, color1, color2, color3) fl_color_set_to(id, format, color1, color2, color3, 0, 0); - #define fl_macro_color_set_to_4(id, format, color1, color2, color3, color4) fl_color_set_to(id, format, color1, color2, color3, color4, 0); - #define fl_macro_color_set_to_5(id, format, color1, color2, color3, color4, color5) fl_color_set_to(id, format, color1, color2, color3, color4, color5); -#endif // _di_fl_color_set_to_ - -/** - * Save color information to some string. - * - * Up to 5 colors may be associted with a single color format block. - * - * @param buffer - * The string to save the colors to. - * @param format - * The color format parts. - * @param color1 - * A color to assign, set to 0 to disable. - * @param color2 - * A color to assign, set to 0 to disable. - * @param color3 - * A color to assign, set to 0 to disable. - * @param color4 - * A color to assign, set to 0 to disable. - * @param color5 - * A color to assign, set to 0 to disable. - * - * @return - * F_none on success. - * F_memory_not (with error bit) on out of memory. - * F_parameter (with error bit) if a parameter is invalid. - */ -#ifndef _di_fl_color_save_ - extern f_status_t fl_color_save(f_string_dynamic_t *buffer, const f_color_format_t format, const int8_t *color1, const int8_t *color2, const int8_t *color3, const int8_t *color4, const int8_t *color5); - - #define fl_macro_color_save_1(buffer, format, color1) fl_color_save(buffer, format, color1, 0, 0, 0, 0); - #define fl_macro_color_save_2(buffer, format, color1, color2) fl_color_save(buffer, format, color1, color2, 0, 0, 0); - #define fl_macro_color_save_3(buffer, format, color1, color2, color3) fl_color_save(buffer, format, color1, color2, color3, 0, 0); - #define fl_macro_color_save_4(buffer, format, color1, color2, color3, color4) fl_color_save(buffer, format, color1, color2, color3, color4, 0); - #define fl_macro_color_save_5(buffer, format, color1, color2, color3, color4, color5) fl_color_save(buffer, format, color1, color2, color3, color4, color5); -#endif // _di_fl_color_save_ - -/** - * Print a string, wrapped in a given start and stop color. - * - * If the colors strings have nothing used in them, then this will only print the string. - * - * @param stream - * The file stream or standard output. - * @param set - * The color set used for printing. - * @param string - * The string to print. - * @param ... - * Variable arguments, processed in the same way fprintf() processes them. - * - * @return - * F_none on success. - * F_parameter (with error bit) if a parameter is invalid. - */ -#ifndef _di_fl_color_print_ - extern f_status_t fl_color_print(FILE *stream, const f_color_set_t set, const f_string_t string, ...); -#endif // _di_fl_color_print_ - -/** - * Print a string, wrapped in a given start, extra, and stop color. - * - * If the colors strings have nothing used in them, then this will only print the string. - * - * It is common for colors to be bolded. - * This is intended to simplify printing bold colors. - * - * @param stream - * The file stream or standard output. - * @param set - * The color set used for printing. - * @param extra - * The a second color set used for printing, which gets appended after set.before and set.after, respectively. - * @param string - * The string to print. - * @param ... - * Variable arguments, processed in the same way fprintf() processes them. - * - * @return - * F_none on success. - * F_parameter (with error bit) if a parameter is invalid. - */ -#ifndef _di_fl_color_print2_ - extern f_status_t fl_color_print2(FILE *stream, const f_color_set_t set, const f_color_set_t extra, const f_string_t string, ...); -#endif // _di_fl_color_print2_ - -/** - * Print a single color code to the given file or standard io. - * - * Be sure to forget to print the color reset when done. - * - * @param stream - * The file stream or standard output. - * @param start_color - * The color code to print. - * - * @return - * F_none on success. - * F_parameter (with error bit) if a parameter is invalid. - * - * Errors (with error bit) from: f_print_dynamic(). - */ -#ifndef _di_fl_color_print_code_ - extern f_status_t fl_color_print_code(FILE *stream, const f_string_static_t color); -#endif // _di_fl_color_print_code_ - -/** - * Print a single color code to the given file represented by a file descriptor. - * - * Be sure to forget to print the color reset when done. - * - * @param id - * The file descriptor to print to. - * @param start_color - * The color code to print. - * - * @return - * F_none on success. - * F_parameter (with error bit) if a parameter is invalid. - * - * Errors (with error bit) from: f_print_to_dynamic(). - */ -#ifndef _di_fl_color_print_code_to_ - extern f_status_t fl_color_print_code_to(const int id, const f_string_static_t color); -#endif // _di_fl_color_print_code_to_ - -/** - * Print a string, wrapped in a given start and stop color. - * - * If the colors strings have nothing used in them, then this will only print the string. - * - * @param id - * The file descriptor to print to. - * @param set - * The color set used for printing. - * @param string - * The string to print. - * @param ... - * Variable arguments, processed in the same way fprintf() processes them. - * - * @return - * F_none on success. - * F_parameter (with error bit) if a parameter is invalid. - * - * Errors (with error bit) from: f_print_dynamic(). - */ -#ifndef _di_fl_color_print_to_ - extern f_status_t fl_color_print_to(const int id, const f_color_set_t set, const f_string_t string, ...); -#endif // _di_fl_color_print_to_ - -/** - * Print a string, wrapped in a given start, extra, and stop color. - * - * If the colors strings have nothing used in them, then this will only print the string. - * - * It is common for colors to be bolded. - * This is intended to simplify printing bold colors. - * - * @param id - * The file descriptor to print to. - * @param set - * The color set used for printing. - * @param extra - * The a second color set used for printing, which gets appended after set.before and set.after, respectively. - * @param string - * The string to print. - * @param ... - * Variable arguments, processed in the same way fprintf() processes them. - * - * @return - * F_none on success. - * F_parameter (with error bit) if a parameter is invalid. - * - * Errors (with error bit) from: f_print_dynamic(). - */ -#ifndef _di_fl_color_print2_to_ - extern f_status_t fl_color_print2_to(const int id, const f_color_set_t set, const f_color_set_t extra, const f_string_t string, ...); -#endif // _di_fl_color_print2_to_ - -/** - * Load the appropriate colors into the color context. - * - * This will handle the difference betweem xorg terminals and linux consoles. - * If you wish to use non-standard colors either redefine this function or don't use it. - * - * The default/fallback behavior is f_color_xterminal. - * - * @param context - * The color context the load the color codes into. - * @param use_light_colors - * Set to F_true to use colors for light backgrounds. - * Set to F_false to use colors for dark backgrounds. - * - * @return - * F_none on success. - * F_memory_not (with error bit) on out of memory. - * F_parameter (with error bit) if a parameter is invalid. - */ -#ifndef _di_fl_color_load_context_ - extern f_status_t fl_color_load_context(f_color_context_t *context, const bool use_light_colors); -#endif // _di_fl_color_load_context_ - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif // _FL_color_h diff --git a/level_1/fl_color/data/build/defines b/level_1/fl_color/data/build/defines deleted file mode 100644 index c665317..0000000 --- a/level_1/fl_color/data/build/defines +++ /dev/null @@ -1,2 +0,0 @@ -# fss-0000 - diff --git a/level_1/fl_color/data/build/dependencies b/level_1/fl_color/data/build/dependencies deleted file mode 100644 index 5f3a165..0000000 --- a/level_1/fl_color/data/build/dependencies +++ /dev/null @@ -1,9 +0,0 @@ -# fss-0000 - -f_type -f_status -f_memory -f_string -f_color -f_file -f_print diff --git a/level_1/fl_color/data/build/settings b/level_1/fl_color/data/build/settings deleted file mode 100644 index 88c880d..0000000 --- a/level_1/fl_color/data/build/settings +++ /dev/null @@ -1,55 +0,0 @@ -# fss-0001 - -project_name fl_color - -version_major 0 -version_minor 5 -version_micro 3 -version_target major - -environment - -process_pre -process_post - -modes individual -modes_default individual - -build_compiler gcc -build_indexer ar -build_language c -build_libraries -lc -build_libraries-individual -lf_color -lf_file -lf_memory -lf_print -lf_string -build_sources_library color.c -build_sources_program -build_sources_headers color.h -build_sources_script -build_sources_setting -build_script yes -build_shared yes -build_static no - -path_headers level_1 -path_headers_preserve no -path_library_script script -path_library_shared shared -path_library_static static -path_program_script script -path_program_shared shared -path_program_static static -path_sources -path_standard yes - -search_exclusive yes -search_shared yes -search_static yes - -defines_all -defines_static -defines_shared - -flags_all -z now -g -fdiagnostics-color=always -flags_shared -flags_static -flags_library -fPIC -flags_program -fPIE diff --git a/level_2/fll_file/c/file.h b/level_2/fll_file/c/file.h index 09759b3..4f3bcc6 100644 --- a/level_2/fll_file/c/file.h +++ b/level_2/fll_file/c/file.h @@ -18,12 +18,12 @@ #include #include #include +#include #include #include #include // fll-1 includes -#include #include #ifdef __cplusplus diff --git a/level_2/fll_file/data/build/dependencies b/level_2/fll_file/data/build/dependencies index 3d952dc..d28bd85 100644 --- a/level_2/fll_file/data/build/dependencies +++ b/level_2/fll_file/data/build/dependencies @@ -4,7 +4,7 @@ f_type f_status f_memory f_string +f_color f_directory f_file -fl_color fl_directory diff --git a/level_2/fll_file/data/build/settings b/level_2/fll_file/data/build/settings index 1dc66c8..23d651e 100644 --- a/level_2/fll_file/data/build/settings +++ b/level_2/fll_file/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfl_color -lfl_directory -lf_color -lf_directory -lf_file -lf_memory -lf_path -lf_print -lf_string -lf_utf +build_libraries-individual -lfl_directory -lf_color -lf_directory -lf_file -lf_memory -lf_path -lf_string -lf_utf build_sources_library file.c private-file.c build_sources_program build_sources_headers file.h diff --git a/level_2/fll_program/c/program.c b/level_2/fll_program/c/program.c index f8d4794..55c9f75 100644 --- a/level_2/fll_program/c/program.c +++ b/level_2/fll_program/c/program.c @@ -8,13 +8,13 @@ extern "C" { f_status_t fll_program_print_help_header(const f_file_t file, const f_color_context_t context, const f_string_t name, const f_string_t version) { fprintf(file.stream, "%c", f_string_eol_s[0]); - fl_color_print(file.stream, context.set.title, " %s", name); + f_color_print(file.stream, context.set.title, " %s", name); fprintf(file.stream, "%c", f_string_eol_s[0]); - fl_color_print(file.stream, context.set.notable, " Version %s", version); + f_color_print(file.stream, context.set.notable, " Version %s", version); fprintf(file.stream, "%c%c", f_string_eol_s[0], f_string_eol_s[0]); - fl_color_print(file.stream, context.set.important, " Available Options: "); + f_color_print(file.stream, context.set.important, " Available Options: "); return F_none; } @@ -24,10 +24,10 @@ extern "C" { f_status_t fll_program_print_help_option(const f_file_t file, const f_color_context_t context, const f_string_t option_short, const f_string_t option_long, const f_string_t symbol_short, const f_string_t symbol_long, const f_string_t description) { fprintf(file.stream, "%c %s", f_string_eol_s[0], symbol_short); - fl_color_print(file.stream, context.set.standout, option_short); + f_color_print(file.stream, context.set.standout, option_short); fprintf(file.stream, ", %s", symbol_long); - fl_color_print(file.stream, context.set.standout, option_long); + f_color_print(file.stream, context.set.standout, option_long); fprintf(file.stream, " %s", description); @@ -39,7 +39,7 @@ extern "C" { f_status_t fll_program_print_help_option_long(const f_file_t file, const f_color_context_t context, const f_string_t option_long, const f_string_t symbol_long, const f_string_t description) { fprintf(file.stream, "%c %s", f_string_eol_s[0], symbol_long); - fl_color_print(file.stream, context.set.standout, option_long); + f_color_print(file.stream, context.set.standout, option_long); fprintf(file.stream, " %s", description); @@ -51,7 +51,7 @@ extern "C" { f_status_t fll_program_print_help_option_other(const f_file_t file, const f_color_context_t context, const f_string_t option_other, const f_string_t description) { fprintf(file.stream, "%c ", f_string_eol_s[0]); - fl_color_print(file.stream, context.set.standout, option_other); + f_color_print(file.stream, context.set.standout, option_other); fprintf(file.stream, " %s", description); @@ -63,23 +63,23 @@ extern "C" { f_status_t fll_program_print_help_usage(const f_file_t file, const f_color_context_t context, const f_string_t name, const f_string_t parameters) { fprintf(file.stream, "%c%c", f_string_eol_s[0], f_string_eol_s[0]); - fl_color_print(file.stream, context.set.important, " Usage:"); + f_color_print(file.stream, context.set.important, " Usage:"); fprintf(file.stream, "%c ", f_string_eol_s[0]); - fl_color_print(file.stream, context.set.standout, name); + f_color_print(file.stream, context.set.standout, name); fprintf(file.stream, f_string_space_s); - fl_color_print(file.stream, context.set.notable, "["); + f_color_print(file.stream, context.set.notable, "["); fprintf(file.stream, " options "); - fl_color_print(file.stream, context.set.notable, "]"); + f_color_print(file.stream, context.set.notable, "]"); if (parameters[0] != '\0') { fprintf(file.stream, f_string_space_s); - fl_color_print(file.stream, context.set.notable, "["); + f_color_print(file.stream, context.set.notable, "["); fprintf(file.stream, " %s ", parameters); - fl_color_print(file.stream, context.set.notable, "]"); + f_color_print(file.stream, context.set.notable, "]"); } fprintf(file.stream, "%c%c", f_string_eol_s[0], f_string_eol_s[0]); @@ -122,7 +122,7 @@ extern "C" { f_macro_color_context_t_new(allocation_status, (*context)); if (F_status_is_error(status)) return status; - status = fl_color_load_context(context, decision == choices.id[1]); + status = f_color_load_context(context, decision == choices.id[1]); } else { context->mode = f_color_mode_no_color; diff --git a/level_2/fll_program/c/program.h b/level_2/fll_program/c/program.h index f70eeac..dcd04d6 100644 --- a/level_2/fll_program/c/program.h +++ b/level_2/fll_program/c/program.h @@ -19,10 +19,11 @@ #include #include #include +#include #include +#include // fll-1 includes -#include #include #ifdef __cplusplus @@ -44,9 +45,9 @@ extern "C" { * @return * F_none on success. * - * Errors (with error bit) from: fl_color_print(). + * Errors (with error bit) from: f_color_print(). * - * @param fl_color_print() + * @param f_color_print() */ #ifndef _di_fll_program_print_help_header_ extern f_status_t fll_program_print_help_header(const f_file_t file, const f_color_context_t context, const f_string_t name, const f_string_t version); @@ -73,9 +74,9 @@ extern "C" { * @return * F_none on success. * - * Errors (with error bit) from: fl_color_print(). + * Errors (with error bit) from: f_color_print(). * - * @param fl_color_print() + * @param f_color_print() */ #ifndef _di_fll_program_print_help_option_ extern f_status_t fll_program_print_help_option(const f_file_t file, const f_color_context_t context, const f_string_t option_short, const f_string_t option_long, const f_string_t symbol_short, const f_string_t symbol_long, const f_string_t description); @@ -98,9 +99,9 @@ extern "C" { * @return * F_none on success. * - * Errors (with error bit) from: fl_color_print(). + * Errors (with error bit) from: f_color_print(). * - * @param fl_color_print() + * @param f_color_print() */ #ifndef _di_fll_program_print_help_option_long_ extern f_status_t fll_program_print_help_option_long(const f_file_t file, const f_color_context_t context, const f_string_t option_long, const f_string_t symbol_long, const f_string_t description); @@ -121,9 +122,9 @@ extern "C" { * @return * F_none on success. * - * Errors (with error bit) from: fl_color_print(). + * Errors (with error bit) from: f_color_print(). * - * @param fl_color_print() + * @param f_color_print() */ #ifndef _di_fll_program_print_help_option_other_ extern f_status_t fll_program_print_help_option_other(const f_file_t file, const f_color_context_t context, const f_string_t option_other, const f_string_t description); @@ -145,9 +146,9 @@ extern "C" { * @return * F_none on success. * - * Errors (with error bit) from: fl_color_print(). + * Errors (with error bit) from: f_color_print(). * - * @param fl_color_print() + * @param f_color_print() */ #ifndef _di_fll_program_print_help_usage_ extern f_status_t fll_program_print_help_usage(const f_file_t file, const f_color_context_t context, const f_string_t name, const f_string_t parameters); @@ -194,12 +195,12 @@ extern "C" { * Errors (with error bit) from: f_console_parameter_prioritize_left(). * Errors (with error bit) from: f_console_parameter_prioritize_right(). * Errors (with error bit) from: f_console_parameter_process(). - * Errors (with error bit) from: fl_color_load_context(). + * Errors (with error bit) from: f_color_load_context(). * * @see f_console_parameter_prioritize_left() * @see f_console_parameter_prioritize_right() * @see f_console_parameter_process() - * @see fl_color_load_context() + * @see f_color_load_context() */ #ifndef _di_fll_program_parameter_process_ extern f_status_t fll_program_parameter_process(const f_console_arguments_t arguments, f_console_parameters_t parameters, const f_console_parameter_ids_t choices, const bool right, f_array_lengths_t *remaining, f_color_context_t *context); diff --git a/level_2/fll_program/data/build/dependencies b/level_2/fll_program/data/build/dependencies index 6ae2734..3b0c180 100644 --- a/level_2/fll_program/data/build/dependencies +++ b/level_2/fll_program/data/build/dependencies @@ -5,5 +5,7 @@ f_status f_memory f_string f_utf +f_color f_console -fl_color +f_file +fl_string diff --git a/level_2/fll_program/data/build/settings b/level_2/fll_program/data/build/settings index b1ac316..9fe3774 100644 --- a/level_2/fll_program/data/build/settings +++ b/level_2/fll_program/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfl_color -lf_color -lf_console -lf_file -lf_memory -lf_print -lf_string -lf_type_array -lf_utf +build_libraries-individual -lfl_string -lf_color -lf_console -lf_file -lf_memory -lf_string -lf_type_array -lf_utf build_sources_library program.c build_sources_program build_sources_headers program.h diff --git a/level_3/byte_dump/c/byte_dump.c b/level_3/byte_dump/c/byte_dump.c index 1fe2f61..837c34a 100644 --- a/level_3/byte_dump/c/byte_dump.c +++ b/level_3/byte_dump/c/byte_dump.c @@ -41,7 +41,7 @@ extern "C" { fprintf(output.stream, "%c%c", f_string_eol_s[0], f_string_eol_s[0]); - fl_color_print(output.stream, context.set.important, " Special Options: "); + f_color_print(output.stream, context.set.important, " Special Options: "); fll_program_print_help_option_long(output, context, byte_dump_long_normal, f_console_symbol_long_enable_s, " Display UTF-8 symbols for ASCII control codes."); fll_program_print_help_option_long(output, context, byte_dump_long_simple, f_console_symbol_long_enable_s, " Display spaces for ASCII control codes."); @@ -50,13 +50,13 @@ extern "C" { fll_program_print_help_usage(output, context, byte_dump_name, "filename(s)"); fprintf(output.stream, " When using the "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, byte_dump_long_text); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, byte_dump_long_text); fprintf(output.stream, " option, some UTF-8 characters may be replaced by your instance and cause display alignment issues."); fprintf(output.stream, "%c%c", f_string_eol_s[0], f_string_eol_s[0]); fprintf(output.stream, " Special UTF-8 characters and non-spacing UTF-8 characters may be replaced with a space (or a placeholder when the "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, byte_dump_long_placeholder); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, byte_dump_long_placeholder); fprintf(output.stream, " option is used)."); fprintf(output.stream, "%c%c", f_string_eol_s[0], f_string_eol_s[0]); @@ -66,7 +66,7 @@ extern "C" { fprintf(output.stream, "%c%c", f_string_eol_s[0], f_string_eol_s[0]); fprintf(output.stream, " When "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, byte_dump_long_last); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, byte_dump_long_last); fprintf(output.stream, " is used, any UTF-8 sequences will still be printed in full should any part is found within the requested range."); fprintf(output.stream, "%c%c", f_string_eol_s[0], f_string_eol_s[0]); @@ -221,9 +221,9 @@ extern "C" { if (data->remaining.used > 0 || data->process_pipe) { if (data->parameters[byte_dump_parameter_width].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, byte_dump_long_width); - fl_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, byte_dump_long_width); + f_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); byte_dump_delete_data(data); return F_status_set_error(status); @@ -237,13 +237,13 @@ extern "C" { status = fl_conversion_string_to_number_unsigned(arguments.argv[index], range, &number); if (F_status_is_error(status) || number < 1 || number >= 0xfb) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, byte_dump_long_width); - fl_color_print(data->error.to.stream, data->context.set.error, "' value can only be a number between "); - fl_color_print(data->error.to.stream, data->context.set.notable, "0"); - fl_color_print(data->error.to.stream, data->context.set.error, " and "); - fl_color_print(data->error.to.stream, data->context.set.notable, "251"); - fl_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, byte_dump_long_width); + f_color_print(data->error.to.stream, data->context.set.error, "' value can only be a number between "); + f_color_print(data->error.to.stream, data->context.set.notable, "0"); + f_color_print(data->error.to.stream, data->context.set.error, " and "); + f_color_print(data->error.to.stream, data->context.set.notable, "251"); + f_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); byte_dump_delete_data(data); return F_status_set_error(status); @@ -253,9 +253,9 @@ extern "C" { } if (data->parameters[byte_dump_parameter_first].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, byte_dump_long_first); - fl_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, byte_dump_long_first); + f_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); byte_dump_delete_data(data); return F_status_set_error(status); @@ -269,13 +269,13 @@ extern "C" { status = fl_conversion_string_to_number_unsigned(arguments.argv[index], range, &number); if (F_status_is_error(status) || number > f_number_t_size_unsigned) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, byte_dump_long_first); - fl_color_print(data->error.to.stream, data->context.set.error, "' value can only be a number (inclusively) between "); - fl_color_print(data->error.to.stream, data->context.set.notable, "0"); - fl_color_print(data->error.to.stream, data->context.set.error, " and "); - fl_color_print(data->error.to.stream, data->context.set.notable, "%llu", f_number_t_size_unsigned); - fl_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, byte_dump_long_first); + f_color_print(data->error.to.stream, data->context.set.error, "' value can only be a number (inclusively) between "); + f_color_print(data->error.to.stream, data->context.set.notable, "0"); + f_color_print(data->error.to.stream, data->context.set.error, " and "); + f_color_print(data->error.to.stream, data->context.set.notable, "%llu", f_number_t_size_unsigned); + f_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); byte_dump_delete_data(data); return F_status_set_error(status); @@ -285,9 +285,9 @@ extern "C" { } if (data->parameters[byte_dump_parameter_last].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, byte_dump_long_last); - fl_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, byte_dump_long_last); + f_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); byte_dump_delete_data(data); return F_status_set_error(status); @@ -301,13 +301,13 @@ extern "C" { status = fl_conversion_string_to_number_unsigned(arguments.argv[index], range, &number); if (F_status_is_error(status) || number < 0 || number > f_number_t_size_unsigned) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, byte_dump_long_last); - fl_color_print(data->error.to.stream, data->context.set.error, "' value can only be a number (inclusively) between "); - fl_color_print(data->error.to.stream, data->context.set.notable, "0"); - fl_color_print(data->error.to.stream, data->context.set.error, " and "); - fl_color_print(data->error.to.stream, data->context.set.notable, "%llu", f_number_t_size_unsigned); - fl_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, byte_dump_long_last); + f_color_print(data->error.to.stream, data->context.set.error, "' value can only be a number (inclusively) between "); + f_color_print(data->error.to.stream, data->context.set.notable, "0"); + f_color_print(data->error.to.stream, data->context.set.error, " and "); + f_color_print(data->error.to.stream, data->context.set.notable, "%llu", f_number_t_size_unsigned); + f_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); byte_dump_delete_data(data); return F_status_set_error(status); @@ -318,11 +318,11 @@ extern "C" { if (data->parameters[byte_dump_parameter_first].result == f_console_result_additional && data->parameters[byte_dump_parameter_last].result == f_console_result_additional) { if (data->first > data->last) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, byte_dump_long_first); - fl_color_print(data->error.to.stream, data->context.set.error, "' value cannot be greater than the parameter '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, byte_dump_long_last); - fl_color_print(data->error.to.stream, data->context.set.error, "' value.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, byte_dump_long_first); + f_color_print(data->error.to.stream, data->context.set.error, "' value cannot be greater than the parameter '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, byte_dump_long_last); + f_color_print(data->error.to.stream, data->context.set.error, "' value.%c", f_string_eol_s[0]); byte_dump_delete_data(data); return F_status_set_error(status); @@ -338,25 +338,25 @@ extern "C" { file.id = f_type_descriptor_input; printf("%c", f_string_eol_s[0]); - fl_color_print(data->output.stream, data->context.set.title, "Piped Byte Dump: (in "); + f_color_print(data->output.stream, data->context.set.title, "Piped Byte Dump: (in "); if (data->mode == byte_dump_mode_hexidecimal) { - fl_color_print(data->output.stream, data->context.set.title, "Hexidecimal"); + f_color_print(data->output.stream, data->context.set.title, "Hexidecimal"); } else if (data->mode == byte_dump_mode_duodecimal) { - fl_color_print(data->output.stream, data->context.set.title, "Duodecimal"); + f_color_print(data->output.stream, data->context.set.title, "Duodecimal"); } else if (data->mode == byte_dump_mode_octal) { - fl_color_print(data->output.stream, data->context.set.title, "Octal"); + f_color_print(data->output.stream, data->context.set.title, "Octal"); } else if (data->mode == byte_dump_mode_binary) { - fl_color_print(data->output.stream, data->context.set.title, "Binary"); + f_color_print(data->output.stream, data->context.set.title, "Binary"); } else if (data->mode == byte_dump_mode_decimal) { - fl_color_print(data->output.stream, data->context.set.title, "Decimal"); + f_color_print(data->output.stream, data->context.set.title, "Decimal"); } - fl_color_print(data->output.stream, data->context.set.title, ")%c", f_string_eol_s[0]); + f_color_print(data->output.stream, data->context.set.title, ")%c", f_string_eol_s[0]); status = byte_dump_file(*data, "-", file); @@ -408,27 +408,27 @@ extern "C" { } printf("%c", f_string_eol_s[0]); - fl_color_print(data->output.stream, data->context.set.title, "Byte Dump of: "); - fl_color_print(data->output.stream, data->context.set.notable, "%s", arguments.argv[data->remaining.array[counter]]); - fl_color_print(data->output.stream, data->context.set.title, " (in "); + f_color_print(data->output.stream, data->context.set.title, "Byte Dump of: "); + f_color_print(data->output.stream, data->context.set.notable, "%s", arguments.argv[data->remaining.array[counter]]); + f_color_print(data->output.stream, data->context.set.title, " (in "); if (data->mode == byte_dump_mode_hexidecimal) { - fl_color_print(data->output.stream, data->context.set.title, "Hexidecimal"); + f_color_print(data->output.stream, data->context.set.title, "Hexidecimal"); } else if (data->mode == byte_dump_mode_duodecimal) { - fl_color_print(data->output.stream, data->context.set.title, "Duodecimal"); + f_color_print(data->output.stream, data->context.set.title, "Duodecimal"); } else if (data->mode == byte_dump_mode_octal) { - fl_color_print(data->output.stream, data->context.set.title, "Octal"); + f_color_print(data->output.stream, data->context.set.title, "Octal"); } else if (data->mode == byte_dump_mode_binary) { - fl_color_print(data->output.stream, data->context.set.title, "Binary"); + f_color_print(data->output.stream, data->context.set.title, "Binary"); } else if (data->mode == byte_dump_mode_decimal) { - fl_color_print(data->output.stream, data->context.set.title, "Decimal"); + f_color_print(data->output.stream, data->context.set.title, "Decimal"); } - fl_color_print(data->output.stream, data->context.set.title, ")%c", f_string_eol_s[0]); + f_color_print(data->output.stream, data->context.set.title, ")%c", f_string_eol_s[0]); status = byte_dump_file(*data, arguments.argv[data->remaining.array[counter]], file); @@ -447,7 +447,7 @@ extern "C" { } } else { - fl_color_print(data->error.to.stream, data->context.set.error, "%sYou failed to specify one or more filenames.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sYou failed to specify one or more filenames.%c", fll_error_print_error, f_string_eol_s[0]); status = F_status_set_error(F_parameter); } diff --git a/level_3/byte_dump/c/byte_dump.h b/level_3/byte_dump/c/byte_dump.h index f474ee3..484daf0 100644 --- a/level_3/byte_dump/c/byte_dump.h +++ b/level_3/byte_dump/c/byte_dump.h @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -33,7 +34,6 @@ #include // fll-1 includes -#include #include #include #include diff --git a/level_3/byte_dump/c/private-byte_dump.c b/level_3/byte_dump/c/private-byte_dump.c index 3ed6c1a..e0a417c 100644 --- a/level_3/byte_dump/c/private-byte_dump.c +++ b/level_3/byte_dump/c/private-byte_dump.c @@ -212,17 +212,17 @@ extern "C" { fflush(data.output.stream); if (found_invalid_utf) { - fl_color_print(data.error.to.stream, data.context.set.error, "Invalid UTF-8 codes were detected for file '"); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", file_name); - fl_color_print(data.error.to.stream, data.context.set.error, "'."); + f_color_print(data.error.to.stream, data.context.set.error, "Invalid UTF-8 codes were detected for file '"); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", file_name); + f_color_print(data.error.to.stream, data.context.set.error, "'."); fprintf(data.error.to.stream, "%c%c", f_string_eol_s[0], f_string_eol_s[0]); } if (size < 0) { // @todo: determine what the error from read() is and display it. - fl_color_print(data.error.to.stream, data.context.set.error, "%sread() failed for '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", file_name); - fl_color_print(data.error.to.stream, data.context.set.error, "'."); + f_color_print(data.error.to.stream, data.context.set.error, "%sread() failed for '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", file_name); + f_color_print(data.error.to.stream, data.context.set.error, "'."); fprintf(data.error.to.stream, "%c%x", f_string_eol_s[0], f_string_eol_s[0]); status = F_status_set_error(F_failure); @@ -256,7 +256,7 @@ extern "C" { } if (!cell->column) { - fl_color_print(data.output.stream, data.context.set.notable, "%016X ", (uint64_t) cell->row); + f_color_print(data.output.stream, data.context.set.notable, "%016X ", (uint64_t) cell->row); if (*offset > 0) { uint8_t offset_to_print = *offset; @@ -306,7 +306,7 @@ extern "C" { if (cell->column < data.width) { if (data.mode == byte_dump_mode_hexidecimal) { if (invalid[character_current]) { - fl_color_print(data.output.stream, data.context.set.error, " %02x", (uint8_t) byte); + f_color_print(data.output.stream, data.context.set.error, " %02x", (uint8_t) byte); } else { fprintf(data.output.stream, " %02x", (uint8_t) byte); @@ -349,7 +349,7 @@ extern "C" { } else if (data.mode == byte_dump_mode_octal) { if (invalid[character_current]) { - fl_color_print(data.output.stream, data.context.set.error, " %03o", (uint8_t) byte); + f_color_print(data.output.stream, data.context.set.error, " %03o", (uint8_t) byte); } else { fprintf(data.output.stream, " %03o", (uint8_t) byte); @@ -368,7 +368,7 @@ extern "C" { binary_string[7] = (byte & 0x01) ? f_string_ascii_1_s[0] : f_string_ascii_0_s[0]; if (invalid[character_current]) { - fl_color_print(data.output.stream, data.context.set.error, " %s", binary_string); + f_color_print(data.output.stream, data.context.set.error, " %s", binary_string); } else { fprintf(data.output.stream, " %s", binary_string); @@ -376,7 +376,7 @@ extern "C" { } else if (data.mode == byte_dump_mode_decimal) { if (invalid[character_current]) { - fl_color_print(data.output.stream, data.context.set.error, " %3d", (uint8_t) byte); + f_color_print(data.output.stream, data.context.set.error, " %3d", (uint8_t) byte); } else { fprintf(data.output.stream, " %3d", (uint8_t) byte); @@ -441,7 +441,7 @@ extern "C" { uint8_t width_utf = 0; bool printed = F_false; - fl_color_print(data.output.stream, data.context.set.notable, " %s ", byte_dump_character_wall); + f_color_print(data.output.stream, data.context.set.notable, " %s ", byte_dump_character_wall); if (*offset > 0) { if (data.parameters[byte_dump_parameter_classic].result == f_console_result_found) { @@ -459,7 +459,7 @@ extern "C" { } while (*offset > 0 && j < data.width) { - fl_color_print(data.output.stream, data.context.set.warning, "%s", placeholder); + f_color_print(data.output.stream, data.context.set.warning, "%s", placeholder); (*offset)--; j++; } // while @@ -479,13 +479,13 @@ extern "C" { for (; j < previous->bytes && j < data.width; j++) { if (previous->invalid) { - fl_color_print(data.output.stream, data.context.set.error, "%s", byte_dump_character_placeholder); + f_color_print(data.output.stream, data.context.set.error, "%s", byte_dump_character_placeholder); } else if (data.parameters[byte_dump_parameter_classic].result == f_console_result_found) { fprintf(data.output.stream, f_string_ascii_period_s); } else { - fl_color_print(data.output.stream, data.context.set.warning, "%s", byte_dump_character_placeholder); + f_color_print(data.output.stream, data.context.set.warning, "%s", byte_dump_character_placeholder); } } // for } @@ -511,111 +511,111 @@ extern "C" { width_utf = f_macro_utf_byte_width_is(output); if (invalid[i]) { - fl_color_print(data.output.stream, data.context.set.error, "%s", byte_dump_character_incomplete); + f_color_print(data.output.stream, data.context.set.error, "%s", byte_dump_character_incomplete); } else if (output >= 0 && output <= 32 || output == 127) { if (data.presentation == byte_dump_presentation_normal) { if (!output) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_null); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_null); } else if (output == 1) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_start_of_header); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_start_of_header); } else if (output == 2) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_start_of_text); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_start_of_text); } else if (output == 3) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_end_of_text); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_end_of_text); } else if (output == 4) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_end_of_transmission); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_end_of_transmission); } else if (output == 5) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_end_of_enquiry); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_end_of_enquiry); } else if (output == 6) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_acknowledge); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_acknowledge); } else if (output == 7) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_bell); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_bell); } else if (output == 8) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_backspace); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_backspace); } else if (output == 9) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_tab); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_tab); } else if (output == 10) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_new_line); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_new_line); } else if (output == 11) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_tab_vertical); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_tab_vertical); } else if (output == 12) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_form_feed); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_form_feed); } else if (output == 13) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_carriage_return); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_carriage_return); } else if (output == 14) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_shift_out); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_shift_out); } else if (output == 15) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_shift_in); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_shift_in); } else if (output == 16) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_data_link_escape); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_data_link_escape); } else if (output == 17) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_device_control_1); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_device_control_1); } else if (output == 18) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_device_control_2); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_device_control_2); } else if (output == 19) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_device_control_3); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_device_control_3); } else if (output == 20) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_device_control_4); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_device_control_4); } else if (output == 21) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_negative_acknowledge); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_negative_acknowledge); } else if (output == 22) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_synchronous_idle); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_synchronous_idle); } else if (output == 23) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_end_of_transmission_block); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_end_of_transmission_block); } else if (output == 24) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_cancel); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_cancel); } else if (output == 25) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_end_of_medium); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_end_of_medium); } else if (output == 26) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_substitute); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_substitute); } else if (output == 27) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_escape); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_escape); } else if (output == 28) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_file_separator); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_file_separator); } else if (output == 29) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_group_separator); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_group_separator); } else if (output == 30) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_record_separator); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_record_separator); } else if (output == 31) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_unit_separator); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_unit_separator); } else if (output == 32) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_space); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_space); } else if (output == 127) { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_delete); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_delete); } } else if (data.presentation == byte_dump_presentation_simple) { @@ -630,7 +630,7 @@ extern "C" { fprintf(data.output.stream, f_string_ascii_period_s); } else { - fl_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_space); + f_color_print2(data.output.stream, data.context.set.notable, data.context.set.warning, "%s", byte_dump_sequence_space); } } else if (f_utf_character_is_zero_width(characters.string[i]) == F_true) { @@ -638,7 +638,7 @@ extern "C" { fprintf(data.output.stream, f_string_ascii_period_s); } else if (data.parameters[byte_dump_parameter_placeholder].result == f_console_result_found) { - fl_color_print(data.output.stream, data.context.set.warning, "%s", byte_dump_character_placeholder); + f_color_print(data.output.stream, data.context.set.warning, "%s", byte_dump_character_placeholder); } else { fprintf(data.output.stream, f_string_space_s); @@ -647,7 +647,7 @@ extern "C" { else if (f_utf_character_is_control(characters.string[i]) == F_true) { // print a space (or '.') for control characters. if (data.presentation == byte_dump_presentation_classic) { - fl_color_print(data.output.stream, data.context.set.warning, f_string_ascii_period_s); + f_color_print(data.output.stream, data.context.set.warning, f_string_ascii_period_s); } else { fprintf(data.output.stream, f_string_space_s); @@ -685,10 +685,10 @@ extern "C" { else if (width_utf == 1) { // print invalid placeholder for invalid UTF-8 widths. if (invalid[i]) { - fl_color_print(data.output.stream, data.context.set.error, "%s", byte_dump_character_incomplete); + f_color_print(data.output.stream, data.context.set.error, "%s", byte_dump_character_incomplete); } else { - fl_color_print(data.output.stream, data.context.set.warning, "%s", byte_dump_character_incomplete); + f_color_print(data.output.stream, data.context.set.warning, "%s", byte_dump_character_incomplete); } } else if (width_utf > 0) { @@ -751,13 +751,13 @@ extern "C" { if (width_utf > 1 && j + 1 < data.width) { if (data.parameters[byte_dump_parameter_placeholder].result == f_console_result_found) { if (invalid[i]) { - fl_color_print(data.output.stream, data.context.set.error, "%s", byte_dump_character_placeholder); + f_color_print(data.output.stream, data.context.set.error, "%s", byte_dump_character_placeholder); } else if (data.parameters[byte_dump_parameter_classic].result == f_console_result_found) { fprintf(data.output.stream, f_string_ascii_period_s); } else { - fl_color_print(data.output.stream, data.context.set.warning, "%s", byte_dump_character_placeholder); + f_color_print(data.output.stream, data.context.set.warning, "%s", byte_dump_character_placeholder); } } else { @@ -769,13 +769,13 @@ extern "C" { if (width_utf > 2 && j + 1 < data.width) { if (data.parameters[byte_dump_parameter_placeholder].result == f_console_result_found) { if (invalid[i]) { - fl_color_print(data.output.stream, data.context.set.error, "%s", byte_dump_character_placeholder); + f_color_print(data.output.stream, data.context.set.error, "%s", byte_dump_character_placeholder); } else if (data.parameters[byte_dump_parameter_classic].result == f_console_result_found) { fprintf(data.output.stream, f_string_ascii_period_s); } else { - fl_color_print(data.output.stream, data.context.set.warning, "%s", byte_dump_character_placeholder); + f_color_print(data.output.stream, data.context.set.warning, "%s", byte_dump_character_placeholder); } } else { @@ -787,13 +787,13 @@ extern "C" { if (width_utf > 3 && j + 1 < data.width) { if (data.parameters[byte_dump_parameter_placeholder].result == f_console_result_found) { if (invalid[i]) { - fl_color_print(data.output.stream, data.context.set.error, "%s", byte_dump_character_placeholder); + f_color_print(data.output.stream, data.context.set.error, "%s", byte_dump_character_placeholder); } else if (data.parameters[byte_dump_parameter_classic].result == f_console_result_found) { fprintf(data.output.stream, f_string_ascii_period_s); } else { - fl_color_print(data.output.stream, data.context.set.warning, "%s", byte_dump_character_placeholder); + f_color_print(data.output.stream, data.context.set.warning, "%s", byte_dump_character_placeholder); } } else { @@ -811,13 +811,13 @@ extern "C" { for (; j < data.width; j++) { if (invalid[j]) { - fl_color_print(data.output.stream, data.context.set.error, "%s", byte_dump_character_placeholder); + f_color_print(data.output.stream, data.context.set.error, "%s", byte_dump_character_placeholder); } else if (data.parameters[byte_dump_parameter_classic].result == f_console_result_found) { fprintf(data.output.stream, f_string_ascii_period_s); } else { - fl_color_print(data.output.stream, data.context.set.warning, "%s", byte_dump_character_placeholder); + f_color_print(data.output.stream, data.context.set.warning, "%s", byte_dump_character_placeholder); } } // for } @@ -827,7 +827,7 @@ extern "C" { } // for } - fl_color_print(data.output.stream, data.context.set.notable, " |"); + f_color_print(data.output.stream, data.context.set.notable, " |"); fprintf(data.output.stream, "%c", f_string_eol_s[0]); } #endif // _di_byte_dump_file_ diff --git a/level_3/byte_dump/data/build/dependencies b/level_3/byte_dump/data/build/dependencies index e88ed86..399e411 100644 --- a/level_3/byte_dump/data/build/dependencies +++ b/level_3/byte_dump/data/build/dependencies @@ -11,7 +11,6 @@ f_conversion f_file f_pipe f_print -fl_color fl_console fl_conversion fll_error diff --git a/level_3/byte_dump/data/build/settings b/level_3/byte_dump/data/build/settings index 4bf00f7..60d6dfc 100644 --- a/level_3/byte_dump/data/build/settings +++ b/level_3/byte_dump/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_error -lfll_program -lfl_color -lfl_console -lfl_conversion -lf_color -lf_console -lf_conversion -lf_file -lf_memory -lf_path -lf_pipe -lf_print -lf_string -lf_type_array -lf_utf +build_libraries-individual -lfll_error -lfll_program -lfl_console -lfl_conversion -lfl_string -lf_color -lf_console -lf_conversion -lf_file -lf_memory -lf_path -lf_pipe -lf_print -lf_string -lf_type_array -lf_utf build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library byte_dump.c private-byte_dump.c diff --git a/level_3/control/c/control.h b/level_3/control/c/control.h index e6d10fd..1ffca5d 100644 --- a/level_3/control/c/control.h +++ b/level_3/control/c/control.h @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -28,7 +29,6 @@ #include // fll-1 includes -#include #include #include diff --git a/level_3/control/data/build/dependencies b/level_3/control/data/build/dependencies index 7aeed1c..81a9424 100644 --- a/level_3/control/data/build/dependencies +++ b/level_3/control/data/build/dependencies @@ -10,7 +10,6 @@ f_console f_file f_pipe f_print -fl_color fl_console fll_error fll_program diff --git a/level_3/control/data/build/settings b/level_3/control/data/build/settings index 91f8468..3ba889e 100644 --- a/level_3/control/data/build/settings +++ b/level_3/control/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_error -lfll_program -lfl_color -lfl_console -lf_color -lf_console -lf_conversion -lf_file -lf_memory -lf_path -lf_pipe -lf_print -lf_string -lf_type_array -lf_utf +build_libraries-individual -lfll_error -lfll_program -lfl_console -lfl_string -lf_color -lf_console -lf_conversion -lf_file -lf_memory -lf_path -lf_pipe -lf_print -lf_string -lf_type_array -lf_utf build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library control.c private-control.c diff --git a/level_3/controller/c/controller.c b/level_3/controller/c/controller.c index 0647ff1..bfd3829 100644 --- a/level_3/controller/c/controller.c +++ b/level_3/controller/c/controller.c @@ -38,9 +38,9 @@ extern "C" { fll_program_print_help_usage(output, context, controller_name, "entry"); fprintf(output.stream, " When both the "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, controller_long_test); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, controller_long_test); fprintf(output.stream, " operation and the "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, controller_long_validate); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, controller_long_validate); fprintf(output.stream, " operation are specified, then additional information on each would be executed rule is printed."); fprintf(output.stream, "%c", f_string_eol_s[0]); diff --git a/level_3/controller/c/controller.h b/level_3/controller/c/controller.h index c4de804..417fb14 100644 --- a/level_3/controller/c/controller.h +++ b/level_3/controller/c/controller.h @@ -61,7 +61,6 @@ #include // fll-1 includes -#include #include #include #include diff --git a/level_3/controller/data/build/dependencies b/level_3/controller/data/build/dependencies index cca5649..6e62175 100644 --- a/level_3/controller/data/build/dependencies +++ b/level_3/controller/data/build/dependencies @@ -23,7 +23,6 @@ f_pipe f_print f_signal f_thread -fl_color fl_console fl_control_group fl_conversion diff --git a/level_3/controller/data/build/settings b/level_3/controller/data/build/settings index 4824893..106baeb 100644 --- a/level_3/controller/data/build/settings +++ b/level_3/controller/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -lcap -build_libraries-individual -lfll_control_group -lfll_error -lfll_execute -lfll_fss -lfll_path -lfll_program -lfl_color -lfl_console -lfl_control_group -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_iki -lfl_status -lfl_string -lf_account -lf_capability -lf_color -lf_console -lf_control_group -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_iki -lf_limit -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_string -lf_thread -lf_type_array -lf_utf +build_libraries-individual -lfll_control_group -lfll_error -lfll_execute -lfll_fss -lfll_path -lfll_program -lfl_console -lfl_control_group -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_iki -lfl_status -lfl_string -lf_account -lf_capability -lf_color -lf_console -lf_control_group -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_iki -lf_limit -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_string -lf_thread -lf_type_array -lf_utf build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library controller.c private-common.c private-control.c private-controller.c private-entry.c private-rule.c private-thread.c diff --git a/level_3/fake/c/fake.c b/level_3/fake/c/fake.c index 547cf5a..491ada8 100644 --- a/level_3/fake/c/fake.c +++ b/level_3/fake/c/fake.c @@ -42,7 +42,7 @@ extern "C" { fprintf(output.stream, "%c%c", f_string_eol_s[0], f_string_eol_s[0]); - fl_color_print(output.stream, context.set.important, " Special Options: "); + f_color_print(output.stream, context.set.important, " Special Options: "); fll_program_print_help_option_long(output, context, fake_long_documents_disabled, f_console_symbol_long_enable_s, " Forcibly do not build documents files."); fll_program_print_help_option_long(output, context, fake_long_documents_enabled, f_console_symbol_long_enable_s, " Forcibly do build documents files."); @@ -53,7 +53,7 @@ extern "C" { fprintf(output.stream, "%c%c", f_string_eol_s[0], f_string_eol_s[0]); - fl_color_print(output.stream, context.set.important, " Operations: "); + f_color_print(output.stream, context.set.important, " Operations: "); fll_program_print_help_option_other(output, context, fake_other_operation_build, " Build or compile the code based on build settings file."); fll_program_print_help_option_other(output, context, fake_other_operation_clean, " Delete all build files."); @@ -63,33 +63,33 @@ extern "C" { fll_program_print_help_usage(output, context, fake_name, "operation"); fprintf(output.stream, " When performing the "); - fl_color_print(output.stream, context.set.notable, "%s", fake_other_operation_build); + f_color_print(output.stream, context.set.notable, "%s", fake_other_operation_build); fprintf(output.stream, " operation, the "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_mode); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_mode); fprintf(output.stream, " parameter specifies a name (limited to alpha-numeric, underscore, and dash) to be used in addition to the global."); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " For example, when a "); - fl_color_print(output.stream, context.set.notable, "%s", fake_long_mode); + f_color_print(output.stream, context.set.notable, "%s", fake_long_mode); fprintf(output.stream, " of 'fll_monolithic' is specified, build libaries from both 'build_libraries' and 'build_libraries-fll_monolithic' are used (but not 'build_libraries-fll_level')."); fprintf(output.stream, "%c%c", f_string_eol_s[0], f_string_eol_s[0]); fprintf(output.stream, " When specifying the "); - fl_color_print(output.stream, context.set.notable, "%s", fake_long_fakefile); + f_color_print(output.stream, context.set.notable, "%s", fake_long_fakefile); fprintf(output.stream, " or the "); - fl_color_print(output.stream, context.set.notable, "%s", fake_long_settings); + f_color_print(output.stream, context.set.notable, "%s", fake_long_settings); fprintf(output.stream, " parameters, the filenames are relative to the data build directory, unless a path is used."); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " For example, with '"); - fl_color_print(output.stream, context.set.notable, "%s%s my_fakefile", f_console_symbol_long_enable_s, fake_long_fakefile); + f_color_print(output.stream, context.set.notable, "%s%s my_fakefile", f_console_symbol_long_enable_s, fake_long_fakefile); fprintf(output.stream, "' the fakefile at '"); - fl_color_print(output.stream, context.set.notable, "./%s%smy_fakefile", fake_default_path_data, fake_default_path_build); + f_color_print(output.stream, context.set.notable, "./%s%smy_fakefile", fake_default_path_data, fake_default_path_build); fprintf(output.stream, " would be used, however with '"); - fl_color_print(output.stream, context.set.notable, "%s%s ./my_fakefile", f_console_symbol_long_enable_s, fake_long_fakefile); + f_color_print(output.stream, context.set.notable, "%s%s ./my_fakefile", f_console_symbol_long_enable_s, fake_long_fakefile); fprintf(output.stream, "' the fakefile at '"); - fl_color_print(output.stream, context.set.notable, "./my_fakefile", fake_default_path_data, fake_default_path_build); + f_color_print(output.stream, context.set.notable, "./my_fakefile", fake_default_path_data, fake_default_path_build); fprintf(output.stream, " would be used."); fprintf(output.stream, "%c%c", f_string_eol_s[0], f_string_eol_s[0]); @@ -342,9 +342,9 @@ extern "C" { else if (F_status_is_error(status)) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->error.context, "%sThe operation '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->error.notable, "%s", operations_name); - fl_color_print(data->error.to.stream, data->error.context, "' failed.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->error.context, "%sThe operation '", fll_error_print_error); + f_color_print(data->error.to.stream, data->error.notable, "%s", operations_name); + f_color_print(data->error.to.stream, data->error.context, "' failed.%c", f_string_eol_s[0]); } break; @@ -364,7 +364,7 @@ extern "C" { else { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->error.context, "%sYou failed to specify an operation.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->error.context, "%sYou failed to specify an operation.%c", fll_error_print_error, f_string_eol_s[0]); fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); } diff --git a/level_3/fake/c/fake.h b/level_3/fake/c/fake.h index 7999724..acc7e43 100644 --- a/level_3/fake/c/fake.h +++ b/level_3/fake/c/fake.h @@ -57,6 +57,7 @@ #include #include #include +#include #include #include #include @@ -64,10 +65,10 @@ #include #include #include +#include #include // fll-1 includes -#include #include #include #include diff --git a/level_3/fake/c/private-build.c b/level_3/fake/c/private-build.c index 4966cec..3795fe5 100644 --- a/level_3/fake/c/private-build.c +++ b/level_3/fake/c/private-build.c @@ -181,7 +181,7 @@ extern "C" { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.output.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.output.stream, data.context.set.important, "Copying %s.", label); + f_color_print(data.output.stream, data.context.set.important, "Copying %s.", label); fprintf(data.output.stream, "%c", f_string_eol_s[0]); } @@ -431,7 +431,7 @@ extern "C" { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.output.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.output.stream, data.context.set.important, "Creating base build directories."); + f_color_print(data.output.stream, data.context.set.important, "Creating base build directories."); fprintf(data.output.stream, "%c", f_string_eol_s[0]); } @@ -680,9 +680,9 @@ extern "C" { if (F_status_set_fine(*status) == F_failure) { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.error.context, "%sFailed to execute script: ", data.error.prefix); - fl_color_print(data.error.to.stream, data.error.notable, "%s", path.string); - fl_color_print(data.error.to.stream, data.error.context, "."); + f_color_print(data.error.to.stream, data.error.context, "%sFailed to execute script: ", data.error.prefix); + f_color_print(data.error.to.stream, data.error.notable, "%s", path.string); + f_color_print(data.error.to.stream, data.error.context, "."); fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); } } @@ -754,7 +754,7 @@ extern "C" { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.output.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.output.stream, data.context.set.important, "Compiling shared library."); + f_color_print(data.output.stream, data.context.set.important, "Compiling shared library."); fprintf(data.output.stream, "%c", f_string_eol_s[0]); } @@ -1071,7 +1071,7 @@ extern "C" { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.output.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.output.stream, data.context.set.important, "Compiling static library."); + f_color_print(data.output.stream, data.context.set.important, "Compiling static library."); fprintf(data.output.stream, "%c", f_string_eol_s[0]); } @@ -1244,11 +1244,11 @@ extern "C" { if (environment->used + data_build.setting.environment.used > f_array_length_t_size) { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe values for the setting '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", fake_build_setting_name_environment); - fl_color_print(data.error.to.stream, data.context.set.error, "' of setting file '"); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", data.file_data_build_settings.string); - fl_color_print(data.error.to.stream, data.context.set.error, "' is too large."); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe values for the setting '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", fake_build_setting_name_environment); + f_color_print(data.error.to.stream, data.context.set.error, "' of setting file '"); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", data.file_data_build_settings.string); + f_color_print(data.error.to.stream, data.context.set.error, "' is too large."); fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); } @@ -1341,11 +1341,11 @@ extern "C" { if (!settings[i]->used) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe setting '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", names[i]); - fl_color_print(data.error.to.stream, data.context.set.error, "' is required but is not specified in the settings file '"); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", setting_file.used ? path_file : data.file_data_build_settings.string); - fl_color_print(data.error.to.stream, data.context.set.error, "'."); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe setting '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", names[i]); + f_color_print(data.error.to.stream, data.context.set.error, "' is required but is not specified in the settings file '"); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", setting_file.used ? path_file : data.file_data_build_settings.string); + f_color_print(data.error.to.stream, data.context.set.error, "'."); fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); failed = F_true; @@ -1578,11 +1578,11 @@ extern "C" { if (found == F_false) { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe specified mode '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", modes->array[i].string); - fl_color_print(data.error.to.stream, data.context.set.error, "' is not a valid mode, according to '"); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", path_file); - fl_color_print(data.error.to.stream, data.context.set.error, "'."); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe specified mode '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", modes->array[i].string); + f_color_print(data.error.to.stream, data.context.set.error, "' is not a valid mode, according to '"); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", path_file); + f_color_print(data.error.to.stream, data.context.set.error, "'."); fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); } @@ -1657,9 +1657,9 @@ extern "C" { if (data.error.verbosity != f_console_verbosity_quiet) { // @todo update FSS functions to return which setting index the problem happened on. fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sA setting in the build setting file '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", path_file); - fl_color_print(data.error.to.stream, data.context.set.error, "' is too long."); + f_color_print(data.error.to.stream, data.context.set.error, "%sA setting in the build setting file '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", path_file); + f_color_print(data.error.to.stream, data.context.set.error, "' is too long."); fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); } } @@ -1856,13 +1856,13 @@ extern "C" { if (settings_single_source[i]->used > 1) { if (data.error.verbosity == f_console_verbosity_verbose) { fprintf(data.output.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.output.stream, data.context.set.warning, "%sthe setting '", fll_error_print_warning); - fl_color_print(data.output.stream, data.context.set.notable, "%s", settings_single_name[i]); - fl_color_print(data.output.stream, data.context.set.warning, "' in the file '"); - fl_color_print(data.output.stream, data.context.set.notable, "%s", path_file); - fl_color_print(data.output.stream, data.context.set.warning, "' may only have a single property, only using the first: '"); - fl_color_print(data.output.stream, data.context.set.notable, "%s", settings_single_source[i]->array[0].string); - fl_color_print(data.output.stream, data.context.set.warning, "'."); + f_color_print(data.output.stream, data.context.set.warning, "%sthe setting '", fll_error_print_warning); + f_color_print(data.output.stream, data.context.set.notable, "%s", settings_single_name[i]); + f_color_print(data.output.stream, data.context.set.warning, "' in the file '"); + f_color_print(data.output.stream, data.context.set.notable, "%s", path_file); + f_color_print(data.output.stream, data.context.set.warning, "' may only have a single property, only using the first: '"); + f_color_print(data.output.stream, data.context.set.notable, "%s", settings_single_source[i]->array[0].string); + f_color_print(data.output.stream, data.context.set.warning, "'."); fprintf(data.output.stream, "%c", f_string_eol_s[0]); } } @@ -1879,17 +1879,17 @@ extern "C" { if (data.error.verbosity == f_console_verbosity_verbose) { fprintf(data.output.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.output.stream, data.context.set.warning, "%sthe setting '", fll_error_print_warning); - fl_color_print(data.output.stream, data.context.set.notable, "%s", settings_single_name[i]); - fl_color_print(data.output.stream, data.context.set.warning, "' in the file '"); - fl_color_print(data.output.stream, data.context.set.notable, "%s", path_file); - fl_color_print(data.output.stream, data.context.set.warning, "' may be either '"); - fl_color_print(data.output.stream, data.context.set.notable, "%s", fake_common_setting_bool_yes); - fl_color_print(data.output.stream, data.context.set.warning, "' or '"); - fl_color_print(data.output.stream, data.context.set.notable, "%s", fake_common_setting_bool_no); - fl_color_print(data.output.stream, data.context.set.warning, "', defaulting to '"); - fl_color_print(data.output.stream, data.context.set.notable, "%s", fake_common_setting_bool_yes); - fl_color_print(data.output.stream, data.context.set.warning, "'."); + f_color_print(data.output.stream, data.context.set.warning, "%sthe setting '", fll_error_print_warning); + f_color_print(data.output.stream, data.context.set.notable, "%s", settings_single_name[i]); + f_color_print(data.output.stream, data.context.set.warning, "' in the file '"); + f_color_print(data.output.stream, data.context.set.notable, "%s", path_file); + f_color_print(data.output.stream, data.context.set.warning, "' may be either '"); + f_color_print(data.output.stream, data.context.set.notable, "%s", fake_common_setting_bool_yes); + f_color_print(data.output.stream, data.context.set.warning, "' or '"); + f_color_print(data.output.stream, data.context.set.notable, "%s", fake_common_setting_bool_no); + f_color_print(data.output.stream, data.context.set.warning, "', defaulting to '"); + f_color_print(data.output.stream, data.context.set.notable, "%s", fake_common_setting_bool_yes); + f_color_print(data.output.stream, data.context.set.warning, "'."); fprintf(data.output.stream, "%c", f_string_eol_s[0]); } } @@ -1909,19 +1909,19 @@ extern "C" { if (data.error.verbosity == f_console_verbosity_verbose) { fprintf(data.output.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.output.stream, data.context.set.warning, "%sthe setting '", fll_error_print_warning); - fl_color_print(data.output.stream, data.context.set.notable, "%s", settings_single_name[i]); - fl_color_print(data.output.stream, data.context.set.warning, "' in the file '"); - fl_color_print(data.output.stream, data.context.set.notable, "%s", path_file); - fl_color_print(data.output.stream, data.context.set.warning, "' may only be one of '"); - fl_color_print(data.output.stream, data.context.set.notable, "%s", fake_build_language_bash); - fl_color_print(data.output.stream, data.context.set.warning, "', '"); - fl_color_print(data.output.stream, data.context.set.notable, "%s", fake_build_language_c); - fl_color_print(data.output.stream, data.context.set.warning, "', or '"); - fl_color_print(data.output.stream, data.context.set.notable, "%s", fake_build_language_cpp); - fl_color_print(data.output.stream, data.context.set.warning, "', defaulting to '"); - fl_color_print(data.output.stream, data.context.set.notable, "%s", fake_build_language_c); - fl_color_print(data.output.stream, data.context.set.warning, "'."); + f_color_print(data.output.stream, data.context.set.warning, "%sthe setting '", fll_error_print_warning); + f_color_print(data.output.stream, data.context.set.notable, "%s", settings_single_name[i]); + f_color_print(data.output.stream, data.context.set.warning, "' in the file '"); + f_color_print(data.output.stream, data.context.set.notable, "%s", path_file); + f_color_print(data.output.stream, data.context.set.warning, "' may only be one of '"); + f_color_print(data.output.stream, data.context.set.notable, "%s", fake_build_language_bash); + f_color_print(data.output.stream, data.context.set.warning, "', '"); + f_color_print(data.output.stream, data.context.set.notable, "%s", fake_build_language_c); + f_color_print(data.output.stream, data.context.set.warning, "', or '"); + f_color_print(data.output.stream, data.context.set.notable, "%s", fake_build_language_cpp); + f_color_print(data.output.stream, data.context.set.warning, "', defaulting to '"); + f_color_print(data.output.stream, data.context.set.notable, "%s", fake_build_language_c); + f_color_print(data.output.stream, data.context.set.warning, "'."); fprintf(data.output.stream, "%c", f_string_eol_s[0]); } } @@ -1941,19 +1941,19 @@ extern "C" { if (data.error.verbosity == f_console_verbosity_verbose) { fprintf(data.output.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.output.stream, data.context.set.warning, "%sthe setting '", fll_error_print_warning); - fl_color_print(data.output.stream, data.context.set.notable, "%s", settings_single_name[i]); - fl_color_print(data.output.stream, data.context.set.warning, "' in the file '"); - fl_color_print(data.output.stream, data.context.set.notable, "%s", path_file); - fl_color_print(data.output.stream, data.context.set.warning, "' may only be one of '"); - fl_color_print(data.output.stream, data.context.set.notable, "%s", fake_build_version_major); - fl_color_print(data.output.stream, data.context.set.warning, "', '"); - fl_color_print(data.output.stream, data.context.set.notable, "%s", fake_build_version_minor); - fl_color_print(data.output.stream, data.context.set.warning, "', or '"); - fl_color_print(data.output.stream, data.context.set.notable, "%s", fake_build_version_micro); - fl_color_print(data.output.stream, data.context.set.warning, "', defaulting to '"); - fl_color_print(data.output.stream, data.context.set.notable, "%s", fake_build_version_major); - fl_color_print(data.output.stream, data.context.set.warning, "'."); + f_color_print(data.output.stream, data.context.set.warning, "%sthe setting '", fll_error_print_warning); + f_color_print(data.output.stream, data.context.set.notable, "%s", settings_single_name[i]); + f_color_print(data.output.stream, data.context.set.warning, "' in the file '"); + f_color_print(data.output.stream, data.context.set.notable, "%s", path_file); + f_color_print(data.output.stream, data.context.set.warning, "' may only be one of '"); + f_color_print(data.output.stream, data.context.set.notable, "%s", fake_build_version_major); + f_color_print(data.output.stream, data.context.set.warning, "', '"); + f_color_print(data.output.stream, data.context.set.notable, "%s", fake_build_version_minor); + f_color_print(data.output.stream, data.context.set.warning, "', or '"); + f_color_print(data.output.stream, data.context.set.notable, "%s", fake_build_version_micro); + f_color_print(data.output.stream, data.context.set.warning, "', defaulting to '"); + f_color_print(data.output.stream, data.context.set.notable, "%s", fake_build_version_major); + f_color_print(data.output.stream, data.context.set.warning, "'."); fprintf(data.output.stream, "%c", f_string_eol_s[0]); } } @@ -2078,20 +2078,20 @@ extern "C" { if (data.error.verbosity == f_console_verbosity_verbose) { fprintf(data.output.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.output.stream, data.context.set.error, "%sthe parameters '", fll_error_print_warning); - fl_color_print(data.output.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_shared_disabled); - fl_color_print(data.output.stream, data.context.set.error, "' and '"); - fl_color_print(data.output.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_shared_enabled); - fl_color_print(data.output.stream, data.context.set.error, "' contradict, defaulting to '"); + f_color_print(data.output.stream, data.context.set.error, "%sthe parameters '", fll_error_print_warning); + f_color_print(data.output.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_shared_disabled); + f_color_print(data.output.stream, data.context.set.error, "' and '"); + f_color_print(data.output.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_shared_enabled); + f_color_print(data.output.stream, data.context.set.error, "' contradict, defaulting to '"); if (setting->build_shared) { - fl_color_print(data.output.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_shared_enabled); + f_color_print(data.output.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_shared_enabled); } else { - fl_color_print(data.output.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_shared_disabled); + f_color_print(data.output.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_shared_disabled); } - fl_color_print(data.output.stream, data.context.set.error, "'."); + f_color_print(data.output.stream, data.context.set.error, "'."); fprintf(data.output.stream, "%c", f_string_eol_s[0]); } } @@ -2118,20 +2118,20 @@ extern "C" { if (data.error.verbosity == f_console_verbosity_verbose) { fprintf(data.output.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.output.stream, data.context.set.error, "%sthe parameters '", fll_error_print_warning); - fl_color_print(data.output.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_static_disabled); - fl_color_print(data.output.stream, data.context.set.error, "' and '"); - fl_color_print(data.output.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_static_enabled); - fl_color_print(data.output.stream, data.context.set.error, "' contradict, defaulting to '"); + f_color_print(data.output.stream, data.context.set.error, "%sthe parameters '", fll_error_print_warning); + f_color_print(data.output.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_static_disabled); + f_color_print(data.output.stream, data.context.set.error, "' and '"); + f_color_print(data.output.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_static_enabled); + f_color_print(data.output.stream, data.context.set.error, "' contradict, defaulting to '"); if (setting->build_static) { - fl_color_print(data.output.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_static_enabled); + f_color_print(data.output.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_static_enabled); } else { - fl_color_print(data.output.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_static_disabled); + f_color_print(data.output.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_static_disabled); } - fl_color_print(data.output.stream, data.context.set.error, "'."); + f_color_print(data.output.stream, data.context.set.error, "'."); fprintf(data.output.stream, "%c", f_string_eol_s[0]); } } @@ -2149,20 +2149,20 @@ extern "C" { if (setting->build_shared == F_false && setting->build_static == F_false) { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe build settings '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", fake_build_setting_name_build_shared); - fl_color_print(data.error.to.stream, data.context.set.error, "' and '"); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", fake_build_setting_name_build_static); - fl_color_print(data.error.to.stream, data.context.set.error, "' cannot both be false when using the language '"); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe build settings '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", fake_build_setting_name_build_shared); + f_color_print(data.error.to.stream, data.context.set.error, "' and '"); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", fake_build_setting_name_build_static); + f_color_print(data.error.to.stream, data.context.set.error, "' cannot both be false when using the language '"); if (setting->build_language == fake_build_language_type_c) { - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", fake_build_language_c); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", fake_build_language_c); } else { - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", fake_build_language_cpp); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", fake_build_language_cpp); } - fl_color_print(data.error.to.stream, data.context.set.error, "'."); + f_color_print(data.error.to.stream, data.context.set.error, "'."); fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); } @@ -2320,7 +2320,7 @@ extern "C" { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.output.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.output.stream, data.context.set.important, "Compiling static objects."); + f_color_print(data.output.stream, data.context.set.important, "Compiling static objects."); fprintf(data.output.stream, "%c", f_string_eol_s[0]); } @@ -2408,9 +2408,9 @@ extern "C" { if (*status == F_false) { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe path '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", destination_path.string); - fl_color_print(data.error.to.stream, data.context.set.error, "' exists but is not a directory."); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe path '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", destination_path.string); + f_color_print(data.error.to.stream, data.context.set.error, "' exists but is not a directory."); fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); } @@ -2423,9 +2423,9 @@ extern "C" { if (F_status_is_error(*status)) { if (F_status_set_fine(*status) == F_file_found_not) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe path '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", destination_path.string); - fl_color_print(data.error.to.stream, data.context.set.error, "' could not be created, a parent directory does not exist."); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe path '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", destination_path.string); + f_color_print(data.error.to.stream, data.context.set.error, "' could not be created, a parent directory does not exist."); fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); } else { @@ -2533,15 +2533,15 @@ extern "C" { if (F_status_is_fine(status)) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->output.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->output.stream, data->context.set.important, "Building project%c", data_build.setting.project_name.used ? ' ' : 0); + f_color_print(data->output.stream, data->context.set.important, "Building project%c", data_build.setting.project_name.used ? ' ' : 0); if (data_build.setting.project_name.used) { - fl_color_print_code(data->output.stream, data->context.notable); + f_color_print_code(data->output.stream, data->context.notable); f_print_dynamic(data->output.stream, data_build.setting.project_name); - fl_color_print_code(data->output.stream, data->context.reset); + f_color_print_code(data->output.stream, data->context.reset); } - fl_color_print(data->output.stream, data->context.set.important, "."); + f_color_print(data->output.stream, data->context.set.important, "."); fprintf(data->output.stream, "%c", f_string_eol_s[0]); } } @@ -2662,7 +2662,7 @@ extern "C" { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.output.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.output.stream, data.context.set.important, "Compiling shared program."); + f_color_print(data.output.stream, data.context.set.important, "Compiling shared program."); fprintf(data.output.stream, "%c", f_string_eol_s[0]); } @@ -2764,7 +2764,7 @@ extern "C" { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.output.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.output.stream, data.context.set.important, "Compiling static program."); + f_color_print(data.output.stream, data.context.set.important, "Compiling static program."); fprintf(data.output.stream, "%c", f_string_eol_s[0]); } diff --git a/level_3/fake/c/private-clean.c b/level_3/fake/c/private-clean.c index 89611ef..6b9944f 100644 --- a/level_3/fake/c/private-clean.c +++ b/level_3/fake/c/private-clean.c @@ -15,9 +15,9 @@ extern "C" { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.output.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.output.stream, data.context.set.important, "Deleting all files within build directory '"); - fl_color_print(data.output.stream, data.context.set.notable, "%s", data.path_build.string); - fl_color_print(data.output.stream, data.context.set.important, "'.%c", f_string_eol_s[0]); + f_color_print(data.output.stream, data.context.set.important, "Deleting all files within build directory '"); + f_color_print(data.output.stream, data.context.set.notable, "%s", data.path_build.string); + f_color_print(data.output.stream, data.context.set.important, "'.%c", f_string_eol_s[0]); } if (fake_signal_received(data)) { diff --git a/level_3/fake/c/private-fake.c b/level_3/fake/c/private-fake.c index 68e4e6a..3c32a70 100644 --- a/level_3/fake/c/private-fake.c +++ b/level_3/fake/c/private-fake.c @@ -67,9 +67,9 @@ extern "C" { if (F_status_set_fine(*status) == F_file_found_not) { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sFailed to find program '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", program.used ? program.string : f_string_empty_s); - fl_color_print(data.error.to.stream, data.context.set.error, "' for executing.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sFailed to find program '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", program.used ? program.string : f_string_empty_s); + f_color_print(data.error.to.stream, data.context.set.error, "' for executing.%c", f_string_eol_s[0]); } } else { @@ -650,9 +650,9 @@ extern "C" { if (F_status_is_error(status)) { if (fll_error_print(data->error, F_status_set_fine(status), "f_utf_is_word_dash_plus", F_false) == F_known_not && data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sFailed to process the parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_process); - fl_color_print(data->error.to.stream, data->context.set.error, "'.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sFailed to process the parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_process); + f_color_print(data->error.to.stream, data->context.set.error, "'.%c", f_string_eol_s[0]); } return status; @@ -661,11 +661,11 @@ extern "C" { if (status == F_false) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_process); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameters value '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s", arguments.argv[location]); - fl_color_print(data->error.to.stream, data->context.set.error, "' contains non-word, non-dash, and non-plus characters.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_process); + f_color_print(data->error.to.stream, data->context.set.error, "' parameters value '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s", arguments.argv[location]); + f_color_print(data->error.to.stream, data->context.set.error, "' contains non-word, non-dash, and non-plus characters.%c", f_string_eol_s[0]); } return F_status_set_error(F_parameter); @@ -679,9 +679,9 @@ extern "C" { if (status == F_status_set_error(F_string_too_large)) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, parameters_name[i]); - fl_color_print(data->error.to.stream, data->context.set.error, "' is too long.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, parameters_name[i]); + f_color_print(data->error.to.stream, data->context.set.error, "' is too long.%c", f_string_eol_s[0]); } } else { @@ -698,9 +698,9 @@ extern "C" { if (length == 0 || status == F_data_not) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, parameters_name[i]); - fl_color_print(data->error.to.stream, data->context.set.error, "' must not be empty and must not contain only whitespace.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, parameters_name[i]); + f_color_print(data->error.to.stream, data->context.set.error, "' must not be empty and must not contain only whitespace.%c", f_string_eol_s[0]); } } } @@ -776,9 +776,9 @@ extern "C" { if (F_status_is_error(status)) { if (fll_error_print(data->error, F_status_set_fine(status), "fl_console_parameter_to_string_dynamic_directory", F_false) == F_known_not && data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sFailed to process parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, parameters_name[i]); - fl_color_print(data->error.to.stream, data->context.set.error, "'.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sFailed to process parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, parameters_name[i]); + f_color_print(data->error.to.stream, data->context.set.error, "'.%c", f_string_eol_s[0]); } return status; @@ -790,9 +790,9 @@ extern "C" { if (F_status_is_error(status)) { if (fll_error_print(data->error, F_status_set_fine(status), " f_macro_string_dynamic_t_resize", F_false) == F_known_not && data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sFailed to load default for the parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, parameters_name[i]); - fl_color_print(data->error.to.stream, data->context.set.error, "'.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sFailed to load default for the parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, parameters_name[i]); + f_color_print(data->error.to.stream, data->context.set.error, "'.%c", f_string_eol_s[0]); } return status; @@ -810,9 +810,9 @@ extern "C" { if (F_status_is_error(status)) { if (fll_error_print(data->error, F_status_set_fine(status), "fll_program_parameter_additional_rip", F_false) == F_known_not && data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sFailed to process the parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_define); - fl_color_print(data->error.to.stream, data->context.set.error, "'.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sFailed to process the parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_define); + f_color_print(data->error.to.stream, data->context.set.error, "'.%c", f_string_eol_s[0]); } return status; @@ -833,9 +833,9 @@ extern "C" { if (F_status_is_error(status)) { if (fll_error_print(data->error, F_status_set_fine(status), "f_utf_is_word", F_false) == F_known_not && data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sFailed to process the parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_define); - fl_color_print(data->error.to.stream, data->context.set.error, "'.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sFailed to process the parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_define); + f_color_print(data->error.to.stream, data->context.set.error, "'.%c", f_string_eol_s[0]); } return status; @@ -844,11 +844,11 @@ extern "C" { if (status == F_false) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_define); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameters value '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s", data->define.array[i].string); - fl_color_print(data->error.to.stream, data->context.set.error, "' contains non-word characters.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_define); + f_color_print(data->error.to.stream, data->context.set.error, "' parameters value '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s", data->define.array[i].string); + f_color_print(data->error.to.stream, data->context.set.error, "' contains non-word characters.%c", f_string_eol_s[0]); } return F_status_set_error(F_parameter); @@ -867,9 +867,9 @@ extern "C" { if (F_status_is_error(status)) { if (fll_error_print(data->error, F_status_set_fine(status), "fll_program_parameter_additional_rip", F_false) == F_known_not && data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sFailed to process the parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_mode); - fl_color_print(data->error.to.stream, data->context.set.error, "'.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sFailed to process the parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_mode); + f_color_print(data->error.to.stream, data->context.set.error, "'.%c", f_string_eol_s[0]); } return status; @@ -890,9 +890,9 @@ extern "C" { if (F_status_is_error(status)) { if (fll_error_print(data->error, F_status_set_fine(status), "f_utf_is_word_dash_plus", F_false) == F_known_not && data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sFailed to process the parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_mode); - fl_color_print(data->error.to.stream, data->context.set.error, "'.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sFailed to process the parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_mode); + f_color_print(data->error.to.stream, data->context.set.error, "'.%c", f_string_eol_s[0]); } return status; @@ -901,11 +901,11 @@ extern "C" { if (status == F_false) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_mode); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameters value '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s", data->mode.array[i].string); - fl_color_print(data->error.to.stream, data->context.set.error, "' contains non-word, non-dash, and non-plus characters.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fake_long_mode); + f_color_print(data->error.to.stream, data->context.set.error, "' parameters value '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s", data->mode.array[i].string); + f_color_print(data->error.to.stream, data->context.set.error, "' contains non-word, non-dash, and non-plus characters.%c", f_string_eol_s[0]); } return F_status_set_error(F_parameter); @@ -943,7 +943,7 @@ extern "C" { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "ALERT: An appropriate exit signal has been received, now aborting."); + f_color_print(data.error.to.stream, data.context.set.error, "ALERT: An appropriate exit signal has been received, now aborting."); fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); } @@ -1018,9 +1018,9 @@ extern "C" { } else if (parameters_required[i]) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sNo valid path for the (required) directory parameter '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, parameters_name[i]); - fl_color_print(data.error.to.stream, data.context.set.error, "' was found.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sNo valid path for the (required) directory parameter '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, parameters_name[i]); + f_color_print(data.error.to.stream, data.context.set.error, "' was found.%c", f_string_eol_s[0]); return F_status_set_error(F_directory_found_not); } diff --git a/level_3/fake/c/private-make.c b/level_3/fake/c/private-make.c index 24c4c92..2a2695b 100644 --- a/level_3/fake/c/private-make.c +++ b/level_3/fake/c/private-make.c @@ -64,9 +64,9 @@ extern "C" { else if (status == F_exist_not) { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(error.to.stream, error.context, "%sThe group name '", error.prefix); - fl_color_print(error.to.stream, error.notable, "%s", buffer.string); - fl_color_print(error.to.stream, error.context, "' was not found.%c", f_string_eol_s[0]); + f_color_print(error.to.stream, error.context, "%sThe group name '", error.prefix); + f_color_print(error.to.stream, error.notable, "%s", buffer.string); + f_color_print(error.to.stream, error.context, "' was not found.%c", f_string_eol_s[0]); } return F_status_set_error(F_failure); @@ -81,9 +81,9 @@ extern "C" { else if (number > f_type_size_32_unsigned) { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(error.to.stream, error.context, "%sThe number '", error.prefix); - fl_color_print(error.to.stream, error.notable, "%llu", number); - fl_color_print(error.to.stream, error.context, "' is too large.%c", f_string_eol_s[0]); + f_color_print(error.to.stream, error.context, "%sThe number '", error.prefix); + f_color_print(error.to.stream, error.notable, "%llu", number); + f_color_print(error.to.stream, error.context, "' is too large.%c", f_string_eol_s[0]); } } @@ -105,9 +105,9 @@ extern "C" { if (data.error.verbosity != f_console_verbosity_quiet) { if (F_status_set_fine(status) == F_syntax) { fprintf(error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(error.to.stream, error.context, "%sThe mode '", error.prefix); - fl_color_print(error.to.stream, error.notable, "%s", buffer.string); - fl_color_print(error.to.stream, error.context, "' is invalid.%c", f_string_eol_s[0]); + f_color_print(error.to.stream, error.context, "%sThe mode '", error.prefix); + f_color_print(error.to.stream, error.notable, "%s", buffer.string); + f_color_print(error.to.stream, error.context, "' is invalid.%c", f_string_eol_s[0]); } else { fll_error_print(error, status, "f_file_mode_from_string", F_true); @@ -142,9 +142,9 @@ extern "C" { else if (status == F_exist_not) { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(error.to.stream, error.context, "%sThe user '", error.prefix); - fl_color_print(error.to.stream, error.notable, "%s", buffer.string); - fl_color_print(error.to.stream, error.context, "' was not found.%c", f_string_eol_s[0]); + f_color_print(error.to.stream, error.context, "%sThe user '", error.prefix); + f_color_print(error.to.stream, error.notable, "%s", buffer.string); + f_color_print(error.to.stream, error.context, "' was not found.%c", f_string_eol_s[0]); } return F_status_set_error(F_failure); @@ -159,9 +159,9 @@ extern "C" { else if (number > f_type_size_32_unsigned) { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(error.to.stream, error.context, "%sThe number '", error.prefix); - fl_color_print(error.to.stream, error.notable, "%llu", number); - fl_color_print(error.to.stream, error.context, "' is too large.%c", f_string_eol_s[0]); + f_color_print(error.to.stream, error.context, "%sThe number '", error.prefix); + f_color_print(error.to.stream, error.notable, "%llu", number); + f_color_print(error.to.stream, error.context, "' is too large.%c", f_string_eol_s[0]); } } @@ -190,9 +190,9 @@ extern "C" { if (!data_make->buffer.used) { if (data.error.verbosity == f_console_verbosity_verbose) { fprintf(data.output.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.output.stream, data.context.set.warning, "%sthe fakefile '", fll_error_print_warning); - fl_color_print(data.output.stream, data.context.set.notable, "%s", data.file_data_build_fakefile.string); - fl_color_print(data.output.stream, data.context.set.warning, "' is empty."); + f_color_print(data.output.stream, data.context.set.warning, "%sthe fakefile '", fll_error_print_warning); + f_color_print(data.output.stream, data.context.set.notable, "%s", data.file_data_build_fakefile.string); + f_color_print(data.output.stream, data.context.set.warning, "' is empty."); } return; @@ -336,11 +336,11 @@ extern "C" { if (missing_main) { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.error.context, "%sThe fakefile '", data.error.prefix); - fl_color_print(data.error.to.stream, data.error.notable, "%s", data.file_data_build_fakefile.string); - fl_color_print(data.error.to.stream, data.error.context, "' is missing the required '"); - fl_color_print(data.error.to.stream, data.error.notable, "%s", fake_make_section_main); - fl_color_print(data.error.to.stream, data.error.context, "' object.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.error.context, "%sThe fakefile '", data.error.prefix); + f_color_print(data.error.to.stream, data.error.notable, "%s", data.file_data_build_fakefile.string); + f_color_print(data.error.to.stream, data.error.context, "' is missing the required '"); + f_color_print(data.error.to.stream, data.error.notable, "%s", fake_make_section_main); + f_color_print(data.error.to.stream, data.error.context, "' object.%c", f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -470,16 +470,16 @@ extern "C" { } else if (data.error.verbosity == f_console_verbosity_verbose) { fprintf(data.output.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.output.stream, data.context.set.warning, "%sThe environment name '", fll_error_print_warning); - fl_color_print(data.output.stream, data.context.set.notable, "%s", name_define.string); - fl_color_print(data.output.stream, data.context.set.warning, "' is already added.%c", f_string_eol_s[0]); + f_color_print(data.output.stream, data.context.set.warning, "%sThe environment name '", fll_error_print_warning); + f_color_print(data.output.stream, data.context.set.notable, "%s", name_define.string); + f_color_print(data.output.stream, data.context.set.warning, "' is already added.%c", f_string_eol_s[0]); } } else if (data.error.verbosity == f_console_verbosity_verbose) { fprintf(data.output.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.output.stream, data.context.set.warning, "%sThe environment name '", fll_error_print_warning); - fl_color_print(data.output.stream, data.context.set.notable, "%s", name_define.string); - fl_color_print(data.output.stream, data.context.set.warning, "' is invalid, ignoring.%c", f_string_eol_s[0]); + f_color_print(data.output.stream, data.context.set.warning, "%sThe environment name '", fll_error_print_warning); + f_color_print(data.output.stream, data.context.set.notable, "%s", name_define.string); + f_color_print(data.output.stream, data.context.set.warning, "' is invalid, ignoring.%c", f_string_eol_s[0]); } name_define.used = 0; @@ -732,13 +732,13 @@ extern "C" { else { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sInvalid characters in the define setting name '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.error, "%sInvalid characters in the define setting name '", fll_error_print_error); - fl_color_print_code(data.error.to.stream, *data.error.notable.before); + f_color_print_code(data.error.to.stream, *data.error.notable.before); f_print_dynamic(data.error.to.stream, define.array[i].name); - fl_color_print_code(data.error.to.stream, *data.error.notable.after); + f_color_print_code(data.error.to.stream, *data.error.notable.after); - fl_color_print(data.error.to.stream, data.context.set.error, "', only alpha-numeric ASCII characters and underscore (without a leading digit) is %c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "', only alpha-numeric ASCII characters and underscore (without a leading digit) is %c", f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -1056,7 +1056,7 @@ extern "C" { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->output.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->output.stream, data->context.set.important, "Making project.%c", f_string_eol_s[0]); + f_color_print(data->output.stream, data->context.set.important, "Making project.%c", f_string_eol_s[0]); } f_status_t status = F_none; @@ -1150,11 +1150,11 @@ extern "C" { if (F_status_is_error(status_path) && data->error.verbosity == f_console_verbosity_verbose) { fprintf(data->output.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->output.stream, data->context.set.warning, "%sFailed change back to orignal path '", fll_error_print_warning); - fl_color_print(data->output.stream, data->context.set.notable, "%s", data_make.path.stack.array[0].string); - fl_color_print(data->output.stream, data->context.set.warning, "', status code = "); - fl_color_print(data->output.stream, data->context.set.notable, "%llu", F_status_set_fine(status_path)); - fl_color_print(data->output.stream, data->context.set.warning, ".%c", f_string_eol_s[0]); + f_color_print(data->output.stream, data->context.set.warning, "%sFailed change back to orignal path '", fll_error_print_warning); + f_color_print(data->output.stream, data->context.set.notable, "%s", data_make.path.stack.array[0].string); + f_color_print(data->output.stream, data->context.set.warning, "', status code = "); + f_color_print(data->output.stream, data->context.set.notable, "%llu", F_status_set_fine(status_path)); + f_color_print(data->output.stream, data->context.set.warning, ".%c", f_string_eol_s[0]); } } @@ -1922,13 +1922,13 @@ extern "C" { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->output.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->output.stream, data->context.set.important, "Processing Section '"); + f_color_print(data->output.stream, data->context.set.important, "Processing Section '"); - fl_color_print_code(data->output.stream, *data->context.set.notable.before); + f_color_print_code(data->output.stream, *data->context.set.notable.before); f_print_dynamic_partial(data->output.stream, data_make->buffer, section->name); - fl_color_print_code(data->output.stream, *data->context.set.notable.after); + f_color_print_code(data->output.stream, *data->context.set.notable.after); - fl_color_print(data->output.stream, data->context.set.important, "'.%c", f_string_eol_s[0]); + f_color_print(data->output.stream, data->context.set.important, "'.%c", f_string_eol_s[0]); } if (!section->objects.used) { @@ -2251,9 +2251,9 @@ extern "C" { } fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sIncomplete '", data_make->error.prefix); - fl_color_print(data_make->error.to.stream, data_make->error.notable, "%s", type_name); - fl_color_print(data_make->error.to.stream, data_make->error.context, "' at end of section.%c", f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sIncomplete '", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.notable, "%s", type_name); + f_color_print(data_make->error.to.stream, data_make->error.context, "' at end of section.%c", f_string_eol_s[0]); } fake_print_message_section_operation_failed(*data, data_make->error, data_make->buffer, section->name, section->objects.array[section->objects.used - 1]); @@ -2310,7 +2310,7 @@ extern "C" { if (data->error.verbosity == f_console_verbosity_verbose) { fprintf(data->output.stream, "Breaking as '"); - fl_color_print(data->output.stream, data->context.set.notable, "%s", arguments.used ? arguments.array[0].string : fake_make_operation_argument_success); + f_color_print(data->output.stream, data->context.set.notable, "%s", arguments.used ? arguments.array[0].string : fake_make_operation_argument_success); fprintf(data->output.stream, "'.%c", f_string_eol_s[0]); } @@ -2423,9 +2423,9 @@ extern "C" { } else if (data->error.verbosity == f_console_verbosity_verbose) { fprintf(data->output.stream, "Cloned '"); - fl_color_print(data->output.stream, data->context.set.notable, "%s", arguments.array[i].string); + f_color_print(data->output.stream, data->context.set.notable, "%s", arguments.array[i].string); fprintf(data->output.stream, "' to '"); - fl_color_print(data->output.stream, data->context.set.notable, "%s", destination); + f_color_print(data->output.stream, data->context.set.notable, "%s", destination); fprintf(data->output.stream, "'.%c", f_string_eol_s[0]); } } @@ -2527,9 +2527,9 @@ extern "C" { } else if (data->error.verbosity == f_console_verbosity_verbose) { fprintf(data->output.stream, "Copied '"); - fl_color_print(data->output.stream, data->context.set.notable, "%s", arguments.array[i].string); + f_color_print(data->output.stream, data->context.set.notable, "%s", arguments.array[i].string); fprintf(data->output.stream, "' to '"); - fl_color_print(data->output.stream, data->context.set.notable, "%s", destination); + f_color_print(data->output.stream, data->context.set.notable, "%s", destination); fprintf(data->output.stream, "'.%c", f_string_eol_s[0]); } } @@ -2557,7 +2557,7 @@ extern "C" { } else if (data->error.verbosity == f_console_verbosity_verbose) { fprintf(data->output.stream, "Defined environment variable '"); - fl_color_print(data->output.stream, data->context.set.notable, "%s", arguments.array[0].string); + f_color_print(data->output.stream, data->context.set.notable, "%s", arguments.array[0].string); fprintf(data->output.stream, "'.%c", f_string_eol_s[0]); } @@ -2577,9 +2577,9 @@ extern "C" { if (F_status_set_fine(*status) == F_file_found_not) { if (data->error.verbosity == f_console_verbosity_verbose) { fprintf(data->output.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->output.stream, data->context.set.warning, "%sthe file '", fll_error_print_warning); - fl_color_print(data->output.stream, data->context.set.notable, "%s", arguments.array[i].string); - fl_color_print(data->output.stream, data->context.set.warning, "' was not found.%c", f_string_eol_s[0]); + f_color_print(data->output.stream, data->context.set.warning, "%sthe file '", fll_error_print_warning); + f_color_print(data->output.stream, data->context.set.notable, "%s", arguments.array[i].string); + f_color_print(data->output.stream, data->context.set.warning, "' was not found.%c", f_string_eol_s[0]); } *status = F_none; @@ -2600,7 +2600,7 @@ extern "C" { if (F_status_set_fine(*status) == F_file_found_not) { if (data->error.verbosity == f_console_verbosity_verbose) { fprintf(data->output.stream, "The directory '"); - fl_color_print(data->output.stream, data->context.set.notable, "%s", arguments.array[i].string); + f_color_print(data->output.stream, data->context.set.notable, "%s", arguments.array[i].string); fprintf(data->output.stream, "' does not exist.%c", f_string_eol_s[0]); } @@ -2613,7 +2613,7 @@ extern "C" { } else if (data->error.verbosity == f_console_verbosity_verbose) { fprintf(data->output.stream, "Removed '"); - fl_color_print(data->output.stream, data->context.set.notable, "%s", arguments.array[i].string); + f_color_print(data->output.stream, data->context.set.notable, "%s", arguments.array[i].string); fprintf(data->output.stream, "'.%c", f_string_eol_s[0]); } } @@ -2623,7 +2623,7 @@ extern "C" { if (F_status_set_fine(*status) == F_file_found_not) { if (data->error.verbosity == f_console_verbosity_verbose) { fprintf(data->output.stream, "The file '"); - fl_color_print(data->output.stream, data->context.set.notable, "%s", arguments.array[i].string); + f_color_print(data->output.stream, data->context.set.notable, "%s", arguments.array[i].string); fprintf(data->output.stream, "' does not exist.%c", f_string_eol_s[0]); } @@ -2636,7 +2636,7 @@ extern "C" { } else if (data->error.verbosity == f_console_verbosity_verbose) { fprintf(data->output.stream, "Removed '"); - fl_color_print(data->output.stream, data->context.set.notable, "%s", arguments.array[i].string); + f_color_print(data->output.stream, data->context.set.notable, "%s", arguments.array[i].string); fprintf(data->output.stream, "'.%c", f_string_eol_s[0]); } } @@ -2679,7 +2679,7 @@ extern "C" { if (data->error.verbosity == f_console_verbosity_verbose) { fprintf(data->output.stream, "Exiting as '"); - fl_color_print(data->output.stream, data->context.set.notable, "%s", arguments.used ? arguments.array[0].string : fake_make_operation_argument_success); + f_color_print(data->output.stream, data->context.set.notable, "%s", arguments.used ? arguments.array[0].string : fake_make_operation_argument_success); fprintf(data->output.stream, "'.%c", f_string_eol_s[0]); } @@ -2714,13 +2714,13 @@ extern "C" { fprintf(data->output.stream, "Set failure state to '"); if (data_make->setting_make.fail == fake_make_operation_fail_type_exit) { - fl_color_print(data->output.stream, data->context.set.notable, "%s", fake_make_operation_argument_exit); + f_color_print(data->output.stream, data->context.set.notable, "%s", fake_make_operation_argument_exit); } else if (data_make->setting_make.fail == fake_make_operation_fail_type_warn) { - fl_color_print(data->output.stream, data->context.set.notable, "%s", fake_make_operation_argument_warn); + f_color_print(data->output.stream, data->context.set.notable, "%s", fake_make_operation_argument_warn); } else if (data_make->setting_make.fail == fake_make_operation_fail_type_ignore) { - fl_color_print(data->output.stream, data->context.set.notable, "%s", fake_make_operation_argument_ignore); + f_color_print(data->output.stream, data->context.set.notable, "%s", fake_make_operation_argument_ignore); } fprintf(data->output.stream, "'.%c", f_string_eol_s[0]); @@ -2758,9 +2758,9 @@ extern "C" { } else if (data->error.verbosity == f_console_verbosity_verbose) { fprintf(data->output.stream, "Changed group of '"); - fl_color_print(data->output.stream, data->context.set.notable, "%s", arguments.array[i].string); + f_color_print(data->output.stream, data->context.set.notable, "%s", arguments.array[i].string); fprintf(data->output.stream, "' to "); - fl_color_print(data->output.stream, data->context.set.notable, "%llu", id); + f_color_print(data->output.stream, data->context.set.notable, "%llu", id); fprintf(data->output.stream, ".%c", f_string_eol_s[0]); } } // for @@ -2797,9 +2797,9 @@ extern "C" { } else if (data->error.verbosity == f_console_verbosity_verbose) { fprintf(data->output.stream, "Changed group of '"); - fl_color_print(data->output.stream, data->context.set.notable, "%s", arguments.array[i].string); + f_color_print(data->output.stream, data->context.set.notable, "%s", arguments.array[i].string); fprintf(data->output.stream, "' to "); - fl_color_print(data->output.stream, data->context.set.notable, "%llu", id); + f_color_print(data->output.stream, data->context.set.notable, "%llu", id); fprintf(data->output.stream, ".%c", f_string_eol_s[0]); } } // for @@ -3267,14 +3267,14 @@ extern "C" { fprintf(data->output.stream, "%c", f_string_eol_s[0]); if ((i == 1 && number_left > f_number_t_size_unsigned) || (i > 1 && number_right > f_number_t_size_unsigned)) { - fl_color_print(data->error.to.stream, data_make->error.context, "%sThe number '", data_make->error.prefix); - fl_color_print(data->error.to.stream, data_make->error.notable, "%c%s", arguments.array[i].string); - fl_color_print(data->error.to.stream, data_make->error.context, "' may only be between the ranges -%llu to %llu.%c", f_number_t_size_unsigned, f_number_t_size_unsigned, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data_make->error.context, "%sThe number '", data_make->error.prefix); + f_color_print(data->error.to.stream, data_make->error.notable, "%c%s", arguments.array[i].string); + f_color_print(data->error.to.stream, data_make->error.context, "' may only be between the ranges -%llu to %llu.%c", f_number_t_size_unsigned, f_number_t_size_unsigned, f_string_eol_s[0]); } else { - fl_color_print(data->error.to.stream, data_make->error.context, "%sInvalid or unsupported number provided '", data_make->error.prefix); - fl_color_print(data->error.to.stream, data_make->error.notable, "%s", arguments.array[i].string); - fl_color_print(data->error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data_make->error.context, "%sInvalid or unsupported number provided '", data_make->error.prefix); + f_color_print(data->error.to.stream, data_make->error.notable, "%s", arguments.array[i].string); + f_color_print(data->error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); } } } @@ -3293,9 +3293,9 @@ extern "C" { } else if (data->error.verbosity == f_console_verbosity_verbose) { fprintf(data->output.stream, "Created symbolic link from '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s", arguments.array[1].string); + f_color_print(data->error.to.stream, data->context.set.notable, "%s", arguments.array[1].string); fprintf(data->output.stream, "' to '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s", arguments.array[0].string); + f_color_print(data->error.to.stream, data->context.set.notable, "%s", arguments.array[0].string); fprintf(data->output.stream, "'.%c", f_string_eol_s[0]); } @@ -3338,9 +3338,9 @@ extern "C" { if (data->error.verbosity == f_console_verbosity_verbose) { fprintf(data->output.stream, "Changed mode of '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s", arguments.array[i].string); + f_color_print(data->error.to.stream, data->context.set.notable, "%s", arguments.array[i].string); fprintf(data->output.stream, "' to "); - fl_color_print(data->error.to.stream, data->context.set.notable, "%#o", mode); + f_color_print(data->error.to.stream, data->context.set.notable, "%#o", mode); fprintf(data->output.stream, ".%c", f_string_eol_s[0]); } } // for @@ -3384,9 +3384,9 @@ extern "C" { if (data->error.verbosity == f_console_verbosity_verbose) { fprintf(data->output.stream, "Changed mode of '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s", arguments.array[i].string); + f_color_print(data->error.to.stream, data->context.set.notable, "%s", arguments.array[i].string); fprintf(data->output.stream, "' to "); - fl_color_print(data->error.to.stream, data->context.set.notable, "%#o", mode); + f_color_print(data->error.to.stream, data->context.set.notable, "%#o", mode); fprintf(data->output.stream, ".%c", f_string_eol_s[0]); } } // for @@ -3512,9 +3512,9 @@ extern "C" { } else if (data->error.verbosity == f_console_verbosity_verbose) { fprintf(data->output.stream, "Changed owner of '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s", arguments.array[i].string); + f_color_print(data->error.to.stream, data->context.set.notable, "%s", arguments.array[i].string); fprintf(data->output.stream, "' to "); - fl_color_print(data->error.to.stream, data->context.set.notable, "%d", id); + f_color_print(data->error.to.stream, data->context.set.notable, "%d", id); fprintf(data->output.stream, ".%c", f_string_eol_s[0]); } } // for @@ -3551,9 +3551,9 @@ extern "C" { } else if (data->error.verbosity == f_console_verbosity_verbose) { fprintf(data->output.stream, "Changed owner of '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s", arguments.array[i].string); + f_color_print(data->error.to.stream, data->context.set.notable, "%s", arguments.array[i].string); fprintf(data->output.stream, "' to "); - fl_color_print(data->error.to.stream, data->context.set.notable, "%d", id); + f_color_print(data->error.to.stream, data->context.set.notable, "%d", id); fprintf(data->output.stream, ".%c", f_string_eol_s[0]); } } // for @@ -3582,9 +3582,9 @@ extern "C" { } fprintf(data->output.stream, "Changed to project path '"); - fl_color_print_code(data->output.stream, *data->context.set.notable.before); + f_color_print_code(data->output.stream, *data->context.set.notable.before); f_print_dynamic(data->output.stream, data_make->path_cache); - fl_color_print_code(data->output.stream, *data->context.set.notable.after); + f_color_print_code(data->output.stream, *data->context.set.notable.after); fprintf(data->output.stream, "'.%c", f_string_eol_s[0]); } @@ -3683,9 +3683,9 @@ extern "C" { } fprintf(data->output.stream, "Changed to project path '"); - fl_color_print_code(data->output.stream, *data->context.set.notable.before); + f_color_print_code(data->output.stream, *data->context.set.notable.before); f_print_dynamic(data->output.stream, data_make->path_cache); - fl_color_print_code(data->output.stream, *data->context.set.notable.after); + f_color_print_code(data->output.stream, *data->context.set.notable.after); fprintf(data->output.stream, "'.%c", f_string_eol_s[0]); } @@ -3755,9 +3755,9 @@ extern "C" { if (data->error.verbosity == f_console_verbosity_verbose) { fprintf(data->output.stream, "Touched %s '", arguments.array[0].string); - fl_color_print_code(data->output.stream, *data->context.set.notable.before); + f_color_print_code(data->output.stream, *data->context.set.notable.before); f_print_dynamic(data->output.stream, arguments.array[i]); - fl_color_print_code(data->output.stream, *data->context.set.notable.after); + f_color_print_code(data->output.stream, *data->context.set.notable.after); fprintf(data->output.stream, "'.%c", f_string_eol_s[0]); } @@ -3827,9 +3827,9 @@ extern "C" { if (F_status_set_fine(status) == F_file_found_not) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data_make->error.context, "%sFailed to find program '", data_make->error.prefix); - fl_color_print(data.error.to.stream, data_make->error.notable, "%s", program.string); - fl_color_print(data.error.to.stream, data_make->error.context, "' for executing.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data_make->error.context, "%sFailed to find program '", data_make->error.prefix); + f_color_print(data.error.to.stream, data_make->error.notable, "%s", program.string); + f_color_print(data.error.to.stream, data_make->error.context, "' for executing.%c", f_string_eol_s[0]); } } else if (F_status_set_fine(status) != F_failure) { @@ -3901,9 +3901,9 @@ extern "C" { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data_make->error.context, "%sFailed with return code '", data_make->error.prefix); - fl_color_print(data.error.to.stream, data_make->error.notable, "%s", data_make->setting_make.parameter.array[0].value.array[0].string); - fl_color_print(data.error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data_make->error.context, "%sFailed with return code '", data_make->error.prefix); + f_color_print(data.error.to.stream, data_make->error.notable, "%s", data_make->setting_make.parameter.array[0].value.array[0].string); + f_color_print(data.error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); } if (data_make->setting_make.fail == fake_make_operation_fail_type_exit) { @@ -3969,7 +3969,7 @@ extern "C" { if (!arguments.used) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sRequires more arguments.%c", data_make->error.prefix, f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sRequires more arguments.%c", data_make->error.prefix, f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -3979,9 +3979,9 @@ extern "C" { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sNo indexer has been specified, cannot perform '", data_make->error.prefix); - fl_color_print(data_make->error.to.stream, data_make->error.notable, fake_make_operation_index); - fl_color_print(data_make->error.to.stream, data_make->error.context, "' section operation.%c", f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sNo indexer has been specified, cannot perform '", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.notable, fake_make_operation_index); + f_color_print(data_make->error.to.stream, data_make->error.context, "' section operation.%c", f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -3995,7 +3995,7 @@ extern "C" { if (arguments.used > 1) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sHas too many arguments.%c", data_make->error.prefix, f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sHas too many arguments.%c", data_make->error.prefix, f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4006,9 +4006,9 @@ extern "C" { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sUnsupported break type '", data_make->error.prefix); - fl_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[0].string); - fl_color_print(data_make->error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sUnsupported break type '", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[0].string); + f_color_print(data_make->error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4023,7 +4023,7 @@ extern "C" { if (arguments.used > 1) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sHas too many arguments.%c", data_make->error.prefix, f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sHas too many arguments.%c", data_make->error.prefix, f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4042,9 +4042,9 @@ extern "C" { if (status_file == F_file_found_not) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sFailed to find file '", data_make->error.prefix); - fl_color_print(data_make->error.to.stream, data_make->error.notable, "%s", path_file); - fl_color_print(data_make->error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sFailed to find file '", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.notable, "%s", path_file); + f_color_print(data_make->error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); } *status = F_status_set_error(status_file); @@ -4056,9 +4056,9 @@ extern "C" { else if (!status_file) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sThe file '", data_make->error.prefix); - fl_color_print(data_make->error.to.stream, data_make->error.notable, "%s", path_file); - fl_color_print(data_make->error.to.stream, data_make->error.context, "' must be a regular file.%c", f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sThe file '", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.notable, "%s", path_file); + f_color_print(data_make->error.to.stream, data_make->error.context, "' must be a regular file.%c", f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4067,7 +4067,7 @@ extern "C" { else { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sFilename argument must not be an empty string.%c", data_make->error.prefix, f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sFilename argument must not be an empty string.%c", data_make->error.prefix, f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4081,7 +4081,7 @@ extern "C" { if (arguments.used) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sHas too many arguments.%c", data_make->error.prefix, f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sHas too many arguments.%c", data_make->error.prefix, f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4091,7 +4091,7 @@ extern "C" { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sMust not attempt to pop project root off of path stack.%c", data_make->error.prefix, f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sMust not attempt to pop project root off of path stack.%c", data_make->error.prefix, f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4121,9 +4121,9 @@ extern "C" { if (f_file_exists(arguments.array[i].string) != F_true) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sFailed to find file '", data_make->error.prefix); - fl_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[i].string); - fl_color_print(data_make->error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sFailed to find file '", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[i].string); + f_color_print(data_make->error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4138,9 +4138,9 @@ extern "C" { if (status_file == F_false || status_file == F_file_found_not) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sThe last file '", data_make->error.prefix); - fl_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[arguments.used - 1].string); - fl_color_print(data_make->error.to.stream, data_make->error.context, "' must be a valid directory.%c", f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sThe last file '", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[arguments.used - 1].string); + f_color_print(data_make->error.to.stream, data_make->error.context, "' must be a valid directory.%c", f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4161,9 +4161,9 @@ extern "C" { if (status_file == F_false) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sThe last file '", data_make->error.prefix); - fl_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[1].string); - fl_color_print(data_make->error.to.stream, data_make->error.context, "' must be a valid directory.%c", f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sThe last file '", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[1].string); + f_color_print(data_make->error.to.stream, data_make->error.context, "' must be a valid directory.%c", f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4174,7 +4174,7 @@ extern "C" { else { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sRequires more arguments.%c", data_make->error.prefix, f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sRequires more arguments.%c", data_make->error.prefix, f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4187,7 +4187,7 @@ extern "C" { if (!arguments.used) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sRequires more arguments.%c", data_make->error.prefix, f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sRequires more arguments.%c", data_make->error.prefix, f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4195,9 +4195,9 @@ extern "C" { else if (data_make->setting_build.build_compiler.used) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sNo compiler has been specified, cannot perform '", data_make->error.prefix); - fl_color_print(data_make->error.to.stream, data_make->error.notable, fake_make_operation_compile); - fl_color_print(data_make->error.to.stream, data_make->error.context, "' section operation.%c", f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sNo compiler has been specified, cannot perform '", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.notable, fake_make_operation_compile); + f_color_print(data_make->error.to.stream, data_make->error.context, "' section operation.%c", f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4226,9 +4226,9 @@ extern "C" { if (f_file_exists(arguments.array[i].string) != F_true) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sFailed to find file '", data_make->error.prefix); - fl_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[i].string); - fl_color_print(data_make->error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sFailed to find file '", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[i].string); + f_color_print(data_make->error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4243,9 +4243,9 @@ extern "C" { if (status_file == F_false || status_file == F_file_found_not) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sThe last file '", data_make->error.prefix); - fl_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[arguments.used - 1].string); - fl_color_print(data_make->error.to.stream, data_make->error.context, "' must be a valid directory.%c", f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sThe last file '", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[arguments.used - 1].string); + f_color_print(data_make->error.to.stream, data_make->error.context, "' must be a valid directory.%c", f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4266,9 +4266,9 @@ extern "C" { if (status_file == F_false) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sThe last file '", data_make->error.prefix); - fl_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[1].string); - fl_color_print(data_make->error.to.stream, data_make->error.context, "' must be a valid directory.%c", f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sThe last file '", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[1].string); + f_color_print(data_make->error.to.stream, data_make->error.context, "' must be a valid directory.%c", f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4279,7 +4279,7 @@ extern "C" { else { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sRequires more arguments.%c", data_make->error.prefix, f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sRequires more arguments.%c", data_make->error.prefix, f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4306,7 +4306,7 @@ extern "C" { else { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sRequires more arguments.%c", data_make->error.prefix, f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sRequires more arguments.%c", data_make->error.prefix, f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4322,7 +4322,7 @@ extern "C" { if (*status == F_none) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sDefine name must not be an empty string.%c", data_make->error.prefix, f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sDefine name must not be an empty string.%c", data_make->error.prefix, f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4330,13 +4330,13 @@ extern "C" { else if (*status == F_false) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sInvalid characters in the define setting name '", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sInvalid characters in the define setting name '", data_make->error.prefix); - fl_color_print_code(data_make->error.to.stream, *data_make->error.notable.before); + f_color_print_code(data_make->error.to.stream, *data_make->error.notable.before); f_print_dynamic(data_make->error.to.stream, arguments.array[0]); - fl_color_print_code(data_make->error.to.stream, *data_make->error.notable.after); + f_color_print_code(data_make->error.to.stream, *data_make->error.notable.after); - fl_color_print(data_make->error.to.stream, data_make->error.context, "', only alpha-numeric ASCII characters and underscore (without a leading digit) is allowed.%c", f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "', only alpha-numeric ASCII characters and underscore (without a leading digit) is allowed.%c", f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4345,7 +4345,7 @@ extern "C" { else { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sRequires more arguments.%c", data_make->error.prefix, f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sRequires more arguments.%c", data_make->error.prefix, f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4358,9 +4358,9 @@ extern "C" { if (*operation_if == fake_make_operation_if_type_else_true || *operation_if == fake_make_operation_if_type_else_false) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sMust not be used after another '", data_make->error.prefix); - fl_color_print(data_make->error.to.stream, data_make->error.notable, "else"); - fl_color_print(data_make->error.to.stream, data_make->error.context, "' section operation.%c", f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sMust not be used after another '", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.notable, "else"); + f_color_print(data_make->error.to.stream, data_make->error.context, "' section operation.%c", f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4372,9 +4372,9 @@ extern "C" { if (*operation_if == fake_make_operation_if_type_true || *operation_if == fake_make_operation_if_type_false || *operation_if == fake_make_operation_if_type_false_always) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sMust not be used inside an ", data_make->error.prefix); - fl_color_print(data_make->error.to.stream, data_make->error.notable, "if"); - fl_color_print(data_make->error.to.stream, data_make->error.context, "' section operation.%c", f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sMust not be used inside an ", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.notable, "if"); + f_color_print(data_make->error.to.stream, data_make->error.context, "' section operation.%c", f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4386,7 +4386,7 @@ extern "C" { if (*operation_if != fake_make_operation_if_type_else_true_next && *operation_if != fake_make_operation_if_type_else_false_next && *operation_if != fake_make_operation_if_type_else_false_next_always) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sHas no preceding if condition.%c", data_make->error.prefix, f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sHas no preceding if condition.%c", data_make->error.prefix, f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4398,7 +4398,7 @@ extern "C" { if (arguments.used) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sHas too many arguments.%c", data_make->error.prefix, f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sHas too many arguments.%c", data_make->error.prefix, f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4412,7 +4412,7 @@ extern "C" { if (arguments.used > 1) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sHas too many arguments.%c", data_make->error.prefix, f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sHas too many arguments.%c", data_make->error.prefix, f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4423,9 +4423,9 @@ extern "C" { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sUnsupported exit type '", data_make->error.prefix); - fl_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[0].string); - fl_color_print(data_make->error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sUnsupported exit type '", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[0].string); + f_color_print(data_make->error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4444,9 +4444,9 @@ extern "C" { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sUnsupported fail type '", data_make->error.prefix); - fl_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[0].string); - fl_color_print(data_make->error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sUnsupported fail type '", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[0].string); + f_color_print(data_make->error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4457,7 +4457,7 @@ extern "C" { else { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sRequires more arguments.%c", data_make->error.prefix, f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sRequires more arguments.%c", data_make->error.prefix, f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4477,9 +4477,9 @@ extern "C" { if (status_file == F_file_found_not) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sFailed to find file '", data_make->error.prefix); - fl_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[i].string); - fl_color_print(data_make->error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sFailed to find file '", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[i].string); + f_color_print(data_make->error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); } *status = F_status_set_error(status_file); @@ -4498,7 +4498,7 @@ extern "C" { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sRequires more arguments.%c", data_make->error.prefix, f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sRequires more arguments.%c", data_make->error.prefix, f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4510,9 +4510,9 @@ extern "C" { if (*operation_if == fake_make_operation_if_type_true || *operation_if == fake_make_operation_if_type_false || *operation_if == fake_make_operation_if_type_false_always) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sMust not be used after another '", data_make->error.prefix); - fl_color_print(data_make->error.to.stream, data_make->error.notable, "if"); - fl_color_print(data_make->error.to.stream, data_make->error.context, "' section operation.%c", f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sMust not be used after another '", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.notable, "if"); + f_color_print(data_make->error.to.stream, data_make->error.context, "' section operation.%c", f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4603,9 +4603,9 @@ extern "C" { if (i == 14) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sUnsupported if type '", data_make->error.prefix); - fl_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[0].string); - fl_color_print(data_make->error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sUnsupported if type '", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[0].string); + f_color_print(data_make->error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4619,7 +4619,7 @@ extern "C" { if (arguments.used > if_type_minimum[i]) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sHas too many arguments.%c", data_make->error.prefix, f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sHas too many arguments.%c", data_make->error.prefix, f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4636,9 +4636,9 @@ extern "C" { if (fl_string_dynamic_compare_string(fake_make_operation_argument_has, arguments.array[1], fake_make_operation_argument_has_length) == F_equal_to_not) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sUnsupported mode type '", data_make->error.prefix); - fl_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[1].string); - fl_color_print(data_make->error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sUnsupported mode type '", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[1].string); + f_color_print(data_make->error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4711,9 +4711,9 @@ extern "C" { else { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sUnsupported file type '", data_make->error.prefix); - fl_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[i].string); - fl_color_print(data_make->error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sUnsupported file type '", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[i].string); + f_color_print(data_make->error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); } type_file |= 0x80; @@ -4782,9 +4782,9 @@ extern "C" { if (fl_string_dynamic_compare_string(fake_make_operation_argument_parameter, arguments.array[1], fake_make_operation_argument_parameter_length) == F_equal_to_not) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sUnsupported define type '", data_make->error.prefix); - fl_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[1].string); - fl_color_print(data_make->error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sUnsupported define type '", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[1].string); + f_color_print(data_make->error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4798,7 +4798,7 @@ extern "C" { if (arguments.used < 3) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sRequires more arguments.%c", data_make->error.prefix, f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sRequires more arguments.%c", data_make->error.prefix, f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4811,7 +4811,7 @@ extern "C" { if (arguments.used < 3) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sRequires more arguments.%c", data_make->error.prefix, f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sRequires more arguments.%c", data_make->error.prefix, f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4856,14 +4856,14 @@ extern "C" { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); if (number > f_number_t_size_unsigned) { - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sThe number '", data_make->error.prefix); - fl_color_print(data_make->error.to.stream, data_make->error.notable, "%c%s", arguments.array[i].string); - fl_color_print(data_make->error.to.stream, data_make->error.context, "' may only be between the ranges -%llu to %llu.%c", f_number_t_size_unsigned, f_number_t_size_unsigned, f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sThe number '", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.notable, "%c%s", arguments.array[i].string); + f_color_print(data_make->error.to.stream, data_make->error.context, "' may only be between the ranges -%llu to %llu.%c", f_number_t_size_unsigned, f_number_t_size_unsigned, f_string_eol_s[0]); } else { - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sInvalid or unsupported number provided '", data_make->error.prefix); - fl_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[i].string); - fl_color_print(data_make->error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sInvalid or unsupported number provided '", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[i].string); + f_color_print(data_make->error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); } } } @@ -4876,7 +4876,7 @@ extern "C" { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sRequires more arguments.%c", data_make->error.prefix, f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sRequires more arguments.%c", data_make->error.prefix, f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4889,7 +4889,7 @@ extern "C" { if (arguments.used > 2) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sHas too many arguments.%c", data_make->error.prefix, f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sHas too many arguments.%c", data_make->error.prefix, f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4918,7 +4918,7 @@ extern "C" { else { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sRequires more arguments.%c", data_make->error.prefix, f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sRequires more arguments.%c", data_make->error.prefix, f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4947,9 +4947,9 @@ extern "C" { if (f_file_exists(arguments.array[i].string) != F_true) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sFailed to find file '", data_make->error.prefix); - fl_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[i].string); - fl_color_print(data_make->error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sFailed to find file '", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[i].string); + f_color_print(data_make->error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4964,9 +4964,9 @@ extern "C" { if (status_file == F_false || status_file == F_file_found_not) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sThe last file '", data_make->error.prefix); - fl_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[arguments.used - 1].string); - fl_color_print(data_make->error.to.stream, data_make->error.context, "' must be a valid directory.%c", f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sThe last file '", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[arguments.used - 1].string); + f_color_print(data_make->error.to.stream, data_make->error.context, "' must be a valid directory.%c", f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -4987,9 +4987,9 @@ extern "C" { if (status_file == F_false) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sThe last file '", data_make->error.prefix); - fl_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[1].string); - fl_color_print(data_make->error.to.stream, data_make->error.context, "' must be a valid directory.%c", f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sThe last file '", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[1].string); + f_color_print(data_make->error.to.stream, data_make->error.context, "' must be a valid directory.%c", f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -5000,7 +5000,7 @@ extern "C" { else { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sRequires more arguments.%c", data_make->error.prefix, f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sRequires more arguments.%c", data_make->error.prefix, f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -5013,7 +5013,7 @@ extern "C" { if (arguments.used > 1) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sHas too many arguments.%c", data_make->error.prefix, f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sHas too many arguments.%c", data_make->error.prefix, f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -5030,22 +5030,22 @@ extern "C" { if (id_section == data_make->fakefile.used) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sNo operation section named '", data_make->error.prefix); - fl_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[0].string); - fl_color_print(data_make->error.to.stream, data_make->error.context, "' was found.%c", f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sNo operation section named '", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[0].string); + f_color_print(data_make->error.to.stream, data_make->error.context, "' was found.%c", f_string_eol_s[0]); } else { for (f_array_length_t i = 0; i < section_stack->used; i++) { if (section_stack->array[i] == id_section) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sThe section operation '", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sThe section operation '", data_make->error.prefix); - fl_color_print_code(data_make->error.to.stream, *data_make->error.notable.before); + f_color_print_code(data_make->error.to.stream, *data_make->error.notable.before); f_print_dynamic_partial(data_make->error.to.stream, data_make->buffer, data_make->fakefile.array[id_section].name); - fl_color_print_code(data_make->error.to.stream, *data_make->error.notable.after); + f_color_print_code(data_make->error.to.stream, *data_make->error.notable.after); - fl_color_print(data_make->error.to.stream, data_make->error.context, "' is already in the operation stack, recursion is not allowed.%c", f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "' is already in the operation stack, recursion is not allowed.%c", f_string_eol_s[0]); *status = F_status_set_error(F_failure); break; @@ -5056,7 +5056,7 @@ extern "C" { else { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sRequires more arguments.%c", data_make->error.prefix, f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sRequires more arguments.%c", data_make->error.prefix, f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -5068,7 +5068,7 @@ extern "C" { if (arguments.used > 1) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sHas too many arguments.%c", data_make->error.prefix, f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sHas too many arguments.%c", data_make->error.prefix, f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -5080,9 +5080,9 @@ extern "C" { if (status_file == F_file_found_not) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sFailed to find file '", data_make->error.prefix); - fl_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[0].string); - fl_color_print(data_make->error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sFailed to find file '", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[0].string); + f_color_print(data_make->error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); } *status = F_status_set_error(status_file); @@ -5097,9 +5097,9 @@ extern "C" { else if (!status_file) { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sThe file '", data_make->error.prefix); - fl_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[0].string); - fl_color_print(data_make->error.to.stream, data_make->error.context, "' must be a directory file.%c", f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sThe file '", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[0].string); + f_color_print(data_make->error.to.stream, data_make->error.context, "' must be a directory file.%c", f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -5108,14 +5108,14 @@ extern "C" { else { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sFilename argument must not be an empty string.%c", data_make->error.prefix, f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sFilename argument must not be an empty string.%c", data_make->error.prefix, f_string_eol_s[0]); } } } else { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sRequires more arguments.%c", data_make->error.prefix, f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sRequires more arguments.%c", data_make->error.prefix, f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -5131,9 +5131,9 @@ extern "C" { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sUnsupported file type '", data_make->error.prefix); - fl_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[0].string); - fl_color_print(data_make->error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sUnsupported file type '", data_make->error.prefix); + f_color_print(data_make->error.to.stream, data_make->error.notable, "%s", arguments.array[0].string); + f_color_print(data_make->error.to.stream, data_make->error.context, "'.%c", f_string_eol_s[0]); } *status = F_status_set_error(F_failure); @@ -5156,7 +5156,7 @@ extern "C" { else { if (data.error.verbosity != f_console_verbosity_quiet && data_make->error.to.stream) { fprintf(data_make->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data_make->error.to.stream, data_make->error.context, "%sRequires more arguments.%c", data_make->error.prefix, f_string_eol_s[0]); + f_color_print(data_make->error.to.stream, data_make->error.context, "%sRequires more arguments.%c", data_make->error.prefix, f_string_eol_s[0]); } *status = F_status_set_error(F_failure); diff --git a/level_3/fake/c/private-print.c b/level_3/fake/c/private-print.c index e33cd90..107ff66 100644 --- a/level_3/fake/c/private-print.c +++ b/level_3/fake/c/private-print.c @@ -15,24 +15,24 @@ extern "C" { if (status == F_file_found_not) { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sFailed to find '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.error, "%sFailed to find '", fll_error_print_error); if (f_file_exists(source) == F_true) { - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", destination); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", destination); } else { - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", source); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", source); } - fl_color_print(data.error.to.stream, data.context.set.error, "' while trying to %s '", operation); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", source); + f_color_print(data.error.to.stream, data.context.set.error, "' while trying to %s '", operation); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", source); if (destination) { - fl_color_print(data.error.to.stream, data.context.set.error, "' %s '", how); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", destination); + f_color_print(data.error.to.stream, data.context.set.error, "' %s '", how); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", destination); } - fl_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); } return F_false; @@ -41,17 +41,17 @@ extern "C" { if (status == F_parameter) { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sInvalid parameter when calling ", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", function); - fl_color_print(data.error.to.stream, data.context.set.error, "() to %s '", operation); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", source); + f_color_print(data.error.to.stream, data.context.set.error, "%sInvalid parameter when calling ", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", function); + f_color_print(data.error.to.stream, data.context.set.error, "() to %s '", operation); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", source); if (destination) { - fl_color_print(data.error.to.stream, data.context.set.error, "' %s '", how); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", destination); + f_color_print(data.error.to.stream, data.context.set.error, "' %s '", how); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", destination); } - fl_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); } return F_false; @@ -60,15 +60,15 @@ extern "C" { if (status == F_name) { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sInvalid name for '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", source); + f_color_print(data.error.to.stream, data.context.set.error, "%sInvalid name for '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", source); if (destination) { - fl_color_print(data.error.to.stream, data.context.set.error, "' or '"); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", destination); + f_color_print(data.error.to.stream, data.context.set.error, "' or '"); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", destination); } - fl_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); } return F_false; @@ -77,15 +77,15 @@ extern "C" { if (status == F_memory_not) { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sUnable to allocate memory, while trying to %s '", fll_error_print_error, operation); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", source); + f_color_print(data.error.to.stream, data.context.set.error, "%sUnable to allocate memory, while trying to %s '", fll_error_print_error, operation); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", source); if (destination) { - fl_color_print(data.error.to.stream, data.context.set.error, "' %s '", how); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", destination); + f_color_print(data.error.to.stream, data.context.set.error, "' %s '", how); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", destination); } - fl_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); } return F_false; @@ -95,15 +95,15 @@ extern "C" { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sOverflow while trying to %s '", fll_error_print_error, operation); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", source); + f_color_print(data.error.to.stream, data.context.set.error, "%sOverflow while trying to %s '", fll_error_print_error, operation); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", source); if (destination) { - fl_color_print(data.error.to.stream, data.context.set.error, "' %s '", how); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", destination); + f_color_print(data.error.to.stream, data.context.set.error, "' %s '", how); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", destination); } - fl_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); } return F_false; @@ -112,15 +112,15 @@ extern "C" { if (status == F_directory) { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sInvalid directory while trying to %s '", fll_error_print_error, operation); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", source); + f_color_print(data.error.to.stream, data.context.set.error, "%sInvalid directory while trying to %s '", fll_error_print_error, operation); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", source); if (destination) { - fl_color_print(data.error.to.stream, data.context.set.error, "' %s '", how); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", destination); + f_color_print(data.error.to.stream, data.context.set.error, "' %s '", how); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", destination); } - fl_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); } return F_false; @@ -129,15 +129,15 @@ extern "C" { if (status == F_access_denied) { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sAccess denied while trying to %s '", fll_error_print_error, operation); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", source); + f_color_print(data.error.to.stream, data.context.set.error, "%sAccess denied while trying to %s '", fll_error_print_error, operation); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", source); if (destination) { - fl_color_print(data.error.to.stream, data.context.set.error, "' %s '", how); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", destination); + f_color_print(data.error.to.stream, data.context.set.error, "' %s '", how); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", destination); } - fl_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); } return F_false; @@ -146,15 +146,15 @@ extern "C" { if (status == F_loop) { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sLoop while trying to %s '", fll_error_print_error, operation); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", source); + f_color_print(data.error.to.stream, data.context.set.error, "%sLoop while trying to %s '", fll_error_print_error, operation); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", source); if (destination) { - fl_color_print(data.error.to.stream, data.context.set.error, "' %s '", how); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", destination); + f_color_print(data.error.to.stream, data.context.set.error, "' %s '", how); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", destination); } - fl_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); } return F_false; @@ -163,15 +163,15 @@ extern "C" { if (status == F_prohibited) { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sProhibited by system while trying to %s '", fll_error_print_error, operation); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", source); + f_color_print(data.error.to.stream, data.context.set.error, "%sProhibited by system while trying to %s '", fll_error_print_error, operation); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", source); if (destination) { - fl_color_print(data.error.to.stream, data.context.set.error, "' %s '", how); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", destination); + f_color_print(data.error.to.stream, data.context.set.error, "' %s '", how); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", destination); } - fl_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); } return F_false; @@ -180,15 +180,15 @@ extern "C" { if (status == F_directory_found_not) { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sFailed to %s '", fll_error_print_error, operation); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", source); + f_color_print(data.error.to.stream, data.context.set.error, "%sFailed to %s '", fll_error_print_error, operation); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", source); if (destination) { - fl_color_print(data.error.to.stream, data.context.set.error, "' %s '", how); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", destination); + f_color_print(data.error.to.stream, data.context.set.error, "' %s '", how); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", destination); } - fl_color_print(data.error.to.stream, data.context.set.error, "' due to an invalid directory in the path.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "' due to an invalid directory in the path.%c", f_string_eol_s[0]); } return F_false; @@ -197,15 +197,15 @@ extern "C" { if (status == F_failure) { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sFailed to %s '", fll_error_print_error, operation); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", source); + f_color_print(data.error.to.stream, data.context.set.error, "%sFailed to %s '", fll_error_print_error, operation); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", source); if (destination) { - fl_color_print(data.error.to.stream, data.context.set.error, "' %s '", how); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", destination); + f_color_print(data.error.to.stream, data.context.set.error, "' %s '", how); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", destination); } - fl_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); } return F_false; @@ -213,17 +213,17 @@ extern "C" { if (fll_error_print(data.error, status, function, F_false) == F_known_not && fallback && data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "UNKNOWN %s(", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%llu", status); - fl_color_print(data.error.to.stream, data.context.set.error, ") occurred while trying to %s '", operation); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", source); + f_color_print(data.error.to.stream, data.context.set.error, "UNKNOWN %s(", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%llu", status); + f_color_print(data.error.to.stream, data.context.set.error, ") occurred while trying to %s '", operation); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", source); if (destination) { - fl_color_print(data.error.to.stream, data.context.set.error, "' %s '", how); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", destination); + f_color_print(data.error.to.stream, data.context.set.error, "' %s '", how); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", destination); } - fl_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); } return F_true; @@ -236,11 +236,11 @@ extern "C" { if (status == F_file_found_not) { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%serror occurred on invalid UTF-8 character at stop position (at ", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%d", range.start); - fl_color_print(data.error.to.stream, data.context.set.error, " of setting file '"); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", path_file); - fl_color_print(data.error.to.stream, data.context.set.error, "').%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%serror occurred on invalid UTF-8 character at stop position (at ", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%d", range.start); + f_color_print(data.error.to.stream, data.context.set.error, " of setting file '"); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", path_file); + f_color_print(data.error.to.stream, data.context.set.error, "').%c", f_string_eol_s[0]); } return F_false; @@ -249,11 +249,11 @@ extern "C" { if (status == F_status_set_error(F_complete_not_utf_stop)) { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%serror occurred on invalid UTF-8 character at end of string (at ", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%d", range.start); - fl_color_print(data.error.to.stream, data.context.set.error, " of setting file '"); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", path_file); - fl_color_print(data.error.to.stream, data.context.set.error, "').%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%serror occurred on invalid UTF-8 character at end of string (at ", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%d", range.start); + f_color_print(data.error.to.stream, data.context.set.error, " of setting file '"); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", path_file); + f_color_print(data.error.to.stream, data.context.set.error, "').%c", f_string_eol_s[0]); } return F_false; @@ -261,11 +261,11 @@ extern "C" { if (fll_error_print(data.error, status, function, F_false) == F_known_not && fallback && data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "UNKNOWN %s(", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%llu", status); - fl_color_print(data.error.to.stream, data.context.set.error, ") in function "); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", function); - fl_color_print(data.error.to.stream, data.context.set.error, "().%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "UNKNOWN %s(", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%llu", status); + f_color_print(data.error.to.stream, data.context.set.error, ") in function "); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", function); + f_color_print(data.error.to.stream, data.context.set.error, "().%c", f_string_eol_s[0]); } return F_true; @@ -278,10 +278,10 @@ extern "C" { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, parameter); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, parameter); - fl_color_print(data.error.to.stream, data.context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); } #endif // _di_fake_print_error_parameter_missing_value_ @@ -291,10 +291,10 @@ extern "C" { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, parameter); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, parameter); - fl_color_print(data.error.to.stream, data.context.set.error, "' specified too many times.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "' specified too many times.%c", f_string_eol_s[0]); } #endif // _di_fake_print_error_parameter_too_many_ @@ -307,21 +307,21 @@ extern "C" { f_fss_count_lines(buffer, operation_name.start, &line); fprintf(error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(error.to.stream, data.error.context, "%sThe section operation '", data.error.prefix); + f_color_print(error.to.stream, data.error.context, "%sThe section operation '", data.error.prefix); - fl_color_print_code(error.to.stream, data.context.notable); + f_color_print_code(error.to.stream, data.context.notable); f_print_dynamic_partial(error.to.stream, buffer, operation_name); - fl_color_print_code(error.to.stream, data.context.reset); + f_color_print_code(error.to.stream, data.context.reset); - fl_color_print(error.to.stream, data.error.context, "' from section '"); + f_color_print(error.to.stream, data.error.context, "' from section '"); - fl_color_print_code(error.to.stream, data.context.notable); + f_color_print_code(error.to.stream, data.context.notable); f_print_dynamic_partial(error.to.stream, buffer, section_name); - fl_color_print_code(error.to.stream, data.context.reset); + f_color_print_code(error.to.stream, data.context.reset); - fl_color_print(error.to.stream, data.error.context, "' on line "); - fl_color_print(error.to.stream, data.context.set.notable, "%llu", line); - fl_color_print(error.to.stream, data.error.context, " failed.%c", f_string_eol_s[0]); + f_color_print(error.to.stream, data.error.context, "' on line "); + f_color_print(error.to.stream, data.context.set.notable, "%llu", line); + f_color_print(error.to.stream, data.error.context, " failed.%c", f_string_eol_s[0]); } #endif // _di_fake_print_message_section_operation_failed_ @@ -331,9 +331,9 @@ extern "C" { if (F_status_set_fine(status) == F_false) { fprintf(error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(error.to.stream, data.error.context, "%sThe path '", data.error.prefix); - fl_color_print(error.to.stream, data.context.set.notable, "%s", path); - fl_color_print(error.to.stream, data.error.context, "' is outside the project root.%c", f_string_eol_s[0]); + f_color_print(error.to.stream, data.error.context, "%sThe path '", data.error.prefix); + f_color_print(error.to.stream, data.context.set.notable, "%s", path); + f_color_print(error.to.stream, data.error.context, "' is outside the project root.%c", f_string_eol_s[0]); } else { fll_error_file_print(data.error, F_status_set_fine(status), function, F_true, path, "determine real path of", fll_error_file_type_file); @@ -347,17 +347,17 @@ extern "C" { if (status == F_array_too_large) { fprintf(error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(error.to.stream, data.error.context, "%s: Maximum stack size reached while processing path '", data.error.prefix); - fl_color_print(error.to.stream, data.context.set.notable, "%s", path); - fl_color_print(error.to.stream, data.error.context, "'"); + f_color_print(error.to.stream, data.error.context, "%s: Maximum stack size reached while processing path '", data.error.prefix); + f_color_print(error.to.stream, data.context.set.notable, "%s", path); + f_color_print(error.to.stream, data.error.context, "'"); if (function) { - fl_color_print(error.to.stream, data.error.context, " while calling "); - fl_color_print(error.to.stream, data.context.set.notable, "%s", function); - fl_color_print(error.to.stream, data.error.context, "()"); + f_color_print(error.to.stream, data.error.context, " while calling "); + f_color_print(error.to.stream, data.context.set.notable, "%s", function); + f_color_print(error.to.stream, data.error.context, "()"); } - fl_color_print(error.to.stream, data.error.context, ".%c", f_string_eol_s[0]); + f_color_print(error.to.stream, data.error.context, ".%c", f_string_eol_s[0]); } else { fll_error_file_print(error, status, function, F_true, path, "change path to", fll_error_file_type_directory); @@ -374,23 +374,23 @@ extern "C" { f_fss_count_lines(buffer, operation_name.start, &line); fprintf(error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(error.to.stream, data.error.context, "The section operation '", data.error.prefix); + f_color_print(error.to.stream, data.error.context, "The section operation '", data.error.prefix); - fl_color_print_code(error.to.stream, data.context.notable); + f_color_print_code(error.to.stream, data.context.notable); f_print_dynamic_partial(error.to.stream, buffer, operation_name); - fl_color_print_code(error.to.stream, data.context.reset); + f_color_print_code(error.to.stream, data.context.reset); - fl_color_print(error.to.stream, data.error.context, "' from section '"); + f_color_print(error.to.stream, data.error.context, "' from section '"); - fl_color_print_code(error.to.stream, data.context.notable); + f_color_print_code(error.to.stream, data.context.notable); f_print_dynamic_partial(error.to.stream, buffer, section_name); - fl_color_print_code(error.to.stream, data.context.reset); + f_color_print_code(error.to.stream, data.context.reset); - fl_color_print(error.to.stream, data.error.context, "' on line "); - fl_color_print(error.to.stream, data.context.set.notable, "%llu", line); - fl_color_print(error.to.stream, data.error.context, " cannot be processed because the max stack depth of "); - fl_color_print(error.to.stream, data.context.set.notable, "%llu", stack_max); - fl_color_print(error.to.stream, data.error.context, " has been reached.%c", f_string_eol_s[0]); + f_color_print(error.to.stream, data.error.context, "' on line "); + f_color_print(error.to.stream, data.context.set.notable, "%llu", line); + f_color_print(error.to.stream, data.error.context, " cannot be processed because the max stack depth of "); + f_color_print(error.to.stream, data.context.set.notable, "%llu", stack_max); + f_color_print(error.to.stream, data.error.context, " has been reached.%c", f_string_eol_s[0]); } #endif // _di_fake_print_message_section_operation_stack_max_ @@ -403,21 +403,21 @@ extern "C" { f_fss_count_lines(buffer, operation_name.start, &line); fprintf(error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(error.to.stream, data.error.context, "%sThe section operation '", data.error.prefix); + f_color_print(error.to.stream, data.error.context, "%sThe section operation '", data.error.prefix); - fl_color_print_code(error.to.stream, data.context.notable); + f_color_print_code(error.to.stream, data.context.notable); f_print_dynamic_partial(error.to.stream, buffer, operation_name); - fl_color_print_code(error.to.stream, data.context.reset); + f_color_print_code(error.to.stream, data.context.reset); - fl_color_print(error.to.stream, data.error.context, "' from section '"); + f_color_print(error.to.stream, data.error.context, "' from section '"); - fl_color_print_code(error.to.stream, data.context.notable); + f_color_print_code(error.to.stream, data.context.notable); f_print_dynamic_partial(error.to.stream, buffer, section_name); - fl_color_print_code(error.to.stream, data.context.reset); + f_color_print_code(error.to.stream, data.context.reset); - fl_color_print(error.to.stream, data.error.context, "' on line "); - fl_color_print(error.to.stream, data.context.set.notable, "%llu", line); - fl_color_print(error.to.stream, data.error.context, " is not a known operation name.%c", f_string_eol_s[0]); + f_color_print(error.to.stream, data.error.context, "' on line "); + f_color_print(error.to.stream, data.context.set.notable, "%llu", line); + f_color_print(error.to.stream, data.error.context, " is not a known operation name.%c", f_string_eol_s[0]); } #endif // _di_fake_print_message_section_operation_unknown_ @@ -427,17 +427,17 @@ extern "C" { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(f_type_warning, data.context.set.warning, "%sthe fakefile '", fll_error_print_warning); - fl_color_print(f_type_warning, data.context.set.notable, "%s", path_file); - fl_color_print(f_type_warning, data.context.set.warning, "' has empty content for the '"); - fl_color_print(f_type_warning, data.context.set.notable, "%s", settings_name); - fl_color_print(f_type_warning, data.context.set.warning, "' object '"); + f_color_print(f_type_warning, data.context.set.warning, "%sthe fakefile '", fll_error_print_warning); + f_color_print(f_type_warning, data.context.set.notable, "%s", path_file); + f_color_print(f_type_warning, data.context.set.warning, "' has empty content for the '"); + f_color_print(f_type_warning, data.context.set.notable, "%s", settings_name); + f_color_print(f_type_warning, data.context.set.warning, "' object '"); - fl_color_print_code(f_type_warning, data.context.notable); + f_color_print_code(f_type_warning, data.context.notable); f_print_dynamic_partial(f_type_warning, buffer, range_object); - fl_color_print_code(f_type_warning, data.context.reset); + f_color_print_code(f_type_warning, data.context.reset); - fl_color_print(f_type_warning, data.context.set.warning, "'.%c", f_string_eol_s[0]); + f_color_print(f_type_warning, data.context.set.warning, "'.%c", f_string_eol_s[0]); } #endif // _di_fake_print_warning_settings_content_empty_ @@ -447,23 +447,23 @@ extern "C" { fprintf(data.output.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.output.stream, data.context.set.warning, "%sthe fakefile '", fll_error_print_warning); - fl_color_print(data.output.stream, data.context.set.notable, "%s", path_file); - fl_color_print(data.output.stream, data.context.set.warning, "' has an invalid content '"); + f_color_print(data.output.stream, data.context.set.warning, "%sthe fakefile '", fll_error_print_warning); + f_color_print(data.output.stream, data.context.set.notable, "%s", path_file); + f_color_print(data.output.stream, data.context.set.warning, "' has an invalid content '"); - fl_color_print_code(data.output.stream, data.context.notable); + f_color_print_code(data.output.stream, data.context.notable); f_print_dynamic_partial(data.output.stream, buffer, range_content); - fl_color_print_code(data.output.stream, data.context.reset); + f_color_print_code(data.output.stream, data.context.reset); - fl_color_print(data.output.stream, data.context.set.warning, "' for the '"); - fl_color_print(data.output.stream, data.context.set.notable, "%s", settings_name); - fl_color_print(data.output.stream, data.context.set.warning, "' object '"); + f_color_print(data.output.stream, data.context.set.warning, "' for the '"); + f_color_print(data.output.stream, data.context.set.notable, "%s", settings_name); + f_color_print(data.output.stream, data.context.set.warning, "' object '"); - fl_color_print_code(data.output.stream, data.context.notable); + f_color_print_code(data.output.stream, data.context.notable); f_print_dynamic_partial(data.output.stream, buffer, range_object); - fl_color_print_code(data.output.stream, data.context.reset); + f_color_print_code(data.output.stream, data.context.reset); - fl_color_print(data.output.stream, data.context.set.warning, "'.%c", f_string_eol_s[0]); + f_color_print(data.output.stream, data.context.set.warning, "'.%c", f_string_eol_s[0]); } #endif // _di_fake_print_warning_settings_content_invalid_ @@ -473,12 +473,12 @@ extern "C" { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(f_type_warning, data.context.set.warning, "%sthe setting '", fll_error_print_warning); - fl_color_print(f_type_warning, data.context.set.notable, "%s", name_object); - fl_color_print(f_type_warning, data.context.set.warning, "' in the file '"); - fl_color_print(f_type_warning, data.context.set.notable, "%s", path_file); + f_color_print(f_type_warning, data.context.set.warning, "%sthe setting '", fll_error_print_warning); + f_color_print(f_type_warning, data.context.set.notable, "%s", name_object); + f_color_print(f_type_warning, data.context.set.warning, "' in the file '"); + f_color_print(f_type_warning, data.context.set.notable, "%s", path_file); - fl_color_print(f_type_warning, data.context.set.warning, "' may only have a single property, only using the first.%c", f_string_eol_s[0]); + f_color_print(f_type_warning, data.context.set.warning, "' may only have a single property, only using the first.%c", f_string_eol_s[0]); } #endif // _di_fake_print_warning_settings_content_multiple_ @@ -488,12 +488,12 @@ extern "C" { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(f_type_warning, data.context.set.warning, "%sthe %s object '", fll_error_print_warning, label); - fl_color_print(f_type_warning, data.context.set.notable, "%s", name_object); - fl_color_print(f_type_warning, data.context.set.warning, "' in the file '"); - fl_color_print(f_type_warning, data.context.set.notable, "%s", path_file); + f_color_print(f_type_warning, data.context.set.warning, "%sthe %s object '", fll_error_print_warning, label); + f_color_print(f_type_warning, data.context.set.notable, "%s", name_object); + f_color_print(f_type_warning, data.context.set.warning, "' in the file '"); + f_color_print(f_type_warning, data.context.set.notable, "%s", path_file); - fl_color_print(f_type_warning, data.context.set.warning, "' may only be specified once, only using the first.%c", f_string_eol_s[0]); + f_color_print(f_type_warning, data.context.set.warning, "' may only be specified once, only using the first.%c", f_string_eol_s[0]); } #endif // _di_fake_print_warning_settings_object_multiple_ diff --git a/level_3/fake/c/private-skeleton.c b/level_3/fake/c/private-skeleton.c index 9694d45..1193cf8 100644 --- a/level_3/fake/c/private-skeleton.c +++ b/level_3/fake/c/private-skeleton.c @@ -20,7 +20,7 @@ extern "C" { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.output.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.output.stream, data.context.set.important, "Generating skeleton structure.%c", f_string_eol_s[0]); + f_color_print(data.output.stream, data.context.set.important, "Generating skeleton structure.%c", f_string_eol_s[0]); } { @@ -175,9 +175,9 @@ extern "C" { if (status == F_false) { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe path '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", path.string); - fl_color_print(data.error.to.stream, data.context.set.error, "' exists but is not a directory.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe path '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", path.string); + f_color_print(data.error.to.stream, data.context.set.error, "' exists but is not a directory.%c", f_string_eol_s[0]); } return F_status_set_warning(F_failure); @@ -188,9 +188,9 @@ extern "C" { if (F_status_is_error(status)) { if (F_status_set_fine(status) == F_file_found_not) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe path '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", path.string); - fl_color_print(data.error.to.stream, data.context.set.error, "' could not be created, a parent directory does not exist.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe path '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", path.string); + f_color_print(data.error.to.stream, data.context.set.error, "' could not be created, a parent directory does not exist.%c", f_string_eol_s[0]); } else { fll_error_file_print(data.error, F_status_set_fine(status), "f_directory_create", F_true, path.string, "create", fll_error_file_type_directory); @@ -260,9 +260,9 @@ extern "C" { if (F_status_is_error(status)) { if (F_status_set_fine(status) == F_file_found_not) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe file '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s", path.string); - fl_color_print(data.error.to.stream, data.context.set.error, "' could not be created, a parent directory does not exist.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe file '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s", path.string); + f_color_print(data.error.to.stream, data.context.set.error, "' could not be created, a parent directory does not exist.%c", f_string_eol_s[0]); } else { fll_error_file_print(data.error, F_status_set_fine(status), "f_file_create", F_true, path.string, "create", fll_error_file_type_file); diff --git a/level_3/fake/data/build/dependencies b/level_3/fake/data/build/dependencies index 9c579ce..c5fb705 100644 --- a/level_3/fake/data/build/dependencies +++ b/level_3/fake/data/build/dependencies @@ -20,7 +20,6 @@ f_iki f_path f_print f_signal -fl_color fl_console fl_control_group fl_conversion diff --git a/level_3/fake/data/build/settings b/level_3/fake/data/build/settings index 76a2994..74b7511 100644 --- a/level_3/fake/data/build/settings +++ b/level_3/fake/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -lcap -build_libraries-individual -lfll_error -lfll_execute -lfll_file -lfll_fss -lfll_path -lfll_program -lfl_color -lfl_console -lfl_control_group -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_iki -lfl_status -lfl_string -lf_account -lf_capability -lf_color -lf_console -lf_control_group -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_iki -lf_limit -lf_memory -lf_path -lf_print -lf_signal -lf_string -lf_thread -lf_type_array -lf_utf +build_libraries-individual -lfll_error -lfll_execute -lfll_file -lfll_fss -lfll_path -lfll_program -lfl_console -lfl_control_group -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_iki -lfl_status -lfl_string -lf_account -lf_capability -lf_color -lf_console -lf_control_group -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_iki -lf_limit -lf_memory -lf_path -lf_print -lf_signal -lf_string -lf_thread -lf_type_array -lf_utf build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library fake.c private-fake.c private-clean.c private-build.c private-make.c private-print.c private-skeleton.c diff --git a/level_3/firewall/c/firewall.c b/level_3/firewall/c/firewall.c index bde3fb2..db91199 100644 --- a/level_3/firewall/c/firewall.c +++ b/level_3/firewall/c/firewall.c @@ -27,26 +27,26 @@ extern "C" { fll_program_print_help_option(output, context, f_console_standard_short_version_s, f_console_standard_long_version_s, f_console_symbol_short_disable_s, f_console_symbol_long_disable_s, " Print only the version number."); fprintf(output.stream, "%c%c", f_string_eol_s[0], f_string_eol_s[0]); - fl_color_print(output.stream, context.set.important, " Available Commands: "); + f_color_print(output.stream, context.set.important, " Available Commands: "); fprintf(output.stream, "%c ", f_string_eol_s[0]); - fl_color_print(output.stream, context.set.standout, firewall_command_start); + f_color_print(output.stream, context.set.standout, firewall_command_start); fprintf(output.stream, " Turn on the firewall"); fprintf(output.stream, "%c ", f_string_eol_s[0]); - fl_color_print(output.stream, context.set.standout, firewall_command_stop); + f_color_print(output.stream, context.set.standout, firewall_command_stop); fprintf(output.stream, " Turn off the firewall"); fprintf(output.stream, "%c ", f_string_eol_s[0]); - fl_color_print(output.stream, context.set.standout, firewall_command_restart); + f_color_print(output.stream, context.set.standout, firewall_command_restart); fprintf(output.stream, " Turn off and then turn on the firewall"); fprintf(output.stream, "%c ", f_string_eol_s[0]); - fl_color_print(output.stream, context.set.standout, firewall_command_lock); + f_color_print(output.stream, context.set.standout, firewall_command_lock); fprintf(output.stream, " Prevent all communication"); fprintf(output.stream, "%c ", f_string_eol_s[0]); - fl_color_print(output.stream, context.set.standout, firewall_command_show); + f_color_print(output.stream, context.set.standout, firewall_command_show); fprintf(output.stream, " Show active firewall settings"); fll_program_print_help_usage(output, context, firewall_name, "command"); @@ -219,7 +219,7 @@ extern "C" { if (strncmp("nat", arguments.argv[data->remaining.array[counter]], 4) != 0) { if (strncmp("mangle", arguments.argv[data->remaining.array[counter]], 7) != 0) { if (strncmp("ports", arguments.argv[data->remaining.array[counter]], 6) != 0) { - fl_color_print(f_type_warning, data->context.set.warning, "%s'%s' is not a valid show option%c", fll_error_print_warning, arguments.argv[data->remaining.array[counter]], f_string_eol_s[0]); + f_color_print(f_type_warning, data->context.set.warning, "%s'%s' is not a valid show option%c", fll_error_print_warning, arguments.argv[data->remaining.array[counter]], f_string_eol_s[0]); } else { show_ports = F_true; @@ -238,16 +238,16 @@ extern "C" { f_macro_string_dynamics_t_resize(status, parameters, 7); if (F_status_is_error(status)) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); firewall_delete_local_data(&local); firewall_delete_data(data); return status; } if (show_nat) { - fl_color_print(data->output.stream, data->context.set.standout, "=========================== "); - fl_color_print(data->output.stream, data->context.set.title, "NAT"); - fl_color_print(data->output.stream, data->context.set.standout, " ============================%c", f_string_eol_s[0]); + f_color_print(data->output.stream, data->context.set.standout, "=========================== "); + f_color_print(data->output.stream, data->context.set.title, "NAT"); + f_color_print(data->output.stream, data->context.set.standout, " ============================%c", f_string_eol_s[0]); fflush(data->output.stream); parameters.used = 6; @@ -278,9 +278,9 @@ extern "C" { } if (F_status_is_error_not(status) && show_mangle) { - fl_color_print(data->output.stream, data->context.set.standout, "========================== "); - fl_color_print(data->output.stream, data->context.set.title, "MANGLE"); - fl_color_print(data->output.stream, data->context.set.standout, " ==========================%c", f_string_eol_s[0]); + f_color_print(data->output.stream, data->context.set.standout, "========================== "); + f_color_print(data->output.stream, data->context.set.title, "MANGLE"); + f_color_print(data->output.stream, data->context.set.standout, " ==========================%c", f_string_eol_s[0]); fflush(data->output.stream); parameters.used = 6; @@ -311,9 +311,9 @@ extern "C" { } if (F_status_is_error_not(status) && show_ports) { - fl_color_print(data->output.stream, data->context.set.standout, "========================== "); - fl_color_print(data->output.stream, data->context.set.title, "FILTER"); - fl_color_print(data->output.stream, data->context.set.standout, " ==========================%c", f_string_eol_s[0]); + f_color_print(data->output.stream, data->context.set.standout, "========================== "); + f_color_print(data->output.stream, data->context.set.title, "FILTER"); + f_color_print(data->output.stream, data->context.set.standout, " ==========================%c", f_string_eol_s[0]); fflush(data->output.stream); parameters.used = 4; @@ -343,22 +343,22 @@ extern "C" { status = F_status_set_fine(status); if (status == F_memory_not) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); } else { - fl_color_print(data->error.to.stream, data->context.set.error, "%sFailed to perform requested %s operation:%c", fll_error_print_error, firewall_tool_iptables, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sFailed to perform requested %s operation:%c", fll_error_print_error, firewall_tool_iptables, f_string_eol_s[0]); fprintf(f_type_error, " "); f_array_length_t i = 0; - fl_color_print_code(f_type_error, data->context.error); + f_color_print_code(f_type_error, data->context.error); fprintf(f_type_error, "%s ", firewall_tool_iptables); for (; i < parameters.used; i++) { fprintf(f_type_error, "%s ", parameters.array[i].string); } // for - fl_color_print_code(f_type_error, data->context.reset); + f_color_print_code(f_type_error, data->context.reset); fprintf(f_type_error, "\n"); } @@ -393,13 +393,13 @@ extern "C" { status = F_status_set_fine(status); if (status == F_memory_not) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); } else if (status == F_data_not) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sCould not find any network devices%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sCould not find any network devices%c", fll_error_print_error, f_string_eol_s[0]); } else if (status == F_failure) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sFailed to read the device directory '%s'%c", fll_error_print_error, network_devices, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sFailed to read the device directory '%s'%c", fll_error_print_error, network_devices, f_string_eol_s[0]); } firewall_delete_local_data(&local); @@ -482,7 +482,7 @@ extern "C" { return status; } else { - fl_color_print(data->error.to.stream, data->context.set.error, "%sFailed to perform lock request because the lock instructions are missing from: %s.%c", fll_error_print_error, network_path firewall_file_other, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sFailed to perform lock request because the lock instructions are missing from: %s.%c", fll_error_print_error, network_path firewall_file_other, f_string_eol_s[0]); firewall_delete_local_data(&local); firewall_delete_data(data); @@ -522,7 +522,7 @@ extern "C" { } } else { - fl_color_print(data->error.to.stream, data->context.set.error, "%sFailed to perform stop request because the lock instructions are missing from: %s.", fll_error_print_error, network_path firewall_file_other, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sFailed to perform stop request because the lock instructions are missing from: %s.", fll_error_print_error, network_path firewall_file_other, f_string_eol_s[0]); firewall_delete_local_data(&local); firewall_delete_data(data); @@ -600,7 +600,7 @@ extern "C" { f_macro_string_dynamic_t_resize(status, file_path, network_path_length + data->devices.array[i].used + firewall_file_suffix_length + 1); if (F_status_is_error(status)) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); firewall_delete_local_data(&local); firewall_delete_data(data); return status; @@ -714,7 +714,7 @@ extern "C" { firewall_delete_local_data(&local); } else { - fl_color_print(data->error.to.stream, data->context.set.error, "%sYou did not pass a command%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sYou did not pass a command%c", fll_error_print_error, f_string_eol_s[0]); status = F_status_set_error(F_parameter); } diff --git a/level_3/firewall/c/firewall.h b/level_3/firewall/c/firewall.h index 924feb6..ad5afc0 100644 --- a/level_3/firewall/c/firewall.h +++ b/level_3/firewall/c/firewall.h @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -32,7 +33,6 @@ #include // fll-1 includes -#include #include #include diff --git a/level_3/firewall/c/private-firewall.c b/level_3/firewall/c/private-firewall.c index 53fbdff..6e92420 100644 --- a/level_3/firewall/c/private-firewall.c +++ b/level_3/firewall/c/private-firewall.c @@ -282,11 +282,11 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi // process rule rule, if the remaining rule does not match as firewall_rule, then it is an invalid rule. else if (length < firewall_rule_length || fl_string_compare(local.buffer.string + local.rule_objects.array[i].start, (f_string_t) firewall_rule, length, firewall_rule_length) == F_equal_to_not) { if (length > 0) { - fl_color_print_code(f_type_warning, data.context.warning); + f_color_print_code(f_type_warning, data.context.warning); fprintf(f_type_warning, "%sAt line %i, the object '", fll_error_print_warning, i); f_print(f_type_warning, local.buffer.string + local.rule_objects.array[i].start, length); fprintf(f_type_warning, "' is invalid"); - fl_color_print_code(f_type_warning, data.context.reset); + f_color_print_code(f_type_warning, data.context.reset); } else { fprintf(f_type_warning, "%sAt line %i, the object is missing", fll_error_print_warning, i); @@ -300,17 +300,17 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi length = firewall_macro_structure_size(local.rule_objects, i); if (length > 0) { - fl_color_print_code(f_type_warning, data.context.warning); + f_color_print_code(f_type_warning, data.context.warning); fprintf(f_type_warning, "%sAt line %i, the object '", fll_error_print_warning, i); f_print(f_type_warning, local.buffer.string + local.rule_objects.array[i].start, length); fprintf(f_type_warning, "' has invalid content '"); f_print(f_type_warning, local.buffer.string + local.rule_contents.array[i].array[0].start, firewall_macro_structure_size(local.rule_contents.array[i], 0)); fprintf(f_type_warning, "'"); - fl_color_print_code(f_type_warning, data.context.reset); + f_color_print_code(f_type_warning, data.context.reset); fprintf(f_type_warning, "\n"); } else { - fl_color_print(f_type_warning, data.context.set.warning, "%sAt line %i, the object has no content%c", fll_error_print_warning, i, f_string_eol_s[0]); + f_color_print(f_type_warning, data.context.set.warning, "%sAt line %i, the object has no content%c", fll_error_print_warning, i, f_string_eol_s[0]); } continue; @@ -552,11 +552,11 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi else { length = firewall_macro_structure_size(local.rule_objects, i); - fl_color_print_code(f_type_warning, data.context.warning); + f_color_print_code(f_type_warning, data.context.warning); fprintf(f_type_warning, "%sAt line %i, the object '", fll_error_print_warning, i); f_print(f_type_warning, local.buffer.string + local.rule_objects.array[i].start, length); fprintf(f_type_warning, "' has no content"); - fl_color_print_code(f_type_warning, data.context.reset); + f_color_print_code(f_type_warning, data.context.reset); fprintf(f_type_warning, "\n"); break; @@ -587,24 +587,24 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi status = F_status_set_fine(status); if (status == F_parameter) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sInvalid parameter when calling f_file_open()%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sInvalid parameter when calling f_file_open()%c", fll_error_print_error, f_string_eol_s[0]); } else if (status == F_file_found_not) { // the file does not have to exist - fl_color_print(f_type_warning, data.context.set.warning, "%sCannot find the file '%.*s'%c", fll_error_print_warning, file_path.used, file_path.string, f_string_eol_s[0]); + f_color_print(f_type_warning, data.context.set.warning, "%sCannot find the file '%.*s'%c", fll_error_print_warning, file_path.used, file_path.string, f_string_eol_s[0]); status = F_none; } else if (status == F_file_open) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sUnable to open the file '%.*s'%c", fll_error_print_error, file_path.used, file_path.string, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sUnable to open the file '%.*s'%c", fll_error_print_error, file_path.used, file_path.string, f_string_eol_s[0]); } else if (status == F_file_descriptor) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sFile descriptor error while trying to open the file '%.*s'%c", fll_error_print_error, file_path.used, file_path.string, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sFile descriptor error while trying to open the file '%.*s'%c", fll_error_print_error, file_path.used, file_path.string, f_string_eol_s[0]); } else if (status == F_memory_not) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); } else { - fl_color_print(data.error.to.stream, data.context.set.error, "%sAn unhandled error (%u) has occurred while calling f_file_open()%c", fll_error_print_error, status, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sAn unhandled error (%u) has occurred while calling f_file_open()%c", fll_error_print_error, status, f_string_eol_s[0]); } if (status != F_file_found_not) { @@ -622,25 +622,25 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi status = F_status_set_fine(status); if (status == F_parameter) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sInvalid parameter when calling f_file_read()%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sInvalid parameter when calling f_file_read()%c", fll_error_print_error, f_string_eol_s[0]); } else if (status == F_number_overflow) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sInteger overflow while trying to buffer the file '%.*s'%c", fll_error_print_error, file_path.used, file_path.string, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sInteger overflow while trying to buffer the file '%.*s'%c", fll_error_print_error, file_path.used, file_path.string, f_string_eol_s[0]); } else if (status == F_file_closed) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe file '%.*s' is no longer open%c", fll_error_print_error, file_path.used, file_path.string, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe file '%.*s' is no longer open%c", fll_error_print_error, file_path.used, file_path.string, f_string_eol_s[0]); } else if (status == F_file_seek) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sA seek error occurred while accessing the file '%.*s'%c", fll_error_print_error, file_path.used, file_path.string, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sA seek error occurred while accessing the file '%.*s'%c", fll_error_print_error, file_path.used, file_path.string, f_string_eol_s[0]); } else if (status == F_file_read) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sA read error occurred while accessing the file '%.*s'%c", fll_error_print_error, file_path.used, file_path.string, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sA read error occurred while accessing the file '%.*s'%c", fll_error_print_error, file_path.used, file_path.string, f_string_eol_s[0]); } else if (status == F_memory_not) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); } else { - fl_color_print(data.error.to.stream, data.context.set.error, "%sAn unhandled error (%u) has occurred while calling f_file_read()%c", fll_error_print_error, status, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sAn unhandled error (%u) has occurred while calling f_file_read()%c", fll_error_print_error, status, f_string_eol_s[0]); } status = F_status_set_error(status); @@ -658,16 +658,16 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi status = F_status_set_fine(status); if (status == F_parameter) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sInvalid parameter when calling fll_fss_basic_read() for the file '%.*s'%c", fll_error_print_error, file_path.used, file_path.string, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sInvalid parameter when calling fll_fss_basic_read() for the file '%.*s'%c", fll_error_print_error, file_path.used, file_path.string, f_string_eol_s[0]); } else if (status == F_data_not_eos || status == F_data_not || status == F_data_not_stop) { // empty files are to be silently ignored } else if (status == F_memory_not) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); } else { - fl_color_print(data.error.to.stream, data.context.set.error, "%sAn unhandled error (%u) has occurred while calling fll_fss_basic_read() for the file '%.*s'%c", fll_error_print_error, status, file_path.used, file_path.string, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sAn unhandled error (%u) has occurred while calling fll_fss_basic_read() for the file '%.*s'%c", fll_error_print_error, status, file_path.used, file_path.string, f_string_eol_s[0]); } status = F_status_set_error(status); @@ -709,7 +709,7 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi } if (F_status_is_error(status)) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); f_macro_string_dynamic_t_delete_simple(ip_list_action); } @@ -730,7 +730,7 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi f_macro_string_dynamic_t_resize(status, ip_argument, ip_length); if (F_status_is_error(status)) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); break; } @@ -741,14 +741,14 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi if (F_status_is_error(status)) break; if (data.error.verbosity == f_console_verbosity_debug) { - fl_color_print_code(f_type_debug, data.context.warning); + f_color_print_code(f_type_debug, data.context.warning); fprintf(f_type_debug, "%s ", current_tool); for (f_array_length_t i = 0; i < arguments.used; i++) { fprintf(f_type_debug, "%.*s ", arguments.array[i].used, arguments.array[i].string); } // for - fl_color_print_code(f_type_debug, data.context.reset); + f_color_print_code(f_type_debug, data.context.reset); fprintf(f_type_debug, "\n"); } @@ -760,17 +760,17 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi } if (status == F_failure) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sFailed to perform requested %s operation:%c", fll_error_print_error, current_tool, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sFailed to perform requested %s operation:%c", fll_error_print_error, current_tool, f_string_eol_s[0]); fprintf(f_type_error, " "); - fl_color_print_code(f_type_error, data.context.error); + f_color_print_code(f_type_error, data.context.error); fprintf(f_type_error, "%s ", current_tool); for (f_array_length_t i = 0; i < arguments.used; i++) { fprintf(f_type_error, "%.*s ", arguments.array[i].used, arguments.array[i].string); } // for - fl_color_print_code(f_type_error, data.context.reset); + f_color_print_code(f_type_error, data.context.reset); fprintf(f_type_error, "\n"); // remove ip_argument from arguments string. @@ -780,7 +780,7 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi break; } else if (status == F_parameter) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sInvalid parameter when calling fll_execute_program()%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sInvalid parameter when calling fll_execute_program()%c", fll_error_print_error, f_string_eol_s[0]); // remove ip_argument from arguments string. f_macro_string_dynamic_t_delete_simple(arguments.array[arguments.used]); @@ -815,14 +815,14 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi } else { if (data.error.verbosity == f_console_verbosity_debug) { - fl_color_print_code(f_type_debug, data.context.warning); + f_color_print_code(f_type_debug, data.context.warning); fprintf(f_type_debug, "%s ", current_tool); for (f_array_length_t i = 0; i < arguments.used; i++) { fprintf(f_type_debug, "%.*s ", arguments.array[i].used, arguments.array[i].string); } // for - fl_color_print_code(f_type_debug, data.context.reset); + f_color_print_code(f_type_debug, data.context.reset); fprintf(f_type_debug, "\n"); } @@ -834,22 +834,22 @@ f_status_t firewall_perform_commands(const firewall_local_data_t local, const fi } if (status == F_failure) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sFailed to perform requested %s operation:%c", fll_error_print_error, current_tool, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sFailed to perform requested %s operation:%c", fll_error_print_error, current_tool, f_string_eol_s[0]); fprintf(f_type_error, " "); - fl_color_print_code(f_type_error, data.context.error); + f_color_print_code(f_type_error, data.context.error); fprintf(f_type_error, "%s ", current_tool); for (f_array_length_t i = 0; i < arguments.used; i++) { fprintf(f_type_error, "%.*s ", arguments.array[i].used, arguments.array[i].string); } // for - fl_color_print_code(f_type_error, data.context.reset); + f_color_print_code(f_type_error, data.context.reset); fprintf(f_type_error, "\n"); break; } else if (status == F_parameter) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sInvalid parameter when calling fll_execute_program()%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sInvalid parameter when calling fll_execute_program()%c", fll_error_print_error, f_string_eol_s[0]); break; } } @@ -1055,14 +1055,14 @@ f_status_t firewall_create_custom_chains(firewall_reserved_chains_t *reserved, f if (create_chain) { if (data->error.verbosity == f_console_verbosity_debug) { - fl_color_print_code(f_type_debug, data->context.warning); + f_color_print_code(f_type_debug, data->context.warning); fprintf(f_type_debug, "%s ", firewall_tool_iptables); for (f_array_length_t i = 0; i < arguments.used; i++) { fprintf(f_type_debug, "%.*s ", arguments.array[i].used, arguments.array[i].string); } // for - fl_color_print_code(f_type_debug, data->context.reset); + f_color_print_code(f_type_debug, data->context.reset); fprintf(f_type_debug, "\n"); } @@ -1076,14 +1076,14 @@ f_status_t firewall_create_custom_chains(firewall_reserved_chains_t *reserved, f if (F_status_is_error_not(status)) { if (data->error.verbosity == f_console_verbosity_debug) { - fl_color_print_code(f_type_debug, data->context.warning); + f_color_print_code(f_type_debug, data->context.warning); fprintf(f_type_debug, "%s ", firewall_tool_ip6tables); for (f_array_length_t i = 0; i < arguments.used; i++) { fprintf(f_type_debug, "%.*s ", arguments.array[i].used, arguments.array[i].string); } // for - fl_color_print_code(f_type_debug, data->context.reset); + f_color_print_code(f_type_debug, data->context.reset); fprintf(f_type_debug, "\n"); } @@ -1101,14 +1101,14 @@ f_status_t firewall_create_custom_chains(firewall_reserved_chains_t *reserved, f if (status == F_failure) { if (tool == firewall_program_iptables) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sFailed to perform requested %s operation:%c", fll_error_print_error, firewall_tool_iptables, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sFailed to perform requested %s operation:%c", fll_error_print_error, firewall_tool_iptables, f_string_eol_s[0]); } else if (tool == firewall_program_ip6tables) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sFailed to perform requested %s operation:%c", fll_error_print_error, firewall_tool_ip6tables, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sFailed to perform requested %s operation:%c", fll_error_print_error, firewall_tool_ip6tables, f_string_eol_s[0]); } fprintf(f_type_error, " "); - fl_color_print_code(f_type_error, data->context.error); + f_color_print_code(f_type_error, data->context.error); if (tool == firewall_program_iptables) { fprintf(f_type_error, "%s ", firewall_tool_iptables); @@ -1121,14 +1121,14 @@ f_status_t firewall_create_custom_chains(firewall_reserved_chains_t *reserved, f fprintf(f_type_error, "%.*s ", arguments.array[i].used, arguments.array[i].string); } // for - fl_color_print_code(f_type_error, data->context.reset); + f_color_print_code(f_type_error, data->context.reset); fprintf(f_type_error, "\n"); } else if (status == F_parameter) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sInvalid parameter when calling fll_execute_program()%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sInvalid parameter when calling fll_execute_program()%c", fll_error_print_error, f_string_eol_s[0]); } else { - fl_color_print(data->error.to.stream, data->context.set.error, "%sAn unhandled error (%u) has occurred while calling fll_execute_program()%c", fll_error_print_error, status, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sAn unhandled error (%u) has occurred while calling fll_execute_program()%c", fll_error_print_error, status, f_string_eol_s[0]); } f_macro_string_dynamics_t_delete_simple(arguments); @@ -1165,14 +1165,14 @@ f_status_t firewall_delete_chains(const firewall_data_t data) { arguments.used = 1; if (data.error.verbosity == f_console_verbosity_debug) { - fl_color_print_code(f_type_debug, data.context.warning); + f_color_print_code(f_type_debug, data.context.warning); fprintf(f_type_debug, "%s ", tools[i]); for (f_array_length_t i = 0; i < arguments.used; i++) { fprintf(f_type_debug, "%.*s ", arguments.array[i].used, arguments.array[i].string); } // for - fl_color_print_code(f_type_debug, data.context.reset); + f_color_print_code(f_type_debug, data.context.reset); fprintf(f_type_debug, "\n"); } @@ -1187,24 +1187,24 @@ f_status_t firewall_delete_chains(const firewall_data_t data) { status = F_status_set_fine(status); if (status == F_failure) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sFailed to perform requested %s operation:%c", fll_error_print_error, tools[i], f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sFailed to perform requested %s operation:%c", fll_error_print_error, tools[i], f_string_eol_s[0]); fprintf(f_type_error, " "); - fl_color_print_code(f_type_error, data.context.error); + f_color_print_code(f_type_error, data.context.error); fprintf(f_type_error, "%s ", tools[i]); for (f_array_length_t i = 0; i < arguments.used; i++) { fprintf(f_type_error, "%.*s ", arguments.array[i].used, arguments.array[i].string); } // for - fl_color_print_code(f_type_error, data.context.reset); + f_color_print_code(f_type_error, data.context.reset); fprintf(f_type_error, "\n"); } else if (status == F_parameter) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sInvalid parameter when calling fll_execute_program()%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sInvalid parameter when calling fll_execute_program()%c", fll_error_print_error, f_string_eol_s[0]); } else { - fl_color_print(data.error.to.stream, data.context.set.error, "%sAn unhandled error (%u) has occurred while calling fll_execute_program()%c", fll_error_print_error, status, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sAn unhandled error (%u) has occurred while calling fll_execute_program()%c", fll_error_print_error, status, f_string_eol_s[0]); } return status; @@ -1225,14 +1225,14 @@ f_status_t firewall_delete_chains(const firewall_data_t data) { arguments.used = 1; if (data.error.verbosity == f_console_verbosity_debug) { - fl_color_print_code(f_type_debug, data.context.warning); + f_color_print_code(f_type_debug, data.context.warning); fprintf(f_type_debug, "%s ", tools[i]); for (f_array_length_t j = 0; j < arguments.used; j++) { fprintf(f_type_debug, "%.*s ", arguments.array[j].used, arguments.array[j].string); } // for - fl_color_print_code(f_type_debug, data.context.reset); + f_color_print_code(f_type_debug, data.context.reset); fprintf(f_type_debug, "\n"); } @@ -1247,24 +1247,24 @@ f_status_t firewall_delete_chains(const firewall_data_t data) { status = F_status_set_fine(status); if (status == F_failure) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sFailed to perform requested %s operation:%c", fll_error_print_error, tools[i], f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sFailed to perform requested %s operation:%c", fll_error_print_error, tools[i], f_string_eol_s[0]); fprintf(f_type_error, " "); - fl_color_print_code(f_type_error, data.context.error); + f_color_print_code(f_type_error, data.context.error); fprintf(f_type_error, "%s ", tools[i]); for (f_array_length_t j = 0; j < arguments.used; j++) { fprintf(f_type_error, "%.*s ", arguments.array[j].used, arguments.array[j].string); } // for - fl_color_print_code(f_type_error, data.context.reset); + f_color_print_code(f_type_error, data.context.reset); fprintf(f_type_error, "\n"); } else if (status == F_parameter) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sInvalid parameter when calling fll_execute_program()%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sInvalid parameter when calling fll_execute_program()%c", fll_error_print_error, f_string_eol_s[0]); } else { - fl_color_print(data.error.to.stream, data.context.set.error, "%sAn unhandled error (%u) has occurred while calling fll_execute_program()%c", fll_error_print_error, status, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sAn unhandled error (%u) has occurred while calling fll_execute_program()%c", fll_error_print_error, status, f_string_eol_s[0]); } return status; @@ -1307,14 +1307,14 @@ f_status_t firewall_default_lock(const firewall_data_t data) { // print command when debugging. if (data.error.verbosity == f_console_verbosity_debug) { - fl_color_print_code(f_type_debug, data.context.warning); + f_color_print_code(f_type_debug, data.context.warning); fprintf(f_type_debug, "%s ", tools[j]); for (f_array_length_t k = 0; k < arguments.used; k++) { fprintf(f_type_debug, "%.*s ", arguments.array[k].used, arguments.array[k].string); } // for - fl_color_print_code(f_type_debug, data.context.reset); + f_color_print_code(f_type_debug, data.context.reset); fprintf(f_type_debug, "\n"); } @@ -1329,24 +1329,24 @@ f_status_t firewall_default_lock(const firewall_data_t data) { status = F_status_set_fine(status); if (status == F_failure) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sFailed to perform requested %s operation:%c", fll_error_print_error, tools[j], f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sFailed to perform requested %s operation:%c", fll_error_print_error, tools[j], f_string_eol_s[0]); fprintf(f_type_error, " "); - fl_color_print_code(f_type_error, data.context.error); + f_color_print_code(f_type_error, data.context.error); fprintf(f_type_error, "%s ", tools[j]); for (f_array_length_t k = 0; k < arguments.used; k++) { fprintf(f_type_error, "%.*s ", arguments.array[k].used, arguments.array[k].string); } // for - fl_color_print_code(f_type_error, data.context.reset); + f_color_print_code(f_type_error, data.context.reset); fprintf(f_type_error, "\n"); } else if (status == F_parameter) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sInvalid parameter when calling fll_execute_program()%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sInvalid parameter when calling fll_execute_program()%c", fll_error_print_error, f_string_eol_s[0]); } else { - fl_color_print(data.error.to.stream, data.context.set.error, "%sAn unhandled error (%u) has occurred while calling fll_execute_program()%c", fll_error_print_error, status, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sAn unhandled error (%u) has occurred while calling fll_execute_program()%c", fll_error_print_error, status, f_string_eol_s[0]); } return status; @@ -1367,26 +1367,26 @@ f_status_t firewall_buffer_rules(const f_string_t filename, const bool optional, if (optional) { if (status == F_parameter) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sInvalid parameter when calling f_file_open().%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sInvalid parameter when calling f_file_open().%c", fll_error_print_error, f_string_eol_s[0]); } else if (status != F_file_found_not && status != F_file_open && status != F_file_descriptor) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sAn unhandled error (%u) has occurred while calling f_file_open().%c", fll_error_print_error, status, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sAn unhandled error (%u) has occurred while calling f_file_open().%c", fll_error_print_error, status, f_string_eol_s[0]); } } else { if (status == F_parameter) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sInvalid parameter when calling f_file_open().%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sInvalid parameter when calling f_file_open().%c", fll_error_print_error, f_string_eol_s[0]); } else if (status == F_file_found_not) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sUnable to find the file '%s'.%c", fll_error_print_error, filename, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sUnable to find the file '%s'.%c", fll_error_print_error, filename, f_string_eol_s[0]); } else if (status == F_file_open) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sUnable to open the file '%s'.%c", fll_error_print_error, filename, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sUnable to open the file '%s'.%c", fll_error_print_error, filename, f_string_eol_s[0]); } else if (status == F_file_descriptor) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sFile descriptor error while trying to open the file '%s'.%c", fll_error_print_error, filename, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sFile descriptor error while trying to open the file '%s'.%c", fll_error_print_error, filename, f_string_eol_s[0]); } else { - fl_color_print(data->error.to.stream, data->context.set.error, "%sAn unhandled error (%u) has occurred while calling f_file_open().%c", fll_error_print_error, status, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sAn unhandled error (%u) has occurred while calling f_file_open().%c", fll_error_print_error, status, f_string_eol_s[0]); } } @@ -1401,25 +1401,25 @@ f_status_t firewall_buffer_rules(const f_string_t filename, const bool optional, status = F_status_set_fine(status); if (status == F_parameter) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sInvalid parameter when calling f_file_read().%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sInvalid parameter when calling f_file_read().%c", fll_error_print_error, f_string_eol_s[0]); } else if (status == F_number_overflow) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sInteger overflow while trying to buffer the file '%s'.%c", fll_error_print_error, filename, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sInteger overflow while trying to buffer the file '%s'.%c", fll_error_print_error, filename, f_string_eol_s[0]); } else if (status == F_file_closed) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe file '%s' is no longer open.%c", fll_error_print_error, filename, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe file '%s' is no longer open.%c", fll_error_print_error, filename, f_string_eol_s[0]); } else if (status == F_file_seek) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sA seek error occurred while accessing the file '%s'.%c", fll_error_print_error, filename, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sA seek error occurred while accessing the file '%s'.%c", fll_error_print_error, filename, f_string_eol_s[0]); } else if (status == F_file_read) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sA read error occurred while accessing the file '%s'.%c", fll_error_print_error, filename, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sA read error occurred while accessing the file '%s'.%c", fll_error_print_error, filename, f_string_eol_s[0]); } else if (status == F_memory_not) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); } else { - fl_color_print(data->error.to.stream, data->context.set.error, "%sAn unhandled error (%u) has occurred while calling f_file_read().%c", fll_error_print_error, status, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sAn unhandled error (%u) has occurred while calling f_file_read().%c", fll_error_print_error, status, f_string_eol_s[0]); } return status; @@ -1438,16 +1438,16 @@ f_status_t firewall_buffer_rules(const f_string_t filename, const bool optional, status = F_status_set_fine(status); if (status == F_parameter) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sInvalid parameter when calling fll_fss_basic_list_read() for the file '%s'.%c", fll_error_print_error, filename, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sInvalid parameter when calling fll_fss_basic_list_read() for the file '%s'.%c", fll_error_print_error, filename, f_string_eol_s[0]); } else if (status == F_data_not_eos || status == F_data_not || status == F_data_not_stop) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sNo relevant data was found within the file '%s'.%c", fll_error_print_error, filename, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sNo relevant data was found within the file '%s'.%c", fll_error_print_error, filename, f_string_eol_s[0]); } else if (status == F_memory_not) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); } else { - fl_color_print(data->error.to.stream, data->context.set.error, "%sAn unhandled error (%u) has occurred while calling fll_fss_basic_list_read() for the file '%s'.%c", fll_error_print_error, status, filename, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sAn unhandled error (%u) has occurred while calling fll_fss_basic_list_read() for the file '%s'.%c", fll_error_print_error, status, filename, f_string_eol_s[0]); } } else { @@ -1486,13 +1486,13 @@ f_status_t firewall_process_rules(f_string_range_t *range, firewall_local_data_t status = F_status_set_fine(status); if (status == F_memory_not) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); } else if (status == F_failure) { // the error message has already been displayed. } else { - fl_color_print(data->error.to.stream, data->context.set.error, "%sAn unhandled error (%u) has occurred while calling firewall_perform_commands().%c", fll_error_print_error, status, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sAn unhandled error (%u) has occurred while calling firewall_perform_commands().%c", fll_error_print_error, status, f_string_eol_s[0]); } f_macro_fss_objects_t_delete_simple(local->rule_objects); diff --git a/level_3/firewall/c/private-firewall.h b/level_3/firewall/c/private-firewall.h index d841e7c..6d624a6 100644 --- a/level_3/firewall/c/private-firewall.h +++ b/level_3/firewall/c/private-firewall.h @@ -85,7 +85,7 @@ typedef struct { (structure.array[index].stop - structure.array[index].start) + 1 // TODO: temporarily added, convert this to a function below. -// TODO: also report: fl_color_print(data.error.to.stream, data.context.set.error, "CRITICAL ERROR: Unable to allocate memory.%c", f_string_eol_s[0]); +// TODO: also report: f_color_print(data.error.to.stream, data.context.set.error, "CRITICAL ERROR: Unable to allocate memory.%c", f_string_eol_s[0]); #define firewall_macro_append_argument_to_arguments(status, arguments, argument) \ if (arguments.used == arguments.size) { \ f_macro_string_dynamics_t_resize(status, arguments, arguments.used + firewall_default_allocation_step); \ diff --git a/level_3/firewall/data/build/dependencies b/level_3/firewall/data/build/dependencies index fcd252d..1530a87 100644 --- a/level_3/firewall/data/build/dependencies +++ b/level_3/firewall/data/build/dependencies @@ -18,7 +18,6 @@ f_fss f_path f_pipe f_print -fl_color fl_console fl_control_group fl_conversion diff --git a/level_3/firewall/data/build/settings b/level_3/firewall/data/build/settings index a436e85..8bc47ed 100644 --- a/level_3/firewall/data/build/settings +++ b/level_3/firewall/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -lcap -build_libraries-individual -lfll_error -lfll_execute -lfll_fss -lfll_program -lfl_color -lfl_console -lfl_control_group -lfl_conversion -lfl_environment -lfl_fss -lfl_status -lfl_string -lf_account -lf_capability -lf_color -lf_console -lf_control_group -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_limit -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_string -lf_thread -lf_type_array -lf_utf +build_libraries-individual -lfll_error -lfll_execute -lfll_fss -lfll_program -lfl_console -lfl_control_group -lfl_conversion -lfl_environment -lfl_fss -lfl_status -lfl_string -lf_account -lf_capability -lf_color -lf_console -lf_control_group -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_limit -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_string -lf_thread -lf_type_array -lf_utf build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library firewall.c private-firewall.c 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 0754284..661f15b 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 @@ -37,7 +37,7 @@ extern "C" { fll_program_print_help_usage(output, context, fss_basic_list_read_name, "filename(s)"); - fl_color_print(output.stream, context.set.important, " Notes:"); + f_color_print(output.stream, context.set.important, " Notes:"); fprintf(output.stream, "%c", f_string_eol_s[0]); @@ -46,27 +46,27 @@ extern "C" { fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " When using the "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_depth); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_depth); fprintf(output.stream, " option, an order of operations is enforced on the parameters.%c", f_string_eol_s[0]); fprintf(output.stream, " 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_s[0]); fprintf(output.stream, " "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_at); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_at); fprintf(output.stream, ": An object index at the specified depth.%c", f_string_eol_s[0]); fprintf(output.stream, " "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_depth); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_depth); fprintf(output.stream, ": A new depth within the specified depth, indexed from the root.%c", f_string_eol_s[0]); fprintf(output.stream, " "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_name); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_name); fprintf(output.stream, ": An object name at the specified depth.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " The parameter "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_depth); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_depth); fprintf(output.stream, " must be in numeric order, but values in between may be skipped.%c", f_string_eol_s[0]); fprintf(output.stream, " ('-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_s[0]); fprintf(output.stream, " ('-d 2 -a 1 -d 0 -a 2' would be invalid because depth 2 is before depth 1.)%c", f_string_eol_s[0]); @@ -74,61 +74,61 @@ extern "C" { fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " The parameter "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_select); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_select); fprintf(output.stream, " selects a content index at a given depth.%c", f_string_eol_s[0]); fprintf(output.stream, " (This parameter is not synonymous with the depth parameter and does not relate to nested content).%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " Specify both "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_object); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_object); fprintf(output.stream, " and the "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_total); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_total); fprintf(output.stream, " parameters to get the total objects.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " When both "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_at); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_at); fprintf(output.stream, " and "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_name); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_name); fprintf(output.stream, " parameters are specified (at the same depth), the "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_at); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_at); fprintf(output.stream, " parameter value will be treated as a position relative to the specified "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_name); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_name); fprintf(output.stream, " parameter value.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " This program may support parameters, such as "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_depth); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_depth); fprintf(output.stream, " or "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_select); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_select); fprintf(output.stream, ", even if not supported by the standard.%c", f_string_eol_s[0]); fprintf(output.stream, " This is done to help ensure consistency for scripting.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " For parameters like "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_depth); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_depth); fprintf(output.stream, ", if the standard doesn't support nested content, then only a depth of 0 would be valid.%c", f_string_eol_s[0]); fprintf(output.stream, " For parameters like "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_select); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_select); fprintf(output.stream, ", if the standard doesn't support multiple content groups, then only a select of 0 would be valid.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " The parameter "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_trim); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_trim); fprintf(output.stream, " will remove leading and trailing whitespaces when selecting objects or when printing objects.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " When specifying both the "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_object); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_object); fprintf(output.stream, " parameter and the "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_content); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_content); fprintf(output.stream, " parameter, the entire object and content are printed, including the formatting.%c", f_string_eol_s[0]); fprintf(output.stream, " Both the object and content printed are already escaped.%c", f_string_eol_s[0]); fprintf(output.stream, " Both the object and content are separated by an EOL.%c", f_string_eol_s[0]); @@ -136,20 +136,20 @@ extern "C" { fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " The parameter "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_delimit); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_delimit); fprintf(output.stream, " accepts the following:%c", f_string_eol_s[0]); fprintf(output.stream, " - "); - fl_color_print(output.stream, context.set.notable, "%s", fss_basic_list_read_delimit_mode_name_none); + f_color_print(output.stream, context.set.notable, "%s", fss_basic_list_read_delimit_mode_name_none); fprintf(output.stream, ": Do not apply delimits.%c", f_string_eol_s[0]); fprintf(output.stream, " - "); - fl_color_print(output.stream, context.set.notable, "%s", fss_basic_list_read_delimit_mode_name_all); + f_color_print(output.stream, context.set.notable, "%s", fss_basic_list_read_delimit_mode_name_all); fprintf(output.stream, ": (default) apply all delimits.%c", f_string_eol_s[0]); fprintf(output.stream, " - a number, 0 or greater: apply delimits for the specified depth.%c", f_string_eol_s[0]); fprintf(output.stream, " - a number, 0 or greater, followed by a "); - fl_color_print(output.stream, context.set.notable, "%s", fss_basic_list_read_delimit_mode_name_greater); + f_color_print(output.stream, context.set.notable, "%s", fss_basic_list_read_delimit_mode_name_greater); fprintf(output.stream, ": (such as '1+') apply delimits for the specified depth and any greater depth (numerically).%c", f_string_eol_s[0]); fprintf(output.stream, " - a number, 0 or greater, followed by a "); - fl_color_print(output.stream, context.set.notable, "%s", fss_basic_list_read_delimit_mode_name_lesser); + f_color_print(output.stream, context.set.notable, "%s", fss_basic_list_read_delimit_mode_name_lesser); fprintf(output.stream, ": (such as '1-') apply delimits for the specified depth and any lesser depth (numerically).%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); @@ -241,75 +241,75 @@ extern "C" { if (data->remaining.used > 0 || data->process_pipe) { if (data->parameters[fss_basic_list_read_parameter_at].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_at); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_at); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (F_status_is_error_not(status) && data->parameters[fss_basic_list_read_parameter_depth].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_depth); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_depth); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (F_status_is_error_not(status) && data->parameters[fss_basic_list_read_parameter_line].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_line); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_line); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (F_status_is_error_not(status) && data->parameters[fss_basic_list_read_parameter_name].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_name); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a string.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_name); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a string.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (F_status_is_error_not(status) && data->parameters[fss_basic_list_read_parameter_select].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_select); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_select); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (F_status_is_error_not(status) && data->parameters[fss_basic_list_read_parameter_object].result == f_console_result_found) { if (data->parameters[fss_basic_list_read_parameter_line].result == f_console_result_additional) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_line); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_line); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (F_status_is_error_not(status) && data->parameters[fss_basic_list_read_parameter_select].result == f_console_result_additional) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_select); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_select); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (data->parameters[fss_basic_list_read_parameter_content].result == f_console_result_found) { if (F_status_is_error_not(status) && data->parameters[fss_basic_list_read_parameter_total].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify both the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' and the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_content); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_total); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify both the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' and the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_content); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_total); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -318,11 +318,11 @@ extern "C" { if (F_status_is_error_not(status) && data->parameters[fss_basic_list_read_parameter_line].result == f_console_result_additional) { if (data->parameters[fss_basic_list_read_parameter_total].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_line); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_total); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_line); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_total); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -330,11 +330,11 @@ extern "C" { if (F_status_is_error_not(status) && data->parameters[fss_basic_list_read_parameter_pipe].result == f_console_result_found) { if (data->parameters[fss_basic_list_read_parameter_total].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_pipe); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_total); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_pipe); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_total); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -342,9 +342,9 @@ extern "C" { if (F_status_is_error_not(status)) { if (data->parameters[fss_basic_list_read_parameter_delimit].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_delimit); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a value.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_delimit); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a value.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -353,9 +353,9 @@ extern "C" { f_array_length_t length = strnlen(arguments.argv[location], f_console_parameter_size); if (length == 0) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe value for the parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_delimit); - fl_color_print(data->error.to.stream, data->context.set.error, "' must not be empty.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe value for the parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_delimit); + f_color_print(data->error.to.stream, data->context.set.error, "' must not be empty.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -427,9 +427,9 @@ extern "C" { } if (F_status_is_error_not(status) && data->parameters[fss_basic_list_read_parameter_select].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_select); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter requires a positive number.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_select); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter requires a positive number.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -526,7 +526,7 @@ extern "C" { f_macro_fss_comments_t_delete_simple(comments); } else { - fl_color_print(data->error.to.stream, data->context.set.error, "%sYou failed to specify one or more files.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sYou failed to specify one or more files.%c", fll_error_print_error, f_string_eol_s[0]); status = F_status_set_error(F_parameter); } diff --git a/level_3/fss_basic_list_read/c/fss_basic_list_read.h b/level_3/fss_basic_list_read/c/fss_basic_list_read.h index 0472be3..9621451 100644 --- a/level_3/fss_basic_list_read/c/fss_basic_list_read.h +++ b/level_3/fss_basic_list_read/c/fss_basic_list_read.h @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -33,7 +34,6 @@ #include // fll-1 includes -#include #include #include #include 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 f1e2e6f..904a235 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 @@ -19,7 +19,7 @@ extern "C" { fss_basic_list_read_macro_depths_t_resize(status, (*depths), depth_size); if (F_status_is_error(status)) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); return status; } @@ -103,12 +103,12 @@ extern "C" { // @todo: move error printing into common function. if (status_code == F_memory_not) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); } else if (status_code == f_array_length_t_size) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sUnable to process '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_trim); - fl_color_print(data.error.to.stream, data.context.set.error, "' because the maximum buffer size was reached.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sUnable to process '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_trim); + f_color_print(data.error.to.stream, data.context.set.error, "' because the maximum buffer size was reached.%c", f_string_eol_s[0]); } else { f_string_t function = "f_string_append"; @@ -117,20 +117,20 @@ extern "C" { function = "fl_string_rip"; } - fl_color_print(data.error.to.stream, data.context.set.error, "%sAn unhandled error (", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%u", status_code); - fl_color_print(data.error.to.stream, data.context.set.error, ") has occurred while calling "); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s()", function); - fl_color_print(data.error.to.stream, data.context.set.error, ".%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sAn unhandled error (", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%u", status_code); + f_color_print(data.error.to.stream, data.context.set.error, ") has occurred while calling "); + f_color_print(data.error.to.stream, data.context.set.notable, "%s()", function); + f_color_print(data.error.to.stream, data.context.set.error, ".%c", f_string_eol_s[0]); } return status; } if (!depths->array[i].value_name.used) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_name); - fl_color_print(data.error.to.stream, data.context.set.error, "' must not be an empty string.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_name); + f_color_print(data.error.to.stream, data.context.set.error, "' must not be an empty string.%c", f_string_eol_s[0]); return F_status_set_error(F_parameter); } @@ -143,22 +143,22 @@ extern "C" { for (f_array_length_t j = i + 1; j < depths->used; j++) { if (depths->array[i].depth == depths->array[j].depth) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe value '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%llu", depths->array[i].depth); - fl_color_print(data.error.to.stream, data.context.set.error, "' may only be specified once for the parameter '"); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_depth); - fl_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe value '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%llu", depths->array[i].depth); + f_color_print(data.error.to.stream, data.context.set.error, "' may only be specified once for the parameter '"); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_depth); + f_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); return F_status_set_error(F_parameter); } else if (depths->array[i].depth > depths->array[j].depth) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_depth); - fl_color_print(data.error.to.stream, data.context.set.error, "' may not have the value '"); - fl_color_print(data.error.to.stream, data.context.set.notable, "%llu", depths->array[i].depth); - fl_color_print(data.error.to.stream, data.context.set.error, "' before the value '"); - fl_color_print(data.error.to.stream, data.context.set.notable, "%llu", depths->array[j].depth); - fl_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_read_long_depth); + f_color_print(data.error.to.stream, data.context.set.error, "' may not have the value '"); + f_color_print(data.error.to.stream, data.context.set.notable, "%llu", depths->array[i].depth); + f_color_print(data.error.to.stream, data.context.set.error, "' before the value '"); + f_color_print(data.error.to.stream, data.context.set.notable, "%llu", depths->array[j].depth); + f_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); return F_status_set_error(F_parameter); } diff --git a/level_3/fss_basic_list_read/data/build/dependencies b/level_3/fss_basic_list_read/data/build/dependencies index 501975c..a6e9b72 100644 --- a/level_3/fss_basic_list_read/data/build/dependencies +++ b/level_3/fss_basic_list_read/data/build/dependencies @@ -13,7 +13,6 @@ f_file f_fss f_pipe f_print -fl_color fl_console fl_conversion fl_fss diff --git a/level_3/fss_basic_list_read/data/build/settings b/level_3/fss_basic_list_read/data/build/settings index 5e6475d..feb45dc 100644 --- a/level_3/fss_basic_list_read/data/build/settings +++ b/level_3/fss_basic_list_read/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_program -lfl_color -lfl_console -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_status -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_string -lf_type_array -lf_utf +build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_program -lfl_console -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_status -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_string -lf_type_array -lf_utf build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library fss_basic_list_read.c private-fss_basic_list_read.c 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 4e07235..0aff3b0 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 @@ -35,31 +35,31 @@ extern "C" { fll_program_print_help_usage(output, context, fss_basic_list_write_name, f_string_empty_s); fprintf(output.stream, " The pipe uses the Backspace character '"); - fl_color_print(output.stream, context.set.notable, "\\b"); + f_color_print(output.stream, context.set.notable, "\\b"); fprintf(output.stream, "' ("); - fl_color_print(output.stream, context.set.notable, "U+0008"); + f_color_print(output.stream, context.set.notable, "U+0008"); fprintf(output.stream, ") to designate the start of a Content.%c", f_string_eol_s[0]); fprintf(output.stream, " The pipe uses the Form Feed character '"); - fl_color_print(output.stream, context.set.notable, "\\f"); + f_color_print(output.stream, context.set.notable, "\\f"); fprintf(output.stream, "' ("); - fl_color_print(output.stream, context.set.notable, "U+000C"); + f_color_print(output.stream, context.set.notable, "U+000C"); fprintf(output.stream, ") to designate the end of the last Content.%c", f_string_eol_s[0]); fprintf(output.stream, " The pipe uses the Vertical Line character '"); - fl_color_print(output.stream, context.set.notable, "\\v"); + f_color_print(output.stream, context.set.notable, "\\v"); fprintf(output.stream, "' ("); - fl_color_print(output.stream, context.set.notable, "U+000B"); + f_color_print(output.stream, context.set.notable, "U+000B"); fprintf(output.stream, ") is used to ignore a content range, which does nothing in this program.%c", f_string_eol_s[0]); fprintf(output.stream, " For the pipe, an Object is terminated by either a Backspace character '"); - fl_color_print(output.stream, context.set.notable, "\\b"); + f_color_print(output.stream, context.set.notable, "\\b"); fprintf(output.stream, "' ("); - fl_color_print(output.stream, context.set.notable, "U+0008"); + f_color_print(output.stream, context.set.notable, "U+0008"); fprintf(output.stream, ") or a Form Feed character '"); - fl_color_print(output.stream, context.set.notable, "\\f"); + f_color_print(output.stream, context.set.notable, "\\f"); fprintf(output.stream, "' ("); - fl_color_print(output.stream, context.set.notable, "U+000C"); + f_color_print(output.stream, context.set.notable, "U+000C"); fprintf(output.stream, ").%c", f_string_eol_s[0]); fprintf(output.stream, " The end of the pipe represents the end of any Object or Content.%c", f_string_eol_s[0]); @@ -67,15 +67,15 @@ extern "C" { fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " The FSS-0002 (Basic List) specification does not support quoted names, therefore the parameters '"); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_single); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_single); fprintf(output.stream, "' and '"); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_double); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_double); fprintf(output.stream, "' do nothing.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " This program does not use the parameter '"); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_ignore); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_ignore); fprintf(output.stream, "', which therefore does nothing.%c", f_string_eol_s[0]); fprintf(output.stream, " This parameter requires two values.%c", f_string_eol_s[0]); @@ -177,9 +177,9 @@ extern "C" { if (data->parameters[fss_basic_list_write_parameter_file].values.used > 1) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_file); - fl_color_print(data->error.to.stream, data->context.set.error, "' may only be specified once.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_file); + f_color_print(data->error.to.stream, data->context.set.error, "' may only be specified once.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -221,13 +221,13 @@ extern "C" { if (data->parameters[fss_basic_list_write_parameter_content].result == f_console_result_additional) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_partial); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter only allows either the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter or the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_content); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter, but not both.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_partial); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter only allows either the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter or the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_content); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter, but not both.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -250,11 +250,11 @@ extern "C" { if (location_object > location_content || location_object == location_content && location_sub_object > location_sub_content) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sEach ", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter must be specified before a '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_content); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sEach ", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter must be specified before a '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_content); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -278,11 +278,11 @@ extern "C" { else if (!data->process_pipe) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThis requires either piped data or the use of the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_content); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThis requires either piped data or the use of the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_content); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -292,9 +292,9 @@ extern "C" { if (data->parameters[fss_basic_list_write_parameter_partial].result == f_console_result_found) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_partial); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter cannot be used when processing a pipe.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_partial); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter cannot be used when processing a pipe.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -306,9 +306,9 @@ extern "C" { if (data->parameters[fss_basic_list_write_parameter_prepend].result == f_console_result_found) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_prepend); - fl_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_prepend); + f_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -332,9 +332,9 @@ extern "C" { if (status == F_false) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe value for the parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_prepend); - fl_color_print(data->error.to.stream, data->context.set.error, "' must only contain whitespace.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe value for the parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_prepend); + f_color_print(data->error.to.stream, data->context.set.error, "' must only contain whitespace.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -345,9 +345,9 @@ extern "C" { else { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe value for the parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_prepend); - fl_color_print(data->error.to.stream, data->context.set.error, "' must not be an empty string.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe value for the parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_prepend); + f_color_print(data->error.to.stream, data->context.set.error, "' must not be an empty string.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -359,9 +359,9 @@ extern "C" { if (data->parameters[fss_basic_list_write_parameter_ignore].result == f_console_result_found) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_ignore); - fl_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no values were given.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_ignore); + f_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no values were given.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -372,9 +372,9 @@ extern "C" { if (total_locations * 2 > total_arguments) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_ignore); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires two values.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_ignore); + f_color_print(data->error.to.stream, data->context.set.error, "' requires two values.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -409,9 +409,9 @@ extern "C" { if (F_status_is_error(status)) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sWhile processing the ", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "input pipe"); - fl_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sWhile processing the ", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "input pipe"); + f_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); } } } @@ -461,9 +461,9 @@ extern "C" { if (F_status_is_error(status)) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sWhile processing the ", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "input arguments"); - fl_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sWhile processing the ", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "input arguments"); + f_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); } } else if (data->error.verbosity != f_console_verbosity_quiet && data->parameters[fss_basic_list_write_parameter_file].result == f_console_result_none) { diff --git a/level_3/fss_basic_list_write/c/fss_basic_list_write.h b/level_3/fss_basic_list_write/c/fss_basic_list_write.h index e9203ed..a000a00 100644 --- a/level_3/fss_basic_list_write/c/fss_basic_list_write.h +++ b/level_3/fss_basic_list_write/c/fss_basic_list_write.h @@ -21,13 +21,13 @@ #include #include #include +#include #include #include #include #include // fll-1 includes -#include #include #include #include diff --git a/level_3/fss_basic_list_write/c/private-fss_basic_list_write.c b/level_3/fss_basic_list_write/c/private-fss_basic_list_write.c index f5e7931..c44f94a 100644 --- a/level_3/fss_basic_list_write/c/private-fss_basic_list_write.c +++ b/level_3/fss_basic_list_write/c/private-fss_basic_list_write.c @@ -13,13 +13,13 @@ extern "C" { } fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sMust specify both the '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_object); - fl_color_print(data.error.to.stream, data.context.set.error, "' parameter and the '"); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_content); - fl_color_print(data.error.to.stream, data.context.set.error, "' parameter the same number of times when not specifying the "); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_partial); - fl_color_print(data.error.to.stream, data.context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sMust specify both the '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_object); + f_color_print(data.error.to.stream, data.context.set.error, "' parameter and the '"); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_content); + f_color_print(data.error.to.stream, data.context.set.error, "' parameter the same number of times when not specifying the "); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_list_write_long_partial); + f_color_print(data.error.to.stream, data.context.set.error, "' parameter.%c", f_string_eol_s[0]); } #endif // _di_fss_basic_list_write_error_parameter_same_times_print_ @@ -31,9 +31,9 @@ extern "C" { } fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sThis standard does not support end of line character '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "\\n"); - fl_color_print(data.error.to.stream, data.context.set.error, "' in objects.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThis standard does not support end of line character '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "\\n"); + f_color_print(data.error.to.stream, data.context.set.error, "' in objects.%c", f_string_eol_s[0]); } #endif // _di_fss_basic_list_write_error_parameter_unsupported_eol_print_ @@ -45,9 +45,9 @@ extern "C" { } fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", symbol, parameter); - fl_color_print(data.error.to.stream, data.context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", symbol, parameter); + f_color_print(data.error.to.stream, data.context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); } #endif // _di_fss_basic_list_write_error_parameter_value_missing_print_ @@ -234,7 +234,7 @@ extern "C" { if (block.string[range.start] == fss_basic_list_write_pipe_content_start) { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sThis standard only supports one content per object.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThis standard only supports one content per object.%c", fll_error_print_error, f_string_eol_s[0]); } status = F_status_set_error(F_supported_not); diff --git a/level_3/fss_basic_list_write/data/build/dependencies b/level_3/fss_basic_list_write/data/build/dependencies index fe0deee..2c5a217 100644 --- a/level_3/fss_basic_list_write/data/build/dependencies +++ b/level_3/fss_basic_list_write/data/build/dependencies @@ -13,7 +13,6 @@ f_file f_fss f_pipe f_print -fl_color fl_console fl_conversion fl_fss diff --git a/level_3/fss_basic_list_write/data/build/settings b/level_3/fss_basic_list_write/data/build/settings index e664781..b980591 100644 --- a/level_3/fss_basic_list_write/data/build/settings +++ b/level_3/fss_basic_list_write/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_program -lfl_color -lfl_console -lfl_conversion -lfl_directory -lfl_fss -lfl_status -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_string -lf_type_array -lf_utf +build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_program -lfl_console -lfl_conversion -lfl_directory -lfl_fss -lfl_status -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_string -lf_type_array -lf_utf build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library fss_basic_list_write.c private-fss_basic_list_write.c 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 9452edc..5d6c04a 100644 --- a/level_3/fss_basic_read/c/fss_basic_read.c +++ b/level_3/fss_basic_read/c/fss_basic_read.c @@ -37,7 +37,7 @@ extern "C" { fll_program_print_help_usage(output, context, fss_basic_read_name, "filename(s)"); - fl_color_print(output.stream, context.set.important, " Notes:"); + f_color_print(output.stream, context.set.important, " Notes:"); fprintf(output.stream, "%c", f_string_eol_s[0]); @@ -46,27 +46,27 @@ extern "C" { fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " When using the "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_depth); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_depth); fprintf(output.stream, " option, an order of operations is enforced on the parameters.%c", f_string_eol_s[0]); fprintf(output.stream, " 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_s[0]); fprintf(output.stream, " "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_at); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_at); fprintf(output.stream, ": An object index at the specified depth.%c", f_string_eol_s[0]); fprintf(output.stream, " "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_depth); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_depth); fprintf(output.stream, ": A new depth within the specified depth, indexed from the root.%c", f_string_eol_s[0]); fprintf(output.stream, " "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_name); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_name); fprintf(output.stream, ": An object name at the specified depth.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " The parameter "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_depth); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_depth); fprintf(output.stream, " must be in numeric order, but values in between may be skipped.%c", f_string_eol_s[0]); fprintf(output.stream, " ('-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_s[0]); fprintf(output.stream, " ('-d 2 -a 1 -d 0 -a 2' would be invalid because depth 2 is before depth 1.)%c", f_string_eol_s[0]); @@ -74,61 +74,61 @@ extern "C" { fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " The parameter "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_select); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_select); fprintf(output.stream, " selects a content index at a given depth.%c", f_string_eol_s[0]); fprintf(output.stream, " (This parameter is not synonymous with the depth parameter and does not relate to nested content).%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " Specify both "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_object); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_object); fprintf(output.stream, " and the "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_total); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_total); fprintf(output.stream, " parameters to get the total objects.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " When both "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_at); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_at); fprintf(output.stream, " and "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_name); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_name); fprintf(output.stream, " parameters are specified (at the same depth), the "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_at); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_at); fprintf(output.stream, " parameter value will be treated as a position relative to the specified "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_name); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_name); fprintf(output.stream, " parameter value.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " This program may support parameters, such as "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_depth); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_depth); fprintf(output.stream, " or "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_select); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_select); fprintf(output.stream, ", even if not supported by the standard.%c", f_string_eol_s[0]); fprintf(output.stream, " This is done to help ensure consistency for scripting.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " For parameters like "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_depth); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_depth); fprintf(output.stream, ", if the standard doesn't support nested content, then only a depth of 0 would be valid.%c", f_string_eol_s[0]); fprintf(output.stream, " For parameters like "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_select); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_select); fprintf(output.stream, ", if the standard doesn't support multiple content groups, then only a select of 0 would be valid.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " The parameter "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_trim); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_trim); fprintf(output.stream, " will remove leading and trailing whitespaces when selecting objects or when printing objects.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " When specifying both the "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_object); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_object); fprintf(output.stream, " parameter and the "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_content); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_content); fprintf(output.stream, " parameter, the entire object and content are printed, including the formatting.%c", f_string_eol_s[0]); fprintf(output.stream, " Both the object and content printed are already escaped.%c", f_string_eol_s[0]); fprintf(output.stream, " Both the object and content are separated by a space.%c", f_string_eol_s[0]); @@ -136,20 +136,20 @@ extern "C" { fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " The parameter "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_delimit); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_delimit); fprintf(output.stream, " accepts the following:%c", f_string_eol_s[0]); fprintf(output.stream, " - "); - fl_color_print(output.stream, context.set.notable, "%s", fss_basic_read_delimit_mode_name_none); + f_color_print(output.stream, context.set.notable, "%s", fss_basic_read_delimit_mode_name_none); fprintf(output.stream, ": Do not apply delimits.%c", f_string_eol_s[0]); fprintf(output.stream, " - "); - fl_color_print(output.stream, context.set.notable, "%s", fss_basic_read_delimit_mode_name_all); + f_color_print(output.stream, context.set.notable, "%s", fss_basic_read_delimit_mode_name_all); fprintf(output.stream, ": (default) apply all delimits.%c", f_string_eol_s[0]); fprintf(output.stream, " - a number, 0 or greater: apply delimits for the specified depth.%c", f_string_eol_s[0]); fprintf(output.stream, " - a number, 0 or greater, followed by a "); - fl_color_print(output.stream, context.set.notable, "%s", fss_basic_read_delimit_mode_name_greater); + f_color_print(output.stream, context.set.notable, "%s", fss_basic_read_delimit_mode_name_greater); fprintf(output.stream, ": (such as '1+') apply delimits for the specified depth and any greater depth (numerically).%c", f_string_eol_s[0]); fprintf(output.stream, " - a number, 0 or greater, followed by a "); - fl_color_print(output.stream, context.set.notable, "%s", fss_basic_read_delimit_mode_name_lesser); + f_color_print(output.stream, context.set.notable, "%s", fss_basic_read_delimit_mode_name_lesser); fprintf(output.stream, ": (such as '1-') apply delimits for the specified depth and any lesser depth (numerically).%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); @@ -241,75 +241,75 @@ extern "C" { if (data->remaining.used > 0 || data->process_pipe) { if (data->parameters[fss_basic_read_parameter_at].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_at); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_at); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (F_status_is_error_not(status) && data->parameters[fss_basic_read_parameter_depth].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_depth); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_depth); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (F_status_is_error_not(status) && data->parameters[fss_basic_read_parameter_line].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_line); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_line); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (F_status_is_error_not(status) && data->parameters[fss_basic_read_parameter_name].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_name); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a string.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_name); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a string.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (F_status_is_error_not(status) && data->parameters[fss_basic_read_parameter_select].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_select); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_select); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (data->parameters[fss_basic_read_parameter_object].result == f_console_result_found) { if (F_status_is_error_not(status) && data->parameters[fss_basic_read_parameter_line].result == f_console_result_additional) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_line); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter."); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_line); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter."); status = F_status_set_error(F_parameter); } if (F_status_is_error_not(status) && data->parameters[fss_basic_read_parameter_select].result == f_console_result_additional) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_select); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_select); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (data->parameters[fss_basic_read_parameter_content].result == f_console_result_found) { if (F_status_is_error_not(status) && data->parameters[fss_basic_read_parameter_total].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify both the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' and the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_content); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_total); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify both the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' and the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_content); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_total); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -318,11 +318,11 @@ extern "C" { if (data->parameters[fss_basic_read_parameter_line].result == f_console_result_additional) { if (F_status_is_error_not(status) && data->parameters[fss_basic_read_parameter_total].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_line); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_total); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_line); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_total); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -330,11 +330,11 @@ extern "C" { if (data->parameters[fss_basic_read_parameter_pipe].result == f_console_result_found) { if (F_status_is_error_not(status) && data->parameters[fss_basic_read_parameter_total].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_pipe); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_total); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_pipe); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_total); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -342,9 +342,9 @@ extern "C" { if (F_status_is_error_not(status)) { if (data->parameters[fss_basic_read_parameter_delimit].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_delimit); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a value.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_delimit); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a value.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -353,9 +353,9 @@ extern "C" { f_array_length_t length = strnlen(arguments.argv[location], f_console_parameter_size); if (length == 0) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe value for the parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_delimit); - fl_color_print(data->error.to.stream, data->context.set.error, "' must not be empty.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe value for the parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_delimit); + f_color_print(data->error.to.stream, data->context.set.error, "' must not be empty.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -425,9 +425,9 @@ extern "C" { } if (F_status_is_error_not(status) && data->parameters[fss_basic_read_parameter_select].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_select); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter requires a positive number.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_select); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter requires a positive number.%c", f_string_eol_s[0]); fss_basic_read_macro_depths_t_delete_simple(depths); status = F_status_set_error(F_parameter); @@ -524,7 +524,7 @@ extern "C" { f_macro_fss_delimits_t_delete_simple(delimits); } else { - fl_color_print(data->error.to.stream, data->context.set.error, "%sYou failed to specify one or more files.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sYou failed to specify one or more files.%c", fll_error_print_error, f_string_eol_s[0]); status = F_status_set_error(F_parameter); } diff --git a/level_3/fss_basic_read/c/fss_basic_read.h b/level_3/fss_basic_read/c/fss_basic_read.h index 0b1ee12..c5b4898 100644 --- a/level_3/fss_basic_read/c/fss_basic_read.h +++ b/level_3/fss_basic_read/c/fss_basic_read.h @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -33,7 +34,6 @@ #include // fll-1 includes -#include #include #include #include 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 bcbc39d..b630fa6 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 @@ -19,7 +19,7 @@ extern "C" { fss_basic_read_macro_depths_t_resize(status, (*depths), depth_size); if (F_status_is_error(status)) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); return status; } @@ -103,12 +103,12 @@ extern "C" { // @todo: move error printing into common function. if (status_code == F_memory_not) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); } else if (status_code == f_array_length_t_size) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sUnable to process '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_trim); - fl_color_print(data.error.to.stream, data.context.set.error, "' because the maximum buffer size was reached.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sUnable to process '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_trim); + f_color_print(data.error.to.stream, data.context.set.error, "' because the maximum buffer size was reached.%c", f_string_eol_s[0]); } else { f_string_t function = "f_string_append"; @@ -117,20 +117,20 @@ extern "C" { function = "fl_string_rip"; } - fl_color_print(data.error.to.stream, data.context.set.error, "%sAn unhandled error (", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%u", status_code); - fl_color_print(data.error.to.stream, data.context.set.error, ") has occurred while calling "); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s()", function); - fl_color_print(data.error.to.stream, data.context.set.error, ".%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sAn unhandled error (", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%u", status_code); + f_color_print(data.error.to.stream, data.context.set.error, ") has occurred while calling "); + f_color_print(data.error.to.stream, data.context.set.notable, "%s()", function); + f_color_print(data.error.to.stream, data.context.set.error, ".%c", f_string_eol_s[0]); } return status; } if (!depths->array[i].value_name.used) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_name); - fl_color_print(data.error.to.stream, data.context.set.error, "' must not be an empty string.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_name); + f_color_print(data.error.to.stream, data.context.set.error, "' must not be an empty string.%c", f_string_eol_s[0]); return F_status_set_error(F_parameter); } @@ -143,22 +143,22 @@ extern "C" { for (f_array_length_t j = i + 1; j < depths->used; j++) { if (depths->array[i].depth == depths->array[j].depth) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe value '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%llu", depths->array[i].depth); - fl_color_print(data.error.to.stream, data.context.set.error, "' may only be specified once for the parameter '"); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_depth); - fl_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe value '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%llu", depths->array[i].depth); + f_color_print(data.error.to.stream, data.context.set.error, "' may only be specified once for the parameter '"); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_depth); + f_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); return F_status_set_error(F_parameter); } else if (depths->array[i].depth > depths->array[j].depth) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_depth); - fl_color_print(data.error.to.stream, data.context.set.error, "' may not have the value '"); - fl_color_print(data.error.to.stream, data.context.set.notable, "%llu", depths->array[i].depth); - fl_color_print(data.error.to.stream, data.context.set.error, "' before the value '"); - fl_color_print(data.error.to.stream, data.context.set.notable, "%llu", depths->array[j].depth); - fl_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_read_long_depth); + f_color_print(data.error.to.stream, data.context.set.error, "' may not have the value '"); + f_color_print(data.error.to.stream, data.context.set.notable, "%llu", depths->array[i].depth); + f_color_print(data.error.to.stream, data.context.set.error, "' before the value '"); + f_color_print(data.error.to.stream, data.context.set.notable, "%llu", depths->array[j].depth); + f_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); return F_status_set_error(F_parameter); } diff --git a/level_3/fss_basic_read/data/build/dependencies b/level_3/fss_basic_read/data/build/dependencies index 501975c..a6e9b72 100644 --- a/level_3/fss_basic_read/data/build/dependencies +++ b/level_3/fss_basic_read/data/build/dependencies @@ -13,7 +13,6 @@ f_file f_fss f_pipe f_print -fl_color fl_console fl_conversion fl_fss diff --git a/level_3/fss_basic_read/data/build/settings b/level_3/fss_basic_read/data/build/settings index 75fde24..c2471d6 100644 --- a/level_3/fss_basic_read/data/build/settings +++ b/level_3/fss_basic_read/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_program -lfl_color -lfl_console -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_status -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_string -lf_type_array -lf_utf +build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_program -lfl_console -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_status -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_string -lf_type_array -lf_utf build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library fss_basic_read.c private-fss_basic_read.c 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 5b70685..7e84866 100644 --- a/level_3/fss_basic_write/c/fss_basic_write.c +++ b/level_3/fss_basic_write/c/fss_basic_write.c @@ -35,31 +35,31 @@ extern "C" { fll_program_print_help_usage(output, context, fss_basic_write_name, f_string_empty_s); fprintf(output.stream, " The pipe uses the Backspace character '"); - fl_color_print(output.stream, context.set.notable, "\\b"); + f_color_print(output.stream, context.set.notable, "\\b"); fprintf(output.stream, "' ("); - fl_color_print(output.stream, context.set.notable, "U+0008"); + f_color_print(output.stream, context.set.notable, "U+0008"); fprintf(output.stream, ") to designate the start of a Content.%c", f_string_eol_s[0]); fprintf(output.stream, " The pipe uses the Form Feed character '"); - fl_color_print(output.stream, context.set.notable, "\\f"); + f_color_print(output.stream, context.set.notable, "\\f"); fprintf(output.stream, "' ("); - fl_color_print(output.stream, context.set.notable, "U+000C"); + f_color_print(output.stream, context.set.notable, "U+000C"); fprintf(output.stream, ") to designate the end of the last Content.%c", f_string_eol_s[0]); fprintf(output.stream, " The pipe uses the Vertical Line character '"); - fl_color_print(output.stream, context.set.notable, "\\v"); + f_color_print(output.stream, context.set.notable, "\\v"); fprintf(output.stream, "' ("); - fl_color_print(output.stream, context.set.notable, "U+000B"); + f_color_print(output.stream, context.set.notable, "U+000B"); fprintf(output.stream, ") is used to ignore a content range, which does nothing in this program.%c", f_string_eol_s[0]); fprintf(output.stream, " For the pipe, an Object is terminated by either a Backspace character '"); - fl_color_print(output.stream, context.set.notable, "\\b"); + f_color_print(output.stream, context.set.notable, "\\b"); fprintf(output.stream, "' ("); - fl_color_print(output.stream, context.set.notable, "U+0008"); + f_color_print(output.stream, context.set.notable, "U+0008"); fprintf(output.stream, ") or a Form Feed character '"); - fl_color_print(output.stream, context.set.notable, "\\f"); + f_color_print(output.stream, context.set.notable, "\\f"); fprintf(output.stream, "' ("); - fl_color_print(output.stream, context.set.notable, "U+000C"); + f_color_print(output.stream, context.set.notable, "U+000C"); fprintf(output.stream, ").%c", f_string_eol_s[0]); fprintf(output.stream, " The end of the pipe represents the end of any Object or Content.%c", f_string_eol_s[0]); @@ -67,13 +67,13 @@ extern "C" { fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " The FSS-0000 (Basic) specification does not support multi-line Content, therefore the parameter '"); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_prepend); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_prepend); fprintf(output.stream, "' does nothing.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " This program does not use the parameter '"); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_ignore); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_ignore); fprintf(output.stream, "', which therefore does nothing.%c", f_string_eol_s[0]); fprintf(output.stream, " This parameter requires two values.%c", f_string_eol_s[0]); @@ -175,9 +175,9 @@ extern "C" { if (data->parameters[fss_basic_write_parameter_file].values.used > 1) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_file); - fl_color_print(data->error.to.stream, data->context.set.error, "' may only be specified once.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_file); + f_color_print(data->error.to.stream, data->context.set.error, "' may only be specified once.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -219,13 +219,13 @@ extern "C" { if (data->parameters[fss_basic_write_parameter_content].result == f_console_result_additional) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_partial); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter only allows either the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter or the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_content); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter, but not both.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_partial); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter only allows either the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter or the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_content); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter, but not both.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -248,11 +248,11 @@ extern "C" { if (location_object > location_content || location_object == location_content && location_sub_object > location_sub_content) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sEach ", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter must be specified before a '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_content); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sEach ", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter must be specified before a '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_content); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -276,11 +276,11 @@ extern "C" { else if (!data->process_pipe) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThis requires either piped data or the use of the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_content); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThis requires either piped data or the use of the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_content); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -290,9 +290,9 @@ extern "C" { if (data->parameters[fss_basic_write_parameter_partial].result == f_console_result_found) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_partial); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter cannot be used when processing a pipe.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_partial); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter cannot be used when processing a pipe.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -304,9 +304,9 @@ extern "C" { if (data->parameters[fss_basic_write_parameter_prepend].result == f_console_result_found) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_prepend); - fl_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_prepend); + f_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -328,9 +328,9 @@ extern "C" { if (status == F_false) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe value for the parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_prepend); - fl_color_print(data->error.to.stream, data->context.set.error, "' must only contain whitespace.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe value for the parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_prepend); + f_color_print(data->error.to.stream, data->context.set.error, "' must only contain whitespace.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -341,9 +341,9 @@ extern "C" { else { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe value for the parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_prepend); - fl_color_print(data->error.to.stream, data->context.set.error, "' must not be an empty string.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe value for the parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_prepend); + f_color_print(data->error.to.stream, data->context.set.error, "' must not be an empty string.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -355,9 +355,9 @@ extern "C" { if (data->parameters[fss_basic_write_parameter_ignore].result == f_console_result_found) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_ignore); - fl_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no values were given.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_ignore); + f_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no values were given.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -368,9 +368,9 @@ extern "C" { if (total_locations * 2 > total_arguments) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_ignore); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires two values.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_ignore); + f_color_print(data->error.to.stream, data->context.set.error, "' requires two values.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -405,9 +405,9 @@ extern "C" { if (F_status_is_error(status)) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sWhile processing the ", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "input pipe"); - fl_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sWhile processing the ", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "input pipe"); + f_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); } } } @@ -460,9 +460,9 @@ extern "C" { if (F_status_is_error(status)) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sWhile processing the ", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "input arguments"); - fl_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sWhile processing the ", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "input arguments"); + f_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); } } else if (data->error.verbosity != f_console_verbosity_quiet && data->parameters[fss_basic_write_parameter_file].result == f_console_result_none) { diff --git a/level_3/fss_basic_write/c/fss_basic_write.h b/level_3/fss_basic_write/c/fss_basic_write.h index e7e1f70..5812cab 100644 --- a/level_3/fss_basic_write/c/fss_basic_write.h +++ b/level_3/fss_basic_write/c/fss_basic_write.h @@ -21,13 +21,13 @@ #include #include #include +#include #include #include #include #include // fll-1 includes -#include #include #include #include diff --git a/level_3/fss_basic_write/c/private-fss_basic_write.c b/level_3/fss_basic_write/c/private-fss_basic_write.c index 443942a..ffc5fb6 100644 --- a/level_3/fss_basic_write/c/private-fss_basic_write.c +++ b/level_3/fss_basic_write/c/private-fss_basic_write.c @@ -13,13 +13,13 @@ extern "C" { } fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sMust specify both the '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_object); - fl_color_print(data.error.to.stream, data.context.set.error, "' parameter and the '"); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_content); - fl_color_print(data.error.to.stream, data.context.set.error, "' parameter the same number of times when not specifying the "); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_partial); - fl_color_print(data.error.to.stream, data.context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sMust specify both the '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_object); + f_color_print(data.error.to.stream, data.context.set.error, "' parameter and the '"); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_content); + f_color_print(data.error.to.stream, data.context.set.error, "' parameter the same number of times when not specifying the "); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_basic_write_long_partial); + f_color_print(data.error.to.stream, data.context.set.error, "' parameter.%c", f_string_eol_s[0]); } #endif // _di_fss_basic_write_error_parameter_same_times_print_ @@ -31,9 +31,9 @@ extern "C" { } fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", symbol, parameter); - fl_color_print(data.error.to.stream, data.context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", symbol, parameter); + f_color_print(data.error.to.stream, data.context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); } #endif // _di_fss_basic_write_error_parameter_value_missing_print_ @@ -45,9 +45,9 @@ extern "C" { } fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sThis standard does not support end of line character '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "\\n"); - fl_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThis standard does not support end of line character '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "\\n"); + f_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); } #endif // _di_fss_basic_write_error_parameter_unsupported_eol_print_ @@ -246,7 +246,7 @@ extern "C" { if (block.string[range.start] == fss_basic_write_pipe_content_start) { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sThis standard only supports one content per object.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThis standard only supports one content per object.%c", fll_error_print_error, f_string_eol_s[0]); } status = F_status_set_error(F_supported_not); diff --git a/level_3/fss_basic_write/data/build/dependencies b/level_3/fss_basic_write/data/build/dependencies index fe0deee..2c5a217 100644 --- a/level_3/fss_basic_write/data/build/dependencies +++ b/level_3/fss_basic_write/data/build/dependencies @@ -13,7 +13,6 @@ f_file f_fss f_pipe f_print -fl_color fl_console fl_conversion fl_fss diff --git a/level_3/fss_basic_write/data/build/settings b/level_3/fss_basic_write/data/build/settings index 20a03b4..390c1d4 100644 --- a/level_3/fss_basic_write/data/build/settings +++ b/level_3/fss_basic_write/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_program -lfl_color -lfl_console -lfl_conversion -lfl_directory -lfl_fss -lfl_status -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_string -lf_type_array -lf_utf +build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_program -lfl_console -lfl_conversion -lfl_directory -lfl_fss -lfl_status -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_string -lf_type_array -lf_utf build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library fss_basic_write.c private-fss_basic_write.c diff --git a/level_3/fss_embedded_list_read/c/fss_embedded_list_read.c b/level_3/fss_embedded_list_read/c/fss_embedded_list_read.c index f47e50a..808577c 100644 --- a/level_3/fss_embedded_list_read/c/fss_embedded_list_read.c +++ b/level_3/fss_embedded_list_read/c/fss_embedded_list_read.c @@ -37,7 +37,7 @@ extern "C" { fll_program_print_help_usage(output, context, fss_embedded_list_read_name, "filename(s)"); - fl_color_print(output.stream, context.set.important, " Notes:"); + f_color_print(output.stream, context.set.important, " Notes:"); fprintf(output.stream, "%c", f_string_eol_s[0]); @@ -46,27 +46,27 @@ extern "C" { fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " When using the "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth); fprintf(output.stream, " option, an order of operations is enforced on the parameters.%c", f_string_eol_s[0]); fprintf(output.stream, " 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_s[0]); fprintf(output.stream, " "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_at); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_at); fprintf(output.stream, ": An object index at the specified depth.%c", f_string_eol_s[0]); fprintf(output.stream, " "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth); fprintf(output.stream, ": A new depth within the specified depth, indexed from the root.%c", f_string_eol_s[0]); fprintf(output.stream, " "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_name); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_name); fprintf(output.stream, ": An object name at the specified depth.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " The parameter "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth); fprintf(output.stream, " must be in numeric order, but values in between may be skipped.%c", f_string_eol_s[0]); fprintf(output.stream, " ('-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_s[0]); fprintf(output.stream, " ('-d 2 -a 1 -d 0 -a 2' would be invalid because depth 2 is before depth 1.)%c", f_string_eol_s[0]); @@ -74,61 +74,61 @@ extern "C" { fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " The parameter "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_select); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_select); fprintf(output.stream, " selects a content index at a given depth.%c", f_string_eol_s[0]); fprintf(output.stream, " (This parameter is not synonymous with the depth parameter and does not relate to nested content).%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " Specify both "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_object); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_object); fprintf(output.stream, " and the "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_total); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_total); fprintf(output.stream, " parameters to get the total objects.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " When both "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_at); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_at); fprintf(output.stream, " and "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_name); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_name); fprintf(output.stream, " parameters are specified (at the same depth), the "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_at); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_at); fprintf(output.stream, " parameter value will be treated as a position relative to the specified "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_name); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_name); fprintf(output.stream, " parameter value.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " This program may support parameters, such as "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth); fprintf(output.stream, " or "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_select); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_select); fprintf(output.stream, ", even if not supported by the standard.%c", f_string_eol_s[0]); fprintf(output.stream, " This is done to help ensure consistency for scripting.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " For parameters like "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth); fprintf(output.stream, ", if the standard doesn't support nested content, then only a depth of 0 would be valid.%c", f_string_eol_s[0]); fprintf(output.stream, " For parameters like "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_select); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_select); fprintf(output.stream, ", if the standard doesn't support multiple content groups, then only a select of 0 would be valid.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " The parameter "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_trim); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_trim); fprintf(output.stream, " will remove leading and trailing whitespaces when selecting objects or when printing objects.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " When specifying both the "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_object); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_object); fprintf(output.stream, " parameter and the "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_content); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_content); fprintf(output.stream, " parameter, the entire object and content are printed, including the formatting.%c", f_string_eol_s[0]); fprintf(output.stream, " Both the object and content printed are already escaped.%c", f_string_eol_s[0]); fprintf(output.stream, " Both the object and content are separated by an EOL.%c", f_string_eol_s[0]); @@ -136,20 +136,20 @@ extern "C" { fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " The parameter "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_delimit); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_delimit); fprintf(output.stream, " accepts the following:%c", f_string_eol_s[0]); fprintf(output.stream, " - "); - fl_color_print(output.stream, context.set.notable, "%s", fss_embedded_list_read_delimit_mode_name_none); + f_color_print(output.stream, context.set.notable, "%s", fss_embedded_list_read_delimit_mode_name_none); fprintf(output.stream, ": Do not apply delimits.%c", f_string_eol_s[0]); fprintf(output.stream, " - "); - fl_color_print(output.stream, context.set.notable, "%s", fss_embedded_list_read_delimit_mode_name_all); + f_color_print(output.stream, context.set.notable, "%s", fss_embedded_list_read_delimit_mode_name_all); fprintf(output.stream, ": (default) apply all delimits.%c", f_string_eol_s[0]); fprintf(output.stream, " - a number, 0 or greater: apply delimits for the specified depth.%c", f_string_eol_s[0]); fprintf(output.stream, " - a number, 0 or greater, followed by a "); - fl_color_print(output.stream, context.set.notable, "%s", fss_embedded_list_read_delimit_mode_name_greater); + f_color_print(output.stream, context.set.notable, "%s", fss_embedded_list_read_delimit_mode_name_greater); fprintf(output.stream, ": (such as '1+') apply delimits for the specified depth and any greater depth (numerically).%c", f_string_eol_s[0]); fprintf(output.stream, " - a number, 0 or greater, followed by a "); - fl_color_print(output.stream, context.set.notable, "%s", fss_embedded_list_read_delimit_mode_name_lesser); + f_color_print(output.stream, context.set.notable, "%s", fss_embedded_list_read_delimit_mode_name_lesser); fprintf(output.stream, ": (such as '1-') apply delimits for the specified depth and any lesser depth (numerically).%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); @@ -241,75 +241,75 @@ extern "C" { if (data->remaining.used > 0 || data->process_pipe) { if (data->parameters[fss_embedded_list_read_parameter_at].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_at); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_at); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (F_status_is_error_not(status) && data->parameters[fss_embedded_list_read_parameter_depth].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (F_status_is_error_not(status) && data->parameters[fss_embedded_list_read_parameter_line].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_line); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_line); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (F_status_is_error_not(status) && data->parameters[fss_embedded_list_read_parameter_name].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_name); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a string.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_name); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a string.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (F_status_is_error_not(status) && data->parameters[fss_embedded_list_read_parameter_select].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_select); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_select); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (data->parameters[fss_embedded_list_read_parameter_object].result == f_console_result_found) { if (F_status_is_error_not(status) && data->parameters[fss_embedded_list_read_parameter_line].result == f_console_result_additional) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_line); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_line); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (F_status_is_error_not(status) && data->parameters[fss_embedded_list_read_parameter_select].result == f_console_result_additional) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_select); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_select); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (data->parameters[fss_embedded_list_read_parameter_content].result == f_console_result_found) { if (F_status_is_error_not(status) && data->parameters[fss_embedded_list_read_parameter_total].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify both the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' and the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_content); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_total); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify both the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' and the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_content); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_total); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -318,11 +318,11 @@ extern "C" { if (data->parameters[fss_embedded_list_read_parameter_line].result == f_console_result_additional) { if (F_status_is_error_not(status) && data->parameters[fss_embedded_list_read_parameter_total].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_line); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_total); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_line); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_total); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -330,11 +330,11 @@ extern "C" { if (data->parameters[fss_embedded_list_read_parameter_pipe].result == f_console_result_found) { if (F_status_is_error_not(status) && data->parameters[fss_embedded_list_read_parameter_total].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_pipe); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_total); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_pipe); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_total); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -342,9 +342,9 @@ extern "C" { if (F_status_is_error_not(status)) { if (data->parameters[fss_embedded_list_read_parameter_delimit].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_delimit); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a value.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_delimit); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a value.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -353,9 +353,9 @@ extern "C" { f_array_length_t length = strnlen(arguments.argv[location], f_console_parameter_size); if (length == 0) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe value for the parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_delimit); - fl_color_print(data->error.to.stream, data->context.set.error, "' must not be empty.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe value for the parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_delimit); + f_color_print(data->error.to.stream, data->context.set.error, "' must not be empty.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -414,9 +414,9 @@ extern "C" { } if (F_status_is_error_not(status) && data->parameters[fss_embedded_list_read_parameter_select].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_select); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter requires a positive number.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_select); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter requires a positive number.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -510,7 +510,7 @@ extern "C" { f_macro_fss_comments_t_delete_simple(comments); } else { - fl_color_print(data->error.to.stream, data->context.set.error, "%sYou failed to specify one or more files.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sYou failed to specify one or more files.%c", fll_error_print_error, f_string_eol_s[0]); status = F_status_set_error(F_parameter); } diff --git a/level_3/fss_embedded_list_read/c/fss_embedded_list_read.h b/level_3/fss_embedded_list_read/c/fss_embedded_list_read.h index 922d98a..9614af7 100644 --- a/level_3/fss_embedded_list_read/c/fss_embedded_list_read.h +++ b/level_3/fss_embedded_list_read/c/fss_embedded_list_read.h @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -33,7 +34,6 @@ #include // fll-1 includes -#include #include #include #include diff --git a/level_3/fss_embedded_list_read/c/private-fss_embedded_list_read.c b/level_3/fss_embedded_list_read/c/private-fss_embedded_list_read.c index 93d3cad..b6eb894 100644 --- a/level_3/fss_embedded_list_read/c/private-fss_embedded_list_read.c +++ b/level_3/fss_embedded_list_read/c/private-fss_embedded_list_read.c @@ -188,23 +188,23 @@ extern "C" { if (depths->array[i].depth == depths->array[j].depth) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe value '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%llu", depths->array[i].depth); - fl_color_print(data.error.to.stream, data.context.set.error, "' may only be specified once for the parameter '"); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth); - fl_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe value '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%llu", depths->array[i].depth); + f_color_print(data.error.to.stream, data.context.set.error, "' may only be specified once for the parameter '"); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth); + f_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); return F_status_set_error(F_parameter); } else if (depths->array[i].depth > depths->array[j].depth) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth); - fl_color_print(data.error.to.stream, data.context.set.error, "' may not have the value '"); - fl_color_print(data.error.to.stream, data.context.set.notable, "%llu", depths->array[i].depth); - fl_color_print(data.error.to.stream, data.context.set.error, "' before the value '"); - fl_color_print(data.error.to.stream, data.context.set.notable, "%llu", depths->array[j].depth); - fl_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_read_long_depth); + f_color_print(data.error.to.stream, data.context.set.error, "' may not have the value '"); + f_color_print(data.error.to.stream, data.context.set.notable, "%llu", depths->array[i].depth); + f_color_print(data.error.to.stream, data.context.set.error, "' before the value '"); + f_color_print(data.error.to.stream, data.context.set.notable, "%llu", depths->array[j].depth); + f_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); return F_status_set_error(F_parameter); } diff --git a/level_3/fss_embedded_list_read/data/build/dependencies b/level_3/fss_embedded_list_read/data/build/dependencies index 501975c..a6e9b72 100644 --- a/level_3/fss_embedded_list_read/data/build/dependencies +++ b/level_3/fss_embedded_list_read/data/build/dependencies @@ -13,7 +13,6 @@ f_file f_fss f_pipe f_print -fl_color fl_console fl_conversion fl_fss diff --git a/level_3/fss_embedded_list_read/data/build/settings b/level_3/fss_embedded_list_read/data/build/settings index eb2c6e7..66fc59a 100644 --- a/level_3/fss_embedded_list_read/data/build/settings +++ b/level_3/fss_embedded_list_read/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_program -lfl_color -lfl_console -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_status -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_string -lf_type_array -lf_utf +build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_program -lfl_console -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_status -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_string -lf_type_array -lf_utf build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library fss_embedded_list_read.c private-fss_embedded_list_read.c diff --git a/level_3/fss_embedded_list_write/c/fss_embedded_list_write.c b/level_3/fss_embedded_list_write/c/fss_embedded_list_write.c index dade5c1..b949815 100644 --- a/level_3/fss_embedded_list_write/c/fss_embedded_list_write.c +++ b/level_3/fss_embedded_list_write/c/fss_embedded_list_write.c @@ -35,31 +35,31 @@ extern "C" { fll_program_print_help_usage(output, context, fss_embedded_list_write_name, f_string_empty_s); fprintf(output.stream, " The pipe uses the Backspace character '"); - fl_color_print(output.stream, context.set.notable, "\\b"); + f_color_print(output.stream, context.set.notable, "\\b"); fprintf(output.stream, "' ("); - fl_color_print(output.stream, context.set.notable, "U+0008"); + f_color_print(output.stream, context.set.notable, "U+0008"); fprintf(output.stream, ") to designate the start of a Content.%c", f_string_eol_s[0]); fprintf(output.stream, " The pipe uses the Form Feed character '"); - fl_color_print(output.stream, context.set.notable, "\\f"); + f_color_print(output.stream, context.set.notable, "\\f"); fprintf(output.stream, "' ("); - fl_color_print(output.stream, context.set.notable, "U+000C"); + f_color_print(output.stream, context.set.notable, "U+000C"); fprintf(output.stream, ") to designate the end of the last Content.%c", f_string_eol_s[0]); fprintf(output.stream, " The pipe uses the Vertical Line character '"); - fl_color_print(output.stream, context.set.notable, "\\v"); + f_color_print(output.stream, context.set.notable, "\\v"); fprintf(output.stream, "' ("); - fl_color_print(output.stream, context.set.notable, "U+000B"); + f_color_print(output.stream, context.set.notable, "U+000B"); fprintf(output.stream, ") is used to ignore a content range (use this both before and after the range).%c", f_string_eol_s[0]); fprintf(output.stream, " For the pipe, an Object is terminated by either a Backspace character '"); - fl_color_print(output.stream, context.set.notable, "\\b"); + f_color_print(output.stream, context.set.notable, "\\b"); fprintf(output.stream, "' ("); - fl_color_print(output.stream, context.set.notable, "U+0008"); + f_color_print(output.stream, context.set.notable, "U+0008"); fprintf(output.stream, ") or a Form Feed character '"); - fl_color_print(output.stream, context.set.notable, "\\f"); + f_color_print(output.stream, context.set.notable, "\\f"); fprintf(output.stream, "' ("); - fl_color_print(output.stream, context.set.notable, "U+000C"); + f_color_print(output.stream, context.set.notable, "U+000C"); fprintf(output.stream, ").%c", f_string_eol_s[0]); fprintf(output.stream, " The end of the pipe represents the end of any Object or Content.%c", f_string_eol_s[0]); @@ -67,22 +67,22 @@ extern "C" { fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " The FSS-0008 (Embedded List) specification does not support quoted names, therefore the parameters '"); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_single); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_single); fprintf(output.stream, "' and '"); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_double); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_double); fprintf(output.stream, "' do nothing.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " The parameter '"); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_ignore); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_ignore); fprintf(output.stream, "' designates to not escape any valid nested Object or Content within some Content.%c", f_string_eol_s[0]); fprintf(output.stream, " This parameter requires two values.%c", f_string_eol_s[0]); fprintf(output.stream, " This parameter is not used for ignoring anything from the input pipe.%c", f_string_eol_s[0]); fprintf(output.stream, " This parameter must be specified after a '"); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_content); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_content); fprintf(output.stream, "' parameter and this applies only to the Content represented by that specific '"); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_content); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_content); fprintf(output.stream, "' parameter.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); @@ -183,9 +183,9 @@ extern "C" { if (data->parameters[fss_embedded_list_write_parameter_file].values.used > 1) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_file); - fl_color_print(data->error.to.stream, data->context.set.error, "' may only be specified once.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_file); + f_color_print(data->error.to.stream, data->context.set.error, "' may only be specified once.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -227,13 +227,13 @@ extern "C" { if (data->parameters[fss_embedded_list_write_parameter_content].result == f_console_result_additional) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_partial); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter only allows either the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter or the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_content); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter, but not both.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_partial); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter only allows either the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter or the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_content); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter, but not both.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -256,11 +256,11 @@ extern "C" { if (location_object > location_content || location_object == location_content && location_sub_object > location_sub_content) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sEach ", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter must be specified before a '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_content); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sEach ", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter must be specified before a '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_content); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -284,11 +284,11 @@ extern "C" { else if (!data->process_pipe) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThis requires either piped data or the use of the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_content); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThis requires either piped data or the use of the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_content); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -298,9 +298,9 @@ extern "C" { if (data->parameters[fss_embedded_list_write_parameter_partial].result == f_console_result_found) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_partial); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter cannot be used when processing a pipe.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_partial); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter cannot be used when processing a pipe.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -312,9 +312,9 @@ extern "C" { if (data->parameters[fss_embedded_list_write_parameter_prepend].result == f_console_result_found) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_prepend); - fl_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_prepend); + f_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -338,9 +338,9 @@ extern "C" { if (status == F_false) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe value for the parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_prepend); - fl_color_print(data->error.to.stream, data->context.set.error, "' must only contain whitespace.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe value for the parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_prepend); + f_color_print(data->error.to.stream, data->context.set.error, "' must only contain whitespace.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -351,9 +351,9 @@ extern "C" { else { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe value for the parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_prepend); - fl_color_print(data->error.to.stream, data->context.set.error, "' must not be an empty string.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe value for the parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_prepend); + f_color_print(data->error.to.stream, data->context.set.error, "' must not be an empty string.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -365,9 +365,9 @@ extern "C" { if (data->parameters[fss_embedded_list_write_parameter_ignore].result == f_console_result_found) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_ignore); - fl_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no values were given.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_ignore); + f_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no values were given.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -378,9 +378,9 @@ extern "C" { if (total_locations * 2 > total_arguments) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_ignore); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires two values.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_ignore); + f_color_print(data->error.to.stream, data->context.set.error, "' requires two values.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -416,9 +416,9 @@ extern "C" { if (F_status_is_error(status)) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sWhile processing the ", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "input pipe"); - fl_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sWhile processing the ", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "input pipe"); + f_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); } } @@ -476,9 +476,9 @@ extern "C" { if (F_status_is_error(status)) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sWhile processing the ", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "input arguments"); - fl_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sWhile processing the ", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "input arguments"); + f_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); } } else if (data->error.verbosity != f_console_verbosity_quiet && data->parameters[fss_embedded_list_write_parameter_file].result == f_console_result_none) { diff --git a/level_3/fss_embedded_list_write/c/fss_embedded_list_write.h b/level_3/fss_embedded_list_write/c/fss_embedded_list_write.h index 3916631..e256b18 100644 --- a/level_3/fss_embedded_list_write/c/fss_embedded_list_write.h +++ b/level_3/fss_embedded_list_write/c/fss_embedded_list_write.h @@ -21,13 +21,13 @@ #include #include #include +#include #include #include #include #include // fll-1 includes -#include #include #include #include diff --git a/level_3/fss_embedded_list_write/c/private-fss_embedded_list_write.c b/level_3/fss_embedded_list_write/c/private-fss_embedded_list_write.c index 62ff1ee..4816882 100644 --- a/level_3/fss_embedded_list_write/c/private-fss_embedded_list_write.c +++ b/level_3/fss_embedded_list_write/c/private-fss_embedded_list_write.c @@ -13,13 +13,13 @@ extern "C" { } fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sMust specify both the '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_object); - fl_color_print(data.error.to.stream, data.context.set.error, "' parameter and the '"); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_content); - fl_color_print(data.error.to.stream, data.context.set.error, "' parameter the same number of times when not specifying the "); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_partial); - fl_color_print(data.error.to.stream, data.context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sMust specify both the '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_object); + f_color_print(data.error.to.stream, data.context.set.error, "' parameter and the '"); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_content); + f_color_print(data.error.to.stream, data.context.set.error, "' parameter the same number of times when not specifying the "); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_embedded_list_write_long_partial); + f_color_print(data.error.to.stream, data.context.set.error, "' parameter.%c", f_string_eol_s[0]); } #endif // _di_fss_embedded_list_write_error_parameter_same_times_print_ @@ -31,9 +31,9 @@ extern "C" { } fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sThis standard does not support end of line character '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "\\n"); - fl_color_print(data.error.to.stream, data.context.set.error, "' in objects.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThis standard does not support end of line character '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "\\n"); + f_color_print(data.error.to.stream, data.context.set.error, "' in objects.%c", f_string_eol_s[0]); } #endif // _di_fss_embedded_list_write_error_parameter_unsupported_eol_print_ @@ -45,9 +45,9 @@ extern "C" { } fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", symbol, parameter); - fl_color_print(data.error.to.stream, data.context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", symbol, parameter); + f_color_print(data.error.to.stream, data.context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); } #endif // _di_fss_embedded_list_write_error_parameter_value_missing_print_ @@ -239,7 +239,7 @@ extern "C" { if (block.string[range.start] == fss_embedded_list_write_pipe_content_start) { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sThis standard only supports one content per object.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThis standard only supports one content per object.%c", fll_error_print_error, f_string_eol_s[0]); } status = F_status_set_error(F_supported_not); diff --git a/level_3/fss_embedded_list_write/data/build/dependencies b/level_3/fss_embedded_list_write/data/build/dependencies index fe0deee..2c5a217 100644 --- a/level_3/fss_embedded_list_write/data/build/dependencies +++ b/level_3/fss_embedded_list_write/data/build/dependencies @@ -13,7 +13,6 @@ f_file f_fss f_pipe f_print -fl_color fl_console fl_conversion fl_fss diff --git a/level_3/fss_embedded_list_write/data/build/settings b/level_3/fss_embedded_list_write/data/build/settings index d392913..3875d8c 100644 --- a/level_3/fss_embedded_list_write/data/build/settings +++ b/level_3/fss_embedded_list_write/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_program -lfl_color -lfl_console -lfl_conversion -lfl_directory -lfl_fss -lfl_status -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_string -lf_type_array -lf_utf +build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_program -lfl_console -lfl_conversion -lfl_directory -lfl_fss -lfl_status -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_string -lf_type_array -lf_utf build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library fss_embedded_list_write.c private-fss_embedded_list_write.c 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 22c616a..3d44b11 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 @@ -37,7 +37,7 @@ extern "C" { fll_program_print_help_usage(output, context, fss_extended_list_read_name, "filename(s)"); - fl_color_print(output.stream, context.set.important, " Notes:"); + f_color_print(output.stream, context.set.important, " Notes:"); fprintf(output.stream, "%c", f_string_eol_s[0]); @@ -46,27 +46,27 @@ extern "C" { fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " When using the "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_depth); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_depth); fprintf(output.stream, " option, an order of operations is enforced on the parameters.%c", f_string_eol_s[0]); fprintf(output.stream, " 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_s[0]); fprintf(output.stream, " "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_at); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_at); fprintf(output.stream, ": An object index at the specified depth.%c", f_string_eol_s[0]); fprintf(output.stream, " "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_depth); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_depth); fprintf(output.stream, ": A new depth within the specified depth, indexed from the root.%c", f_string_eol_s[0]); fprintf(output.stream, " "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_name); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_name); fprintf(output.stream, ": An object name at the specified depth.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " The parameter "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_depth); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_depth); fprintf(output.stream, " must be in numeric order, but values in between may be skipped.%c", f_string_eol_s[0]); fprintf(output.stream, " ('-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_s[0]); fprintf(output.stream, " ('-d 2 -a 1 -d 0 -a 2' would be invalid because depth 2 is before depth 1.)%c", f_string_eol_s[0]); @@ -74,61 +74,61 @@ extern "C" { fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " The parameter "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_select); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_select); fprintf(output.stream, " selects a content index at a given depth.%c", f_string_eol_s[0]); fprintf(output.stream, " (This parameter is not synonymous with the depth parameter and does not relate to nested content).%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " Specify both "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_object); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_object); fprintf(output.stream, " and the "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_total); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_total); fprintf(output.stream, " parameters to get the total objects.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " When both "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_at); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_at); fprintf(output.stream, " and "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_name); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_name); fprintf(output.stream, " parameters are specified (at the same depth), the "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_at); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_at); fprintf(output.stream, " parameter value will be treated as a position relative to the specified "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_name); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_name); fprintf(output.stream, " parameter value.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " This program may support parameters, such as "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_depth); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_depth); fprintf(output.stream, " or "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_select); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_select); fprintf(output.stream, ", even if not supported by the standard.%c", f_string_eol_s[0]); fprintf(output.stream, " This is done to help ensure consistency for scripting.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " For parameters like "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_depth); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_depth); fprintf(output.stream, ", if the standard doesn't support nested content, then only a depth of 0 would be valid.%c", f_string_eol_s[0]); fprintf(output.stream, " For parameters like "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_select); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_select); fprintf(output.stream, ", if the standard doesn't support multiple content groups, then only a select of 0 would be valid.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " The parameter "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_trim); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_trim); fprintf(output.stream, " will remove leading and trailing whitespaces when selecting objects or when printing objects.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " When specifying both the "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_object); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_object); fprintf(output.stream, " parameter and the "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_content); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_content); fprintf(output.stream, " parameter, the entire object and content are printed, including the formatting.%c", f_string_eol_s[0]); fprintf(output.stream, " Both the object and content printed are already escaped.%c", f_string_eol_s[0]); fprintf(output.stream, " Both the object and content are separated by an EOL.%c", f_string_eol_s[0]); @@ -136,20 +136,20 @@ extern "C" { fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " The parameter "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_delimit); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_delimit); fprintf(output.stream, " accepts the following:%c", f_string_eol_s[0]); fprintf(output.stream, " - "); - fl_color_print(output.stream, context.set.notable, "%s", fss_extended_list_read_delimit_mode_name_none); + f_color_print(output.stream, context.set.notable, "%s", fss_extended_list_read_delimit_mode_name_none); fprintf(output.stream, ": Do not apply delimits.%c", f_string_eol_s[0]); fprintf(output.stream, " - "); - fl_color_print(output.stream, context.set.notable, "%s", fss_extended_list_read_delimit_mode_name_all); + f_color_print(output.stream, context.set.notable, "%s", fss_extended_list_read_delimit_mode_name_all); fprintf(output.stream, ": (default) apply all delimits.%c", f_string_eol_s[0]); fprintf(output.stream, " - a number, 0 or greater: apply delimits for the specified depth.%c", f_string_eol_s[0]); fprintf(output.stream, " - a number, 0 or greater, followed by a "); - fl_color_print(output.stream, context.set.notable, "%s", fss_extended_list_read_delimit_mode_name_greater); + f_color_print(output.stream, context.set.notable, "%s", fss_extended_list_read_delimit_mode_name_greater); fprintf(output.stream, ": (such as '1+') apply delimits for the specified depth and any greater depth (numerically).%c", f_string_eol_s[0]); fprintf(output.stream, " - a number, 0 or greater, followed by a "); - fl_color_print(output.stream, context.set.notable, "%s", fss_extended_list_read_delimit_mode_name_lesser); + f_color_print(output.stream, context.set.notable, "%s", fss_extended_list_read_delimit_mode_name_lesser); fprintf(output.stream, ": (such as '1-') apply delimits for the specified depth and any lesser depth (numerically).%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); @@ -241,75 +241,75 @@ extern "C" { if (data->remaining.used > 0 || data->process_pipe) { if (data->parameters[fss_extended_list_read_parameter_at].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_at); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_at); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (F_status_is_error_not(status) && data->parameters[fss_extended_list_read_parameter_depth].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_depth); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_depth); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (F_status_is_error_not(status) && data->parameters[fss_extended_list_read_parameter_line].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_line); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_line); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (F_status_is_error_not(status) && data->parameters[fss_extended_list_read_parameter_name].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_name); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a string.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_name); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a string.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (F_status_is_error_not(status) && data->parameters[fss_extended_list_read_parameter_select].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_select); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_select); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (F_status_is_error_not(status) && data->parameters[fss_extended_list_read_parameter_object].result == f_console_result_found) { if (data->parameters[fss_extended_list_read_parameter_line].result == f_console_result_additional) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_line); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_line); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (F_status_is_error_not(status) && data->parameters[fss_extended_list_read_parameter_select].result == f_console_result_additional) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_select); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_select); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (data->parameters[fss_extended_list_read_parameter_content].result == f_console_result_found) { if (F_status_is_error_not(status) && data->parameters[fss_extended_list_read_parameter_total].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify both the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' and the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_content); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_total); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify both the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' and the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_content); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_total); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -318,11 +318,11 @@ extern "C" { if (F_status_is_error_not(status) && data->parameters[fss_extended_list_read_parameter_line].result == f_console_result_additional) { if (data->parameters[fss_extended_list_read_parameter_total].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_line); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_total); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_line); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_total); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -330,11 +330,11 @@ extern "C" { if (F_status_is_error_not(status) && data->parameters[fss_extended_list_read_parameter_pipe].result == f_console_result_found) { if (data->parameters[fss_extended_list_read_parameter_total].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_pipe); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_total); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_pipe); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_total); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -342,9 +342,9 @@ extern "C" { if (F_status_is_error_not(status)) { if (data->parameters[fss_extended_list_read_parameter_delimit].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_delimit); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a value.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_delimit); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a value.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -353,9 +353,9 @@ extern "C" { f_array_length_t length = strnlen(arguments.argv[location], f_console_parameter_size); if (length == 0) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe value for the parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_delimit); - fl_color_print(data->error.to.stream, data->context.set.error, "' must not be empty.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe value for the parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_delimit); + f_color_print(data->error.to.stream, data->context.set.error, "' must not be empty.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -427,9 +427,9 @@ extern "C" { } if (F_status_is_error_not(status) && data->parameters[fss_extended_list_read_parameter_select].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_select); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter requires a positive number.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_select); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter requires a positive number.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -526,7 +526,7 @@ extern "C" { f_macro_fss_comments_t_delete_simple(comments); } else { - fl_color_print(data->error.to.stream, data->context.set.error, "%sYou failed to specify one or more files.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sYou failed to specify one or more files.%c", fll_error_print_error, f_string_eol_s[0]); status = F_status_set_error(F_parameter); } diff --git a/level_3/fss_extended_list_read/c/fss_extended_list_read.h b/level_3/fss_extended_list_read/c/fss_extended_list_read.h index cff8c9b..e3dba48 100644 --- a/level_3/fss_extended_list_read/c/fss_extended_list_read.h +++ b/level_3/fss_extended_list_read/c/fss_extended_list_read.h @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -33,7 +34,6 @@ #include // fll-1 includes -#include #include #include #include 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 fde8513..451ba54 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 @@ -19,7 +19,7 @@ extern "C" { fss_extended_list_read_macro_depths_t_resize(status, (*depths), depth_size); if (F_status_is_error(status)) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); return status; } @@ -103,12 +103,12 @@ extern "C" { // @todo: move error printing into common function. if (status_code == F_memory_not) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); } else if (status_code == f_array_length_t_size) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sUnable to process '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_trim); - fl_color_print(data.error.to.stream, data.context.set.error, "' because the maximum buffer size was reached.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sUnable to process '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_trim); + f_color_print(data.error.to.stream, data.context.set.error, "' because the maximum buffer size was reached.%c", f_string_eol_s[0]); } else { f_string_t function = "f_string_append"; @@ -117,20 +117,20 @@ extern "C" { function = "fl_string_rip"; } - fl_color_print(data.error.to.stream, data.context.set.error, "%sAn unhandled error (", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%u", status_code); - fl_color_print(data.error.to.stream, data.context.set.error, ") has occurred while calling "); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s()", function); - fl_color_print(data.error.to.stream, data.context.set.error, ".%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sAn unhandled error (", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%u", status_code); + f_color_print(data.error.to.stream, data.context.set.error, ") has occurred while calling "); + f_color_print(data.error.to.stream, data.context.set.notable, "%s()", function); + f_color_print(data.error.to.stream, data.context.set.error, ".%c", f_string_eol_s[0]); } return status; } if (!depths->array[i].value_name.used) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_name); - fl_color_print(data.error.to.stream, data.context.set.error, "' must not be an empty string.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_name); + f_color_print(data.error.to.stream, data.context.set.error, "' must not be an empty string.%c", f_string_eol_s[0]); return F_status_set_error(F_parameter); } @@ -143,22 +143,22 @@ extern "C" { for (f_array_length_t j = i + 1; j < depths->used; j++) { if (depths->array[i].depth == depths->array[j].depth) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe value '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%llu", depths->array[i].depth); - fl_color_print(data.error.to.stream, data.context.set.error, "' may only be specified once for the parameter '"); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_depth); - fl_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe value '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%llu", depths->array[i].depth); + f_color_print(data.error.to.stream, data.context.set.error, "' may only be specified once for the parameter '"); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_depth); + f_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); return F_status_set_error(F_parameter); } else if (depths->array[i].depth > depths->array[j].depth) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_depth); - fl_color_print(data.error.to.stream, data.context.set.error, "' may not have the value '"); - fl_color_print(data.error.to.stream, data.context.set.notable, "%llu", depths->array[i].depth); - fl_color_print(data.error.to.stream, data.context.set.error, "' before the value '"); - fl_color_print(data.error.to.stream, data.context.set.notable, "%llu", depths->array[j].depth); - fl_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_read_long_depth); + f_color_print(data.error.to.stream, data.context.set.error, "' may not have the value '"); + f_color_print(data.error.to.stream, data.context.set.notable, "%llu", depths->array[i].depth); + f_color_print(data.error.to.stream, data.context.set.error, "' before the value '"); + f_color_print(data.error.to.stream, data.context.set.notable, "%llu", depths->array[j].depth); + f_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); return F_status_set_error(F_parameter); } diff --git a/level_3/fss_extended_list_read/data/build/dependencies b/level_3/fss_extended_list_read/data/build/dependencies index 501975c..a6e9b72 100644 --- a/level_3/fss_extended_list_read/data/build/dependencies +++ b/level_3/fss_extended_list_read/data/build/dependencies @@ -13,7 +13,6 @@ f_file f_fss f_pipe f_print -fl_color fl_console fl_conversion fl_fss diff --git a/level_3/fss_extended_list_read/data/build/settings b/level_3/fss_extended_list_read/data/build/settings index caec2e0..acbbb56 100644 --- a/level_3/fss_extended_list_read/data/build/settings +++ b/level_3/fss_extended_list_read/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_program -lfl_color -lfl_console -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_status -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_string -lf_type_array -lf_utf +build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_program -lfl_console -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_status -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_string -lf_type_array -lf_utf build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library fss_extended_list_read.c private-fss_extended_list_read.c diff --git a/level_3/fss_extended_list_write/c/fss_extended_list_write.c b/level_3/fss_extended_list_write/c/fss_extended_list_write.c index 1b70256..cbf5612 100644 --- a/level_3/fss_extended_list_write/c/fss_extended_list_write.c +++ b/level_3/fss_extended_list_write/c/fss_extended_list_write.c @@ -35,31 +35,31 @@ extern "C" { fll_program_print_help_usage(output, context, fss_extended_list_write_name, f_string_empty_s); fprintf(output.stream, " The pipe uses the Backspace character '"); - fl_color_print(output.stream, context.set.notable, "\\b"); + f_color_print(output.stream, context.set.notable, "\\b"); fprintf(output.stream, "' ("); - fl_color_print(output.stream, context.set.notable, "U+0008"); + f_color_print(output.stream, context.set.notable, "U+0008"); fprintf(output.stream, ") to designate the start of a Content.%c", f_string_eol_s[0]); fprintf(output.stream, " The pipe uses the Form Feed character '"); - fl_color_print(output.stream, context.set.notable, "\\f"); + f_color_print(output.stream, context.set.notable, "\\f"); fprintf(output.stream, "' ("); - fl_color_print(output.stream, context.set.notable, "U+000C"); + f_color_print(output.stream, context.set.notable, "U+000C"); fprintf(output.stream, ") to designate the end of the last Content.%c", f_string_eol_s[0]); fprintf(output.stream, " The pipe uses the Vertical Line character '"); - fl_color_print(output.stream, context.set.notable, "\\v"); + f_color_print(output.stream, context.set.notable, "\\v"); fprintf(output.stream, "' ("); - fl_color_print(output.stream, context.set.notable, "U+000B"); + f_color_print(output.stream, context.set.notable, "U+000B"); fprintf(output.stream, ") is used to ignore a content range (use this both before and after the range).%c", f_string_eol_s[0]); fprintf(output.stream, " For the pipe, an Object is terminated by either a Backspace character '"); - fl_color_print(output.stream, context.set.notable, "\\b"); + f_color_print(output.stream, context.set.notable, "\\b"); fprintf(output.stream, "' ("); - fl_color_print(output.stream, context.set.notable, "U+0008"); + f_color_print(output.stream, context.set.notable, "U+0008"); fprintf(output.stream, ") or a Form Feed character '"); - fl_color_print(output.stream, context.set.notable, "\\f"); + f_color_print(output.stream, context.set.notable, "\\f"); fprintf(output.stream, "' ("); - fl_color_print(output.stream, context.set.notable, "U+000C"); + f_color_print(output.stream, context.set.notable, "U+000C"); fprintf(output.stream, ").%c", f_string_eol_s[0]); fprintf(output.stream, " The end of the pipe represents the end of any Object or Content.%c", f_string_eol_s[0]); @@ -67,22 +67,22 @@ extern "C" { fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " The FSS-0003 (Extended List) specification does not support quoted names, therefore the parameters '"); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_single); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_single); fprintf(output.stream, "' and '"); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_double); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_double); fprintf(output.stream, "' do nothing.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " The parameter '"); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_ignore); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_ignore); fprintf(output.stream, "' designates to not escape any valid nested Object or Content within some Content.%c", f_string_eol_s[0]); fprintf(output.stream, " This parameter requires two values.%c", f_string_eol_s[0]); fprintf(output.stream, " This parameter is not used for ignoring anything from the input pipe.%c", f_string_eol_s[0]); fprintf(output.stream, " This parameter must be specified after a '"); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_content); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_content); fprintf(output.stream, "' parameter and this applies only to the Content represented by that specific '"); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_content); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_content); fprintf(output.stream, "' parameter.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); @@ -183,9 +183,9 @@ extern "C" { if (data->parameters[fss_extended_list_write_parameter_file].values.used > 1) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_file); - fl_color_print(data->error.to.stream, data->context.set.error, "' may only be specified once.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_file); + f_color_print(data->error.to.stream, data->context.set.error, "' may only be specified once.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -227,13 +227,13 @@ extern "C" { if (data->parameters[fss_extended_list_write_parameter_content].result == f_console_result_additional) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_partial); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter only allows either the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter or the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_content); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter, but not both.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_partial); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter only allows either the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter or the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_content); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter, but not both.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -256,11 +256,11 @@ extern "C" { if (location_object > location_content || location_object == location_content && location_sub_object > location_sub_content) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sEach ", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter must be specified before a '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_content); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sEach ", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter must be specified before a '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_content); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -284,11 +284,11 @@ extern "C" { else if (!data->process_pipe) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThis requires either piped data or the use of the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_content); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThis requires either piped data or the use of the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_content); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -298,9 +298,9 @@ extern "C" { if (data->parameters[fss_extended_list_write_parameter_partial].result == f_console_result_found) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_partial); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter cannot be used when processing a pipe.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_partial); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter cannot be used when processing a pipe.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -312,9 +312,9 @@ extern "C" { if (data->parameters[fss_extended_list_write_parameter_prepend].result == f_console_result_found) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_prepend); - fl_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_prepend); + f_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -338,9 +338,9 @@ extern "C" { if (status == F_false) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe value for the parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_prepend); - fl_color_print(data->error.to.stream, data->context.set.error, "' must only contain whitespace.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe value for the parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_prepend); + f_color_print(data->error.to.stream, data->context.set.error, "' must only contain whitespace.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -351,9 +351,9 @@ extern "C" { else { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe value for the parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_prepend); - fl_color_print(data->error.to.stream, data->context.set.error, "' must not be an empty string.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe value for the parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_prepend); + f_color_print(data->error.to.stream, data->context.set.error, "' must not be an empty string.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -365,9 +365,9 @@ extern "C" { if (data->parameters[fss_extended_list_write_parameter_ignore].result == f_console_result_found) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_ignore); - fl_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no values were given.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_ignore); + f_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no values were given.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -378,9 +378,9 @@ extern "C" { if (total_locations * 2 > total_arguments) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_ignore); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires two values.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_ignore); + f_color_print(data->error.to.stream, data->context.set.error, "' requires two values.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -416,9 +416,9 @@ extern "C" { if (F_status_is_error(status)) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sWhile processing the ", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "input pipe"); - fl_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sWhile processing the ", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "input pipe"); + f_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); } } @@ -476,9 +476,9 @@ extern "C" { if (F_status_is_error(status)) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sWhile processing the ", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "input arguments"); - fl_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sWhile processing the ", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "input arguments"); + f_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); } } else if (data->error.verbosity != f_console_verbosity_quiet && data->parameters[fss_extended_list_write_parameter_file].result == f_console_result_none) { diff --git a/level_3/fss_extended_list_write/c/fss_extended_list_write.h b/level_3/fss_extended_list_write/c/fss_extended_list_write.h index 1c10409..7f0c68f 100644 --- a/level_3/fss_extended_list_write/c/fss_extended_list_write.h +++ b/level_3/fss_extended_list_write/c/fss_extended_list_write.h @@ -21,13 +21,13 @@ #include #include #include +#include #include #include #include #include // fll-1 includes -#include #include #include #include diff --git a/level_3/fss_extended_list_write/c/private-fss_extended_list_write.c b/level_3/fss_extended_list_write/c/private-fss_extended_list_write.c index 587b61e..6a05564 100644 --- a/level_3/fss_extended_list_write/c/private-fss_extended_list_write.c +++ b/level_3/fss_extended_list_write/c/private-fss_extended_list_write.c @@ -13,13 +13,13 @@ extern "C" { } fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sMust specify both the '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_object); - fl_color_print(data.error.to.stream, data.context.set.error, "' parameter and the '"); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_content); - fl_color_print(data.error.to.stream, data.context.set.error, "' parameter the same number of times when not specifying the "); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_partial); - fl_color_print(data.error.to.stream, data.context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sMust specify both the '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_object); + f_color_print(data.error.to.stream, data.context.set.error, "' parameter and the '"); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_content); + f_color_print(data.error.to.stream, data.context.set.error, "' parameter the same number of times when not specifying the "); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_list_write_long_partial); + f_color_print(data.error.to.stream, data.context.set.error, "' parameter.%c", f_string_eol_s[0]); } #endif // _di_fss_extended_list_write_error_parameter_same_times_print_ @@ -31,9 +31,9 @@ extern "C" { } fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sThis standard does not support end of line character '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "\\n"); - fl_color_print(data.error.to.stream, data.context.set.error, "' in objects.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThis standard does not support end of line character '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "\\n"); + f_color_print(data.error.to.stream, data.context.set.error, "' in objects.%c", f_string_eol_s[0]); } #endif // _di_fss_extended_list_write_error_parameter_unsupported_eol_print_ @@ -45,9 +45,9 @@ extern "C" { } fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", symbol, parameter); - fl_color_print(data.error.to.stream, data.context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", symbol, parameter); + f_color_print(data.error.to.stream, data.context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); } #endif // _di_fss_extended_list_write_error_parameter_value_missing_print_ @@ -239,7 +239,7 @@ extern "C" { if (block.string[range.start] == fss_extended_list_write_pipe_content_start) { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sThis standard only supports one content per object.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThis standard only supports one content per object.%c", fll_error_print_error, f_string_eol_s[0]); } status = F_status_set_error(F_supported_not); diff --git a/level_3/fss_extended_list_write/data/build/dependencies b/level_3/fss_extended_list_write/data/build/dependencies index fe0deee..2c5a217 100644 --- a/level_3/fss_extended_list_write/data/build/dependencies +++ b/level_3/fss_extended_list_write/data/build/dependencies @@ -13,7 +13,6 @@ f_file f_fss f_pipe f_print -fl_color fl_console fl_conversion fl_fss diff --git a/level_3/fss_extended_list_write/data/build/settings b/level_3/fss_extended_list_write/data/build/settings index 57b285e..06ead4e 100644 --- a/level_3/fss_extended_list_write/data/build/settings +++ b/level_3/fss_extended_list_write/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_program -lfl_color -lfl_console -lfl_conversion -lfl_directory -lfl_fss -lfl_status -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_string -lf_type_array -lf_utf +build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_program -lfl_console -lfl_conversion -lfl_directory -lfl_fss -lfl_status -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_string -lf_type_array -lf_utf build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library fss_extended_list_write.c private-fss_extended_list_write.c 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 1090cdd..2f0bd5a 100644 --- a/level_3/fss_extended_read/c/fss_extended_read.c +++ b/level_3/fss_extended_read/c/fss_extended_read.c @@ -37,7 +37,7 @@ extern "C" { fll_program_print_help_usage(output, context, fss_extended_read_name, "filename(s)"); - fl_color_print(output.stream, context.set.important, " Notes:"); + f_color_print(output.stream, context.set.important, " Notes:"); fprintf(output.stream, "%c", f_string_eol_s[0]); @@ -46,27 +46,27 @@ extern "C" { fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " When using the "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_depth); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_depth); fprintf(output.stream, " option, an order of operations is enforced on the parameters.%c", f_string_eol_s[0]); fprintf(output.stream, " 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_s[0]); fprintf(output.stream, " "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_at); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_at); fprintf(output.stream, ": An object index at the specified depth.%c", f_string_eol_s[0]); fprintf(output.stream, " "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_depth); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_depth); fprintf(output.stream, ": A new depth within the specified depth, indexed from the root.%c", f_string_eol_s[0]); fprintf(output.stream, " "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_name); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_name); fprintf(output.stream, ": An object name at the specified depth.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " The parameter "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_depth); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_depth); fprintf(output.stream, " must be in numeric order, but values in between may be skipped.%c", f_string_eol_s[0]); fprintf(output.stream, " ('-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_s[0]); fprintf(output.stream, " ('-d 2 -a 1 -d 0 -a 2' would be invalid because depth 2 is before depth 1.)%c", f_string_eol_s[0]); @@ -74,61 +74,61 @@ extern "C" { fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " The parameter "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_select); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_select); fprintf(output.stream, " selects a content index at a given depth.%c", f_string_eol_s[0]); fprintf(output.stream, " (This parameter is not synonymous with the depth parameter and does not relate to nested content).%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " Specify both "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_object); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_object); fprintf(output.stream, " and the "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_total); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_total); fprintf(output.stream, " parameters to get the total objects.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " When both "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_at); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_at); fprintf(output.stream, " and "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_name); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_name); fprintf(output.stream, " parameters are specified (at the same depth), the "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_at); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_at); fprintf(output.stream, " parameter value will be treated as a position relative to the specified "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_name); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_name); fprintf(output.stream, " parameter value.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " This program may support parameters, such as "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_depth); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_depth); fprintf(output.stream, " or "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_select); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_select); fprintf(output.stream, ", even if not supported by the standard.%c", f_string_eol_s[0]); fprintf(output.stream, " This is done to help ensure consistency for scripting.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " For parameters like "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_depth); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_depth); fprintf(output.stream, ", if the standard doesn't support nested content, then only a depth of 0 would be valid.%c", f_string_eol_s[0]); fprintf(output.stream, " For parameters like "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_select); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_select); fprintf(output.stream, ", if the standard doesn't support multiple content groups, then only a select of 0 would be valid.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " The parameter "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_trim); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_trim); fprintf(output.stream, " will remove leading and trailing whitespaces when selecting objects or when printing objects.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " When specifying both the "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_object); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_object); fprintf(output.stream, " parameter and the "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_content); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_content); fprintf(output.stream, " parameter, the entire object and content are printed, including the formatting.%c", f_string_eol_s[0]); fprintf(output.stream, " Both the object and content printed are already escaped.%c", f_string_eol_s[0]); fprintf(output.stream, " Both the object and content are separated by a space.%c", f_string_eol_s[0]); @@ -136,20 +136,20 @@ extern "C" { fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " The parameter "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_delimit); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_delimit); fprintf(output.stream, " accepts the following:%c", f_string_eol_s[0]); fprintf(output.stream, " - "); - fl_color_print(output.stream, context.set.notable, "%s", fss_extended_read_delimit_mode_name_none); + f_color_print(output.stream, context.set.notable, "%s", fss_extended_read_delimit_mode_name_none); fprintf(output.stream, ": Do not apply delimits.%c", f_string_eol_s[0]); fprintf(output.stream, " - "); - fl_color_print(output.stream, context.set.notable, "%s", fss_extended_read_delimit_mode_name_all); + f_color_print(output.stream, context.set.notable, "%s", fss_extended_read_delimit_mode_name_all); fprintf(output.stream, ": (default) apply all delimits.%c", f_string_eol_s[0]); fprintf(output.stream, " - a number, 0 or greater: apply delimits for the specified depth.%c", f_string_eol_s[0]); fprintf(output.stream, " - a number, 0 or greater, followed by a "); - fl_color_print(output.stream, context.set.notable, "%s", fss_extended_read_delimit_mode_name_greater); + f_color_print(output.stream, context.set.notable, "%s", fss_extended_read_delimit_mode_name_greater); fprintf(output.stream, ": (such as '1+') apply delimits for the specified depth and any greater depth (numerically).%c", f_string_eol_s[0]); fprintf(output.stream, " - a number, 0 or greater, followed by a "); - fl_color_print(output.stream, context.set.notable, "%s", fss_extended_read_delimit_mode_name_lesser); + f_color_print(output.stream, context.set.notable, "%s", fss_extended_read_delimit_mode_name_lesser); fprintf(output.stream, ": (such as '1-') apply delimits for the specified depth and any lesser depth (numerically).%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); @@ -241,75 +241,75 @@ extern "C" { if (data->remaining.used > 0 || data->process_pipe) { if (data->parameters[fss_extended_read_parameter_at].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_at); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_at); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (F_status_is_error_not(status) && data->parameters[fss_extended_read_parameter_depth].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_depth); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_depth); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (F_status_is_error_not(status) && data->parameters[fss_extended_read_parameter_line].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_line); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_line); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (F_status_is_error_not(status) && data->parameters[fss_extended_read_parameter_name].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_name); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a string.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_name); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a string.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (F_status_is_error_not(status) && data->parameters[fss_extended_read_parameter_select].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_select); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_select); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (data->parameters[fss_extended_read_parameter_object].result == f_console_result_found) { if (F_status_is_error_not(status) && data->parameters[fss_extended_read_parameter_line].result == f_console_result_additional) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_line); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_line); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (F_status_is_error_not(status) && data->parameters[fss_extended_read_parameter_select].result == f_console_result_additional) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_select); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_select); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } if (data->parameters[fss_extended_read_parameter_content].result == f_console_result_found) { if (F_status_is_error_not(status) && data->parameters[fss_extended_read_parameter_total].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify both the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' and the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_content); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_total); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify both the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' and the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_content); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_total); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -318,11 +318,11 @@ extern "C" { if (data->parameters[fss_extended_read_parameter_line].result == f_console_result_additional) { if (F_status_is_error_not(status) && data->parameters[fss_extended_read_parameter_total].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_line); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_total); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_line); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_total); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -330,11 +330,11 @@ extern "C" { if (data->parameters[fss_extended_read_parameter_pipe].result == f_console_result_found) { if (F_status_is_error_not(status) && data->parameters[fss_extended_read_parameter_total].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_pipe); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_total); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_pipe); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_total); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -342,9 +342,9 @@ extern "C" { if (F_status_is_error_not(status)) { if (data->parameters[fss_extended_read_parameter_delimit].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_delimit); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a value.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_delimit); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a value.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -353,9 +353,9 @@ extern "C" { f_array_length_t length = strnlen(arguments.argv[location], f_console_parameter_size); if (length == 0) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe value for the parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_delimit); - fl_color_print(data->error.to.stream, data->context.set.error, "' must not be empty.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe value for the parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_delimit); + f_color_print(data->error.to.stream, data->context.set.error, "' must not be empty.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -427,9 +427,9 @@ extern "C" { } if (F_status_is_error_not(status) && data->parameters[fss_extended_read_parameter_select].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_select); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter requires a positive number.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_select); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter requires a positive number.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -526,7 +526,7 @@ extern "C" { f_macro_fss_delimits_t_delete_simple(contents_delimits); } else { - fl_color_print(data->error.to.stream, data->context.set.error, "%sYou failed to specify one or more files.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sYou failed to specify one or more files.%c", fll_error_print_error, f_string_eol_s[0]); status = F_status_set_error(F_parameter); } diff --git a/level_3/fss_extended_read/c/fss_extended_read.h b/level_3/fss_extended_read/c/fss_extended_read.h index 3f8db59..15a16da 100644 --- a/level_3/fss_extended_read/c/fss_extended_read.h +++ b/level_3/fss_extended_read/c/fss_extended_read.h @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -33,7 +34,6 @@ #include // fll-1 includes -#include #include #include #include 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 bad7a57..1fe67fb 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 @@ -46,7 +46,7 @@ extern "C" { fss_extended_read_macro_depths_t_resize(status, (*depths), depth_size); if (F_status_is_error(status)) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); return status; } @@ -130,12 +130,12 @@ extern "C" { // @todo: move error printing into common function. if (status_code == F_memory_not) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol_s[0]); } else if (status_code == f_array_length_t_size) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sUnable to process '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_trim); - fl_color_print(data.error.to.stream, data.context.set.error, "' because the maximum buffer size was reached.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sUnable to process '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_trim); + f_color_print(data.error.to.stream, data.context.set.error, "' because the maximum buffer size was reached.%c", f_string_eol_s[0]); } else { f_string_t function = "f_string_append"; @@ -144,20 +144,20 @@ extern "C" { function = "fl_string_rip"; } - fl_color_print(data.error.to.stream, data.context.set.error, "%sAn unhandled error (", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%u", status_code); - fl_color_print(data.error.to.stream, data.context.set.error, ") has occurred while calling "); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s()", function); - fl_color_print(data.error.to.stream, data.context.set.error, ".%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sAn unhandled error (", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%u", status_code); + f_color_print(data.error.to.stream, data.context.set.error, ") has occurred while calling "); + f_color_print(data.error.to.stream, data.context.set.notable, "%s()", function); + f_color_print(data.error.to.stream, data.context.set.error, ".%c", f_string_eol_s[0]); } return status; } if (!depths->array[i].value_name.used) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_name); - fl_color_print(data.error.to.stream, data.context.set.error, "' must not be an empty string.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_name); + f_color_print(data.error.to.stream, data.context.set.error, "' must not be an empty string.%c", f_string_eol_s[0]); return F_status_set_error(F_parameter); } @@ -170,22 +170,22 @@ extern "C" { for (f_array_length_t j = i + 1; j < depths->used; j++) { if (depths->array[i].depth == depths->array[j].depth) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe value '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%llu", depths->array[i].depth); - fl_color_print(data.error.to.stream, data.context.set.error, "' may only be specified once for the parameter '"); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_depth); - fl_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe value '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%llu", depths->array[i].depth); + f_color_print(data.error.to.stream, data.context.set.error, "' may only be specified once for the parameter '"); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_depth); + f_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); return F_status_set_error(F_parameter); } else if (depths->array[i].depth > depths->array[j].depth) { - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_depth); - fl_color_print(data.error.to.stream, data.context.set.error, "' may not have the value '"); - fl_color_print(data.error.to.stream, data.context.set.notable, "%llu", depths->array[i].depth); - fl_color_print(data.error.to.stream, data.context.set.error, "' before the value '"); - fl_color_print(data.error.to.stream, data.context.set.notable, "%llu", depths->array[j].depth); - fl_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_read_long_depth); + f_color_print(data.error.to.stream, data.context.set.error, "' may not have the value '"); + f_color_print(data.error.to.stream, data.context.set.notable, "%llu", depths->array[i].depth); + f_color_print(data.error.to.stream, data.context.set.error, "' before the value '"); + f_color_print(data.error.to.stream, data.context.set.notable, "%llu", depths->array[j].depth); + f_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); return F_status_set_error(F_parameter); } diff --git a/level_3/fss_extended_read/data/build/dependencies b/level_3/fss_extended_read/data/build/dependencies index de0c727..41ccf44 100644 --- a/level_3/fss_extended_read/data/build/dependencies +++ b/level_3/fss_extended_read/data/build/dependencies @@ -13,7 +13,6 @@ f_file f_fss f_pipe f_print -fl_color fl_conversion fl_console fl_fss diff --git a/level_3/fss_extended_read/data/build/settings b/level_3/fss_extended_read/data/build/settings index fdfd70c..5014bd1 100644 --- a/level_3/fss_extended_read/data/build/settings +++ b/level_3/fss_extended_read/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_program -lfl_color -lfl_console -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_status -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_string -lf_type_array -lf_utf +build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_program -lfl_console -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_status -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_string -lf_type_array -lf_utf build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library fss_extended_read.c private-fss_extended_read.c 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 02c3718..0597380 100644 --- a/level_3/fss_extended_write/c/fss_extended_write.c +++ b/level_3/fss_extended_write/c/fss_extended_write.c @@ -35,31 +35,31 @@ extern "C" { fll_program_print_help_usage(output, context, fss_extended_write_name, f_string_empty_s); fprintf(output.stream, " The pipe uses the Backspace character '"); - fl_color_print(output.stream, context.set.notable, "\\b"); + f_color_print(output.stream, context.set.notable, "\\b"); fprintf(output.stream, "' ("); - fl_color_print(output.stream, context.set.notable, "U+0008"); + f_color_print(output.stream, context.set.notable, "U+0008"); fprintf(output.stream, ") to designate the start of a Content.%c", f_string_eol_s[0]); fprintf(output.stream, " The pipe uses the Form Feed character '"); - fl_color_print(output.stream, context.set.notable, "\\f"); + f_color_print(output.stream, context.set.notable, "\\f"); fprintf(output.stream, "' ("); - fl_color_print(output.stream, context.set.notable, "U+000C"); + f_color_print(output.stream, context.set.notable, "U+000C"); fprintf(output.stream, ") to designate the end of the last Content.%c", f_string_eol_s[0]); fprintf(output.stream, " The pipe uses the Vertical Line character '"); - fl_color_print(output.stream, context.set.notable, "\\v"); + f_color_print(output.stream, context.set.notable, "\\v"); fprintf(output.stream, "' ("); - fl_color_print(output.stream, context.set.notable, "U+000B"); + f_color_print(output.stream, context.set.notable, "U+000B"); fprintf(output.stream, ") is used to ignore a content range, which does nothing in this program.%c", f_string_eol_s[0]); fprintf(output.stream, " For the pipe, an Object is terminated by either a Backspace character '"); - fl_color_print(output.stream, context.set.notable, "\\b"); + f_color_print(output.stream, context.set.notable, "\\b"); fprintf(output.stream, "' ("); - fl_color_print(output.stream, context.set.notable, "U+0008"); + f_color_print(output.stream, context.set.notable, "U+0008"); fprintf(output.stream, ") or a Form Feed character '"); - fl_color_print(output.stream, context.set.notable, "\\f"); + f_color_print(output.stream, context.set.notable, "\\f"); fprintf(output.stream, "' ("); - fl_color_print(output.stream, context.set.notable, "U+000C"); + f_color_print(output.stream, context.set.notable, "U+000C"); fprintf(output.stream, ").%c", f_string_eol_s[0]); fprintf(output.stream, " The end of the pipe represents the end of any Object or Content.%c", f_string_eol_s[0]); @@ -67,13 +67,13 @@ extern "C" { fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " The FSS-0001 (Extended) specification does not support multi-line Content, therefore the parameter '"); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_prepend); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_prepend); fprintf(output.stream, "' does nothing.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " This program does not use the parameter '"); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_ignore); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_ignore); fprintf(output.stream, "', which therefore does nothing.%c", f_string_eol_s[0]); fprintf(output.stream, " This parameter requires two values.%c", f_string_eol_s[0]); @@ -175,9 +175,9 @@ extern "C" { if (data->parameters[fss_extended_write_parameter_file].values.used > 1) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_file); - fl_color_print(data->error.to.stream, data->context.set.error, "' may only be specified once.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_file); + f_color_print(data->error.to.stream, data->context.set.error, "' may only be specified once.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -219,13 +219,13 @@ extern "C" { if (data->parameters[fss_extended_write_parameter_content].result == f_console_result_additional) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_partial); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter only allows either the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter or the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_content); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter, but not both.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_partial); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter only allows either the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter or the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_content); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter, but not both.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -242,11 +242,11 @@ extern "C" { if (location_object > location_content || location_object == location_content && location_sub_object > location_sub_content) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sEach ", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter must be specified before a '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_content); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sEach ", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter must be specified before a '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_content); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -260,11 +260,11 @@ extern "C" { if (location_object > location_content || location_object == location_content && location_sub_object > location_sub_content) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sEach ", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter must have at least one '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_content); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sEach ", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter must have at least one '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_content); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -287,11 +287,11 @@ extern "C" { else if (!data->process_pipe) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThis requires either piped data or the use of the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_content); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThis requires either piped data or the use of the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_content); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -301,9 +301,9 @@ extern "C" { if (data->parameters[fss_extended_write_parameter_partial].result == f_console_result_found) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_partial); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter cannot be used when processing a pipe.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_partial); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter cannot be used when processing a pipe.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -315,9 +315,9 @@ extern "C" { if (data->parameters[fss_extended_write_parameter_prepend].result == f_console_result_found) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_prepend); - fl_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_prepend); + f_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -339,9 +339,9 @@ extern "C" { if (status == F_false) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe value for the parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_prepend); - fl_color_print(data->error.to.stream, data->context.set.error, "' must only contain whitespace.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe value for the parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_prepend); + f_color_print(data->error.to.stream, data->context.set.error, "' must only contain whitespace.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -352,9 +352,9 @@ extern "C" { else { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe value for the parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_prepend); - fl_color_print(data->error.to.stream, data->context.set.error, "' must not be an empty string.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe value for the parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_prepend); + f_color_print(data->error.to.stream, data->context.set.error, "' must not be an empty string.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -366,9 +366,9 @@ extern "C" { if (data->parameters[fss_extended_write_parameter_ignore].result == f_console_result_found) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_ignore); - fl_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no values were given.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_ignore); + f_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no values were given.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -379,9 +379,9 @@ extern "C" { if (total_locations * 2 > total_arguments) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_ignore); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires two values.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_ignore); + f_color_print(data->error.to.stream, data->context.set.error, "' requires two values.%c", f_string_eol_s[0]); status = F_status_set_error(F_parameter); } @@ -416,9 +416,9 @@ extern "C" { if (F_status_is_error(status)) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sWhile processing the ", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "input pipe"); - fl_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sWhile processing the ", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "input pipe"); + f_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); } } } @@ -535,9 +535,9 @@ extern "C" { if (F_status_is_error(status)) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sWhile processing the ", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "input arguments"); - fl_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sWhile processing the ", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "input arguments"); + f_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); } } else if (data->error.verbosity != f_console_verbosity_quiet && data->parameters[fss_extended_write_parameter_file].result == f_console_result_none) { diff --git a/level_3/fss_extended_write/c/fss_extended_write.h b/level_3/fss_extended_write/c/fss_extended_write.h index e949681..99c4818 100644 --- a/level_3/fss_extended_write/c/fss_extended_write.h +++ b/level_3/fss_extended_write/c/fss_extended_write.h @@ -21,13 +21,13 @@ #include #include #include +#include #include #include #include #include // fll-1 includes -#include #include #include #include diff --git a/level_3/fss_extended_write/c/private-fss_extended_write.c b/level_3/fss_extended_write/c/private-fss_extended_write.c index 9d4c7a3..35f2b0f 100644 --- a/level_3/fss_extended_write/c/private-fss_extended_write.c +++ b/level_3/fss_extended_write/c/private-fss_extended_write.c @@ -13,13 +13,13 @@ extern "C" { } fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sMust specify the '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_object); - fl_color_print(data.error.to.stream, data.context.set.error, "' parameter at least once and the '"); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_content); - fl_color_print(data.error.to.stream, data.context.set.error, "' parameter one or more times when not specifying the "); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_partial); - fl_color_print(data.error.to.stream, data.context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sMust specify the '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_object); + f_color_print(data.error.to.stream, data.context.set.error, "' parameter at least once and the '"); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_content); + f_color_print(data.error.to.stream, data.context.set.error, "' parameter one or more times when not specifying the "); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_extended_write_long_partial); + f_color_print(data.error.to.stream, data.context.set.error, "' parameter.%c", f_string_eol_s[0]); } #endif // _di_fss_extended_write_error_parameter_at_least_once_print_ @@ -31,9 +31,9 @@ extern "C" { } fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "%s%s", symbol, parameter); - fl_color_print(data.error.to.stream, data.context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "%s%s", symbol, parameter); + f_color_print(data.error.to.stream, data.context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); } #endif // _di_fss_extended_write_error_parameter_value_missing_print_ @@ -45,9 +45,9 @@ extern "C" { } fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sThis standard does not support end of line character '", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "\\n"); - fl_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThis standard does not support end of line character '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "\\n"); + f_color_print(data.error.to.stream, data.context.set.error, "'.%c", f_string_eol_s[0]); } #endif // _di_fss_extended_write_error_parameter_unsupported_eol_print_ diff --git a/level_3/fss_extended_write/data/build/dependencies b/level_3/fss_extended_write/data/build/dependencies index 779e9c9..9d2be39 100644 --- a/level_3/fss_extended_write/data/build/dependencies +++ b/level_3/fss_extended_write/data/build/dependencies @@ -13,7 +13,6 @@ f_file f_fss f_pipe f_print -fl_color fl_conversion fl_fss fl_status diff --git a/level_3/fss_extended_write/data/build/settings b/level_3/fss_extended_write/data/build/settings index 89b8325..bf94b5e 100644 --- a/level_3/fss_extended_write/data/build/settings +++ b/level_3/fss_extended_write/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_program -lfl_color -lfl_conversion -lfl_directory -lfl_fss -lfl_status -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_string -lf_type_array -lf_utf +build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_program -lfl_conversion -lfl_directory -lfl_fss -lfl_status -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_string -lf_type_array -lf_utf build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library fss_extended_write.c private-fss_extended_write.c 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 72d35c1..4384125 100644 --- a/level_3/fss_status_code/c/fss_status_code.c +++ b/level_3/fss_status_code/c/fss_status_code.c @@ -116,39 +116,39 @@ extern "C" { if (data->parameters[fss_status_code_parameter_is_error].result == f_console_result_found) { if (data->parameters[fss_status_code_parameter_is_warning].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_status_code_long_is_error); - fl_color_print(data->error.to.stream, data->context.set.error, "' cannot be used with the parameter "); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_status_code_long_is_warning); - fl_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_status_code_long_is_error); + f_color_print(data->error.to.stream, data->context.set.error, "' cannot be used with the parameter "); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_status_code_long_is_warning); + f_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); fss_status_code_delete_data(data); return F_status_set_error(status); } else if (data->parameters[fss_status_code_parameter_is_fine].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_status_code_long_is_error); - fl_color_print(data->error.to.stream, data->context.set.error, "' cannot be used with the parameter "); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_status_code_long_is_fine); - fl_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_status_code_long_is_error); + f_color_print(data->error.to.stream, data->context.set.error, "' cannot be used with the parameter "); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_status_code_long_is_fine); + f_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); fss_status_code_delete_data(data); return F_status_set_error(status); } } else if (data->parameters[fss_status_code_parameter_is_warning].result == f_console_result_found && data->parameters[fss_status_code_parameter_is_fine].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_status_code_long_is_warning); - fl_color_print(data->error.to.stream, data->context.set.error, "' cannot be used with the parameter "); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_status_code_long_is_fine); - fl_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_status_code_long_is_warning); + f_color_print(data->error.to.stream, data->context.set.error, "' cannot be used with the parameter "); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, fss_status_code_long_is_fine); + f_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); fss_status_code_delete_data(data); return F_status_set_error(status); } if (data->remaining.used == 0 && !data->process_pipe) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sYou failed to specify an error code.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sYou failed to specify an error code.%c", fll_error_print_error, f_string_eol_s[0]); fss_status_code_delete_data(data); return F_status_set_error(F_parameter); diff --git a/level_3/fss_status_code/c/fss_status_code.h b/level_3/fss_status_code/c/fss_status_code.h index b15c866..4ab9b7b 100644 --- a/level_3/fss_status_code/c/fss_status_code.h +++ b/level_3/fss_status_code/c/fss_status_code.h @@ -21,13 +21,13 @@ #include #include #include +#include #include #include #include #include // fll-1 includes -#include #include #include #include diff --git a/level_3/fss_status_code/c/private-fss_status_code.c b/level_3/fss_status_code/c/private-fss_status_code.c index 40fa405..c5fe1bb 100644 --- a/level_3/fss_status_code/c/private-fss_status_code.c +++ b/level_3/fss_status_code/c/private-fss_status_code.c @@ -53,13 +53,13 @@ extern "C" { status = fl_conversion_string_to_number_unsigned(value, range, &number); if (status == F_none) { - fl_color_print(data.output.stream, data.context.set.error, "invalid name%c", f_string_eol_s[0]); + f_color_print(data.output.stream, data.context.set.error, "invalid name%c", f_string_eol_s[0]); return F_status_set_error(F_parameter); } if (status == F_data_not || F_status_set_fine(status) == F_parameter) { - fl_color_print(data.output.stream, data.context.set.error, "invalid data%c", f_string_eol_s[0]); + f_color_print(data.output.stream, data.context.set.error, "invalid data%c", f_string_eol_s[0]); return status; } @@ -76,10 +76,10 @@ extern "C" { if (F_status_is_error(status)) { if (F_status_set_fine(status) == F_data) { - fl_color_print(data.output.stream, data.context.set.error, "unknown name%c", f_string_eol_s[0]); + f_color_print(data.output.stream, data.context.set.error, "unknown name%c", f_string_eol_s[0]); } else { - fl_color_print(data.output.stream, data.context.set.error, "failed to convert%c", f_string_eol_s[0]); + f_color_print(data.output.stream, data.context.set.error, "failed to convert%c", f_string_eol_s[0]); } return status; @@ -87,7 +87,7 @@ extern "C" { } if (status == F_data) { - fl_color_print(data.output.stream, data.context.set.warning, "unknown code%c", f_string_eol_s[0]); + f_color_print(data.output.stream, data.context.set.warning, "unknown code%c", f_string_eol_s[0]); return F_none; } @@ -112,10 +112,10 @@ extern "C" { if (F_status_is_error(status)) { if (F_status_set_fine(status) == F_data) { - fl_color_print(data.output.stream, data.context.set.error, "unknown code%c", f_string_eol_s[0]); + f_color_print(data.output.stream, data.context.set.error, "unknown code%c", f_string_eol_s[0]); } else { - fl_color_print(data.output.stream, data.context.set.error, "failed to convert%c", f_string_eol_s[0]); + f_color_print(data.output.stream, data.context.set.error, "failed to convert%c", f_string_eol_s[0]); } return status; @@ -134,17 +134,17 @@ extern "C" { f_status_t status = fl_conversion_string_to_number_unsigned(value, range, number); if (*number > F_status_size_max_with_signal) { - fl_color_print(data.output.stream, data.context.set.error, "out of range%c", f_string_eol_s[0]); + f_color_print(data.output.stream, data.context.set.error, "out of range%c", f_string_eol_s[0]); return status; } if (F_status_is_error(status)) { if (F_status_set_fine(status) == F_number_negative) { - fl_color_print(data.output.stream, data.context.set.error, "out of range%c", f_string_eol_s[0]); + f_color_print(data.output.stream, data.context.set.error, "out of range%c", f_string_eol_s[0]); } else { - fl_color_print(data.output.stream, data.context.set.error, "invalid number%c", f_string_eol_s[0]); + f_color_print(data.output.stream, data.context.set.error, "invalid number%c", f_string_eol_s[0]); } return status; diff --git a/level_3/fss_status_code/data/build/dependencies b/level_3/fss_status_code/data/build/dependencies index def0f70..a8d9226 100644 --- a/level_3/fss_status_code/data/build/dependencies +++ b/level_3/fss_status_code/data/build/dependencies @@ -14,7 +14,6 @@ f_file f_fss f_pipe f_print -fl_color fl_console fl_conversion fl_fss diff --git a/level_3/fss_status_code/data/build/settings b/level_3/fss_status_code/data/build/settings index 47705c5..8004319 100644 --- a/level_3/fss_status_code/data/build/settings +++ b/level_3/fss_status_code/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_program -lfll_status -lfl_color -lfl_console -lfl_conversion -lfl_directory -lfl_fss -lfl_status -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_string -lf_type_array -lf_utf +build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_program -lfll_status -lfl_console -lfl_conversion -lfl_directory -lfl_fss -lfl_status -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_string -lf_type_array -lf_utf build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library fss_status_code.c private-fss_status_code.c diff --git a/level_3/iki_read/c/iki_read.c b/level_3/iki_read/c/iki_read.c index 52c8347..144bee7 100644 --- a/level_3/iki_read/c/iki_read.c +++ b/level_3/iki_read/c/iki_read.c @@ -40,7 +40,7 @@ extern "C" { fll_program_print_help_usage(output, context, iki_read_name, "filename(s)"); - fl_color_print(output.stream, context.set.important, " Notes:"); + f_color_print(output.stream, context.set.important, " Notes:"); fprintf(output.stream, "%c", f_string_eol_s[0]); @@ -49,29 +49,29 @@ extern "C" { fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " The "); - fl_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_substitute); + f_color_print(output.stream, context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_substitute); fprintf(output.stream, " option, requires 3 additional parameters: "); - fl_color_print(output.stream, context.set.notable, "<"); + f_color_print(output.stream, context.set.notable, "<"); fprintf(output.stream, "%s", iki_read_substitution_vocabulary); - fl_color_print(output.stream, context.set.notable, ">"); + f_color_print(output.stream, context.set.notable, ">"); fprintf(output.stream, f_string_space_s); - fl_color_print(output.stream, context.set.notable, "<"); + f_color_print(output.stream, context.set.notable, "<"); fprintf(output.stream, "%s", iki_read_substitution_replace); - fl_color_print(output.stream, context.set.notable, ">"); + f_color_print(output.stream, context.set.notable, ">"); fprintf(output.stream, f_string_space_s); - fl_color_print(output.stream, context.set.notable, "<"); + f_color_print(output.stream, context.set.notable, "<"); fprintf(output.stream, "%s", iki_read_substitution_with); - fl_color_print(output.stream, context.set.notable, ">"); + f_color_print(output.stream, context.set.notable, ">"); fprintf(output.stream, ".%c", f_string_eol_s[0]); - fl_color_print(output.stream, context.set.notable, " %s", iki_read_substitution_vocabulary); + f_color_print(output.stream, context.set.notable, " %s", iki_read_substitution_vocabulary); fprintf(output.stream, ": The name of the vocabulary whose content is to be substituted.%c", f_string_eol_s[0]); - fl_color_print(output.stream, context.set.notable, " %s", iki_read_substitution_replace); + f_color_print(output.stream, context.set.notable, " %s", iki_read_substitution_replace); fprintf(output.stream, ": The content matching this exact string will be substituted.%c", f_string_eol_s[0]); - fl_color_print(output.stream, context.set.notable, " %s", iki_read_substitution_with); + f_color_print(output.stream, context.set.notable, " %s", iki_read_substitution_with); fprintf(output.stream, ": The new string to use as the substitute.%c", f_string_eol_s[0]); fprintf(output.stream, "%c", f_string_eol_s[0]); @@ -181,9 +181,9 @@ extern "C" { if (data->parameters[iki_read_parameter_at].result == f_console_result_found) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_at); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_at); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -207,11 +207,11 @@ extern "C" { if (data->parameters[iki_read_parameter_total].result == f_console_result_found) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_at); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_total); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter."); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_at); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_total); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter."); } status = F_status_set_error(F_parameter); @@ -221,9 +221,9 @@ extern "C" { if (data->parameters[iki_read_parameter_line].result == f_console_result_found) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_line); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_line); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a positive number.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -248,9 +248,9 @@ extern "C" { if (data->parameters[iki_read_parameter_name].result == f_console_result_found) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_name); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires a string.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_name); + f_color_print(data->error.to.stream, data->context.set.error, "' requires a string.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -260,9 +260,9 @@ extern "C" { if (data->parameters[iki_read_parameter_substitute].result == f_console_result_found || data->parameters[iki_read_parameter_substitute].values.used % 3 != 0) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_substitute); - fl_color_print(data->error.to.stream, data->context.set.error, "' requires 3 strings.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_substitute); + f_color_print(data->error.to.stream, data->context.set.error, "' requires 3 strings.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -271,11 +271,11 @@ extern "C" { if (data->parameters[iki_read_parameter_total].result == f_console_result_found) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_substitute); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_total); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_substitute); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_total); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -286,11 +286,11 @@ extern "C" { if (data->parameters[iki_read_parameter_object].result == f_console_result_found) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_literal); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_literal); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -299,11 +299,11 @@ extern "C" { if (data->parameters[iki_read_parameter_content].result == f_console_result_found) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_literal); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_content); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_literal); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_content); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -312,11 +312,11 @@ extern "C" { if (data->parameters[iki_read_parameter_total].result == f_console_result_found) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_literal); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_total); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_literal); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_total); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -328,11 +328,11 @@ extern "C" { if (data->parameters[iki_read_parameter_content].result == f_console_result_found) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_content); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_content); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -341,11 +341,11 @@ extern "C" { if (data->parameters[iki_read_parameter_total].result == f_console_result_found) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_total); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_total); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -365,11 +365,11 @@ extern "C" { if (data->parameters[iki_read_parameter_total].result == f_console_result_found) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_whole); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_total); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sCannot specify the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_whole); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter with the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_read_long_total); + f_color_print(data->error.to.stream, data->context.set.error, "' parameter.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -454,7 +454,7 @@ extern "C" { else { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%syou failed to specify one or more files.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%syou failed to specify one or more files.%c", fll_error_print_error, f_string_eol_s[0]); } status = F_status_set_error(F_parameter); diff --git a/level_3/iki_read/c/iki_read.h b/level_3/iki_read/c/iki_read.h index 07f3b21..998541a 100644 --- a/level_3/iki_read/c/iki_read.h +++ b/level_3/iki_read/c/iki_read.h @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -35,7 +36,6 @@ #include // fll-1 includes -#include #include #include #include diff --git a/level_3/iki_read/data/build/dependencies b/level_3/iki_read/data/build/dependencies index ab00e65..d2a916a 100644 --- a/level_3/iki_read/data/build/dependencies +++ b/level_3/iki_read/data/build/dependencies @@ -12,7 +12,6 @@ f_file f_iki f_pipe f_print -fl_color fl_console fl_conversion fl_iki diff --git a/level_3/iki_read/data/build/settings b/level_3/iki_read/data/build/settings index 1940fad..0faa1a4 100644 --- a/level_3/iki_read/data/build/settings +++ b/level_3/iki_read/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_error -lfll_program -lfl_color -lfl_console -lfl_conversion -lfl_iki -lfl_string -lf_color -lf_console -lf_conversion -lf_file -lf_iki -lf_memory -lf_path -lf_pipe -lf_print -lf_string -lf_type_array -lf_utf +build_libraries-individual -lfll_error -lfll_program -lfl_console -lfl_conversion -lfl_iki -lfl_string -lf_color -lf_console -lf_conversion -lf_file -lf_iki -lf_memory -lf_path -lf_pipe -lf_print -lf_string -lf_type_array -lf_utf build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library iki_read.c private-iki_read.c diff --git a/level_3/iki_write/c/iki_write.c b/level_3/iki_write/c/iki_write.c index d260b90..93fbacf 100644 --- a/level_3/iki_write/c/iki_write.c +++ b/level_3/iki_write/c/iki_write.c @@ -30,12 +30,12 @@ extern "C" { fll_program_print_help_usage(output, context, iki_write_name, f_string_empty_s); - fl_color_print(output.stream, context.set.important, " Notes:"); + f_color_print(output.stream, context.set.important, " Notes:"); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " This program will accept object and content strings to generate an IKI string, such as: "); - fl_color_print(output.stream, context.set.notable, "object:\"content\""); + f_color_print(output.stream, context.set.notable, "object:\"content\""); fprintf(output.stream, ".%c", f_string_eol_s[0]); fprintf(output.stream, " Each object must have a content (and each content must have an object).%c", f_string_eol_s[0]); @@ -147,9 +147,9 @@ extern "C" { if (data->parameters[iki_write_parameter_file].result == f_console_result_additional) { if (data->parameters[iki_write_parameter_file].values.used > 1) { if (data->error.verbosity != f_console_verbosity_quiet) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_write_long_file); - fl_color_print(data->error.to.stream, data->context.set.error, "' may only be specified once.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_write_long_file); + f_color_print(data->error.to.stream, data->context.set.error, "' may only be specified once.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -169,9 +169,9 @@ extern "C" { } else if (data->parameters[iki_write_parameter_file].result == f_console_result_found) { if (data->error.verbosity != f_console_verbosity_quiet) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_write_long_file); - fl_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_write_long_file); + f_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -180,9 +180,9 @@ extern "C" { if (F_status_is_error_not(status) && data->parameters[iki_write_parameter_object].result == f_console_result_found) { if (data->error.verbosity != f_console_verbosity_quiet) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_write_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_write_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -190,9 +190,9 @@ extern "C" { if (F_status_is_error_not(status) && data->parameters[iki_write_parameter_content].result == f_console_result_found) { if (data->error.verbosity != f_console_verbosity_quiet) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_write_long_content); - fl_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_write_long_content); + f_color_print(data->error.to.stream, data->context.set.error, "' was specified, but no value was given.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -202,11 +202,11 @@ extern "C" { if (data->parameters[iki_write_parameter_object].result != f_console_result_additional && data->parameters[iki_write_parameter_content].result != f_console_result_additional) { if (data->error.verbosity != f_console_verbosity_quiet) { fprintf(data->error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data->error.to.stream, data->context.set.error, "%sNo data provided, either pipe the data or use the '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_write_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' and the '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_write_long_content); - fl_color_print(data->error.to.stream, data->context.set.error, "' parameters.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sNo data provided, either pipe the data or use the '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_write_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' and the '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_write_long_content); + f_color_print(data->error.to.stream, data->context.set.error, "' parameters.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -216,11 +216,11 @@ extern "C" { if (F_status_is_error_not(status)) { if (data->parameters[iki_write_parameter_object].values.used != data->parameters[iki_write_parameter_content].values.used) { if (data->error.verbosity != f_console_verbosity_quiet) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameters '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_write_long_content); - fl_color_print(data->error.to.stream, data->context.set.error, "' and '"); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_write_long_object); - fl_color_print(data->error.to.stream, data->context.set.error, "' must be specified the same number of times.%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameters '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_write_long_content); + f_color_print(data->error.to.stream, data->context.set.error, "' and '"); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, iki_write_long_object); + f_color_print(data->error.to.stream, data->context.set.error, "' must be specified the same number of times.%c", f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -276,7 +276,7 @@ extern "C" { if (!buffer.used) { if (data->error.verbosity != f_console_verbosity_quiet) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe pipe has no data.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe pipe has no data.%c", fll_error_print_error, f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -303,7 +303,7 @@ extern "C" { if (object_ended && previous == range.start) { if (data->error.verbosity != f_console_verbosity_quiet) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe pipe has incorrectly placed newlines.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe pipe has incorrectly placed newlines.%c", fll_error_print_error, f_string_eol_s[0]); } status = F_status_set_error(F_parameter); @@ -360,7 +360,7 @@ extern "C" { if (F_status_is_error_not(status) && object_ended) { if (data->error.verbosity != f_console_verbosity_quiet) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe pipe has an object without content.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe pipe has an object without content.%c", fll_error_print_error, f_string_eol_s[0]); } status = F_status_set_error(F_parameter); diff --git a/level_3/iki_write/c/iki_write.h b/level_3/iki_write/c/iki_write.h index 762f40b..860f5a0 100644 --- a/level_3/iki_write/c/iki_write.h +++ b/level_3/iki_write/c/iki_write.h @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -35,7 +36,6 @@ #include // fll-1 includes -#include #include #include #include diff --git a/level_3/iki_write/c/private-iki_write.c b/level_3/iki_write/c/private-iki_write.c index cbf0849..892824b 100644 --- a/level_3/iki_write/c/private-iki_write.c +++ b/level_3/iki_write/c/private-iki_write.c @@ -11,9 +11,9 @@ extern "C" { if (!object.used) { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe object is missing, it must not have a length of ", fll_error_print_error); - fl_color_print(data.error.to.stream, data.context.set.notable, "0"); - fl_color_print(data.error.to.stream, data.context.set.error, ".%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe object is missing, it must not have a length of ", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.notable, "0"); + f_color_print(data.error.to.stream, data.context.set.error, ".%c", f_string_eol_s[0]); } return F_status_set_error(F_failure); @@ -24,13 +24,13 @@ extern "C" { if (status == F_false) { if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "%sThe object '", fll_error_print_error); + f_color_print(data.error.to.stream, data.context.set.error, "%sThe object '", fll_error_print_error); - fl_color_print_code(data.error.to.stream, data.context.notable); + f_color_print_code(data.error.to.stream, data.context.notable); f_print_dynamic(data.error.to.stream, object); - fl_color_print_code(data.error.to.stream, data.context.reset); + f_color_print_code(data.error.to.stream, data.context.reset); - fl_color_print(data.error.to.stream, data.context.set.error, "' is not a valid IKI object.%c", f_string_eol_s[0]); + f_color_print(data.error.to.stream, data.context.set.error, "' is not a valid IKI object.%c", f_string_eol_s[0]); } return F_status_set_error(F_failure); diff --git a/level_3/iki_write/data/build/dependencies b/level_3/iki_write/data/build/dependencies index 31135ac..30e8b86 100644 --- a/level_3/iki_write/data/build/dependencies +++ b/level_3/iki_write/data/build/dependencies @@ -11,7 +11,6 @@ f_file f_iki f_pipe f_print -fl_color fl_console fl_iki fll_iki diff --git a/level_3/iki_write/data/build/settings b/level_3/iki_write/data/build/settings index 1240482..eefc89b 100644 --- a/level_3/iki_write/data/build/settings +++ b/level_3/iki_write/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_error -lfll_iki -lfll_program -lfl_color -lfl_console -lfl_iki -lf_color -lf_console -lf_conversion -lf_file -lf_iki -lf_memory -lf_path -lf_pipe -lf_print -lf_string -lf_type_array -lf_utf +build_libraries-individual -lfll_error -lfll_iki -lfll_program -lfl_console -lfl_iki -lfl_string -lf_color -lf_console -lf_conversion -lf_file -lf_iki -lf_memory -lf_path -lf_pipe -lf_print -lf_string -lf_type_array -lf_utf build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library iki_write.c private-iki_write.c diff --git a/level_3/init/c/init.c b/level_3/init/c/init.c index 26325d4..97feec0 100644 --- a/level_3/init/c/init.c +++ b/level_3/init/c/init.c @@ -18,7 +18,7 @@ extern "C" { fll_program_print_help_usage(output, context, init_name, f_string_empty_s); - fl_color_print(output.stream, context.set.important, " Notes:"); + f_color_print(output.stream, context.set.important, " Notes:"); fprintf(output.stream, "%c", f_string_eol_s[0]); fprintf(output.stream, " This program is intended to be directly called by the kernel during boot.%c", f_string_eol_s[0]); diff --git a/level_3/init/c/init.h b/level_3/init/c/init.h index 2aeada9..446b780 100644 --- a/level_3/init/c/init.h +++ b/level_3/init/c/init.h @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -36,7 +37,6 @@ #include // fll-1 includes -#include #include #include diff --git a/level_3/init/c/private-init.c b/level_3/init/c/private-init.c index 6221db2..b0b2c29 100644 --- a/level_3/init/c/private-init.c +++ b/level_3/init/c/private-init.c @@ -361,7 +361,7 @@ Consider the "*.device" files such that they are also use IKI. if (data.error.verbosity != f_console_verbosity_quiet) { fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); - fl_color_print(data.error.to.stream, data.context.set.error, "ALERT: An appropriate exit signal has been received, now aborting."); + f_color_print(data.error.to.stream, data.context.set.error, "ALERT: An appropriate exit signal has been received, now aborting."); fprintf(data.error.to.stream, "%c", f_string_eol_s[0]); } diff --git a/level_3/init/data/build/dependencies b/level_3/init/data/build/dependencies index 55647b2..41a8f16 100644 --- a/level_3/init/data/build/dependencies +++ b/level_3/init/data/build/dependencies @@ -12,7 +12,6 @@ f_file f_iki f_print f_signal -fl_color fl_conversion fl_iki fl_string diff --git a/level_3/init/data/build/settings b/level_3/init/data/build/settings index 16b22fc..79cf264 100644 --- a/level_3/init/data/build/settings +++ b/level_3/init/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_error -lfll_program -lfl_color -lfl_conversion -lfl_iki -lfl_string -lf_color -lf_console -lf_conversion -lf_file -lf_iki -lf_memory -lf_print -lf_signal -lf_string -lf_type_array -lf_utf +build_libraries-individual -lfll_error -lfll_program -lfl_conversion -lfl_iki -lfl_string -lf_color -lf_console -lf_conversion -lf_file -lf_iki -lf_memory -lf_print -lf_signal -lf_string -lf_type_array -lf_utf build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library init.c private-init.c diff --git a/level_3/status_code/c/private-status_code.c b/level_3/status_code/c/private-status_code.c index e8b18e0..3373ed1 100644 --- a/level_3/status_code/c/private-status_code.c +++ b/level_3/status_code/c/private-status_code.c @@ -55,13 +55,13 @@ extern "C" { status = fl_conversion_string_to_number_unsigned(value, range, &number); if (status == F_none) { - fl_color_print(data.output.stream, data.context.set.error, "invalid name%c", f_string_eol_s[0]); + f_color_print(data.output.stream, data.context.set.error, "invalid name%c", f_string_eol_s[0]); return F_status_set_error(F_parameter); } if (status == F_data_not || F_status_set_fine(status) == F_parameter) { - fl_color_print(data.output.stream, data.context.set.error, "invalid data%c", f_string_eol_s[0]); + f_color_print(data.output.stream, data.context.set.error, "invalid data%c", f_string_eol_s[0]); return status; } @@ -73,17 +73,17 @@ extern "C" { if (F_status_is_error(status)) { if (F_status_set_fine(status) == F_data) { - fl_color_print(data.output.stream, data.context.set.error, "unknown name%c", f_string_eol_s[0]); + f_color_print(data.output.stream, data.context.set.error, "unknown name%c", f_string_eol_s[0]); } else { - fl_color_print(data.output.stream, data.context.set.error, "failed to convert%c", f_string_eol_s[0]); + f_color_print(data.output.stream, data.context.set.error, "failed to convert%c", f_string_eol_s[0]); } return status; } if (status == F_data) { - fl_color_print(data.output.stream, data.context.set.warning, "unknown code%c", f_string_eol_s[0]); + f_color_print(data.output.stream, data.context.set.warning, "unknown code%c", f_string_eol_s[0]); return F_none; } @@ -110,10 +110,10 @@ extern "C" { if (F_status_is_error(status)) { if (F_status_set_fine(status) == F_data) { - fl_color_print(data.output.stream, data.context.set.error, "unknown code%c", f_string_eol_s[0]); + f_color_print(data.output.stream, data.context.set.error, "unknown code%c", f_string_eol_s[0]); } else { - fl_color_print(data.output.stream, data.context.set.error, "failed to convert%c", f_string_eol_s[0]); + f_color_print(data.output.stream, data.context.set.error, "failed to convert%c", f_string_eol_s[0]); } return status; @@ -132,17 +132,17 @@ extern "C" { f_status_t status = fl_conversion_string_to_number_unsigned(value, range, number); if (*number > F_status_size_max_with_signal) { - fl_color_print(data.output.stream, data.context.set.error, "out of range%c", f_string_eol_s[0]); + f_color_print(data.output.stream, data.context.set.error, "out of range%c", f_string_eol_s[0]); return status; } if (F_status_is_error(status)) { if (F_status_set_fine(status) == F_number_negative) { - fl_color_print(data.output.stream, data.context.set.error, "out of range%c", f_string_eol_s[0]); + f_color_print(data.output.stream, data.context.set.error, "out of range%c", f_string_eol_s[0]); } else { - fl_color_print(data.output.stream, data.context.set.error, "invalid number%c", f_string_eol_s[0]); + f_color_print(data.output.stream, data.context.set.error, "invalid number%c", f_string_eol_s[0]); } return status; diff --git a/level_3/status_code/c/status_code.c b/level_3/status_code/c/status_code.c index 34a900b..72f1260 100644 --- a/level_3/status_code/c/status_code.c +++ b/level_3/status_code/c/status_code.c @@ -116,39 +116,39 @@ extern "C" { if (data->parameters[status_code_parameter_is_error].result == f_console_result_found) { if (data->parameters[status_code_parameter_is_warning].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, status_code_long_is_error); - fl_color_print(data->error.to.stream, data->context.set.error, "' cannot be used with the parameter "); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, status_code_long_is_warning); - fl_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, status_code_long_is_error); + f_color_print(data->error.to.stream, data->context.set.error, "' cannot be used with the parameter "); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, status_code_long_is_warning); + f_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); status_code_delete_data(data); return F_status_set_error(status); } else if (data->parameters[status_code_parameter_is_fine].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, status_code_long_is_error); - fl_color_print(data->error.to.stream, data->context.set.error, "' cannot be used with the parameter "); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, status_code_long_is_fine); - fl_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, status_code_long_is_error); + f_color_print(data->error.to.stream, data->context.set.error, "' cannot be used with the parameter "); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, status_code_long_is_fine); + f_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); status_code_delete_data(data); return F_status_set_error(status); } } else if (data->parameters[status_code_parameter_is_warning].result == f_console_result_found && data->parameters[status_code_parameter_is_fine].result == f_console_result_found) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, status_code_long_is_warning); - fl_color_print(data->error.to.stream, data->context.set.error, "' cannot be used with the parameter "); - fl_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, status_code_long_is_fine); - fl_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sThe parameter '", fll_error_print_error); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, status_code_long_is_warning); + f_color_print(data->error.to.stream, data->context.set.error, "' cannot be used with the parameter "); + f_color_print(data->error.to.stream, data->context.set.notable, "%s%s", f_console_symbol_long_enable_s, status_code_long_is_fine); + f_color_print(data->error.to.stream, data->context.set.error, ".%c", f_string_eol_s[0]); status_code_delete_data(data); return F_status_set_error(status); } if (data->remaining.used == 0 && !data->process_pipe) { - fl_color_print(data->error.to.stream, data->context.set.error, "%sYou failed to specify a status code.%c", fll_error_print_error, f_string_eol_s[0]); + f_color_print(data->error.to.stream, data->context.set.error, "%sYou failed to specify a status code.%c", fll_error_print_error, f_string_eol_s[0]); status_code_delete_data(data); return F_status_set_error(F_parameter); diff --git a/level_3/status_code/c/status_code.h b/level_3/status_code/c/status_code.h index 24ef23e..cf3074b 100644 --- a/level_3/status_code/c/status_code.h +++ b/level_3/status_code/c/status_code.h @@ -21,13 +21,13 @@ #include #include #include +#include #include #include #include #include // fll-1 includes -#include #include #include #include diff --git a/level_3/status_code/data/build/dependencies b/level_3/status_code/data/build/dependencies index 8057a39..0f7a8c5 100644 --- a/level_3/status_code/data/build/dependencies +++ b/level_3/status_code/data/build/dependencies @@ -11,7 +11,6 @@ f_conversion f_file f_pipe f_print -fl_color fl_console fl_conversion fl_status diff --git a/level_3/status_code/data/build/settings b/level_3/status_code/data/build/settings index 78db2f0..2cb4277 100644 --- a/level_3/status_code/data/build/settings +++ b/level_3/status_code/data/build/settings @@ -19,7 +19,7 @@ build_compiler gcc build_indexer ar build_language c build_libraries -lc -build_libraries-individual -lfll_error -lfll_program -lfll_status -lfl_color -lfl_console -lfl_conversion -lfl_status -lfl_string -lf_color -lf_console -lf_conversion -lf_file -lf_memory -lf_path -lf_pipe -lf_print -lf_string -lf_type_array -lf_utf +build_libraries-individual -lfll_error -lfll_program -lfll_status -lfl_console -lfl_conversion -lfl_status -lfl_string -lf_color -lf_console -lf_conversion -lf_file -lf_memory -lf_path -lf_pipe -lf_print -lf_string -lf_type_array -lf_utf build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library status_code.c private-status_code.c