Cleanup: Use _1 and _2 consistently in fl_print_t macro functions.

diff --git a/level_1/fl_print/c/print/common.h b/level_1/fl_print/c/print/common.h
index 8a317c9a631d6ce1d769a45f15568e68f36485ac..044045fd7110989368af6ad783cf19e2435dad5a 100644 (file)
--- a/level_1/fl_print/c/print/common.h
+++ b/level_1/fl_print/c/print/common.h
@@ -103,12 +103,12 @@ extern "C" {
     custom, \
   }
 
-  #define macro_fl_print_t_initialize_debug()               macro_fl_print_t_initialize_1(macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d), f_console_verbosity_normal_e, 0, fl_print_debug_s, f_string_static_t_initialize, f_color_set_t_initialize, f_color_set_t_initialize, 0, 0)
-  #define macro_fl_print_t_initialize_debug2(suffix, set)   macro_fl_print_t_initialize_1(macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d), f_console_verbosity_normal_e, 0, fl_print_debug_s, suffix, f_color_set_t_initialize, f_color_set_t_initialize, set, 0)
-  #define macro_fl_print_t_initialize_error()               macro_fl_print_t_initialize_1(macro_f_file_t_initialize_2(F_type_error_d, F_type_descriptor_error_d, F_file_flag_write_only_d), f_console_verbosity_normal_e, 0, fl_print_error_s, f_string_static_t_initialize, f_color_set_t_initialize, f_color_set_t_initialize, 0, 0)
-  #define macro_fl_print_t_initialize_error2(suffix, set)   macro_fl_print_t_initialize_1(macro_f_file_t_initialize_2(F_type_error_d, F_type_descriptor_error_d, F_file_flag_write_only_d), f_console_verbosity_normal_e, 0, fl_print_error_s, suffix, f_color_set_t_initialize, f_color_set_t_initialize, set, 0)
-  #define macro_fl_print_t_initialize_warning()             macro_fl_print_t_initialize_1(macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d), f_console_verbosity_normal_e, 0, fl_print_warning_s, f_string_static_t_initialize, f_color_set_t_initialize, f_color_set_t_initialize, 0, 0)
-  #define macro_fl_print_t_initialize_warning2(suffix, set) macro_fl_print_t_initialize_1(macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d), f_console_verbosity_normal_e, 0, fl_print_warning_s, suffix, f_color_set_t_initialize, f_color_set_t_initialize, set, 0)
+  #define macro_fl_print_t_initialize_debug_1()              macro_fl_print_t_initialize_1(macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d), f_console_verbosity_normal_e, 0, fl_print_debug_s, f_string_static_t_initialize, f_color_set_t_initialize, f_color_set_t_initialize, 0, 0)
+  #define macro_fl_print_t_initialize_debug_2(suffix, set)   macro_fl_print_t_initialize_1(macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d), f_console_verbosity_normal_e, 0, fl_print_debug_s, suffix, f_color_set_t_initialize, f_color_set_t_initialize, set, 0)
+  #define macro_fl_print_t_initialize_error_1()              macro_fl_print_t_initialize_1(macro_f_file_t_initialize_2(F_type_error_d, F_type_descriptor_error_d, F_file_flag_write_only_d), f_console_verbosity_normal_e, 0, fl_print_error_s, f_string_static_t_initialize, f_color_set_t_initialize, f_color_set_t_initialize, 0, 0)
+  #define macro_fl_print_t_initialize_error_2(suffix, set)   macro_fl_print_t_initialize_1(macro_f_file_t_initialize_2(F_type_error_d, F_type_descriptor_error_d, F_file_flag_write_only_d), f_console_verbosity_normal_e, 0, fl_print_error_s, suffix, f_color_set_t_initialize, f_color_set_t_initialize, set, 0)
+  #define macro_fl_print_t_initialize_warning_1()            macro_fl_print_t_initialize_1(macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d), f_console_verbosity_normal_e, 0, fl_print_warning_s, f_string_static_t_initialize, f_color_set_t_initialize, f_color_set_t_initialize, 0, 0)
+  #define macro_fl_print_t_initialize_warning_2(suffix, set) macro_fl_print_t_initialize_1(macro_f_file_t_initialize_2(F_type_output_d, F_type_descriptor_output_d, F_file_flag_write_only_d), f_console_verbosity_normal_e, 0, fl_print_warning_s, suffix, f_color_set_t_initialize, f_color_set_t_initialize, set, 0)
 #endif // _di_fl_print_t_
 
 #ifdef __cplusplus

diff --git a/level_2/fll_program/c/program/common.h b/level_2/fll_program/c/program/common.h
index 51796e3e33635c42e89810c92c759f370e9adb20..ec352b874a7ae97ad2c3d6650fea65ee85c3f4da 100644 (file)
--- a/level_2/fll_program/c/program/common.h
+++ b/level_2/fll_program/c/program/common.h
@@ -143,9 +143,9 @@ extern "C" {
       f_signal_t_initialize, \
       fl_print_t_initialize, \
       fl_print_t_initialize, \
-      macro_fl_print_t_initialize_error(), \
-      macro_fl_print_t_initialize_warning(), \
-      macro_fl_print_t_initialize_debug(), \
+      macro_fl_print_t_initialize_error_1(), \
+      macro_fl_print_t_initialize_warning_1(), \
+      macro_fl_print_t_initialize_debug_1(), \
       f_color_context_t_initialize, \
     }