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.

diff --git a/level_1/fl_colors/c/colors.h b/level_1/fl_colors/c/colors.h
index 68fdfba3ef1cd403263e7112c88b7532def9f222..1dad9a7b667ac97c67707d44d8c470bd208942a7 100644 (file)
--- 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 d6287b63645211ca56109bdde7db6e855db8246b..762ae4403bbdadaee98e657983eee278746875be 100644 (file)
--- 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 6366e7b71931cecbaf6e940766703a41f985f4e0..8cd52324848f7dce0f18c33d5e4f57a6d1925aee 100644 (file)
--- 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 005516c2560e17fb2064f8da19b2ed1d41f24fc4..35803f95b607dd2af8bf2c4f0e5be9215ed958ba 100644 (file)
--- 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 dda945d884fc9871be42b2828dd7175d1779d650..7e5bbf9833b8cc75691fb62874cc96e0dec55578 100644 (file)
--- 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 204d466a44856db63ffcee72491521842969fc05..30cb26e6ba455a1715c948e6fb98ef0a1d09df85 100644 (file)
--- 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 89b80e7376456a480fef87ab4c05034c857eb59c..401fd1db779576de7de2ba5d18e4e96aa7e2ee44 100644 (file)
--- 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 0979e866072b6f4c07223d417b8b67d7c970eeec..a4cfa36a420f4be6f66ad4736941e35eed5a461d 100644 (file)
--- 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 14af7ceb73af31d4ce7e3b93dc4e3ab4c1206f51..70fcb8c395f77b3f0bb9927f4633cb144ba8a676 100644 (file)
--- 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 7e9b23f2ab3a39f733e2be2218da0909d23ea97e..e208e932d641fba631187d74bea5061c01bb525e 100644 (file)
--- 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 dc5da71694ef9cfae1446511dccd2ac3f6bd7741..0ea96005a90db8883172671e83c8d7beddfd07ef 100644 (file)
--- 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 238a7cb5994c52110cef665066c4e51a3b1afbf6..50deb22758bd377048eb6376d0cf6ef21f9769e3 100644 (file)
--- 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 83aabfe017082e9d3378f82b48c8b71695f93c64..b80f612e0d30f1ddbc60add092abc2380df06fb6 100644 (file)
--- 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 2b1cd53eb56b9657c24c1ba2b601a034f82cf9e6..ddacf8ca89e0deb710a605c52fcb0ede5715cc19 100644 (file)
--- 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 159e9e3ad826aba52d2a6693cace0bc2a2cc2a84..d3a4dea1c72e0994fa63e49b14611a27d054ea1f 100644 (file)
--- 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 b84872412006ac61e1c525d4aba7c2ca3d7b1b6d..527fbadc1de6f0b246f5831bca19ae40f6401fbf 100644 (file)
--- 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 9c6a3e4bc20b06985c6b2a5be975706aa50068af..6a69dbaed6b078c4200c13f58e216d73ab0a484a 100644 (file)
--- 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 a4770098d3ad165b7a34247eec1c34217f7ebd04..cdf33463ce5d7403fcbbf02983a29d7b9fdf2f97 100644 (file)
--- 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 1296892ca1cf233e44737c167e62089a49e4d6f7..e5e80490ba645b995c2e1c615ab9374168d18660 100644 (file)
--- 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 b9e44fc0077ac04f39ef3872d3257dcf597cbd53..080559c5ff93de9f4795b50c03fc4d7907ae09ef 100644 (file)
--- 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 58f0ea50cb15226f8f66c8bb73ca79d8486320fe..23168ac25e0be944c38fb005ea9eb5cdf0400d1e 100644 (file)
--- 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 b5b47af4573e1bd2d999b7da2ed71122eda61323..b9372d45d0a9014390ec6b9408ee5e968c8e7e6a 100644 (file)
--- 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_