Cleanup: don't use f_console_standard for stuff outside of f_console

This was probably a copy and paste accident where the define names were not properly updated.

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 a06236335083d97b67761733126af83a4558e62d..c0de5678e3d834457428c82ce360f7e8ffc53171 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
@@ -61,45 +61,45 @@ extern "C"{
 
 
     printf("\n\n  %s", f_console_symbol_short_enable);
-    fl_print_color(f_standard_output, data.context.standout, data.context.reset, f_console_standard_short_name);
+    fl_print_color(f_standard_output, data.context.standout, data.context.reset, fss_basic_list_read_short_name);
 
     printf(", %s", f_console_symbol_long_enable);
-    fl_print_color(f_standard_output, data.context.standout, data.context.reset, f_console_standard_long_name);
+    fl_print_color(f_standard_output, data.context.standout, data.context.reset, fss_basic_list_read_long_name);
     printf("      Find and print content from this object name");
 
     printf("\n  %s", f_console_symbol_short_enable);
-    fl_print_color(f_standard_output, data.context.standout, data.context.reset, f_console_standard_short_count);
+    fl_print_color(f_standard_output, data.context.standout, data.context.reset, fss_basic_list_read_short_count);
 
     printf(", %s", f_console_symbol_long_enable);
-    fl_print_color(f_standard_output, data.context.standout, data.context.reset, f_console_standard_long_count);
+    fl_print_color(f_standard_output, data.context.standout, data.context.reset, fss_basic_list_read_long_count);
     printf("     Find a specific occurrence of the object");
 
     printf("\n  %s", f_console_symbol_short_enable);
-    fl_print_color(f_standard_output, data.context.standout, data.context.reset, f_console_standard_short_total);
+    fl_print_color(f_standard_output, data.context.standout, data.context.reset, fss_basic_list_read_short_total);
 
     printf(", %s", f_console_symbol_long_enable);
-    fl_print_color(f_standard_output, data.context.standout, data.context.reset, f_console_standard_long_total);
+    fl_print_color(f_standard_output, data.context.standout, data.context.reset, fss_basic_list_read_long_total);
     printf("     Print the total number of objects in this file");
 
     printf("\n  %s", f_console_symbol_short_enable);
-    fl_print_color(f_standard_output, data.context.standout, data.context.reset, f_console_standard_short_object);
+    fl_print_color(f_standard_output, data.context.standout, data.context.reset, fss_basic_list_read_short_object);
 
     printf(", %s", f_console_symbol_long_enable);
-    fl_print_color(f_standard_output, data.context.standout, data.context.reset, f_console_standard_long_object);
+    fl_print_color(f_standard_output, data.context.standout, data.context.reset, fss_basic_list_read_long_object);
     printf("    Print the object instead of the content");
 
     printf("\n  %s", f_console_symbol_short_enable);
-    fl_print_color(f_standard_output, data.context.standout, data.context.reset, f_console_standard_short_size);
+    fl_print_color(f_standard_output, data.context.standout, data.context.reset, fss_basic_list_read_short_size);
 
     printf(", %s", f_console_symbol_long_enable);
-    fl_print_color(f_standard_output, data.context.standout, data.context.reset, f_console_standard_long_size);
+    fl_print_color(f_standard_output, data.context.standout, data.context.reset, fss_basic_list_read_long_size);
     printf("      Print total lines in the given content");
 
     printf("\n  %s", f_console_symbol_short_enable);
-    fl_print_color(f_standard_output, data.context.standout, data.context.reset, f_console_standard_short_line);
+    fl_print_color(f_standard_output, data.context.standout, data.context.reset, fss_basic_list_read_short_line);
 
     printf(", %s", f_console_symbol_long_enable);
-    fl_print_color(f_standard_output, data.context.standout, data.context.reset, f_console_standard_long_line);
+    fl_print_color(f_standard_output, data.context.standout, data.context.reset, fss_basic_list_read_long_line);
     printf("      Print only the content at the given line");
 
 

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 13a0ef8e309b4e8917e8feeb1c58d300f3e74ce5..b8920bdbfb7c431d010ef4d4fc7207944fef04b5 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
@@ -54,19 +54,19 @@ extern "C"{
 #endif // _di_fss_basic_list_read_name_
 
 #ifndef _di_fss_basic_list_read_defines_
-  #define f_console_standard_short_name   "n"
-  #define f_console_standard_short_count  "c"
-  #define f_console_standard_short_total  "t"
-  #define f_console_standard_short_object "o"
-  #define f_console_standard_short_size   "s"
-  #define f_console_standard_short_line   "l"
-
-  #define f_console_standard_long_name   "name"
-  #define f_console_standard_long_count  "count"
-  #define f_console_standard_long_total  "total"
-  #define f_console_standard_long_object "object"
-  #define f_console_standard_long_size   "size"
-  #define f_console_standard_long_line   "line"
+  #define fss_basic_list_read_short_name   "n"
+  #define fss_basic_list_read_short_count  "c"
+  #define fss_basic_list_read_short_total  "t"
+  #define fss_basic_list_read_short_object "o"
+  #define fss_basic_list_read_short_size   "s"
+  #define fss_basic_list_read_short_line   "l"
+
+  #define fss_basic_list_read_long_name   "name"
+  #define fss_basic_list_read_long_count  "count"
+  #define fss_basic_list_read_long_total  "total"
+  #define fss_basic_list_read_long_object "object"
+  #define fss_basic_list_read_long_size   "size"
+  #define fss_basic_list_read_long_line   "line"
 
   enum {
     fss_basic_list_read_parameter_help,
@@ -88,12 +88,12 @@ extern "C"{
       f_console_parameter_initialize(f_console_standard_short_light, f_console_standard_long_light, 0, 0, f_false, f_console_type_inverse, 0), \
       f_console_parameter_initialize(f_console_standard_short_no_color, f_console_standard_long_no_color, 0, 0, f_false, f_console_type_inverse, 0), \
       f_console_parameter_initialize(f_console_standard_short_version, f_console_standard_long_version, 0, 0, f_false, f_console_type_normal, 0), \
-      f_console_parameter_initialize(f_console_standard_short_name, f_console_standard_long_name, 0, 0, f_true, f_console_type_normal, 0), \
-      f_console_parameter_initialize(f_console_standard_short_count, f_console_standard_long_count, 0, 0, f_true, f_console_type_normal, 0), \
-      f_console_parameter_initialize(f_console_standard_short_total, f_console_standard_long_total, 0, 0, f_false, f_console_type_normal, 0), \
-      f_console_parameter_initialize(f_console_standard_short_object, f_console_standard_long_object, 0, 0, f_false, f_console_type_normal, 0), \
-      f_console_parameter_initialize(f_console_standard_short_size, f_console_standard_long_size, 0, 0, f_false, f_console_type_normal, 0), \
-      f_console_parameter_initialize(f_console_standard_short_line, f_console_standard_long_line, 0, 0, f_true, f_console_type_normal, 0), \
+      f_console_parameter_initialize(fss_basic_list_read_short_name, fss_basic_list_read_long_name, 0, 0, f_true, f_console_type_normal, 0), \
+      f_console_parameter_initialize(fss_basic_list_read_short_count, fss_basic_list_read_long_count, 0, 0, f_true, f_console_type_normal, 0), \
+      f_console_parameter_initialize(fss_basic_list_read_short_total, fss_basic_list_read_long_total, 0, 0, f_false, f_console_type_normal, 0), \
+      f_console_parameter_initialize(fss_basic_list_read_short_object, fss_basic_list_read_long_object, 0, 0, f_false, f_console_type_normal, 0), \
+      f_console_parameter_initialize(fss_basic_list_read_short_size, fss_basic_list_read_long_size, 0, 0, f_false, f_console_type_normal, 0), \
+      f_console_parameter_initialize(fss_basic_list_read_short_line, fss_basic_list_read_long_line, 0, 0, f_true, f_console_type_normal, 0), \
     }
 
   #define fss_basic_list_read_total_parameters 10

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 58a81fa3967eab000d7b8521f634642bea896022..a7acb4ec1ce9cad25a21b2d47ef2ad22d96a36f6 100644 (file)
--- a/level_3/fss_basic_read/c/fss_basic_read.c
+++ b/level_3/fss_basic_read/c/fss_basic_read.c
@@ -61,31 +61,31 @@ extern "C"{
 
 
     printf("\n\n  %s", f_console_symbol_short_enable);
-    fl_print_color(f_standard_output, data.context.standout, data.context.reset, f_console_standard_short_name);
+    fl_print_color(f_standard_output, data.context.standout, data.context.reset, fss_basic_read_short_name);
 
     printf(", %s", f_console_symbol_long_enable);
-    fl_print_color(f_standard_output, data.context.standout, data.context.reset, f_console_standard_long_name);
+    fl_print_color(f_standard_output, data.context.standout, data.context.reset, fss_basic_read_long_name);
     printf("      Find and print content from this object name");
 
     printf("\n  %s", f_console_symbol_short_enable);
-    fl_print_color(f_standard_output, data.context.standout, data.context.reset, f_console_standard_short_count);
+    fl_print_color(f_standard_output, data.context.standout, data.context.reset, fss_basic_read_short_count);
 
     printf(", %s", f_console_symbol_long_enable);
-    fl_print_color(f_standard_output, data.context.standout, data.context.reset, f_console_standard_long_count);
+    fl_print_color(f_standard_output, data.context.standout, data.context.reset, fss_basic_read_long_count);
     printf("     Find a specific occurrence of the object");
 
     printf("\n  %s", f_console_symbol_short_enable);
-    fl_print_color(f_standard_output, data.context.standout, data.context.reset, f_console_standard_short_total);
+    fl_print_color(f_standard_output, data.context.standout, data.context.reset, fss_basic_read_short_total);
 
     printf(", %s", f_console_symbol_long_enable);
-    fl_print_color(f_standard_output, data.context.standout, data.context.reset, f_console_standard_long_total);
+    fl_print_color(f_standard_output, data.context.standout, data.context.reset, fss_basic_read_long_total);
     printf("     Print the total number of objects in this file");
 
     printf("\n  %s", f_console_symbol_short_enable);
-    fl_print_color(f_standard_output, data.context.standout, data.context.reset, f_console_standard_short_object);
+    fl_print_color(f_standard_output, data.context.standout, data.context.reset, fss_basic_read_short_object);
 
     printf(", %s", f_console_symbol_long_enable);
-    fl_print_color(f_standard_output, data.context.standout, data.context.reset, f_console_standard_long_object);
+    fl_print_color(f_standard_output, data.context.standout, data.context.reset, fss_basic_read_long_object);
     printf("    Print the object instead of the content");
 
 

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 0accbc392f2c71e0b0aa215795a9ab8408624071..6151cebcc648f4cc9f683a4fc4f5f0b3e413c5bb 100644 (file)
--- a/level_3/fss_basic_read/c/fss_basic_read.h
+++ b/level_3/fss_basic_read/c/fss_basic_read.h
@@ -54,15 +54,15 @@ extern "C"{
 #endif // _di_fss_basic_read_name_
 
 #ifndef _di_fss_basic_read_defines_
-  #define f_console_standard_short_name   "n"
-  #define f_console_standard_short_count  "c"
-  #define f_console_standard_short_total  "t"
-  #define f_console_standard_short_object "o"
+  #define fss_basic_read_short_name   "n"
+  #define fss_basic_read_short_count  "c"
+  #define fss_basic_read_short_total  "t"
+  #define fss_basic_read_short_object "o"
 
-  #define f_console_standard_long_name   "name"
-  #define f_console_standard_long_count  "count"
-  #define f_console_standard_long_total  "total"
-  #define f_console_standard_long_object "object"
+  #define fss_basic_read_long_name   "name"
+  #define fss_basic_read_long_count  "count"
+  #define fss_basic_read_long_total  "total"
+  #define fss_basic_read_long_object "object"
 
   enum {
     fss_basic_read_parameter_help,
@@ -82,10 +82,10 @@ extern "C"{
       f_console_parameter_initialize(f_console_standard_short_light, f_console_standard_long_light, 0, 0, f_false, f_console_type_inverse, 0), \
       f_console_parameter_initialize(f_console_standard_short_no_color, f_console_standard_long_no_color, 0, 0, f_false, f_console_type_inverse, 0), \
       f_console_parameter_initialize(f_console_standard_short_version, f_console_standard_long_version, 0, 0, f_false, f_console_type_normal, 0), \
-      f_console_parameter_initialize(f_console_standard_short_name, f_console_standard_long_name, 0, 0, f_true, f_console_type_normal, 0), \
-      f_console_parameter_initialize(f_console_standard_short_count, f_console_standard_long_count, 0, 0, f_true, f_console_type_normal, 0), \
-      f_console_parameter_initialize(f_console_standard_short_total, f_console_standard_long_total, 0, 0, f_false, f_console_type_normal, 0), \
-      f_console_parameter_initialize(f_console_standard_short_object, f_console_standard_long_object, 0, 0, f_false, f_console_type_normal, 0), \
+      f_console_parameter_initialize(fss_basic_read_short_name, fss_basic_read_long_name, 0, 0, f_true, f_console_type_normal, 0), \
+      f_console_parameter_initialize(fss_basic_read_short_count, fss_basic_read_long_count, 0, 0, f_true, f_console_type_normal, 0), \
+      f_console_parameter_initialize(fss_basic_read_short_total, fss_basic_read_long_total, 0, 0, f_false, f_console_type_normal, 0), \
+      f_console_parameter_initialize(fss_basic_read_short_object, fss_basic_read_long_object, 0, 0, f_false, f_console_type_normal, 0), \
     }
 
   #define fss_basic_read_total_parameters 8

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 e5dde612ae5c3daa8d8f689aafb8e4dc47e8d77a..555fd62e09a6f768a309ad395e578f8b5275971c 100644 (file)
--- a/level_3/fss_extended_read/c/fss_extended_read.c
+++ b/level_3/fss_extended_read/c/fss_extended_read.c
@@ -61,38 +61,38 @@ extern "C"{
 
 
     printf("\n\n  %s", f_console_symbol_short_enable);
-    fl_print_color(f_standard_output, data.context.standout, data.context.reset, f_console_standard_short_name);
+    fl_print_color(f_standard_output, data.context.standout, data.context.reset, fss_extended_read_short_name);
 
     printf(", %s", f_console_symbol_long_enable);
-    fl_print_color(f_standard_output, data.context.standout, data.context.reset, f_console_standard_long_name);
+    fl_print_color(f_standard_output, data.context.standout, data.context.reset, fss_extended_read_long_name);
     printf("      Find and print content from this object name");
 
     printf("\n  %s", f_console_symbol_short_enable);
-    fl_print_color(f_standard_output, data.context.standout, data.context.reset, f_console_standard_short_count);
+    fl_print_color(f_standard_output, data.context.standout, data.context.reset, fss_extended_read_short_count);
 
     printf(", %s", f_console_symbol_long_enable);
-    fl_print_color(f_standard_output, data.context.standout, data.context.reset, f_console_standard_long_count);
+    fl_print_color(f_standard_output, data.context.standout, data.context.reset, fss_extended_read_long_count);
     printf("     Find a specific occurrence of the object");
 
     printf("\n  %s", f_console_symbol_short_enable);
-    fl_print_color(f_standard_output, data.context.standout, data.context.reset, f_console_standard_short_total);
+    fl_print_color(f_standard_output, data.context.standout, data.context.reset, fss_extended_read_short_total);
 
     printf(", %s", f_console_symbol_long_enable);
-    fl_print_color(f_standard_output, data.context.standout, data.context.reset, f_console_standard_long_total);
+    fl_print_color(f_standard_output, data.context.standout, data.context.reset, fss_extended_read_long_total);
     printf("     Print the total number of objects in this file");
 
     printf("\n  %s", f_console_symbol_short_enable);
-    fl_print_color(f_standard_output, data.context.standout, data.context.reset, f_console_standard_short_object);
+    fl_print_color(f_standard_output, data.context.standout, data.context.reset, fss_extended_read_short_object);
 
     printf(", %s", f_console_symbol_long_enable);
-    fl_print_color(f_standard_output, data.context.standout, data.context.reset, f_console_standard_long_object);
+    fl_print_color(f_standard_output, data.context.standout, data.context.reset, fss_extended_read_long_object);
     printf("    Print the object instead of the content");
 
     printf("\n  %s", f_console_symbol_short_enable);
-    fl_print_color(f_standard_output, data.context.standout, data.context.reset, f_console_standard_short_select);
+    fl_print_color(f_standard_output, data.context.standout, data.context.reset, fss_extended_read_short_select);
 
     printf(", %s", f_console_symbol_long_enable);
-    fl_print_color(f_standard_output, data.context.standout, data.context.reset, f_console_standard_long_select);
+    fl_print_color(f_standard_output, data.context.standout, data.context.reset, fss_extended_read_long_select);
     printf("    Select a specific content to print, default is 0");
 
 

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 c4b84a65e867d29e8d2787089f27cd83b215bfb8..a95a939b93312e5038db6bdfaeeab09807f598fa 100644 (file)
--- a/level_3/fss_extended_read/c/fss_extended_read.h
+++ b/level_3/fss_extended_read/c/fss_extended_read.h
@@ -54,17 +54,17 @@ extern "C"{
 #endif // _di_fss_extended_read_name_
 
 #ifndef _di_fss_extended_read_defines_
-  #define f_console_standard_short_name   "n"
-  #define f_console_standard_short_count  "c"
-  #define f_console_standard_short_total  "t"
-  #define f_console_standard_short_object "o"
-  #define f_console_standard_short_select "s"
-
-  #define f_console_standard_long_name   "name"
-  #define f_console_standard_long_count  "count"
-  #define f_console_standard_long_total  "total"
-  #define f_console_standard_long_object "object"
-  #define f_console_standard_long_select "select"
+  #define fss_extended_read_short_name   "n"
+  #define fss_extended_read_short_count  "c"
+  #define fss_extended_read_short_total  "t"
+  #define fss_extended_read_short_object "o"
+  #define fss_extended_read_short_select "s"
+
+  #define fss_extended_read_long_name   "name"
+  #define fss_extended_read_long_count  "count"
+  #define fss_extended_read_long_total  "total"
+  #define fss_extended_read_long_object "object"
+  #define fss_extended_read_long_select "select"
 
   enum {
     fss_extended_read_parameter_help,
@@ -85,11 +85,11 @@ extern "C"{
       f_console_parameter_initialize(f_console_standard_short_light, f_console_standard_long_light, 0, 0, f_false, f_console_type_inverse, 0), \
       f_console_parameter_initialize(f_console_standard_short_no_color, f_console_standard_long_no_color, 0, 0, f_false, f_console_type_inverse, 0), \
       f_console_parameter_initialize(f_console_standard_short_version, f_console_standard_long_version, 0, 0, f_false, f_console_type_normal, 0), \
-      f_console_parameter_initialize(f_console_standard_short_name, f_console_standard_long_name, 0, 0, f_true, f_console_type_normal, 0), \
-      f_console_parameter_initialize(f_console_standard_short_count, f_console_standard_long_count, 0, 0, f_true, f_console_type_normal, 0), \
-      f_console_parameter_initialize(f_console_standard_short_total, f_console_standard_long_total, 0, 0, f_false, f_console_type_normal, 0), \
-      f_console_parameter_initialize(f_console_standard_short_object, f_console_standard_long_object, 0, 0, f_false, f_console_type_normal, 0), \
-      f_console_parameter_initialize(f_console_standard_short_select, f_console_standard_long_select, 0, 0, f_true, f_console_type_normal, 0), \
+      f_console_parameter_initialize(fss_extended_read_short_name, fss_extended_read_long_name, 0, 0, f_true, f_console_type_normal, 0), \
+      f_console_parameter_initialize(fss_extended_read_short_count, fss_extended_read_long_count, 0, 0, f_true, f_console_type_normal, 0), \
+      f_console_parameter_initialize(fss_extended_read_short_total, fss_extended_read_long_total, 0, 0, f_false, f_console_type_normal, 0), \
+      f_console_parameter_initialize(fss_extended_read_short_object, fss_extended_read_long_object, 0, 0, f_false, f_console_type_normal, 0), \
+      f_console_parameter_initialize(fss_extended_read_short_select, fss_extended_read_long_select, 0, 0, f_true, f_console_type_normal, 0), \
     }
 
   #define fss_extended_read_total_parameters 9