From 81880465d8480d62765a10b4fcd820fba354a1b5 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sat, 9 Jun 2012 14:48:41 -0500 Subject: [PATCH] Cleanup: move color context structure from level 2 to level 1 Nothing in it depends on level 2. Move it to level 1, making it available to all level 2 projects. This renames the structure from fll_color_context to fl_color_context. Appropriate initializers and memory related macros are renamed accordingly. --- level_1/fl_colors/c/colors.h | 51 +++++++++++++++++++++ level_2/fll_colors/c/colors.c | 2 +- level_2/fll_colors/c/colors.h | 53 +--------------------- level_2/fll_colors/data/build/settings | 6 +-- level_3/firewall/c/firewall.c | 4 +- level_3/firewall/c/firewall.h | 4 +- .../fss_basic_list_read/c/fss_basic_list_read.c | 4 +- .../fss_basic_list_read/c/fss_basic_list_read.h | 4 +- .../fss_basic_list_write/c/fss_basic_list_write.c | 4 +- .../fss_basic_list_write/c/fss_basic_list_write.h | 4 +- level_3/fss_basic_read/c/fss_basic_read.c | 4 +- level_3/fss_basic_read/c/fss_basic_read.h | 4 +- level_3/fss_basic_write/c/fss_basic_write.c | 4 +- level_3/fss_basic_write/c/fss_basic_write.h | 4 +- level_3/fss_extended_read/c/fss_extended_read.c | 4 +- level_3/fss_extended_read/c/fss_extended_read.h | 4 +- level_3/fss_extended_write/c/fss_extended_write.c | 4 +- level_3/fss_extended_write/c/fss_extended_write.h | 4 +- level_3/fss_return_code/c/fss_return_code.c | 4 +- level_3/fss_return_code/c/fss_return_code.h | 4 +- level_3/return_code/c/return_code.c | 4 +- level_3/return_code/c/return_code.h | 4 +- 22 files changed, 92 insertions(+), 92 deletions(-) diff --git a/level_1/fl_colors/c/colors.h b/level_1/fl_colors/c/colors.h index 68fdfba..1dad9a7 100644 --- a/level_1/fl_colors/c/colors.h +++ b/level_1/fl_colors/c/colors.h @@ -25,6 +25,57 @@ extern "C"{ #endif +#ifndef _di_fl_color_context_ + typedef struct { + f_colors color_list; + f_colors_format color_format; + f_dynamic_string reset; + f_dynamic_string warning; + f_dynamic_string error; + f_dynamic_string title; + f_dynamic_string notable; + f_dynamic_string important; + f_dynamic_string standout; + f_dynamic_string normal; + f_dynamic_string normal_reset; + } fl_color_context; + + #define fl_color_context_initialize { f_colors_initialize_linux, f_colors_format_initialize_linux, f_dynamic_string_initialize, f_dynamic_string_initialize, f_dynamic_string_initialize, f_dynamic_string_initialize, f_dynamic_string_initialize, f_dynamic_string_initialize, f_dynamic_string_initialize, f_dynamic_string_initialize, f_dynamic_string_initialize } + + #define fl_new_color_context(status, color_context) \ + f_resize_dynamic_string(status, color_context.reset, f_color_max_size + 1); \ + if (f_error_is_not_error(status)) f_resize_dynamic_string(status, color_context.warning, f_color_max_size + 1); \ + if (f_error_is_not_error(status)) f_resize_dynamic_string(status, color_context.error, f_color_max_size + 1); \ + if (f_error_is_not_error(status)) f_resize_dynamic_string(status, color_context.title, f_color_max_size + 1); \ + if (f_error_is_not_error(status)) f_resize_dynamic_string(status, color_context.notable, f_color_max_size + 1); \ + if (f_error_is_not_error(status)) f_resize_dynamic_string(status, color_context.important, f_color_max_size + 1); \ + if (f_error_is_not_error(status)) f_resize_dynamic_string(status, color_context.standout, f_color_max_size + 1); \ + if (f_error_is_not_error(status)) f_resize_dynamic_string(status, color_context.normal, f_color_max_size + 1); \ + if (f_error_is_not_error(status)) f_resize_dynamic_string(status, color_context.normal_reset, f_color_max_size + 1); + + #define fl_delete_color_context(status, color_context) \ + f_delete_dynamic_string(status, color_context.reset); \ + if (f_error_is_not_error(status)) f_delete_dynamic_string(status, color_context.warning); \ + if (f_error_is_not_error(status)) f_delete_dynamic_string(status, color_context.error); \ + if (f_error_is_not_error(status)) f_delete_dynamic_string(status, color_context.title); \ + if (f_error_is_not_error(status)) f_delete_dynamic_string(status, color_context.notable); \ + if (f_error_is_not_error(status)) f_delete_dynamic_string(status, color_context.important); \ + if (f_error_is_not_error(status)) f_delete_dynamic_string(status, color_context.standout); \ + if (f_error_is_not_error(status)) f_delete_dynamic_string(status, color_context.normal); \ + if (f_error_is_not_error(status)) f_delete_dynamic_string(status, color_context.normal_reset); + + #define fl_destroy_color_context(status, color_context, size) \ + f_destroy_dynamic_string(status, color_context.reset); \ + if (f_error_is_not_error(status)) f_destroy_dynamic_string(status, color_context.warning, size); \ + if (f_error_is_not_error(status)) f_destroy_dynamic_string(status, color_context.error, size); \ + if (f_error_is_not_error(status)) f_destroy_dynamic_string(status, color_context.title, size); \ + if (f_error_is_not_error(status)) f_destroy_dynamic_string(status, color_context.notable, size); \ + if (f_error_is_not_error(status)) f_destroy_dynamic_string(status, color_context.important, size); \ + if (f_error_is_not_error(status)) f_destroy_dynamic_string(status, color_context.standout, size); \ + if (f_error_is_not_error(status)) f_destroy_dynamic_string(status, color_context.normal); \ + if (f_error_is_not_error(status)) f_destroy_dynamic_string(status, color_context.normal_reset); +#endif // _di_fl_color_context_ + #ifndef _di_fl_set_color_ // this will accept some file or standard io, and push color information to that file or standard io extern f_return_status fl_set_color(f_file_type file, const f_colors_format format, const f_autochar *color1, const f_autochar *color2, const f_autochar *color3, const f_autochar *color4, const f_autochar *color5); diff --git a/level_2/fll_colors/c/colors.c b/level_2/fll_colors/c/colors.c index d6287b6..762ae44 100644 --- a/level_2/fll_colors/c/colors.c +++ b/level_2/fll_colors/c/colors.c @@ -11,7 +11,7 @@ extern "C"{ #endif #ifndef _di_fll_colors_load_context_ - f_return_status fll_colors_load_context(fll_color_context *data, f_bool use_light_colors) { + f_return_status fll_colors_load_context(fl_color_context *data, f_bool use_light_colors) { #ifndef _di_level_2_parameter_checking_ if (data == 0) return f_error_set_error(f_invalid_parameter); #endif // _di_level_2_parameter_checking_ diff --git a/level_2/fll_colors/c/colors.h b/level_2/fll_colors/c/colors.h index 6366e7b..8cd5232 100644 --- a/level_2/fll_colors/c/colors.h +++ b/level_2/fll_colors/c/colors.h @@ -26,62 +26,11 @@ extern "C"{ #endif -#ifndef _di_fll_color_context_ - typedef struct { - f_colors color_list; - f_colors_format color_format; - f_dynamic_string reset; - f_dynamic_string warning; - f_dynamic_string error; - f_dynamic_string title; - f_dynamic_string notable; - f_dynamic_string important; - f_dynamic_string standout; - f_dynamic_string normal; - f_dynamic_string normal_reset; - } fll_color_context; - - #define fll_color_context_initialize { f_colors_initialize_linux, f_colors_format_initialize_linux, f_dynamic_string_initialize, f_dynamic_string_initialize, f_dynamic_string_initialize, f_dynamic_string_initialize, f_dynamic_string_initialize, f_dynamic_string_initialize, f_dynamic_string_initialize, f_dynamic_string_initialize, f_dynamic_string_initialize } - - #define fll_new_color_context(status, color_context) \ - f_resize_dynamic_string(status, color_context.reset, f_color_max_size + 1); \ - if (f_error_is_not_error(status)) f_resize_dynamic_string(status, color_context.warning, f_color_max_size + 1); \ - if (f_error_is_not_error(status)) f_resize_dynamic_string(status, color_context.error, f_color_max_size + 1); \ - if (f_error_is_not_error(status)) f_resize_dynamic_string(status, color_context.title, f_color_max_size + 1); \ - if (f_error_is_not_error(status)) f_resize_dynamic_string(status, color_context.notable, f_color_max_size + 1); \ - if (f_error_is_not_error(status)) f_resize_dynamic_string(status, color_context.important, f_color_max_size + 1); \ - if (f_error_is_not_error(status)) f_resize_dynamic_string(status, color_context.standout, f_color_max_size + 1); \ - if (f_error_is_not_error(status)) f_resize_dynamic_string(status, color_context.normal, f_color_max_size + 1); \ - if (f_error_is_not_error(status)) f_resize_dynamic_string(status, color_context.normal_reset, f_color_max_size + 1); - - #define fll_delete_color_context(status, color_context) \ - f_delete_dynamic_string(status, color_context.reset); \ - if (f_error_is_not_error(status)) f_delete_dynamic_string(status, color_context.warning); \ - if (f_error_is_not_error(status)) f_delete_dynamic_string(status, color_context.error); \ - if (f_error_is_not_error(status)) f_delete_dynamic_string(status, color_context.title); \ - if (f_error_is_not_error(status)) f_delete_dynamic_string(status, color_context.notable); \ - if (f_error_is_not_error(status)) f_delete_dynamic_string(status, color_context.important); \ - if (f_error_is_not_error(status)) f_delete_dynamic_string(status, color_context.standout); \ - if (f_error_is_not_error(status)) f_delete_dynamic_string(status, color_context.normal); \ - if (f_error_is_not_error(status)) f_delete_dynamic_string(status, color_context.normal_reset); - - #define fll_destroy_color_context(status, color_context, size) \ - f_destroy_dynamic_string(status, color_context.reset); \ - if (f_error_is_not_error(status)) f_destroy_dynamic_string(status, color_context.warning, size); \ - if (f_error_is_not_error(status)) f_destroy_dynamic_string(status, color_context.error, size); \ - if (f_error_is_not_error(status)) f_destroy_dynamic_string(status, color_context.title, size); \ - if (f_error_is_not_error(status)) f_destroy_dynamic_string(status, color_context.notable, size); \ - if (f_error_is_not_error(status)) f_destroy_dynamic_string(status, color_context.important, size); \ - if (f_error_is_not_error(status)) f_destroy_dynamic_string(status, color_context.standout, size); \ - if (f_error_is_not_error(status)) f_destroy_dynamic_string(status, color_context.normal); \ - if (f_error_is_not_error(status)) f_destroy_dynamic_string(status, color_context.normal_reset); -#endif // _di_fll_color_context_ - #ifndef _di_fll_colors_load_context_ // For any application that uses the standard color contexts, this function will load the appropriate colors to the structure // 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 - extern f_return_status fll_colors_load_context(fll_color_context *data, f_bool use_light_colors); + extern f_return_status fll_colors_load_context(fl_color_context *data, f_bool use_light_colors); #endif // _di_fll_colors_load_context_ #ifdef __cplusplus diff --git a/level_2/fll_colors/data/build/settings b/level_2/fll_colors/data/build/settings index 005516c..35803f9 100644 --- a/level_2/fll_colors/data/build/settings +++ b/level_2/fll_colors/data/build/settings @@ -1,6 +1,6 @@ # fss-0000 -project_name fll_colors +project_name fll_print project_level 2 version_major 0 @@ -9,9 +9,9 @@ version_micro 0 build_compiler gcc build_libraries -lc -build_sources_library colors.c +build_sources_library print.c build_sources_program -build_sources_headers colors.h +build_sources_headers print.h build_shared yes flags_all -z now diff --git a/level_3/firewall/c/firewall.c b/level_3/firewall/c/firewall.c index dda945d..7e5bbf9 100644 --- a/level_3/firewall/c/firewall.c +++ b/level_3/firewall/c/firewall.c @@ -115,7 +115,7 @@ extern "C"{ // load colors when not told to show no colors if (data->parameters[firewall_parameter_no_color].result == f_console_result_none) { - fll_new_color_context(status2, data->context); + fl_new_color_context(status2, data->context); if (status2 == f_none) { fll_colors_load_context(&data->context, data->parameters[firewall_parameter_light].result == f_console_result_found); @@ -685,7 +685,7 @@ extern "C"{ f_delete_string_lengths(status, data->remaining); f_delete_dynamic_strings(status, data->devices); - fll_delete_color_context(status, data->context); + fl_delete_color_context(status, data->context); return f_none; } diff --git a/level_3/firewall/c/firewall.h b/level_3/firewall/c/firewall.h index 204d466..30cb26e 100644 --- a/level_3/firewall/c/firewall.h +++ b/level_3/firewall/c/firewall.h @@ -253,7 +253,7 @@ extern "C"{ f_string_lengths remaining; f_dynamic_strings devices; - fll_color_context context; + fl_color_context context; } firewall_data; #define firewall_data_initialize \ @@ -262,7 +262,7 @@ extern "C"{ f_dynamic_strings_initialize, \ f_string_lengths_initialize, \ f_dynamic_strings_initialize, \ - fll_color_context_initialize, \ + fl_color_context_initialize, \ } #endif // _di_firewall_data_ 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 89b80e7..401fd1d 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 @@ -139,7 +139,7 @@ extern "C"{ // load colors when not told to show no colors if (data->parameters[fss_basic_list_read_parameter_no_color].result == f_console_result_none) { - fll_new_color_context(status2, data->context); + fl_new_color_context(status2, data->context); if (f_error_is_error(status2)) { fprintf(f_standard_error, "Critical Error: unable to allocate memory\n"); @@ -585,7 +585,7 @@ extern "C"{ f_delete_dynamic_string(status, data->buffer); f_delete_string_lengths(status, data->remaining); - fll_delete_color_context(status, data->context); + fl_delete_color_context(status, data->context); return f_none; } 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 0979e86..a4cfa36 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 @@ -110,7 +110,7 @@ extern "C"{ f_string_lengths remaining; f_bool process_pipe; - fll_color_context context; + fl_color_context context; } fss_basic_list_read_data; #define fss_basic_list_read_data_initialize \ @@ -122,7 +122,7 @@ extern "C"{ f_file_position_initialize, \ f_string_lengths_initialize, \ f_false, \ - fll_color_context_initialize, \ + fl_color_context_initialize, \ } #endif // _di_fss_basic_list_read_data_ 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 14af7ce..70fcb8c 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 @@ -111,7 +111,7 @@ extern "C"{ // load colors when not told to show no colors if (data->parameters[fss_basic_list_write_parameter_no_color].result == f_console_result_none) { - fll_new_color_context(status2, data->context); + fl_new_color_context(status2, data->context); if (f_error_is_error(status2)) { fprintf(f_standard_error, "Critical Error: unable to allocate memory\n"); @@ -291,7 +291,7 @@ extern "C"{ } // while f_delete_string_lengths(status, data->remaining); - fll_delete_color_context(status, data->context); + fl_delete_color_context(status, data->context); return f_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 7e9b23f..e208e93 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 @@ -88,7 +88,7 @@ extern "C"{ f_string_lengths remaining; f_bool process_pipe; - fll_color_context context; + fl_color_context context; } fss_basic_list_write_data; #define fss_basic_list_write_data_initialize \ @@ -96,7 +96,7 @@ extern "C"{ f_console_parameter_initialize_fss_basic_list_write, \ f_string_lengths_initialize, \ f_false, \ - fll_color_context_initialize, \ + fl_color_context_initialize, \ } #endif // _di_fss_basic_list_write_data_ 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 dc5da71..0ea9600 100644 --- a/level_3/fss_basic_read/c/fss_basic_read.c +++ b/level_3/fss_basic_read/c/fss_basic_read.c @@ -125,7 +125,7 @@ extern "C"{ // load colors when not told to show no colors if (data->parameters[fss_basic_read_parameter_no_color].result == f_console_result_none) { - fll_new_color_context(status2, data->context); + fl_new_color_context(status2, data->context); if (f_error_is_error(status2)) { fprintf(f_standard_error, "Critical Error: unable to allocate memory\n"); @@ -476,7 +476,7 @@ extern "C"{ f_delete_dynamic_string(status, data->buffer); f_delete_string_lengths(status, data->remaining); - fll_delete_color_context(status, data->context); + fl_delete_color_context(status, data->context); return f_none; } 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 238a7cb..50deb22 100644 --- a/level_3/fss_basic_read/c/fss_basic_read.h +++ b/level_3/fss_basic_read/c/fss_basic_read.h @@ -102,7 +102,7 @@ extern "C"{ f_string_lengths remaining; f_bool process_pipe; - fll_color_context context; + fl_color_context context; } fss_basic_read_data; #define fss_basic_read_data_initialize \ @@ -114,7 +114,7 @@ extern "C"{ f_file_position_initialize, \ f_string_lengths_initialize, \ f_false, \ - fll_color_context_initialize, \ + fl_color_context_initialize, \ } #endif // _di_fss_basic_read_data_ 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 83aabfe..b80f612 100644 --- a/level_3/fss_basic_write/c/fss_basic_write.c +++ b/level_3/fss_basic_write/c/fss_basic_write.c @@ -111,7 +111,7 @@ extern "C"{ // load colors when not told to show no colors if (data->parameters[fss_basic_write_parameter_no_color].result == f_console_result_none) { - fll_new_color_context(status2, data->context); + fl_new_color_context(status2, data->context); if (f_error_is_error(status2)) { fprintf(f_standard_error, "Critical Error: unable to allocate memory\n"); @@ -291,7 +291,7 @@ extern "C"{ } // while f_delete_string_lengths(status, data->remaining); - fll_delete_color_context(status, data->context); + fl_delete_color_context(status, data->context); return f_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 2b1cd53..ddacf8c 100644 --- a/level_3/fss_basic_write/c/fss_basic_write.h +++ b/level_3/fss_basic_write/c/fss_basic_write.h @@ -88,7 +88,7 @@ extern "C"{ f_string_lengths remaining; f_bool process_pipe; - fll_color_context context; + fl_color_context context; } fss_basic_write_data; #define fss_basic_write_data_initialize \ @@ -96,7 +96,7 @@ extern "C"{ f_console_parameter_initialize_fss_basic_write, \ f_string_lengths_initialize, \ f_false, \ - fll_color_context_initialize, \ + fl_color_context_initialize, \ } #endif // _di_fss_basic_write_data_ 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 159e9e3..d3a4dea 100644 --- a/level_3/fss_extended_read/c/fss_extended_read.c +++ b/level_3/fss_extended_read/c/fss_extended_read.c @@ -132,7 +132,7 @@ extern "C"{ // load colors when not told to show no colors if (data->parameters[fss_extended_read_parameter_no_color].result == f_console_result_none) { - fll_new_color_context(status2, data->context); + fl_new_color_context(status2, data->context); if (f_error_is_error(status2)) { fprintf(f_standard_error, "Critical Error: unable to allocate memory\n"); @@ -490,7 +490,7 @@ extern "C"{ f_delete_dynamic_string(status, data->buffer); f_delete_string_lengths(status, data->remaining); - fll_delete_color_context(status, data->context); + fl_delete_color_context(status, data->context); return f_none; } 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 b848724..527fbad 100644 --- a/level_3/fss_extended_read/c/fss_extended_read.h +++ b/level_3/fss_extended_read/c/fss_extended_read.h @@ -106,7 +106,7 @@ extern "C"{ f_string_lengths remaining; f_bool process_pipe; - fll_color_context context; + fl_color_context context; } fss_extended_read_data; #define fss_extended_read_data_initialize \ @@ -118,7 +118,7 @@ extern "C"{ f_file_position_initialize, \ f_string_lengths_initialize, \ f_false, \ - fll_color_context_initialize, \ + fl_color_context_initialize, \ } #endif // _di_fss_extended_read_data_ 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 9c6a3e4..6a69dba 100644 --- a/level_3/fss_extended_write/c/fss_extended_write.c +++ b/level_3/fss_extended_write/c/fss_extended_write.c @@ -118,7 +118,7 @@ extern "C"{ // load colors when not told to show no colors if (data->parameters[fss_extended_write_parameter_no_color].result == f_console_result_none) { - fll_new_color_context(status2, data->context); + fl_new_color_context(status2, data->context); if (f_error_is_error(status2)) { fprintf(f_standard_error, "Critical Error: unable to allocate memory\n"); @@ -336,7 +336,7 @@ extern "C"{ } // while f_delete_string_lengths(status, data->remaining); - fll_delete_color_context(status, data->context); + fl_delete_color_context(status, data->context); return f_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 a477009..cdf3346 100644 --- a/level_3/fss_extended_write/c/fss_extended_write.h +++ b/level_3/fss_extended_write/c/fss_extended_write.h @@ -92,7 +92,7 @@ extern "C"{ f_string_lengths remaining; f_bool process_pipe; - fll_color_context context; + fl_color_context context; } fss_extended_write_data; #define fss_extended_write_data_initialize \ @@ -100,7 +100,7 @@ extern "C"{ f_console_parameter_initialize_fss_extended_write, \ f_string_lengths_initialize, \ f_false, \ - fll_color_context_initialize, \ + fl_color_context_initialize, \ } #endif // _di_fss_extended_write_data_ diff --git a/level_3/fss_return_code/c/fss_return_code.c b/level_3/fss_return_code/c/fss_return_code.c index 1296892..e5e8049 100644 --- a/level_3/fss_return_code/c/fss_return_code.c +++ b/level_3/fss_return_code/c/fss_return_code.c @@ -124,7 +124,7 @@ extern "C"{ // load colors when not told to show no colors if (data->parameters[fss_return_code_parameter_no_color].result == f_console_result_none) { - fll_new_color_context(allocation_status, data->context); + fl_new_color_context(allocation_status, data->context); if (f_error_is_error(allocation_status)) { fprintf(f_standard_error, "Critical Error: unable to allocate memory\n"); @@ -267,7 +267,7 @@ extern "C"{ } // while f_delete_string_lengths(status, data->remaining); - fll_delete_color_context(status, data->context); + fl_delete_color_context(status, data->context); return f_none; } diff --git a/level_3/fss_return_code/c/fss_return_code.h b/level_3/fss_return_code/c/fss_return_code.h index b9e44fc..080559c 100644 --- a/level_3/fss_return_code/c/fss_return_code.h +++ b/level_3/fss_return_code/c/fss_return_code.h @@ -92,7 +92,7 @@ extern "C"{ f_string_lengths remaining; f_bool process_pipe; - fll_color_context context; + fl_color_context context; } fss_return_code_data; #define fss_return_code_data_initialize \ @@ -100,7 +100,7 @@ extern "C"{ f_console_parameter_initialize_fss_return_code, \ f_string_lengths_initialize, \ f_false, \ - fll_color_context_initialize, \ + fl_color_context_initialize, \ } #endif // _di_fss_return_code_data_ diff --git a/level_3/return_code/c/return_code.c b/level_3/return_code/c/return_code.c index 58f0ea5..23168ac 100644 --- a/level_3/return_code/c/return_code.c +++ b/level_3/return_code/c/return_code.c @@ -124,7 +124,7 @@ extern "C"{ // load colors when not told to show no colors if (data->parameters[return_code_parameter_no_color].result == f_console_result_none) { - fll_new_color_context(allocation_status, data->context); + fl_new_color_context(allocation_status, data->context); if (f_error_is_error(allocation_status)) { fprintf(f_standard_error, "Critical Error: unable to allocate memory\n"); @@ -267,7 +267,7 @@ extern "C"{ } // while f_delete_string_lengths(status, data->remaining); - fll_delete_color_context(status, data->context); + fl_delete_color_context(status, data->context); return f_none; } diff --git a/level_3/return_code/c/return_code.h b/level_3/return_code/c/return_code.h index b5b47af..b9372d4 100644 --- a/level_3/return_code/c/return_code.h +++ b/level_3/return_code/c/return_code.h @@ -91,7 +91,7 @@ extern "C"{ f_string_lengths remaining; f_bool process_pipe; - fll_color_context context; + fl_color_context context; } return_code_data; #define return_code_data_initialize \ @@ -99,7 +99,7 @@ extern "C"{ f_console_parameter_initialize_return_code, \ f_string_lengths_initialize, \ f_false, \ - fll_color_context_initialize, \ + fl_color_context_initialize, \ } #endif // _di_return_code_data_ -- 1.8.3.1